Eliminate the generator/profile cyclic import for real

The prior TYPE_CHECKING-guarded import wasn't a real runtime cycle, but
CodeQL's py/unsafe-cyclic-import flagged it anyway, and inline codeql[]
suppression comments didn't take for this query (still 4 findings after
adding them). Simpler to actually remove the cycle: RampParams moves to
its own core/ramp_params.py with no dependency on either generator.py
or profile.py, so profile.py can import it directly instead of only
under TYPE_CHECKING.

Author: miklosbagi

invforge/core/generator.py

@@ -9,31 +9,18 @@
 from __future__ import annotations
 
 import re
-from dataclasses import dataclass
 from typing import Literal
 
-# Not a real runtime cycle: profile.py's reciprocal import of this module
-# is guarded by `if TYPE_CHECKING:` (see profile.py), which is False at
-# runtime, so Python never executes that import line. mypy resolves the
-# annotation-only cycle fine too, since every module here uses
-# `from __future__ import annotations`.
-from .profile import Profile  # codeql[py/unsafe-cyclic-import]
-from .scenario import Scenario  # codeql[py/unsafe-cyclic-import]
+from .profile import Profile
+from .ramp_params import RampParams
+from .scenario import Scenario
 
 _RAMP_RE = re.compile(
     r"^linear-(?P<direction>drain|charge)-(?P<start>\d+(?:\.\d+)?)-to-"
     r"(?P<end>\d+(?:\.\d+)?)-(?P<duration>\d+(?:\.\d+)?)s$"
 )
 
 
-@dataclass(frozen=True)
-class RampParams:
-    direction: Literal["drain", "charge"]
-    start_pct: float
-    end_pct: float
-    duration_s: float
-
-
 def resolve_generated(name: str, profile: Profile) -> Scenario | None:
     """None if `name` doesn't match the generator's naming convention, or
     the profile has no ramp_builder -- caller falls back to the static

invforge/core/profile.py

@@ -8,17 +8,10 @@
 from collections.abc import Callable
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING
 
+from .ramp_params import RampParams
 from .registers import RegisterDef
 
-if TYPE_CHECKING:
-    # Not a real runtime cycle -- this only ever executes for a type
-    # checker (TYPE_CHECKING is False at runtime), and generator.py's
-    # reciprocal import of Profile is fine to resolve after the fact
-    # since every module here uses `from __future__ import annotations`.
-    from .generator import RampParams  # codeql[py/unsafe-cyclic-import]
-
 
 @dataclass(frozen=True)
 class Profile:

invforge/core/ramp_params.py

@@ -0,0 +1,18 @@
+"""RampParams lives in its own module, separate from generator.py, so
+that profile.py (which needs the type for Profile.ramp_builder) doesn't
+have to import back into generator.py (which imports profile.py) --
+avoids a cyclic import rather than working around one.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Literal
+
+
+@dataclass(frozen=True)
+class RampParams:
+    direction: Literal["drain", "charge"]
+    start_pct: float
+    end_pct: float
+    duration_s: float

invforge/core/scenario.py

@@ -35,10 +35,7 @@
 
 import yaml
 
-# Not a real runtime cycle: profile.py never imports this module except
-# under `if TYPE_CHECKING:` (see profile.py), which doesn't execute at
-# runtime.
-from .profile import Profile  # codeql[py/unsafe-cyclic-import]
+from .profile import Profile
 from .registers import DType, RegisterDef, normalize_scenario_value
 
 

invforge/profiles/sigenergy/firmwares/V100R001C21SPC116/ramps.py

@@ -16,7 +16,7 @@
 
 from __future__ import annotations
 
-from invforge.core.generator import RampParams
+from invforge.core.ramp_params import RampParams
 
 _RATED_CAPACITY_KWH = 18.0  # matches this firmware's other synthetic fixtures' 30083 (gain 100 -> raw 1800)