Update typing information - switched to inline

Author: justin13601

src/aces/__main__.py

@@ -131,7 +131,7 @@ def get_and_validate_label_schema(df: pl.DataFrame) -> pa.Table:
 
 
 @hydra.main(version_base=None, config_path=str(config_yaml.parent.resolve()), config_name=config_yaml.stem)
-def main(cfg: DictConfig):
+def main(cfg: DictConfig) -> None:
     import os
     from datetime import datetime
     from pathlib import Path

src/aces/aggregate.pyi

@@ -9,6 +9,7 @@
 from dataclasses import field
 from datetime import timedelta
 from pathlib import Path
+from typing import Any
 
 import networkx as nx
 import polars as pl
@@ -28,7 +29,7 @@
 
 @dataclasses.dataclass
 class PlainPredicateConfig:
-    code: str | dict
+    code: str | dict[str, Any]
     value_min: float | None = None
     value_max: float | None = None
     value_min_inclusive: bool | None = None
@@ -289,7 +290,7 @@ class DerivedPredicateConfig:
     expr: str
     static: bool = False
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if not self.expr:
             raise ValueError("Derived predicates must have a non-empty expression field.")
 
@@ -647,7 +648,7 @@ class WindowConfig:
     index_timestamp: str | None = None
 
     @classmethod
-    def _check_reference(cls, reference: str):
+    def _check_reference(cls, reference: str) -> None:
         """Checks to ensure referenced events are valid."""
         err_str = (
             "Window boundary reference must be either a valid alphanumeric/'_' string "
@@ -708,7 +709,7 @@ def _parse_boundary(cls, boundary: str) -> dict[str, str]:
             cls._check_reference(ref)
             return {"referenced": ref, "offset": None, "event_bound": None, "occurs_before": None}
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         # Parse the has constraints from the string representation to the tuple representation
         if self.has is not None:
             for each_constraint in self.has:
@@ -1127,7 +1128,11 @@ class TaskExtractorConfig:
     index_timestamp_window: str | None = None
 
     @classmethod
-    def load(cls, config_path: str | Path, predicates_path: str | Path = None) -> TaskExtractorConfig:
+    def load(
+        cls: TaskExtractorConfig,
+        config_path: str | Path,
+        predicates_path: str | Path = None,
+    ) -> TaskExtractorConfig:
         """Load a configuration file from the given path and return it as a dict.
 
         Args:
@@ -1308,7 +1313,7 @@ def load(cls, config_path: str | Path, predicates_path: str | Path = None) -> Ta
 
         return cls(predicates=predicate_objs, trigger=trigger, windows=windows)
 
-    def _initialize_predicates(self):
+    def _initialize_predicates(self) -> None:
         """Initialize the predicates tree from the configuration object and check validity.
 
         Raises:
@@ -1355,7 +1360,7 @@ def _initialize_predicates(self):
                 f"Graph: {nx.write_network_text(self._predicate_dag_graph)}"
             )
 
-    def _initialize_windows(self):
+    def _initialize_windows(self) -> None:
         """Initialize the windows tree from the configuration object and check validity.
 
         Raises:
@@ -1502,7 +1507,7 @@ def _initialize_windows(self):
 
         self.window_nodes = window_nodes
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._initialize_predicates()
         self._initialize_windows()
 
@@ -1515,12 +1520,12 @@ def predicates_DAG(self) -> nx.DiGraph:
         return self._predicate_dag_graph
 
     @property
-    def plain_predicates(self) -> dict[str:PlainPredicateConfig]:
+    def plain_predicates(self) -> dict[str, PlainPredicateConfig]:
         """Returns a dictionary of plain predicates in {name: code} format."""
         return {p: cfg for p, cfg in self.predicates.items() if cfg.is_plain}
 
     @property
-    def derived_predicates(self) -> OrderedDict[str:DerivedPredicateConfig]:
+    def derived_predicates(self) -> OrderedDict[str, DerivedPredicateConfig]:
         """Returns an ordered dictionary mapping derived predicates to their configs in a proper order."""
         return {
             p: self.predicates[p]

src/aces/config.py

@@ -71,7 +71,7 @@ def expand_shards(*shards: str) -> str:
     return ",".join(result)
 
 
-def main():
+def main() -> None:
     print(expand_shards(*sys.argv[1:]))