fix: add year argument to AoC package

Author: mbrickerd

aoc/models/authenticator.py

@@ -6,9 +6,7 @@
 """
 
 import json
-import os
 from pathlib import Path
-import sys
 
 
 class Authenticator:
@@ -23,8 +21,9 @@ def get_path() -> Path:
         -------
             Path to the directory containing the current script or script's parent.
         """
-        path = os.path.realpath(sys.argv[0])
-        return Path(path).parent if not Path(path).is_dir() else Path(path)
+        current_file = Path(__file__).resolve()
+        aoc_dir = current_file.parent.parent
+        return aoc_dir.parent
 
     @staticmethod
     def get_session() -> str:

aoc/models/base.py

@@ -34,6 +34,7 @@ class SolutionBase:
 
     def __init__(
         self,
+        year: int,
         day: int = -1,
         part_num: int = 1,
         *,
@@ -52,16 +53,17 @@ def __init__(
             benchmark: Whether to measure solution execution time.
                 Defaults to `False`.
         """
+        self.year = year
         self.day = day
         self.part_num = part_num
         self.is_raw = is_raw
         self.skip_test = skip_test
         self._benchmark = benchmark
         self.benchmark_times: list[float] = []
         self.data = (
-            Reader.get_puzzle_input(self.day, raw=self.is_raw)
+            Reader.get_puzzle_input(self.year, self.day, raw=self.is_raw)
             if self.skip_test
-            else Reader.get_test_input(self.day, self.part_num, raw=self.is_raw)
+            else Reader.get_test_input(self.year, self.day, self.part_num, raw=self.is_raw)
         )
 
     def check_is_raw(self) -> None:

aoc/models/file.py

@@ -7,12 +7,12 @@
 """
 
 from datetime import datetime
-from pathlib import Path
 from time import sleep
 
 from bs4 import BeautifulSoup
 from loguru import logger
 import requests
+from requests import Request, Session
 
 from aoc.models.authenticator import Authenticator
 
@@ -26,10 +26,11 @@ class File:
     """
 
     @staticmethod
-    def download_puzzle_input(day: int) -> str:
+    def download_puzzle_input(year: int, day: int) -> str:
         """Download the puzzle input for a specific day from Advent of Code.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25) of the puzzle.
 
         Returns
@@ -41,28 +42,32 @@ def download_puzzle_input(day: int) -> str:
             Year is determined from the project directory name.
         """
         session = Authenticator.get_session()
-        path_obj = Path(Authenticator.get_path())
-        year = path_obj.parts[-1].split("-")[-1]
-
         headers = Authenticator.get_headers()
+
         headers["Referer"] = f"https://adventofcode.com/{year}/day/{day}"
         headers["Cookie"] = f"session={session}"
 
         url = f"https://adventofcode.com/{year}/day/{day}/input"
         method = "GET"
-        request = requests.Request(method, url, headers=headers)
+        request = Request(method, url, headers=headers)
         prepped_request = request.prepare()
 
-        with requests.Session() as sess:
+        logger.debug(f"URL: {url}")
+        logger.debug(f"Headers: {headers}")
+        logger.debug(f"Session token length: {len(session)}")
+
+        with Session() as sess:
             response = sess.send(prepped_request)
+            logger.debug(response.status_code)
             response.raise_for_status()
             return response.text
 
     @staticmethod
-    def download_test_input(day: int, part_num: int) -> str | None:
+    def download_test_input(year: int, day: int, part_num: int) -> str | None:
         """Download test input from the puzzle description for a specific day and part.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25) of the puzzle.
             part_num: The puzzle part number (1 or 2).
 
@@ -75,10 +80,8 @@ def download_test_input(day: int, part_num: int) -> str | None:
             Part number determines which code block to use.
         """
         session = Authenticator.get_session()
-        path_obj = Path(Authenticator.get_path())
-        year = path_obj.parts[-1].split("-")[-1]
-
         headers = Authenticator.get_headers()
+
         headers["Referer"] = f"https://adventofcode.com/{year}/day/{day}"
         headers["Cookie"] = f"session={session}"
 
@@ -97,7 +100,7 @@ def download_test_input(day: int, part_num: int) -> str | None:
         return None
 
     @staticmethod
-    def add_day(day: int) -> None:
+    def add_day(year: int, day: int) -> None:
         """Set up the file structure for a new puzzle day.
 
         Creates solution file from template and downloads puzzle input when available.
