railjson_generator: replace 'pytype' by 'pyright'

Signed-off-by: Jean SIMARD <[email protected]>

Author: woshilapin

.github/workflows/build.yml

@@ -250,10 +250,10 @@ jobs:
           poetry run ruff check
           poetry run ruff format --check
 
-      - name: Pytype
+      - name: Pyright
         run: |
           cd python/railjson_generator
-          poetry run pytype -j auto
+          poetry run pyright
 
       - name: Pytest
         run: |

python/railjson_generator/poetry.lock

@@ -15,12 +15,9 @@ pytest-cov = "^4.1.0"
 python = ">=3.9,<3.12"
 
 [tool.poetry.group.dev.dependencies]
-pytype = { platform = "linux", version = "^2023.10.17" }
+pyright = "1.1.393"
 ruff = "0.9.5"
 
-[tool.pytype]
-inputs = ["railjson_generator"]
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

python/railjson_generator/pyproject.toml

@@ -36,9 +36,9 @@ def to_rjs(self) -> infra.RailJsonInfra:
             track_sections=[track.to_rjs() for track in self.track_sections],
             switches=[switch.to_rjs() for switch in self.switches],
             routes=[route.to_rjs() for route in self.routes],
-            signals=self.make_rjs_signals(),
-            buffer_stops=self.make_rjs_buffer_stops(),
-            detectors=self.make_rjs_detectors(),
+            signals=list(self.make_rjs_signals()),
+            buffer_stops=list(self.make_rjs_buffer_stops()),
+            detectors=list(self.make_rjs_detectors()),
             operational_points=self.make_rjs_operational_points(),
             extended_switch_types=[],
             speed_sections=[
@@ -85,8 +85,7 @@ def make_rjs_operational_points(self):
             new_op = infra.OperationalPoint(
                 id=op.label,
                 parts=parts_per_op[op.label],
-                name=op.label,
-                extensions={
+                extensions={  # pyright: ignore[reportCallIssue] - 'extensions' exists but is register through 'register_extension'
                     "sncf": infra.OperationalPointSncfExtension(
                         ci=0,
                         ch="BV",

python/railjson_generator/railjson_generator/schema/infra/infra.py

@@ -1,11 +1,12 @@
 from typing import Mapping
 
 from geojson_pydantic import LineString
+from geojson_pydantic.types import LineStringCoords
 
 
-def make_geo_line(*points) -> LineString:
+def make_geo_line(points: LineStringCoords) -> LineString:
     return LineString(coordinates=points, type="LineString")
 
 
-def make_geo_lines(*points) -> Mapping[str, LineString]:
-    return {"geo": make_geo_line(*points)}
+def make_geo_lines(points: LineStringCoords) -> Mapping[str, LineString]:
+    return {"geo": make_geo_line(points)}

python/railjson_generator/railjson_generator/schema/infra/make_geo_data.py

@@ -10,8 +10,8 @@
 
 def _neutral_section_id():
     # pytype: disable=name-error
-    res = f"neutral_section.{NeutralSection._INDEX}"
-    NeutralSection._INDEX += 1
+    res = f"neutral_section.{NeutralSection._index}"
+    NeutralSection._index += 1
     # pytype: enable=name-error
     return res
 
@@ -33,7 +33,7 @@ class NeutralSection:
     lower_pantograph: bool = field(default=False)
     label: str = field(default_factory=_neutral_section_id)
 
-    _INDEX = 0
+    _index = 0
 
     def add_track_range(
         self, track: TrackSection, begin: float, end: float, direction: Direction

python/railjson_generator/railjson_generator/schema/infra/neutral_section.py

@@ -35,7 +35,7 @@ def __post_init__(self):
 
     def to_rjs(self):
         return infra.Route(
-            id=self.label,
+            id=self.label,  # pyright: ignore[reportArgumentType] - '__post_init__' ensures 'label' always has a value
             entry_point=self.entry_point.get_waypoint_ref(),
             entry_point_direction=infra.Direction[self.entry_point_direction.name],
             exit_point=self.exit_point.get_waypoint_ref(),

python/railjson_generator/railjson_generator/schema/infra/route.py

@@ -8,8 +8,8 @@
 
 def _signal_id():
     # pytype: disable=name-error
-    res = f"signal.{Signal._INDEX}"
-    Signal._INDEX += 1
+    res = f"signal.{Signal._index}"
+    Signal._index += 1
     # pytype: enable=name-error
     return res
 
@@ -20,7 +20,7 @@ class SignalConditionalParameters:
     parameters: Dict[str, str]
 
     def to_rjs(self):
-        return infra.SignalConditionalParameters(
+        return infra.ConditionalParameter(
             on_route=self.on_route,
             parameters=self.parameters,
         )
@@ -69,7 +69,7 @@ class Signal:
     installation_type: str = "CARRE"
     side: infra.Side = infra.Side.LEFT
 
-    _INDEX = 0
+    _index = 0
 
     def add_logical_signal(self, *args, **kwargs) -> LogicalSignal:
         signal = LogicalSignal(*args, **kwargs)
@@ -84,7 +84,7 @@ def to_rjs(self, track):
             direction=infra.Direction[self.direction.name],
             sight_distance=self.sight_distance,
             logical_signals=[sig.to_rjs() for sig in self.logical_signals],
-            extensions={
+            extensions={  # pyright: ignore[reportCallIssue] - 'extensions' exists but is register through 'register_extension'
                 "sncf": {
                     "label": self.label,
                     "side": self.side,

python/railjson_generator/railjson_generator/schema/infra/signal.py

@@ -10,8 +10,8 @@
 
 def _speed_section_id():
     # pytype: disable=name-error
-    res = f"speed_section.{SpeedSection._INDEX}"
-    SpeedSection._INDEX += 1
+    res = f"speed_section.{SpeedSection._index}"
+    SpeedSection._index += 1
     # pytype: enable=name-error
     return res
 
@@ -24,7 +24,7 @@ class SpeedSection:
     label: str = field(default_factory=_speed_section_id)
     on_routes: Optional[List[str]] = None
 
-    _INDEX = 0
+    _index = 0
 
     def add_track_range(self, track, begin, end, applicable_directions):
         self.track_ranges.append(

python/railjson_generator/railjson_generator/schema/infra/speed_section.py

@@ -16,8 +16,8 @@
 
 def _switch_id():
     # pytype: disable=name-error
-    res = f"switch.{Switch._INDEX}"
-    Switch._INDEX += 1
+    res = f"switch.{Switch._index}"
+    Switch._index += 1
     # pytype: enable=name-error
     return res
 
@@ -30,7 +30,7 @@ class SwitchGroup:
 
 @dataclass
 class Switch:
-    _INDEX = 0
+    _index = 0
     # overridden by subclasses
     PORT_NAMES = []
     SWITCH_TYPE = ""
@@ -85,7 +85,7 @@ def to_rjs(self):
                 port_name: getattr(self, port_name).to_rjs()
                 for port_name in self.PORT_NAMES
             },
-            extensions={"sncf": {"label": self.label}},
+            extensions={"sncf": {"label": self.label}},  # pyright: ignore[reportCallIssue] - 'extensions' exists but is register through 'register_extension'
         )
 
 

python/railjson_generator/railjson_generator/schema/infra/switch.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Optional, Tuple
 
+from geojson_pydantic.types import LineStringCoords
 from osrd_schemas import infra
 from pydantic import ValidationError
 
@@ -21,15 +22,15 @@
 
 def _track_id():
     # pytype: disable=name-error
-    res = f"track.{TrackSection._INDEX}"
-    TrackSection._INDEX += 1
+    res = f"track.{TrackSection._index}"
+    TrackSection._index += 1
     # pytype: enable=name-error
     return res
 
 
 @dataclass
 class TrackSection:
-    _INDEX = 0
+    _index = 0
 
     length: float
     label: str = field(default_factory=_track_id)
@@ -131,10 +132,12 @@ def neighbors(self, direction: Direction):
         return self.begining_links
 
     def to_rjs(self):
-        if self.coordinates == [(None, None), (None, None)]:
-            self.coordinates = [(0, 0), (0, 0)]
+        # Replace 'None' by '0.0'
+        coordinates: LineStringCoords = list(
+            map(lambda pos: (pos[0] or 0.0, pos[1] or 0.0), self.coordinates)
+        )
         try:
-            geo_data = make_geo_lines(*self.coordinates)
+            geo_data = make_geo_lines(coordinates)
         except ValidationError:
             print(f"Track section {self.label} has invalid coordinates:")
             print(self.coordinates)
@@ -149,7 +152,7 @@ def to_rjs(self):
                 for loading_gauge_limit in self.loading_gauge_limits
             ],
             **geo_data,
-            extensions={
+            extensions={  # pyright: ignore[reportCallIssue] - 'extensions' exists but is register through 'register_extension'
                 "sncf": {
                     "line_code": self.line_code,
                     "line_name": self.line_name,

python/railjson_generator/railjson_generator/schema/infra/track_section.py

@@ -10,8 +10,8 @@
 
 def _buffer_stop_id():
     # pytype: disable=name-error
-    res = f"buffer_stop.{BufferStop._INDEX}"
-    BufferStop._INDEX += 1
+    res = f"buffer_stop.{BufferStop._index}"
+    BufferStop._index += 1
     # pytype: enable=name-error
     return res
 
@@ -21,7 +21,7 @@ class BufferStop:
     position: float
     label: str = field(default_factory=_buffer_stop_id)
 
-    _INDEX = 0
+    _index = 0
 
     @property
     def id(self):
@@ -45,8 +45,8 @@ def get_direction(self, track) -> Direction:
 
 def _detector_id():
     # pytype: disable=name-error
-    res = f"detector.{Detector._INDEX}"
-    Detector._INDEX += 1
+    res = f"detector.{Detector._index}"
+    Detector._index += 1
     # pytype: enable=name-error
     return res
 
@@ -56,7 +56,7 @@ class Detector:
     position: float
     label: str = field(default_factory=_detector_id)
 
-    _INDEX = 0
+    _index = 0
 
     @property
     def id(self):

python/railjson_generator/railjson_generator/schema/infra/waypoint.py

@@ -1,8 +1,7 @@
 from dataclasses import dataclass, field
-from typing import List
+from typing import Union
 
 from osrd_schemas.train_schedule import (
-    Allowance,
     AllowanceDistribution,
     AllowancePercentValue,
     AllowanceTimePerDistanceValue,
@@ -17,8 +16,8 @@
 
 def _train_id():
     # pytype: disable=name-error
-    res = f"train.{TrainSchedule._INDEX}"
-    TrainSchedule._INDEX += 1
+    res = f"train.{TrainSchedule._index}"
+    TrainSchedule._index += 1
     # pytype: enable=name-error
     return res
 
@@ -29,10 +28,12 @@ class TrainSchedule:
     rolling_stock: str = field(default="fast_rolling_stock")
     departure_time: float = field(default=0.0)
     initial_speed: float = field(default=0.0)
-    stops: List[Stop] = field(default_factory=list)
-    allowances: List[Allowance] = field(default_factory=list)
+    stops: list[Stop] = field(default_factory=list)
+    allowances: list[Union[EngineeringAllowance, StandardAllowance]] = field(
+        default_factory=list
+    )
 
-    _INDEX = 0
+    _index = 0
 
     def add_stop(self, *args, **kwargs):
         stop = Stop(*args, **kwargs)
@@ -54,18 +55,18 @@ def add_standard_single_value_allowance(
         """Add a standard allowance with a single value. For more information on allowances, see
         the documentation of the Allowance class in osrd_schemas."""
         if value_type == "time":
-            value = AllowanceTimeValue(seconds=value)
+            allowance = AllowanceTimeValue(seconds=value)
         elif value_type == "time_per_distance":
-            value = AllowanceTimePerDistanceValue(minutes=value)
+            allowance = AllowanceTimePerDistanceValue(minutes=value)
         elif value_type == "percentage":
-            value = AllowancePercentValue(percentage=value)
+            allowance = AllowancePercentValue(percentage=value)
         else:
             raise ValueError(f"Unknown value kind {value_type}")
 
         distribution = AllowanceDistribution(distribution)
 
         self.add_allowance(
-            default_value=value,
+            default_value=allowance,
             distribution=distribution,
             ranges=[],
             capacity_speed_limit=-1,
@@ -86,8 +87,8 @@ def format(self):
 
 def _group_id():
     # pytype: disable=name-error
-    res = f"group.{TrainScheduleGroup._INDEX}"
-    TrainScheduleGroup._INDEX += 1
+    res = f"group.{TrainScheduleGroup._index}"
+    TrainScheduleGroup._index += 1
     # pytype: enable=name-error
     return res
 
@@ -96,11 +97,11 @@ def _group_id():
 class TrainScheduleGroup:
     """A group of train schedules that share the same waypoints."""
 
-    schedules: List[TrainSchedule] = field(default_factory=list)
-    waypoints: List[List[DirectedLocation]] = field(default_factory=list)
+    schedules: list[TrainSchedule] = field(default_factory=list)
+    waypoints: list[list[DirectedLocation]] = field(default_factory=list)
     id: str = field(default_factory=_group_id)
 
-    _INDEX = 0
+    _index = 0
 
     def format(self):
         return {

python/railjson_generator/railjson_generator/schema/simulation/train_schedule.py

@@ -1,5 +1,4 @@
-from osrd_schemas.infra import ApplicableDirections
-
+from railjson_generator.schema.infra.direction import ApplicableDirection
 from railjson_generator.schema.infra.speed_section import (
     ApplicableDirectionsTrackRange,
     SpeedSection,
@@ -23,27 +22,27 @@ def test_applicable_track_ranges(self):
                 begin=50.0,
                 end=100.0,
                 track=track1,
-                applicable_directions=ApplicableDirections.BOTH,
+                applicable_directions=ApplicableDirection.BOTH,
             ),
             ApplicableDirectionsTrackRange(
                 begin=0.0,
                 end=200.0,
                 track=track2,
-                applicable_directions=ApplicableDirections.START_TO_STOP,
+                applicable_directions=ApplicableDirection.START_TO_STOP,
             ),
         )
 
         ref.add_track_range(
             begin=50.0,
             end=100.0,
             track=track1,
-            applicable_directions=ApplicableDirections.BOTH,
+            applicable_directions=ApplicableDirection.BOTH,
         )
         ref.add_track_range(
             begin=0.0,
             end=200.0,
             track=track2,
-            applicable_directions=ApplicableDirections.START_TO_STOP,
+            applicable_directions=ApplicableDirection.START_TO_STOP,
         )
 
         assert speed == ref