refactors

gatelogue-aggregator/src/gatelogue_aggregator/cli/__init__.py

@@ -2,16 +2,14 @@
 
 import click
 import msgspec.json
-import networkx as nx
 import rich
-import pygraphviz as pgv
 
 from gatelogue_aggregator.__about__ import __version__
 from gatelogue_aggregator.downloader import DEFAULT_CACHE_DIR, DEFAULT_TIMEOUT
-from gatelogue_aggregator.sources.dynmap_airports import DynmapAirports
-from gatelogue_aggregator.sources.mrt_transit import MRTTransit
-from gatelogue_aggregator.sources.wiki_airline import WikiAirline
-from gatelogue_aggregator.sources.wiki_airport import WikiAirport
+from gatelogue_aggregator.sources.air.dynmap_airports import DynmapAirports
+from gatelogue_aggregator.sources.air.mrt_transit import MRTTransit
+from gatelogue_aggregator.sources.air.wiki_airline import WikiAirline
+from gatelogue_aggregator.sources.air.wiki_airport import WikiAirport
 from gatelogue_aggregator.types.context import Context
 
 
@@ -39,7 +37,7 @@ def run(*, cache_dir: Path, timeout: int, output: Path, fmt: bool, graph: Path |
             WikiAirport(cache_dir, timeout),
         ]
     )
-    if True or graph is not None:
+    if graph is not None:
         ctx.graph(graph)
     j = msgspec.json.encode(ctx.ser())
     if fmt:

gatelogue-aggregator/src/gatelogue_aggregator/sources/wiki_airline.py → gatelogue-aggregator/src/gatelogue_aggregator/sources/air/wiki_airline.py

@@ -5,10 +5,11 @@
 import rich.progress
 
 from gatelogue_aggregator.downloader import DEFAULT_CACHE_DIR, DEFAULT_TIMEOUT
+from gatelogue_aggregator.sources.air.wiki_extractors.airline import _EXTRACTORS
 from gatelogue_aggregator.sources.wiki_base import get_wiki_link, get_wiki_text
-from gatelogue_aggregator.sources.wiki_extractors.airline import _EXTRACTORS
 from gatelogue_aggregator.types.air import AirContext, Airline, Airport, AirSource, Flight, Gate
-from gatelogue_aggregator.types.base import Source, search_all
+from gatelogue_aggregator.types.base import Source
+from gatelogue_aggregator.utils import search_all
 
 if TYPE_CHECKING:
     from pathlib import Path

gatelogue-aggregator/src/gatelogue_aggregator/sources/wiki_airport.py → gatelogue-aggregator/src/gatelogue_aggregator/sources/air/wiki_airport.py

@@ -5,10 +5,11 @@
 import rich.progress
 
 from gatelogue_aggregator.downloader import DEFAULT_CACHE_DIR, DEFAULT_TIMEOUT
+from gatelogue_aggregator.sources.air.wiki_extractors.airport import _EXTRACTORS
 from gatelogue_aggregator.sources.wiki_base import get_wiki_link, get_wiki_text
-from gatelogue_aggregator.sources.wiki_extractors.airport import _EXTRACTORS
 from gatelogue_aggregator.types.air import AirContext, Airport, AirSource, Gate
-from gatelogue_aggregator.types.base import Source, search_all
+from gatelogue_aggregator.types.base import Source
+from gatelogue_aggregator.utils import search_all
 
 if TYPE_CHECKING:
     from pathlib import Path

gatelogue-aggregator/src/gatelogue_aggregator/sources/wiki_extractors/airline.py → gatelogue-aggregator/src/gatelogue_aggregator/sources/air/wiki_extractors/airline.py

@@ -9,7 +9,7 @@
     from collections.abc import Callable
     from pathlib import Path
 
-    from gatelogue_aggregator.sources.wiki_airline import WikiAirline
+    from gatelogue_aggregator.sources.air.wiki_airline import WikiAirline
 
 _EXTRACTORS: list[Callable[[WikiAirline, Path, int], None]] = []
 

gatelogue-aggregator/src/gatelogue_aggregator/sources/wiki_extractors/airport.py → gatelogue-aggregator/src/gatelogue_aggregator/sources/air/wiki_extractors/airport.py

@@ -7,7 +7,7 @@
     from collections.abc import Callable
     from pathlib import Path
 
-    from gatelogue_aggregator.sources.wiki_airport import WikiAirport
+    from gatelogue_aggregator.sources.air.wiki_airport import WikiAirport
 
 _EXTRACTORS: list[Callable[[WikiAirport, Path, int], None]] = []
 

gatelogue-aggregator/src/gatelogue_aggregator/types/air.py

@@ -6,7 +6,7 @@
 import msgspec
 import rich.progress
 
-from gatelogue_aggregator.sources.directional_flights import DIRECTIONAL_FLIGHT_AIRLINES
+from gatelogue_aggregator.sources.air.hardcode import DIRECTIONAL_FLIGHT_AIRLINES
 from gatelogue_aggregator.types.base import BaseContext, Node, Source, Sourced
 
 if TYPE_CHECKING:

gatelogue-aggregator/src/gatelogue_aggregator/types/base.py

@@ -10,6 +10,8 @@
 import networkx as nx
 import rich
 
+from gatelogue_aggregator.utils import search_all
+
 if TYPE_CHECKING:
     from collections.abc import Callable, Container, Iterator
 
@@ -20,7 +22,7 @@ class Ser(msgspec.Struct, kw_only=True):
 
 
 class BaseContext(ToSerializable):
-    g: nx.MultiGraph[uuid.UUID]
+    g: nx.MultiGraph
 
     def __init__(self):
         self.g = nx.MultiGraph()
@@ -264,10 +266,3 @@ class Source(metaclass=SourceMeta):
 
     def __init__(self):
         rich.print(f"[yellow]Retrieving from {self.name}")
-
-
-def search_all(regex: re.Pattern[str], text: str) -> Iterator[re.Match[str]]:
-    pos = 0
-    while (match := regex.search(text, pos)) is not None:
-        pos = match.end()
-        yield match

gatelogue-aggregator/src/gatelogue_aggregator/types/context.py

@@ -1,20 +1,21 @@
 from __future__ import annotations
 
 import datetime
-from pathlib import Path
-from typing import TYPE_CHECKING, Self, override, cast
+from typing import TYPE_CHECKING, Self, cast, override
 
 import msgspec
 import networkx as nx
-import pygraphviz
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
+    from pathlib import Path
+
+    import pygraphviz
 
 import rich
 import rich.progress
 
-from gatelogue_aggregator.types.air import AirContext, AirSource, Flight, Airport, Airline, Gate
+from gatelogue_aggregator.types.air import AirContext, Airline, Airport, AirSource, Flight, Gate
 from gatelogue_aggregator.types.base import Node, ToSerializable
 
 

gatelogue-aggregator/src/gatelogue_aggregator/utils.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import re
+    from collections.abc import Iterator
+
+
+def search_all(regex: re.Pattern[str], text: str) -> Iterator[re.Match[str]]:
+    pos = 0
+    while (match := regex.search(text, pos)) is not None:
+        pos = match.end()
+        yield match