@@ -112,7 +115,7 @@ def add_day(day: int) -> None:
             - `data/dayXX/puzzle_input.txt`
         """
         path = Authenticator.get_path()
-        solution_path = path / f"solutions/day{day:02}.py"
+        solution_path = path / str(year) / f"solutions/day{day:02}.py"
 
         if not solution_path.exists():
             sample_file = path / "templates/solutions/sample.py"
@@ -121,7 +124,7 @@ def add_day(day: int) -> None:
             solution_path.write_text(content)
             logger.info(f"Created file: {solution_path}")
 
-        folder_path = path / f"data/day{day:02}"
+        folder_path = path / str(year) / f"data/day{day:02}"
         folder_path.mkdir(parents=True, exist_ok=True)
 
         file_path = folder_path / "puzzle_input.txt"
@@ -146,25 +149,26 @@ def add_day(day: int) -> None:
                 now = datetime.now()
 
             logger.info("Downloading puzzle input...")
-            file_path.write_text(File.download_puzzle_input(day))
+            file_path.write_text(File.download_puzzle_input(year, day))
             logger.info(f"Downloaded puzzle input to: {file_path}")
 
     @staticmethod
-    def add_test_input(day: int, part_num: int) -> None:
+    def add_test_input(year: int, day: int, part_num: int) -> None:
         """Set up and download test input for a specific puzzle part.
 
         Creates test input file and downloads content when available.
         Waits for puzzle unlock time (5:00 UTC) if necessary.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25) of the puzzle.
             part_num: The puzzle part number (1 or 2).
 
         Note:
             Creates file at: `tests/data/dayXX/test_XX_input.txt`
         """
         path = Authenticator.get_path()
-        folder_path = path / f"tests/data/day{day:02}"
+        folder_path = path / str(year) / f"tests/data/day{day:02}"
         folder_path.mkdir(parents=True, exist_ok=True)
 
         file_path = folder_path / f"test_{part_num:02d}_input.txt"
@@ -191,18 +195,19 @@ def add_test_input(day: int, part_num: int) -> None:
             logger.info("Downloading test input...")
 
             # Use the method's return value
-            test_input = File.download_test_input(day, part_num)
+            test_input = File.download_test_input(year, day, part_num)
 
             # Only write if test input is not None
             if test_input is not None:
                 file_path.write_text(test_input)
                 logger.info(f"Downloaded test input to: {file_path}")
 
     @staticmethod
-    def add_test_file(day: int) -> None:
+    def add_test_file(year: int, day: int) -> None:
         """Create a test file for a specific puzzle day from template.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25) to create test file for.
 
         Note:
@@ -215,7 +220,7 @@ def add_test_file(day: int) -> None:
             FileNotFoundError: If the template file is not found.
         """
         path = Authenticator.get_path()
-        test_path = path / f"tests/test_{day:02}.py"
+        test_path = path / str(year) / f"tests/test_{day:02}.py"
 
         logger.info(f"Test file path: {test_path}")
 

aoc/models/reader.py

@@ -21,11 +21,12 @@ class Reader:
     PROJECT_ROOT = _aoc_dir.parent
 
     @classmethod
-    def get_test_input(cls, day: int, part_num: int, *, raw: bool) -> str | list[str]:
+    def get_test_input(cls, year: int, day: int, part_num: int, *, raw: bool) -> str | list[str]:
         """
         Read test input for a specific day and part.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25)
             raw: If True, preserves newlines. If False, strips whitespace
             part_num: The puzzle part number (1 or 2)
