Fix test, change path handling, turn config into a class

Author: egeakman

Dockerfile

@@ -8,8 +8,8 @@ RUN pip install -r requirements.txt
 COPY src/ ./src/
 COPY Makefile .
 
-RUN mkdir -p /srv/data/raw/europython-2024
-RUN mkdir -p /srv/data/public/2024/
+RUN mkdir -p /srv/data/raw/europython-2024/
+RUN mkdir -p /srv/data/public/europython-2024/
 
 
 CMD ["make", "all"]

data/public/2024/speakers.json

@@ -1,8 +1,13 @@
 import os
+from pathlib import Path
 
-# with open("config.toml", "rb") as fd:
-#     conf = tomllib.load(fd)
 
-conf = {
-    "pretalx-token": os.environ["PRETALX_TOKEN"],
-}
+class Config:
+    event = "europython-2024"
+    project_root = Path(__file__).resolve().parents[1]
+    raw_path = Path(f"{project_root}/data/raw/{event}")
+    public_path = Path(f"{project_root}/data/public/{event}")
+
+    @staticmethod
+    def token():
+        return os.environ["PRETALX_TOKEN"]

data/public/2024/.gitignore data/public/europython-2024/.gitignoredata/public/2024/.gitignore renamed to data/public/europython-2024/.gitignore

@@ -1,16 +1,12 @@
 import json
-from datetime import datetime
 from pathlib import Path
-from pprint import pprint as pp
 
 import requests
 
-from config import conf
-
-
-class Config:
-    token = conf["pretalx-token"]
-    event = "europython-2024"
+try:
+    from config import Config
+except ImportError:
+    from src.config import Config
 
 
 headers = {
@@ -44,7 +40,7 @@ class Config:
 
     filename = resource.split("?")[0]  # To get rid of "?questions"
     filename = f"{filename}_latest.json"
-    filepath = f"../data/raw/{Config.event}/{filename}"
+    filepath = Path.joinpath(Config.raw_path, filename)
 
     with open(filepath, "w") as fd:
         json.dump(res0, fd)

data/public/2024/schedule.json src/__init__.pydata/public/2024/schedule.json renamed to src/__init__.py

@@ -1,12 +1,16 @@
 import json
-import os
-from collections import defaultdict
-from datetime import date, datetime, time, timedelta
+from datetime import datetime
+from pathlib import Path
 
 from pydantic import BaseModel, Field
 from pydantic.class_validators import root_validator
 from slugify import slugify
 
+try:
+    from config import Config
+except ImportError:
+    from src.config import Config
+
 
 class SpeakerQuestion:
     affiliation = "Company / Organization / Educational Institution"
@@ -171,7 +175,7 @@ def parse_submissions() -> list[PretalxSubmission]:
     """
     Returns only confirmed talks
     """
-    with open("../data/raw/europython-2024/submissions_latest.json") as fd:
+    with open(Path.joinpath(Config.raw_path, "submissions_latest.json")) as fd:
         js = json.load(fd)
         subs = []
         for item in js:
@@ -185,7 +189,7 @@ def parse_speakers() -> list[PretalxSpeaker]:
     """
     Returns only speakers with confirmed talks
     """
-    with open("../data/raw/europython-2024/speakers_latest.json") as fd:
+    with open(Path.joinpath(Config.raw_path, "speakers_latest.json")) as fd:
         js = json.load(fd)
         speakers = []
         for item in js:
@@ -213,7 +217,7 @@ def publishable_speakers(accepted_proposals: set[str]) -> dict[str, PretalxSpeak
 
 
 def save_publishable_sessions():
-    path = "../data/public/2024/sessions.json"
+    path = Path.joinpath(Config.public_path, "sessions.json")
 
     publishable = publishable_submissions()
 
@@ -223,7 +227,7 @@ def save_publishable_sessions():
 
 
 def save_publishable_speakers():
-    path = "../data/public/2024/speakers.json"
+    path = Path.joinpath(Config.public_path, "speakers.json")
 
     publishable = publishable_submissions()
     speakers = publishable_speakers(publishable.keys())
@@ -237,6 +241,6 @@ def save_publishable_speakers():
     publishable_submissions()
 )
 
-
-save_publishable_sessions()
-save_publishable_speakers()
+if __name__ == "__main__":
+    save_publishable_sessions()
+    save_publishable_speakers()

src/config.py

@@ -1,5 +1,6 @@
 import json
-from transform import PretalxSubmission
+
+from src.transform import PretalxSubmission
 
 with open("./data/examples/pretalx/submissions.json") as fd:
     pretalx_submissions = json.load(fd)