s2-python 0.4.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

s2python/common/resource_manager_details.py

@@ -13,13 +13,13 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class ResourceManagerDetails(GenResourceManagerDetails, S2MessageComponent["ResourceManagerDetails"]):
+class ResourceManagerDetails(GenResourceManagerDetails, S2MessageComponent):
     model_config = GenResourceManagerDetails.model_config
     model_config["validate_assignment"] = True
 
-    instruction_processing_delay: Duration = GenResourceManagerDetails.model_fields[
+    instruction_processing_delay: Duration = GenResourceManagerDetails.model_fields[  # type: ignore[assignment,reportIncompatibleVariableOverride]
         "instruction_processing_delay"
-    ]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenResourceManagerDetails.model_fields["message_id"]  # type: ignore[assignment]
-    resource_id: uuid.UUID = GenResourceManagerDetails.model_fields["resource_id"]  # type: ignore[assignment]
-    roles: List[Role] = GenResourceManagerDetails.model_fields["roles"]  # type: ignore[assignment]
+    ]
+    message_id: uuid.UUID = GenResourceManagerDetails.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    resource_id: uuid.UUID = GenResourceManagerDetails.model_fields["resource_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    roles: List[Role] = GenResourceManagerDetails.model_fields["roles"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/common/revoke_object.py

@@ -8,9 +8,9 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class RevokeObject(GenRevokeObject, S2MessageComponent["RevokeObject"]):
+class RevokeObject(GenRevokeObject, S2MessageComponent):
     model_config = GenRevokeObject.model_config
     model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenRevokeObject.model_fields["message_id"]  # type: ignore[assignment]
-    object_id: uuid.UUID = GenRevokeObject.model_fields["object_id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenRevokeObject.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    object_id: uuid.UUID = GenRevokeObject.model_fields["object_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/common/role.py

@@ -6,6 +6,6 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class Role(GenRole, S2MessageComponent["Role"]):
+class Role(GenRole, S2MessageComponent):
     model_config = GenRole.model_config
     model_config["validate_assignment"] = True

s2python/common/select_control_type.py

@@ -8,8 +8,8 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class SelectControlType(GenSelectControlType, S2MessageComponent["SelectControlType"]):
+class SelectControlType(GenSelectControlType, S2MessageComponent):
     model_config = GenSelectControlType.model_config
     model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenSelectControlType.model_fields["message_id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenSelectControlType.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/common/session_request.py

@@ -8,8 +8,8 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class SessionRequest(GenSessionRequest, S2MessageComponent["SessionRequest"]):
+class SessionRequest(GenSessionRequest, S2MessageComponent):
     model_config = GenSessionRequest.model_config
     model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenSessionRequest.model_fields["message_id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenSessionRequest.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/common/timer.py

@@ -9,9 +9,9 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class Timer(GenTimer, S2MessageComponent["Timer"]):
+class Timer(GenTimer, S2MessageComponent):
     model_config = GenTimer.model_config
     model_config["validate_assignment"] = True
 
-    id: uuid.UUID = GenTimer.model_fields["id"]  # type: ignore[assignment]
-    duration: Duration = GenTimer.model_fields["duration"]  # type: ignore[assignment]
+    id: uuid.UUID = GenTimer.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    duration: Duration = GenTimer.model_fields["duration"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/common/transition.py

@@ -10,15 +10,15 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class Transition(GenTransition, S2MessageComponent["Transition"]):
+class Transition(GenTransition, S2MessageComponent):
     model_config = GenTransition.model_config
     model_config["validate_assignment"] = True
 
-    id: uuid.UUID = GenTransition.model_fields["id"]  # type: ignore[assignment]
-    from_: uuid.UUID = GenTransition.model_fields["from_"]  # type: ignore[assignment]
-    to: uuid.UUID = GenTransition.model_fields["to"]  # type: ignore[assignment]
-    start_timers: List[uuid.UUID] = GenTransition.model_fields["start_timers"]  # type: ignore[assignment]
-    blocking_timers: List[uuid.UUID] = GenTransition.model_fields["blocking_timers"]  # type: ignore[assignment]
-    transition_duration: Optional[Duration] = GenTransition.model_fields[
+    id: uuid.UUID = GenTransition.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    from_: uuid.UUID = GenTransition.model_fields["from_"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    to: uuid.UUID = GenTransition.model_fields["to"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    start_timers: List[uuid.UUID] = GenTransition.model_fields["start_timers"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    blocking_timers: List[uuid.UUID] = GenTransition.model_fields["blocking_timers"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    transition_duration: Optional[Duration] = GenTransition.model_fields[  # type: ignore[assignment,reportIncompatibleVariableOverride]
         "transition_duration"
-    ]  # type: ignore[assignment]
+    ]

s2python/ddbc/__init__.py

@@ -0,0 +1,21 @@
+from s2python.ddbc.ddbc_actuator_description import DDBCActuatorDescription
+from s2python.ddbc.ddbc_operation_mode import DDBCOperationMode
+from s2python.ddbc.ddbc_instruction import DDBCInstruction
+from s2python.ddbc.ddbc_actuator_status import DDBCActuatorStatus
+from s2python.ddbc.ddbc_average_demand_rate_forecast_element import (
+    DDBCAverageDemandRateForecastElement,
+)
+from s2python.ddbc.ddbc_average_demand_rate_forecast import DDBCAverageDemandRateForecast
+from s2python.ddbc.ddbc_system_description import DDBCSystemDescription
+from s2python.ddbc.ddbc_timer_status import DDBCTimerStatus
+
+__all__ = [
+    "DDBCActuatorDescription",
+    "DDBCOperationMode",
+    "DDBCInstruction",
+    "DDBCActuatorStatus",
+    "DDBCAverageDemandRateForecastElement",
+    "DDBCAverageDemandRateForecast",
+    "DDBCSystemDescription",
+    "DDBCTimerStatus",
+]

s2python/ddbc/ddbc_actuator_description.py

@@ -0,0 +1,30 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import (
+    DDBCActuatorDescription as GenDDBCActuatorDescription,
+)
+from s2python.generated.gen_s2 import Commodity
+from s2python.ddbc.ddbc_operation_mode import DDBCOperationMode
+
+from s2python.common.timer import Timer
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCActuatorDescription(GenDDBCActuatorDescription, S2MessageComponent):
+    model_config = GenDDBCActuatorDescription.model_config
+    model_config["validate_assignment"] = True
+
+    id: uuid.UUID = GenDDBCActuatorDescription.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    supported_commodites: List[Commodity] = GenDDBCActuatorDescription.model_fields[
+        "supported_commodites"
+    ]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    timers: List[Timer] = GenDDBCActuatorDescription.model_fields["timers"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    operation_modes: List[DDBCOperationMode] = GenDDBCActuatorDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "operation_modes"
+    ]  # type: ignore[assignment]

s2python/ddbc/ddbc_actuator_status.py

@@ -0,0 +1,22 @@
+import uuid
+
+from s2python.generated.gen_s2 import DDBCActuatorStatus as GenDDBCActuatorStatus
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCActuatorStatus(GenDDBCActuatorStatus, S2MessageComponent):
+    model_config = GenDDBCActuatorStatus.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenDDBCActuatorStatus.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    actuator_id: uuid.UUID = GenDDBCActuatorStatus.model_fields["actuator_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    active_operation_mode_id: uuid.UUID = GenDDBCActuatorStatus.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "active_operation_mode_id"
+    ]  # type: ignore[assignment]
+    operation_mode_factor: float = GenDDBCActuatorStatus.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "operation_mode_factor"
+    ]  # type: ignore[assignment]

s2python/ddbc/ddbc_average_demand_rate_forecast.py

@@ -0,0 +1,28 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import (
+    DDBCAverageDemandRateForecast as GenDDBCAverageDemandRateForecast,
+)
+from s2python.ddbc.ddbc_average_demand_rate_forecast_element import (
+    DDBCAverageDemandRateForecastElement,
+)
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCAverageDemandRateForecast(
+    GenDDBCAverageDemandRateForecast,
+    S2MessageComponent,
+):
+    model_config = GenDDBCAverageDemandRateForecast.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenDDBCAverageDemandRateForecast.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    elements: List[DDBCAverageDemandRateForecastElement] = (  # type: ignore[reportIncompatibleVariableOverride]
+        GenDDBCAverageDemandRateForecast.model_fields["elements"]  # type: ignore[assignment]
+    )

s2python/ddbc/ddbc_average_demand_rate_forecast_element.py

@@ -0,0 +1,21 @@
+from s2python.generated.gen_s2 import Duration
+
+from s2python.generated.gen_s2 import (
+    DDBCAverageDemandRateForecastElement as GenDDBCAverageDemandRateForecastElement,
+)
+
+from s2python.validate_values_mixin import catch_and_convert_exceptions, S2MessageComponent
+
+
+@catch_and_convert_exceptions
+class DDBCAverageDemandRateForecastElement(
+    GenDDBCAverageDemandRateForecastElement,
+    S2MessageComponent,
+):
+    model_config = GenDDBCAverageDemandRateForecastElement.model_config
+    model_config["validate_assignment"] = True
+
+    duration: Duration = GenDDBCAverageDemandRateForecastElement.model_fields["duration"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    demand_rate_expected: float = GenDDBCAverageDemandRateForecastElement.model_fields[
+        "demand_rate_expected"
+    ]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/ddbc/ddbc_instruction.py

@@ -0,0 +1,19 @@
+import uuid
+
+from s2python.generated.gen_s2 import DDBCInstruction as GenDDBCInstruction
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCInstruction(GenDDBCInstruction, S2MessageComponent):
+    model_config = GenDDBCInstruction.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenDDBCInstruction.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    actuator_id: uuid.UUID = GenDDBCInstruction.model_fields["actuator_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    operation_mode_id: uuid.UUID = GenDDBCInstruction.model_fields["operation_mode_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    operation_mode_factor: float = GenDDBCInstruction.model_fields["operation_mode_factor"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    abnormal_condition: bool = GenDDBCInstruction.model_fields["abnormal_condition"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/ddbc/ddbc_operation_mode.py

@@ -0,0 +1,26 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import DDBCOperationMode as GenDDBCOperationMode
+
+from s2python.common.power_range import PowerRange
+from s2python.common.number_range import NumberRange
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCOperationMode(GenDDBCOperationMode, S2MessageComponent):
+    model_config = GenDDBCOperationMode.model_config
+    model_config["validate_assignment"] = True
+
+    # ? Id vs id
+    id: uuid.UUID = GenDDBCOperationMode.model_fields["Id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    power_ranges: List[PowerRange] = GenDDBCOperationMode.model_fields["power_ranges"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    supply_range: List[NumberRange] = GenDDBCOperationMode.model_fields["supply_range"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    abnormal_condition_only: bool = GenDDBCOperationMode.model_fields[
+        "abnormal_condition_only"
+    ]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/ddbc/ddbc_system_description.py

@@ -0,0 +1,29 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import (
+    DDBCSystemDescription as GenDDBCSystemDescription,
+)
+from s2python.common.number_range import NumberRange
+from s2python.ddbc.ddbc_actuator_description import DDBCActuatorDescription
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCSystemDescription(GenDDBCSystemDescription, S2MessageComponent):
+    model_config = GenDDBCSystemDescription.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenDDBCSystemDescription.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    actuators: List[DDBCActuatorDescription] = GenDDBCSystemDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "actuators"
+    ]  # type: ignore[assignment]
+    present_demand_rate: NumberRange = GenDDBCSystemDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "present_demand_rate"
+    ]  # type: ignore[assignment]
+    provides_average_demand_rate_forecast: bool = GenDDBCSystemDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
+        "provides_average_demand_rate_forecast"
+    ]  # type: ignore[assignment]

s2python/ddbc/ddbc_timer_status.py

@@ -0,0 +1,18 @@
+import uuid
+
+from s2python.generated.gen_s2 import DDBCTimerStatus as GenDDBCTimerStatus
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class DDBCTimerStatus(GenDDBCTimerStatus, S2MessageComponent):
+    model_config = GenDDBCTimerStatus.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenDDBCTimerStatus.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    timer_id: uuid.UUID = GenDDBCTimerStatus.model_fields["timer_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    actuator_id: uuid.UUID = GenDDBCTimerStatus.model_fields["actuator_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/__init__.py

@@ -1,6 +1,4 @@
-from s2python.frbc.frbc_fill_level_target_profile_element import (
-    FRBCFillLevelTargetProfileElement,
-)
+from s2python.frbc.frbc_fill_level_target_profile_element import FRBCFillLevelTargetProfileElement
 from s2python.frbc.frbc_fill_level_target_profile import FRBCFillLevelTargetProfile
 from s2python.frbc.frbc_instruction import FRBCInstruction
 from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
@@ -15,3 +13,21 @@ from s2python.frbc.frbc_storage_description import FRBCStorageDescription
 from s2python.frbc.frbc_storage_status import FRBCStorageStatus
 from s2python.frbc.frbc_system_description import FRBCSystemDescription
 from s2python.frbc.frbc_timer_status import FRBCTimerStatus
+
+__all__ = [
+    "FRBCFillLevelTargetProfileElement",
+    "FRBCFillLevelTargetProfile",
+    "FRBCInstruction",
+    "FRBCLeakageBehaviourElement",
+    "FRBCLeakageBehaviour",
+    "FRBCUsageForecastElement",
+    "FRBCUsageForecast",
+    "FRBCOperationModeElement",
+    "FRBCOperationMode",
+    "FRBCActuatorDescription",
+    "FRBCActuatorStatus",
+    "FRBCStorageDescription",
+    "FRBCStorageStatus",
+    "FRBCSystemDescription",
+    "FRBCTimerStatus",
+]

s2python/frbc/frbc_actuator_description.py

@@ -18,19 +18,19 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent["FRBCActuatorDescription"]):
+class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent):
     model_config = GenFRBCActuatorDescription.model_config
     model_config["validate_assignment"] = True
 
-    id: uuid.UUID = GenFRBCActuatorDescription.model_fields["id"]  # type: ignore[assignment]
-    operation_modes: List[FRBCOperationMode] = GenFRBCActuatorDescription.model_fields[
+    id: uuid.UUID = GenFRBCActuatorDescription.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    operation_modes: List[FRBCOperationMode] = GenFRBCActuatorDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "operation_modes"
     ]  # type: ignore[assignment]
-    transitions: List[Transition] = GenFRBCActuatorDescription.model_fields["transitions"]  # type: ignore[assignment]
-    timers: List[Timer] = GenFRBCActuatorDescription.model_fields["timers"]  # type: ignore[assignment]
+    transitions: List[Transition] = GenFRBCActuatorDescription.model_fields["transitions"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    timers: List[Timer] = GenFRBCActuatorDescription.model_fields["timers"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
     supported_commodities: List[Commodity] = GenFRBCActuatorDescription.model_fields[
         "supported_commodities"
-    ]  # type: ignore[assignment]
+    ]  # type: ignore[assignment,reportIncompatibleVariableOverride]
 
     @model_validator(mode="after")
     def validate_timers_in_transitions(self) -> Self:
@@ -61,14 +61,18 @@ class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent["FR
         timer: Timer
         for timer in self.timers:
             if timer.id in ids:
-                raise ValueError(self, f"Id {timer.id} was found multiple times in 'timers'.")
+                raise ValueError(
+                    self, f"Id {timer.id} was found multiple times in 'timers'."
+                )
             ids.append(timer.id)
 
         return self
 
     @model_validator(mode="after")
     def validate_operation_modes_in_transitions(self) -> Self:
-        operation_mode_by_id = {operation_mode.id: operation_mode for operation_mode in self.operation_modes}
+        operation_mode_by_id = {
+            operation_mode.id: operation_mode for operation_mode in self.operation_modes
+        }
         transition: Transition
         for transition in self.transitions:
             if transition.from_ not in operation_mode_by_id:
@@ -111,7 +115,9 @@ class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent["FR
                     power_ranges_for_commodity = [
                         power_range
                         for power_range in operation_mode_element.power_ranges
-                        if commodity_has_quantity(commodity, power_range.commodity_quantity)
+                        if commodity_has_quantity(
+                            commodity, power_range.commodity_quantity
+                        )
                     ]
 
                     if len(power_ranges_for_commodity) > 1:

s2python/frbc/frbc_actuator_status.py

@@ -9,15 +9,15 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCActuatorStatus(GenFRBCActuatorStatus, S2MessageComponent["FRBCActuatorStatus"]):
+class FRBCActuatorStatus(GenFRBCActuatorStatus, S2MessageComponent):
     model_config = GenFRBCActuatorStatus.model_config
     model_config["validate_assignment"] = True
 
-    active_operation_mode_id: uuid.UUID = GenFRBCActuatorStatus.model_fields[
+    active_operation_mode_id: uuid.UUID = GenFRBCActuatorStatus.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "active_operation_mode_id"
     ]  # type: ignore[assignment]
-    actuator_id: uuid.UUID = GenFRBCActuatorStatus.model_fields["actuator_id"]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCActuatorStatus.model_fields["message_id"]  # type: ignore[assignment]
-    previous_operation_mode_id: Optional[uuid.UUID] = GenFRBCActuatorStatus.model_fields[
+    actuator_id: uuid.UUID = GenFRBCActuatorStatus.model_fields["actuator_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    message_id: uuid.UUID = GenFRBCActuatorStatus.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    previous_operation_mode_id: Optional[uuid.UUID] = GenFRBCActuatorStatus.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "previous_operation_mode_id"
     ]  # type: ignore[assignment]

s2python/frbc/frbc_fill_level_target_profile.py

@@ -14,11 +14,11 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCFillLevelTargetProfile(GenFRBCFillLevelTargetProfile, S2MessageComponent["FRBCFillLevelTargetProfile"]):
+class FRBCFillLevelTargetProfile(GenFRBCFillLevelTargetProfile, S2MessageComponent):
     model_config = GenFRBCFillLevelTargetProfile.model_config
     model_config["validate_assignment"] = True
 
-    elements: List[FRBCFillLevelTargetProfileElement] = GenFRBCFillLevelTargetProfile.model_fields[
+    elements: List[FRBCFillLevelTargetProfileElement] = GenFRBCFillLevelTargetProfile.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "elements"
     ]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.model_fields["message_id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/frbc_fill_level_target_profile_element.py

@@ -8,18 +8,19 @@ from s2python.common import Duration, NumberRange
 from s2python.generated.gen_s2 import (
     FRBCFillLevelTargetProfileElement as GenFRBCFillLevelTargetProfileElement,
 )
-from s2python.validate_values_mixin import catch_and_convert_exceptions, S2MessageComponent
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCFillLevelTargetProfileElement(
-    GenFRBCFillLevelTargetProfileElement, S2MessageComponent["FRBCFillLevelTargetProfileElement"]
-):
+class FRBCFillLevelTargetProfileElement(GenFRBCFillLevelTargetProfileElement, S2MessageComponent):
     model_config = GenFRBCFillLevelTargetProfileElement.model_config
     model_config["validate_assignment"] = True
 
-    duration: Duration = GenFRBCFillLevelTargetProfileElement.model_fields["duration"]  # type: ignore[assignment]
-    fill_level_range: NumberRange = GenFRBCFillLevelTargetProfileElement.model_fields[
+    duration: Duration = GenFRBCFillLevelTargetProfileElement.model_fields["duration"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    fill_level_range: NumberRange = GenFRBCFillLevelTargetProfileElement.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "fill_level_range"
     ]  # type: ignore[assignment]
 

s2python/frbc/frbc_instruction.py

@@ -8,11 +8,11 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCInstruction(GenFRBCInstruction, S2MessageComponent["FRBCInstruction"]):
+class FRBCInstruction(GenFRBCInstruction, S2MessageComponent):
     model_config = GenFRBCInstruction.model_config
     model_config["validate_assignment"] = True
 
-    actuator_id: uuid.UUID = GenFRBCInstruction.model_fields["actuator_id"]  # type: ignore[assignment]
-    id: uuid.UUID = GenFRBCInstruction.model_fields["id"]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCInstruction.model_fields["message_id"]  # type: ignore[assignment]
-    operation_mode: uuid.UUID = GenFRBCInstruction.model_fields["operation_mode"]  # type: ignore[assignment]
+    actuator_id: uuid.UUID = GenFRBCInstruction.model_fields["actuator_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    id: uuid.UUID = GenFRBCInstruction.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    message_id: uuid.UUID = GenFRBCInstruction.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    operation_mode: uuid.UUID = GenFRBCInstruction.model_fields["operation_mode"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/frbc_leakage_behaviour.py

@@ -10,11 +10,11 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCLeakageBehaviour(GenFRBCLeakageBehaviour, S2MessageComponent["FRBCLeakageBehaviour"]):
+class FRBCLeakageBehaviour(GenFRBCLeakageBehaviour, S2MessageComponent):
     model_config = GenFRBCLeakageBehaviour.model_config
     model_config["validate_assignment"] = True
 
-    elements: List[FRBCLeakageBehaviourElement] = GenFRBCLeakageBehaviour.model_fields[
+    elements: List[FRBCLeakageBehaviourElement] = GenFRBCLeakageBehaviour.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "elements"
     ]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCLeakageBehaviour.model_fields["message_id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCLeakageBehaviour.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/frbc_leakage_behaviour_element.py

@@ -4,18 +4,21 @@ from pydantic import model_validator
 from typing_extensions import Self
 
 from s2python.common import NumberRange
-from s2python.generated.gen_s2 import FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement
-from s2python.validate_values_mixin import catch_and_convert_exceptions, S2MessageComponent
+from s2python.generated.gen_s2 import (
+    FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCLeakageBehaviourElement(
-    GenFRBCLeakageBehaviourElement, S2MessageComponent["FRBCLeakageBehaviourElement"]
-):
+class FRBCLeakageBehaviourElement(GenFRBCLeakageBehaviourElement, S2MessageComponent):
     model_config = GenFRBCLeakageBehaviourElement.model_config
     model_config["validate_assignment"] = True
 
-    fill_level_range: NumberRange = GenFRBCLeakageBehaviourElement.model_fields[
+    fill_level_range: NumberRange = GenFRBCLeakageBehaviourElement.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "fill_level_range"
     ]  # type: ignore[assignment]
 

s2python/frbc/frbc_operation_mode.py

@@ -16,24 +16,31 @@ from s2python.utils import pairwise
 
 
 @catch_and_convert_exceptions
-class FRBCOperationMode(GenFRBCOperationMode, S2MessageComponent["FRBCOperationMode"]):
+class FRBCOperationMode(GenFRBCOperationMode, S2MessageComponent):
     model_config = GenFRBCOperationMode.model_config
     model_config["validate_assignment"] = True
 
-    id: uuid.UUID = GenFRBCOperationMode.model_fields["id"]  # type: ignore[assignment]
-    elements: List[FRBCOperationModeElement] = GenFRBCOperationMode.model_fields["elements"]  # type: ignore[assignment]
+    id: uuid.UUID = GenFRBCOperationMode.model_fields["id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    elements: List[FRBCOperationModeElement] = GenFRBCOperationMode.model_fields["elements"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
 
     @model_validator(mode="after")
     def validate_contiguous_fill_levels_operation_mode_elements(self) -> Self:
         elements_by_fill_level_range: Dict[NumberRange, FRBCOperationModeElement]
-        elements_by_fill_level_range = {element.fill_level_range: element for element in self.elements}
+        elements_by_fill_level_range = {
+            element.fill_level_range: element for element in self.elements
+        }
 
         sorted_fill_level_ranges: List[NumberRange]
         sorted_fill_level_ranges = list(elements_by_fill_level_range.keys())
         sorted_fill_level_ranges.sort(key=lambda r: r.start_of_range)
 
-        for current_fill_level_range, next_fill_level_range in pairwise(sorted_fill_level_ranges):
-            if current_fill_level_range.end_of_range != next_fill_level_range.start_of_range:
+        for current_fill_level_range, next_fill_level_range in pairwise(
+            sorted_fill_level_ranges
+        ):
+            if (
+                current_fill_level_range.end_of_range
+                != next_fill_level_range.start_of_range
+            ):
                 raise ValueError(
                     self,
                     f"Elements with fill level ranges {current_fill_level_range} and "

s2python/frbc/frbc_operation_mode_element.py

@@ -11,17 +11,17 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCOperationModeElement(GenFRBCOperationModeElement, S2MessageComponent["FRBCOperationModeElement"]):
+class FRBCOperationModeElement(GenFRBCOperationModeElement, S2MessageComponent):
     model_config = GenFRBCOperationModeElement.model_config
     model_config["validate_assignment"] = True
 
-    fill_level_range: NumberRange = GenFRBCOperationModeElement.model_fields[
+    fill_level_range: NumberRange = GenFRBCOperationModeElement.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "fill_level_range"
     ]  # type: ignore[assignment]
-    fill_rate: NumberRange = GenFRBCOperationModeElement.model_fields["fill_rate"]  # type: ignore[assignment]
-    power_ranges: List[PowerRange] = GenFRBCOperationModeElement.model_fields[
+    fill_rate: NumberRange = GenFRBCOperationModeElement.model_fields["fill_rate"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    power_ranges: List[PowerRange] = GenFRBCOperationModeElement.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "power_ranges"
     ]  # type: ignore[assignment]
-    running_costs: Optional[NumberRange] = GenFRBCOperationModeElement.model_fields[
+    running_costs: Optional[NumberRange] = GenFRBCOperationModeElement.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "running_costs"
     ]  # type: ignore[assignment]

s2python/frbc/frbc_storage_description.py

@@ -9,10 +9,10 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCStorageDescription(GenFRBCStorageDescription, S2MessageComponent["FRBCStorageDescription"]):
+class FRBCStorageDescription(GenFRBCStorageDescription, S2MessageComponent):
     model_config = GenFRBCStorageDescription.model_config
     model_config["validate_assignment"] = True
 
-    fill_level_range: NumberRange = GenFRBCStorageDescription.model_fields[
+    fill_level_range: NumberRange = GenFRBCStorageDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "fill_level_range"
     ]  # type: ignore[assignment]