Add calendar module

Author: pareronia

src/main/python/aoc/calendar.py

@@ -0,0 +1,42 @@
+from datetime import datetime
+
+from dateutil import tz
+
+AOC_TZ = tz.gettz("America/New_York")
+
+
+def get_now_aoc() -> datetime:
+    return datetime.now(tz=AOC_TZ)
+
+
+def get_now_utc() -> datetime:
+    return datetime.now(tz=tz.UTC)
+
+
+def valid_years() -> range:
+    aoc_now = get_now_aoc()
+    return range(2015, aoc_now.year + int(aoc_now.month == 12))
+
+
+def is_valid_year(year: int) -> bool:
+    return year in valid_years()
+
+
+def get_days(year: int) -> int:
+    if not is_valid_year(year):
+        raise AssertionError
+    return 25 if year < 2025 else 12
+
+
+def is_ranked_year(year: int) -> bool:
+    if not is_valid_year(year):
+        raise AssertionError
+    return year < 2025
+
+
+def is_valid_day(year: int, day: int) -> bool:
+    valid_day = is_valid_year(year) and day in range(1, get_days(year) + 1)
+    aoc_now = get_now_aoc()
+    if year == aoc_now.year:
+        return valid_day and day <= aoc_now.day
+    return valid_day

src/main/python/aoc/implementation_tables/implementation_tables.py

@@ -6,6 +6,8 @@
 from pathlib import Path
 from typing import IO
 
+import aoc.calendar as calendar
+
 if __name__ == "__main__":
     from config import Row  # type:ignore[import-not-found]
     from config import config
@@ -28,7 +30,7 @@ def _build_row(days: list[str]) -> str:
 
 def _print_year(year: int, rows: list[Row], f: IO[str]) -> None:
     log.debug("Adding %s", year)
-    days = 12 if year >= 2025 else 25
+    days = calendar.get_days(year)
     print("| " + _build_row([str(day) for day in range(1, days + 1)]), file=f)
     print("| ---" + _build_row(["---" for day in range(1, days + 1)]), file=f)
     for row in rows:

src/main/python/aoc/runner/listener.py

@@ -5,11 +5,10 @@
 from abc import abstractmethod
 from collections.abc import Iterable
 from collections.abc import Iterator
-from datetime import datetime
 from typing import NamedTuple
 from typing import cast
 
-from dateutil import tz
+from aoc import calendar
 from junitparser import Attr
 from junitparser import Error
 from junitparser import Failure
@@ -270,7 +269,7 @@ def _format_time(self, time: int, timeout: float) -> str:
 class JUnitXmlListener(Listener):
     def __init__(self) -> None:
         self.suite = TestSuite("Advent of Code")
-        self.suite.timestamp = datetime.now(tz.UTC)
+        self.suite.timestamp = calendar.get_now_utc()
         self.suite.hostname = socket.gethostname()
         TestCase.year = IntAttr("year")
         TestCase.day = IntAttr("day")

src/main/python/aoc/runner/runner.py

@@ -30,12 +30,12 @@
 from collections.abc import Callable
 from collections.abc import Generator
 from contextlib import contextmanager
-from datetime import datetime
 from pathlib import Path
 from typing import Any
 
 import pebble
-from dateutil.tz import gettz
+
+from aoc import calendar
 
 from . import Result
 from .aocd import AocdHelper
@@ -55,7 +55,6 @@
 from .rust import Rust
 
 DEFAULT_TIMEOUT = config.default_timeout
-AOC_TZ = gettz("America/New_York")
 log = logging.getLogger(__name__)
 all_plugins = OrderedDict(
     {
@@ -70,8 +69,7 @@
 
 
 def main() -> None:
-    aoc_now = datetime.now(tz=AOC_TZ)
-    years = range(2015, aoc_now.year + int(aoc_now.month == 12))
+    years = calendar.valid_years()
     days = range(1, 26)
     users = AocdHelper.load_users()
     parser = ArgumentParser(description="AoC runner")
@@ -102,7 +100,7 @@ def main() -> None:
         nargs="+",
         choices=days,
         default=days,
-        help="AoC days to run. Runs all 1-25 by default.",
+        help="AoC days to run. Runs all days by default.",
     )
     parser.add_argument(
         "-u",
@@ -274,11 +272,10 @@ def run_for(
     autosubmit: bool,
     listener: Listener,
 ) -> int:
-    aoc_now = datetime.now(tz=AOC_TZ)
     it = itertools.product(years, days, plugins.items(), datasets)
     n_incorrect = 0
     for year, day, plugin, user_id in it:
-        if year == aoc_now.year and day > aoc_now.day:
+        if not calendar.is_valid_day(year, day):
             continue
         token = datasets[user_id]
         puzzle = Puzzle.create(token, year, day, autosubmit)

src/main/python/aoc/stats/input.py

@@ -3,6 +3,7 @@
 import re
 from datetime import timedelta
 
+from aoc import calendar
 from tqdm import tqdm
 
 from . import LeaderBoard
@@ -86,7 +87,7 @@ def _scrape_leaderboard(year: int) -> dict[int, LeaderBoard]:
             continue
         splits = line.split()
         day = int(splits[0])
-        if year >= 2025:
+        if not calendar.is_ranked_year(year):
             time_first = html.unescape(splits[1]) if splits[1] != "-" else None
             rank_first = None
             score_first = None
@@ -112,7 +113,7 @@ def _scrape_leaderboard(year: int) -> dict[int, LeaderBoard]:
 
 
 def get_leaderboard(year: int) -> dict[int, LeaderBoard]:
-    if year < 2025:
+    if calendar.is_ranked_year(year):
         try:
             return _get_aocd_leaderboard(year)
         except AttributeError:

src/main/python/aoc/stats/stats.py

@@ -1,16 +1,15 @@
-import datetime
 import sys
 
-import dateutil
+from aoc import calendar
 
 from . import input as stats_input
 from . import output as stats_output
 
 
 def main(args: list[str]) -> None:
-    now = datetime.datetime.now(tz=dateutil.tz.gettz("America/New_York"))
     if len(args) == 0:
-        if now.month == 12:
+        now = calendar.get_now_aoc()
+        if calendar.is_valid_year(now.year):
             print_year(now.year)
     elif args[0] == "all":
         print_summary()