submissions/sessions work

Author: egeakman

Makefile

@@ -1,20 +1,3 @@
-# Variables for the project
-# =========================
-CONFERENCE ?= ep2025
-DATA_DIR ?= ./data/public/$(CONFERENCE)/
-
-# Variables for remote host
-# =========================
-VPS_USER  ?= static_content_user
-VPS_HOST  ?= static.europython.eu
-VPS_PATH  ?= /home/$(VPS_USER)/content/static/programme/$(CONFERENCE)/releases
-REMOTE_CMD=ssh $(VPS_USER)@$(VPS_HOST)
-
-# Variables for deploy
-# ====================
-TIMESTAMP ?= $(shell date +%Y%m%d%H%M%S)
-FORCE_DEPLOY ?= false
-
 # Optional arguments
 # ==================
 EXCLUDE ?=
@@ -23,16 +6,7 @@ WARN_DUPES ?= false
 # Convert EXCLUDE space-separated list to repeated --exclude flags
 EXCLUDE_FLAGS = $(foreach item,$(EXCLUDE),--exclude $(item))
 
-dev:
-	uv sync --dev
-
-deps/upgrade:
-	uv lock --upgrade
-
-deps/install:
-	uv sync
-
-install: deps/install
+all: download transform
 
 download:
 	python -m src.download $(EXCLUDE_FLAGS)
@@ -44,18 +18,6 @@ else
 	python -m src.transform $(EXCLUDE_FLAGS)
 endif
 
-all: download transform
-
-ifeq ($(FORCE_DEPLOY), true)
-deploy: TARGET = $(VPS_PATH)/$(TIMESTAMP)
-deploy:
-	@echo "\n\n**** Deploying branch '$(CONFERENCE)' to $(TARGET)...\n\n"
-	$(REMOTE_CMD) "mkdir -p $(TARGET)"
-	rsync -avz --delete $(DATA_DIR) $(VPS_USER)@$(VPS_HOST):$(TARGET)
-	$(REMOTE_CMD) "cd $(VPS_PATH) && ln -snf $(TIMESTAMP) current"
-	@echo "\n\n**** Deployment complete.\n\n"
-endif
-
 test:
 	uv run pytest
 

pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "programapi"
-version = "2025.4.5"
+version = "2025.10.14"
 description = "Programme API for EuroPython"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.12,<3.14"
 classifiers = [
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.12",

src/config.py

@@ -5,8 +5,8 @@
 
 
 class Config:
-    event = "europython-2025"
-    event_dir_name = "ep2025"
+    event = "pyladiescon-2025"
+    event_dir_name = "plc25"
     api_version = "v1"
 
     project_root = Path(__file__).resolve().parents[1]

src/download.py

@@ -27,14 +27,14 @@
 base_url = f"https://pretalx.com/api/events/{Config.event}/"
 schedule_url = (
     base_url
-    + "schedules/latest?expand="
-    + "slots,slots.submission,slots.submission.submission_type,slots.submission.track,slots.room"
+    + "schedules/latest?lang=en&expand="
+    + "slots,slots.submission,slots.submission.submission_type,slots.submission.track,slots.room,slots.submission.content_locale"
 )
 
 # Build resource list dynamically based on exclusions
 resources = [
-    "submissions?state=confirmed&expand=answers.question,submission_type,track,slots.room,resources",
-    "speakers?expand=answers.question",
+    "submissions?state=confirmed&lang=en&expand=answers.question,submission_type,track,slots.room,resources,content_locale",
+    "speakers?lang=en&expand=answers.question",
 ]
 
 if "youtube" not in exclude:

src/misc.py

@@ -12,10 +12,12 @@ class SpeakerQuestion:
 
 
 class SubmissionQuestion:
+    talk_topic = "Talk topic"
     outline = "Outline"
     tweet = "Abstract as a short post (150 character max)"
     delivery = "My presentation can be delivered in-person"
-    level = "Expected audience expertise"
+    level = "Level"
+    language = "Language"
 
 
 class SubmissionState(Enum):

src/models/europython.py

@@ -35,9 +35,7 @@ class EuroPythonSpeaker(BaseModel):
 
     @computed_field
     def website_url(self) -> str:
-        return (
-            f"https://ep{Config.event.split('-')[1]}.europython.eu/speaker/{self.slug}"
-        )
+        return f"https://{Config.event.split('-')[1]}.conference.pyladies.com/speaker/{self.slug}"
 
     @model_validator(mode="before")
     @classmethod
@@ -312,6 +310,7 @@ class EuroPythonSession(BaseModel):
     duration: str = ""
     level: str = ""
     delivery: str = ""
+    language: str = ""
     resources: list[dict[str, str | None]] | None = None
     room: str | None = None
     start: datetime | None = None
@@ -334,17 +333,19 @@ def handle_poster_room(cls, value) -> str | None:
 
     @computed_field
     def website_url(self) -> str:
-        return (
-            f"https://ep{Config.event.split('-')[1]}.europython.eu/session/{self.slug}"
-        )
+        return f"https://{Config.event.split('-')[1]}.conference.pyladies.com/session/{self.slug}"
 
     @model_validator(mode="before")
     @classmethod
     def extract_answers(cls, values) -> dict:
         answers = [PretalxAnswer.model_validate(ans) for ans in values["answers"]]
 
         for answer in answers:
-            # TODO if we need any other questions
+            if answer.question_text == SubmissionQuestion.talk_topic and not values.get(
+                "track"
+            ):
+                values["track"] = answer.answer_text
+
             if answer.question_text == SubmissionQuestion.tweet:
                 values["tweet"] = answer.answer_text
 

src/models/pretalx.py

@@ -16,7 +16,7 @@ class PretalxAnswer(BaseModel):
     @model_validator(mode="before")
     @classmethod
     def extract(cls, values) -> dict:
-        values["question_text"] = values["question"]["question"]["en"]
+        values["question_text"] = values["question"]["question"]
         values["answer_text"] = values["answer"]
         values["answer_file"] = values["answer_file"]
         values["submission_id"] = values["submission"]
@@ -31,9 +31,9 @@ class PretalxSlot(BaseModel):
 
     @field_validator("room", mode="before")
     @classmethod
-    def handle_localized(cls, v) -> str | None:
+    def handle_dict(cls, v) -> str | None:
         if isinstance(v, dict):
-            return v["name"].get("en")
+            return v["name"]
         return v
 
 
@@ -63,6 +63,8 @@ class PretalxSubmission(BaseModel):
     state: SubmissionState
     abstract: str = ""
     duration: str = ""
+    content_locale: str = Field(exclude=True)
+    language: str = ""
     resources: list[dict[str, str | None]] | None = None
     answers: list[PretalxAnswer]
     slots: list[PretalxSlot] = Field(default_factory=list, exclude=True)
@@ -75,9 +77,9 @@ class PretalxSubmission(BaseModel):
 
     @field_validator("submission_type", "track", mode="before")
     @classmethod
-    def handle_localized(cls, v) -> str | None:
+    def handle_dict(cls, v) -> str | None:
         if isinstance(v, dict):
-            return v["name"].get("en")
+            return v["name"]
         return v
 
     @field_validator("duration", mode="before")
@@ -95,6 +97,8 @@ def handle_resources(cls, v) -> list[dict[str, str]] | None:
     @model_validator(mode="before")
     @classmethod
     def process_values(cls, values) -> dict:
+        values["language"] = values["content_locale"]
+
         # Transform resource information
         if raw_resources := values.get("resources"):
             resources = [
@@ -129,13 +133,6 @@ class PretalxScheduleBreak(BaseModel):
     end: datetime
     description: dict[str, str] | str
 
-    @field_validator("description", mode="before")
-    @classmethod
-    def handle_localized(cls, v) -> str | Any:
-        if isinstance(v, dict):
-            return v.get("en")
-        return v
-
     @model_validator(mode="before")
     @classmethod
     def set_slot_info(cls, values) -> dict:

src/utils/transform.py

@@ -42,6 +42,7 @@ def pretalx_submissions_to_europython_sessions(
                 session_type=submission.submission_type,
                 slug=session_code_to_slug[submission.code],
                 track=submission.track,
+                language=submission.language,
                 abstract=submission.abstract,
                 duration=submission.duration,
                 resources=submission.resources,
@@ -140,6 +141,7 @@ def pretalx_schedule_to_europython_schedule(
                     track=session.track,
                     tweet=session.tweet,
                     level=session.level,
+                    language=session.language,
                     total_duration=int(session.duration),
                     rooms=[session.room],
                     start=start_time,