s2-python 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

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:
@@ -68,7 +68,9 @@ class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent["FR
 
     @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:

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

@@ -12,14 +12,12 @@ from s2python.validate_values_mixin import catch_and_convert_exceptions, S2Messa
 
 
 @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

@@ -9,13 +9,11 @@ from s2python.validate_values_mixin import catch_and_convert_exceptions, S2Messa
 
 
 @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,17 +16,19 @@ 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())

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]

s2python/frbc/frbc_storage_status.py

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

s2python/frbc/frbc_system_description.py

@@ -11,12 +11,12 @@ from s2python.frbc.frbc_storage_description import FRBCStorageDescription
 
 
 @catch_and_convert_exceptions
-class FRBCSystemDescription(GenFRBCSystemDescription, S2MessageComponent["FRBCSystemDescription"]):
+class FRBCSystemDescription(GenFRBCSystemDescription, S2MessageComponent):
     model_config = GenFRBCSystemDescription.model_config
     model_config["validate_assignment"] = True
 
-    actuators: List[FRBCActuatorDescription] = GenFRBCSystemDescription.model_fields[
+    actuators: List[FRBCActuatorDescription] = GenFRBCSystemDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "actuators"
     ]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCSystemDescription.model_fields["message_id"]  # type: ignore[assignment]
-    storage: FRBCStorageDescription = GenFRBCSystemDescription.model_fields["storage"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCSystemDescription.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    storage: FRBCStorageDescription = GenFRBCSystemDescription.model_fields["storage"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/frbc_timer_status.py

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

s2python/frbc/frbc_usage_forecast.py

@@ -10,9 +10,9 @@ from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement
 
 
 @catch_and_convert_exceptions
-class FRBCUsageForecast(GenFRBCUsageForecast, S2MessageComponent["FRBCUsageForecast"]):
+class FRBCUsageForecast(GenFRBCUsageForecast, S2MessageComponent):
     model_config = GenFRBCUsageForecast.model_config
     model_config["validate_assignment"] = True
 
-    elements: List[FRBCUsageForecastElement] = GenFRBCUsageForecast.model_fields["elements"]  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCUsageForecast.model_fields["message_id"]  # type: ignore[assignment]
+    elements: List[FRBCUsageForecastElement] = GenFRBCUsageForecast.model_fields["elements"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+    message_id: uuid.UUID = GenFRBCUsageForecast.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]

s2python/frbc/frbc_usage_forecast_element.py

@@ -10,8 +10,8 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-class FRBCUsageForecastElement(GenFRBCUsageForecastElement, S2MessageComponent["FRBCUsageForecastElement"]):
+class FRBCUsageForecastElement(GenFRBCUsageForecastElement, S2MessageComponent):
     model_config = GenFRBCUsageForecastElement.model_config
     model_config["validate_assignment"] = True
 
-    duration: Duration = GenFRBCUsageForecastElement.model_fields["duration"]  # type: ignore[assignment]
+    duration: Duration = GenFRBCUsageForecastElement.model_fields["duration"]  # type: ignore[assignment,reportIncompatibleVariableOverride]