@@ -35,7 +36,12 @@ def get_test_input(cls, day: int, part_num: int, *, raw: bool) -> str | list[str
             The test input as a string or list of strings
         """
         file_path = (
-            cls.PROJECT_ROOT / "tests" / "data" / f"day{day:02d}" / f"test_{part_num:02d}_input.txt"
+            cls.PROJECT_ROOT
+            / str(year)
+            / "tests"
+            / "data"
+            / f"day{day:02d}"
+            / f"test_{part_num:02d}_input.txt"
         )
 
         with Path.open(file_path) as f:
@@ -48,19 +54,20 @@ def get_test_input(cls, day: int, part_num: int, *, raw: bool) -> str | list[str
         return content.strip().split("\n")
 
     @classmethod
-    def get_puzzle_input(cls, day: int, *, raw: bool = False) -> str | list[str]:
+    def get_puzzle_input(cls, year: int, day: int, *, raw: bool = False) -> str | list[str]:
         """
         Read actual puzzle input for a specific day.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25)
             raw: If True, preserves newlines. If False, strips whitespace
 
         Returns
         -------
             The puzzle input as a string or list of strings
         """
-        file_path = cls.PROJECT_ROOT / "data" / f"day{day:02d}" / "puzzle_input.txt"
+        file_path = cls.PROJECT_ROOT / str(year) / "data" / f"day{day:02d}" / "puzzle_input.txt"
 
         with Path.open(file_path) as f:
             content = f.read()

aoc/models/submission.py

@@ -6,7 +6,6 @@
 server's response.
 """
 
-from pathlib import Path
 import re
 import urllib.parse
 import urllib.request
@@ -24,13 +23,14 @@ class Submission:
     """
 
     @staticmethod
-    def submit(day: int, level: int, answer: int) -> None:
+    def submit(year: int, day: int, level: int, answer: int) -> None:
         """Submit a puzzle solution to Advent of Code.
 
         Makes a POST request to submit the answer and processes the response,
         displaying formatted feedback about whether the answer was correct.
 
         Args:
+            year: The year of the puzzle (2024, 2025, etc.)
             day: The day number (1-25) of the puzzle.
             level: The part number (1 or 2) of the puzzle.
             answer: The calculated answer to submit.
@@ -42,10 +42,8 @@ def submit(day: int, level: int, answer: int) -> None:
             - Preserves important punctuation in separate lines for readability
         """
         session = Authenticator.get_session()
-        path_obj = Path(Authenticator.get_path())
-        year = path_obj.parts[-1].split("-")[-1]
-
         headers = Authenticator.get_headers()
+
         headers["Referer"] = f"https://adventofcode.com/{year}/day/{day}"
         headers["Cookie"] = f"session={session}"
 

aoc/models/tester.py

@@ -19,6 +19,7 @@ class TestSolutionUtility:
 
     @staticmethod
     def run_test(
+        year: int,
         day: int,
         part_num: int,
         expected: str | int,
@@ -48,13 +49,13 @@ def run_test(
             - Loads test input from `tests/data/dayXX/test_YY_input.txt`
             - Expects solution classes to have `part1()` and `part2()` methods
         """
-        solution: SolutionBase = initialise(day, skip_test=False)
+        solution: SolutionBase = initialise(year, day, skip_test=False)
         part_method = getattr(solution, f"part{part_num}")
-        test_input = Reader.get_test_input(day, part_num, raw=is_raw)
+        test_input = Reader.get_test_input(year, day, part_num, raw=is_raw)
         result = part_method(data=test_input)
 
         if result != expected:
-            error_message = (
+            err_msg = (
                 f"Test failed for Day {day}, Part {part_num}: Expected {expected}, got {result}."
             )
-            raise ValueError(error_message)
+            raise ValueError(err_msg)

aoc/utils/initalise.py

@@ -15,6 +15,7 @@
 
 
 def initialise(
+    year: int,
     day: int,
     part: int = 1,
     *,
@@ -26,6 +27,7 @@ def initialise(
     Dynamically load and instantiate the `Solution` class for a specific puzzle day.
 
     Args:
+        year (int): The year of the puzzle to initialize.
         day (int): The day number (1-25) of the puzzle to initialize.
         part (int, optional): Part number (1 or 2) to solve. Defaults to 1.
         raw (bool, optional): Whether to use raw input. Defaults to False.
@@ -49,9 +51,9 @@ def initialise(
     solution_class: type[SolutionBase] = solution_module.Solution
 
     if not issubclass(solution_class, SolutionBase):
-        error_message = f"Solution class for day {day} must inherit from SolutionBase"
-        raise TypeError(error_message)
+        err_msg = f"Solution class for day {day} must inherit from SolutionBase"
+        raise TypeError(err_msg)
 
     return solution_class(
-        day=day, part_num=part, is_raw=raw, skip_test=skip_test, benchmark=benchmark
+        year=year, day=day, part_num=part, is_raw=raw, skip_test=skip_test, benchmark=benchmark
     )