Convert typedefs in AST module to serde compat.

Replace usage of Sequence in the typedefs for an AST with a bare list
because pyserde doesn't support the Sequence type alias (see
yukinarit/pyserde#440). Once support is added
for a Sequence it should be possible to revert the changes.

Replaced custom serialization with the json stdlib with a call to
pyserde.

Author: minkedup

yass/__init__.py

@@ -5,14 +5,14 @@
 from typing import MutableSequence, TypeAlias, Iterable, Literal, Any, cast
 import re
 import sys
-import json
 import enum
 import logging
 import argparse
 import datetime
 import itertools
 import dataclasses
 
+import serde.json
 import requests
 import lxml.html
 
@@ -67,17 +67,5 @@ def main() -> None:
 
     ast = parse_ast(s_periods, s_time_tables)
 
-    def encode(thing: Any):
-        if dataclasses.is_dataclass(thing):
-            return dataclasses.asdict(thing)  # type: ignore
-        if isinstance(thing, datetime.date):
-            return thing.isoformat()
-        if isinstance(thing, datetime.time):
-            return thing.isoformat()
-        if isinstance(thing, enum.Enum):
-            return thing.value
-
-        return None
-
-    json.dump(ast, sys.stdout, indent=4, default=encode)
-    sys.stdout.write("\n")
+    serialized = serde.json.to_json(ast, indent=4)
+    print(serialized)

yass/ast.py

@@ -2,11 +2,13 @@
 An AST.
 """
 
-from typing import Sequence, TypeAlias, NewType
+from typing import TypeAlias, NewType
 import enum
 import datetime
 import dataclasses
 
+import serde
+
 
 class StopPart(enum.Enum):
     """
@@ -25,20 +27,20 @@ class StopPart(enum.Enum):
 TimeTableCell: TypeAlias = datetime.time | None
 
 
-@dataclasses.dataclass(frozen=True)
+@serde.serde
 class TimeTable:
     """
     A TimeTable (mapping of Stop + StopPart to rows of times).
     """
 
-    cols: Sequence[TimeTableColumn]
-    time_matrix: Sequence[Sequence[TimeTableCell]]
+    cols: list[TimeTableColumn]
+    time_matrix: list[list[TimeTableCell]]
 
 
 TimeTableIdx = NewType("TimeTableIdx", int)
 
 
-@dataclasses.dataclass(frozen=True)
+@serde.serde
 class SubPeriod:
     """
     A SubPeriod (e.g. Weekday, Weekend).
@@ -50,7 +52,7 @@ class SubPeriod:
 SubPeriodIdx = NewType("SubPeriodIdx", int)
 
 
-@dataclasses.dataclass(frozen=True)
+@serde.serde
 class Route:
     """
     A Route (e.g. 3 RIT Inn).
@@ -64,7 +66,7 @@ class Route:
 RouteIdx = NewType("RouteIdx", int)
 
 
-@dataclasses.dataclass(frozen=True)
+@serde.serde
 class Period:
     """
     A Period (e.g. Spring 2025 Shuttle Schedule).
@@ -76,21 +78,21 @@ class Period:
 PeriodIdx = NewType("PeriodIdx", int)
 
 
-@dataclasses.dataclass(frozen=True)
+@serde.serde
 class Ast:
     """
     A cohesive collection of Stops, Routes, Periods, SubPeriods, and TimeTables.
     """
 
-    routes: Sequence[Route]
-    stops: Sequence[Stop]
-    time_tables: Sequence[TimeTable]
+    routes: list[Route]
+    stops: list[Stop]
+    time_tables: list[TimeTable]
 
-    periods: Sequence[Period]
-    sub_periods: Sequence[SubPeriod]
+    periods: list[Period]
+    sub_periods: list[SubPeriod]
 
-    route_stops: dict[RouteIdx, Sequence[StopIdx]]
+    route_stops: dict[RouteIdx, list[StopIdx]]
     route_time_table: dict[RouteIdx, TimeTableIdx]
 
-    period_to_sub_periods: dict[PeriodIdx, Sequence[SubPeriodIdx]]
-    sub_period_routes: dict[SubPeriodIdx, Sequence[RouteIdx]]
+    period_to_sub_periods: dict[PeriodIdx, list[SubPeriodIdx]]
+    sub_period_routes: dict[SubPeriodIdx, list[RouteIdx]]

yass/parse.py

@@ -77,10 +77,10 @@ def finish(self) -> Ast:
             time_tables=self.time_tables,
             periods=self.periods,
             sub_periods=self.sub_periods,
-            route_stops=self.route_stops,  # type: ignore
+            route_stops=self.route_stops,
             route_time_table=self.route_time_table,
-            period_to_sub_periods=self.period_to_sub_periods,  # type: ignore
-            sub_period_routes=self.sub_period_routes,  # type: ignore
+            period_to_sub_periods=self.period_to_sub_periods,
+            sub_period_routes=self.sub_period_routes,
         )