s2-python 0.0.0__py3-none-any.whl → 0.1.0__py3-none-any.whl

s2python/common/timer.py

@@ -2,13 +2,16 @@ import uuid
 
 from s2python.common.duration import Duration
 from s2python.generated.gen_s2 import Timer as GenTimer
-from s2python.validate_values_mixin import ValidateValuesMixin, catch_and_convert_exceptions
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
 
 
 @catch_and_convert_exceptions
-class Timer(GenTimer, ValidateValuesMixin['Timer']):
+class Timer(GenTimer, S2Message["Timer"]):
     class Config(GenTimer.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenTimer.__fields__['id'].field_info  # type: ignore[assignment]
-    duration: Duration = GenTimer.__fields__['duration'].field_info  # type: ignore[assignment]
+    id: uuid.UUID = GenTimer.__fields__["id"].field_info  # type: ignore[assignment]
+    duration: Duration = GenTimer.__fields__["duration"].field_info  # type: ignore[assignment]

s2python/common/transition.py

@@ -1,19 +1,26 @@
 import uuid
 from typing import Optional, List
 
-from s2python.common import Duration
+from s2python.common.duration import Duration
 from s2python.generated.gen_s2 import Transition as GenTransition
-from s2python.validate_values_mixin import ValidateValuesMixin, catch_and_convert_exceptions
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
 
 
 @catch_and_convert_exceptions
-class Transition(GenTransition, ValidateValuesMixin['Transition']):
+class Transition(GenTransition, S2Message["Transition"]):
     class Config(GenTransition.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenTransition.__fields__['id'].field_info  # type: ignore[assignment]
-    from_: uuid.UUID = GenTransition.__fields__['from_'].field_info  # type: ignore[assignment]
-    to: uuid.UUID = GenTransition.__fields__['to'].field_info  # type: ignore[assignment]
-    start_timers: List[uuid.UUID] = GenTransition.__fields__['start_timers'].field_info  # type: ignore[assignment]
-    blocking_timers: List[uuid.UUID] = GenTransition.__fields__['blocking_timers'].field_info  # type: ignore[assignment]
-    transition_duration: Optional[Duration] = GenTransition.__fields__['transition_duration'].field_info  # type: ignore[assignment]
+    id: uuid.UUID = GenTransition.__fields__["id"].field_info  # type: ignore[assignment]
+    from_: uuid.UUID = GenTransition.__fields__["from_"].field_info  # type: ignore[assignment]
+    to: uuid.UUID = GenTransition.__fields__["to"].field_info  # type: ignore[assignment]
+    start_timers: List[uuid.UUID] = GenTransition.__fields__["start_timers"].field_info  # type: ignore[assignment]
+    blocking_timers: List[uuid.UUID] = GenTransition.__fields__[
+        "blocking_timers"
+    ].field_info  # type: ignore[assignment]
+    transition_duration: Optional[Duration] = GenTransition.__fields__[
+        "transition_duration"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/__init__.py

@@ -1,4 +1,6 @@
-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

s2python/frbc/frbc_actuator_description.py

@@ -6,103 +6,165 @@ from pydantic import root_validator
 
 from s2python.common import Transition, Timer, Commodity
 from s2python.common.support import commodity_has_quantity
-from s2python.frbc import FRBCOperationMode
-from s2python.generated.gen_s2 import FRBCActuatorDescription as GenFRBCActuatorDescription, CommodityQuantity
-from s2python.validate_values_mixin import ValidateValuesMixin, catch_and_convert_exceptions
+from s2python.frbc.frbc_operation_mode import FRBCOperationMode
+from s2python.generated.gen_s2 import (
+    FRBCActuatorDescription as GenFRBCActuatorDescription,
+    CommodityQuantity,
+)
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCActuatorDescription(GenFRBCActuatorDescription, ValidateValuesMixin['FRBCActuatorDescription']):
+class FRBCActuatorDescription(
+    GenFRBCActuatorDescription, S2Message["FRBCActuatorDescription"]
+):
     class Config(GenFRBCActuatorDescription.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenFRBCActuatorDescription.__fields__['id'].field_info  # type: ignore[assignment]
-    operation_modes: List[FRBCOperationMode] = GenFRBCActuatorDescription.__fields__['operation_modes'].field_info  # type: ignore[assignment]
-    transitions: List[Transition] = GenFRBCActuatorDescription.__fields__['transitions'].field_info  # type: ignore[assignment]
-    timers: List[Timer] = GenFRBCActuatorDescription.__fields__['timers'].field_info  # type: ignore[assignment]
-    supported_commodities: List[Commodity] = GenFRBCActuatorDescription.__fields__['supported_commodities'].field_info  # type: ignore[assignment]
+    id: uuid.UUID = GenFRBCActuatorDescription.__fields__["id"].field_info  # type: ignore[assignment]
+    operation_modes: List[FRBCOperationMode] = GenFRBCActuatorDescription.__fields__[
+        "operation_modes"
+    ].field_info  # type: ignore[assignment]
+    transitions: List[Transition] = GenFRBCActuatorDescription.__fields__[
+        "transitions"
+    ].field_info  # type: ignore[assignment]
+    timers: List[Timer] = GenFRBCActuatorDescription.__fields__["timers"].field_info  # type: ignore[assignment]
+    supported_commodities: List[Commodity] = GenFRBCActuatorDescription.__fields__[
+        "supported_commodities"
+    ].field_info  # type: ignore[assignment]
 
     @root_validator(pre=False)
+    @classmethod
     def validate_timers_in_transitions(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         timers_by_id = {timer.id: timer for timer in values.get("timers", {})}
         transition: Transition
         for transition in values.get("transitions", []):
             for start_timer_id in transition.start_timers:
                 if start_timer_id not in timers_by_id:
-                    raise ValueError(cls, f'{start_timer_id} was referenced as start timer in transition '
-                                          f'{transition.id} but was not defined in \'timers\'.')
+                    raise ValueError(
+                        cls,
+                        f"{start_timer_id} was referenced as start timer in transition "
+                        f"{transition.id} but was not defined in 'timers'.",
+                    )
 
             for blocking_timer_id in transition.blocking_timers:
                 if blocking_timer_id not in timers_by_id:
-                    raise ValueError(cls, f'{blocking_timer_id} was referenced as blocking timer in transition '
-                                          f'{transition.id} but was not defined in \'timers\'.')
+                    raise ValueError(
+                        cls,
+                        f"{blocking_timer_id} was referenced as blocking timer in transition "
+                        f"{transition.id} but was not defined in 'timers'.",
+                    )
 
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_timers_unique_ids(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         ids = []
         timer: Timer
         for timer in values.get("timers", []):
             if timer.id in ids:
-                raise ValueError(cls, f'Id {timer.id} was found multiple times in \'timers\'.')
+                raise ValueError(
+                    cls, f"Id {timer.id} was found multiple times in 'timers'."
+                )
             ids.append(timer.id)
 
         return values
 
     @root_validator(pre=False)
-    def validate_operation_modes_in_transitions(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        operation_mode_by_id = {operation_mode.id: operation_mode
-                                for operation_mode in values.get("operation_modes", [])}
+    @classmethod
+    def validate_operation_modes_in_transitions(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        operation_mode_by_id = {
+            operation_mode.id: operation_mode
+            for operation_mode in values.get("operation_modes", [])
+        }
         transition: Transition
         for transition in values.get("transitions", []):
             if transition.from_ not in operation_mode_by_id:
-                raise ValueError(cls, f'Operation mode {transition.from_} was referenced as \'from\' in transition '
-                                      f'{transition.id} but was not defined in \'operation_modes\'.')
+                raise ValueError(
+                    cls,
+                    f"Operation mode {transition.from_} was referenced as 'from' in transition "
+                    f"{transition.id} but was not defined in 'operation_modes'.",
+                )
 
             if transition.to not in operation_mode_by_id:
-                raise ValueError(cls, f'Operation mode {transition.to} was referenced as \'to\' in transition '
-                                      f'{transition.id} but was not defined in \'operation_modes\'.')
+                raise ValueError(
+                    cls,
+                    f"Operation mode {transition.to} was referenced as 'to' in transition "
+                    f"{transition.id} but was not defined in 'operation_modes'.",
+                )
 
         return values
 
     @root_validator(pre=False)
-    def validate_operation_modes_unique_ids(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @classmethod
+    def validate_operation_modes_unique_ids(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:
         ids = []
         operation_mode: FRBCOperationMode
         for operation_mode in values.get("operation_modes", []):
             if operation_mode.id in ids:
-                raise ValueError(cls, f'Id {operation_mode.id} was found multiple times in \'operation_modes\'.')
+                raise ValueError(
+                    cls,
+                    f"Id {operation_mode.id} was found multiple times in 'operation_modes'.",
+                )
             ids.append(operation_mode.id)
 
         return values
 
     @root_validator(pre=False)
-    def validate_operation_mode_elements_have_all_supported_commodities(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        supported_commodities = values.get('supported_commodities', [])
+    @classmethod
+    def validate_operation_mode_elements_have_all_supported_commodities(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        supported_commodities = values.get("supported_commodities", [])
         operation_mode: FRBCOperationMode
         for operation_mode in values.get("operation_modes", []):
             for operation_mode_element in operation_mode.elements:
                 for commodity in supported_commodities:
-                    power_ranges_for_commodity = [power_range
-                                                  for power_range in operation_mode_element.power_ranges
-                                                  if commodity_has_quantity(commodity, power_range.commodity_quantity)]
+                    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 len(power_ranges_for_commodity) > 1:
-                        raise ValueError(cls, f'Multiple power ranges defined for commodity {commodity} in operation '
-                                              f'mode {operation_mode.id} and element with fill_level_range '
-                                              f'{operation_mode_element.fill_level_range}')
+                        raise ValueError(
+                            cls,
+                            f"Multiple power ranges defined for commodity {commodity} in operation "
+                            f"mode {operation_mode.id} and element with fill_level_range "
+                            f"{operation_mode_element.fill_level_range}",
+                        )
                     if not power_ranges_for_commodity:
-                        raise ValueError(cls, f'No power ranges defined for commodity {commodity} in operation '
-                                              f'mode {operation_mode.id} and element with fill_level_range '
-                                              f'{operation_mode_element.fill_level_range}')
+                        raise ValueError(
+                            cls,
+                            f"No power ranges defined for commodity {commodity} in operation "
+                            f"mode {operation_mode.id} and element with fill_level_range "
+                            f"{operation_mode_element.fill_level_range}",
+                        )
         return values
 
     @root_validator(pre=False)
-    def validate_unique_supported_commodities(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        supported_commodities: list[CommodityQuantity] = values.get('supported_commodities', [])
+    @classmethod
+    def validate_unique_supported_commodities(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        supported_commodities: List[CommodityQuantity] = values.get(
+            "supported_commodities", []
+        )
 
         for supported_commodity in supported_commodities:
             if supported_commodities.count(supported_commodity) > 1:
-                raise ValueError(cls, f'Found duplicate {supported_commodity} commodity in \'supported_commodities\'')
+                raise ValueError(
+                    cls,
+                    f"Found duplicate {supported_commodity} commodity in 'supported_commodities'",
+                )
         return values

s2python/frbc/frbc_actuator_status.py

@@ -2,15 +2,22 @@ from typing import Optional
 import uuid
 
 from s2python.generated.gen_s2 import FRBCActuatorStatus as GenFRBCActuatorStatus
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCActuatorStatus(GenFRBCActuatorStatus, ValidateValuesMixin['FRBCActuatorStatus']):
+class FRBCActuatorStatus(GenFRBCActuatorStatus, S2Message["FRBCActuatorStatus"]):
     class Config(GenFRBCActuatorStatus.Config):
         validate_assignment = True
 
-    active_operation_mode_id: uuid.UUID = GenFRBCActuatorStatus.__fields__['active_operation_mode_id'].field_info  # type: ignore[assignment]
-    actuator_id: uuid.UUID = GenFRBCActuatorStatus.__fields__['actuator_id'].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCActuatorStatus.__fields__['message_id'].field_info  # type: ignore[assignment]
-    previous_operation_mode_id: Optional[uuid.UUID] = GenFRBCActuatorStatus.__fields__['previous_operation_mode_id'].field_info  # type: ignore[assignment]
+    active_operation_mode_id: uuid.UUID = GenFRBCActuatorStatus.__fields__[
+        "active_operation_mode_id"
+    ].field_info  # type: ignore[assignment]
+    actuator_id: uuid.UUID = GenFRBCActuatorStatus.__fields__["actuator_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCActuatorStatus.__fields__["message_id"].field_info  # type: ignore[assignment]
+    previous_operation_mode_id: Optional[uuid.UUID] = GenFRBCActuatorStatus.__fields__[
+        "previous_operation_mode_id"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_fill_level_target_profile.py

@@ -1,15 +1,30 @@
 from typing import List
 import uuid
 
-from s2python.frbc import FRBCFillLevelTargetProfileElement
-from s2python.generated.gen_s2 import FRBCFillLevelTargetProfile as GenFRBCFillLevelTargetProfile
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.frbc.frbc_fill_level_target_profile_element import (
+    FRBCFillLevelTargetProfileElement,
+)
+from s2python.generated.gen_s2 import (
+    FRBCFillLevelTargetProfile as GenFRBCFillLevelTargetProfile,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCFillLevelTargetProfile(GenFRBCFillLevelTargetProfile, ValidateValuesMixin['FRBCFillLevelTargetProfile']):
+class FRBCFillLevelTargetProfile(
+    GenFRBCFillLevelTargetProfile, S2Message["FRBCFillLevelTargetProfile"]
+):
     class Config(GenFRBCFillLevelTargetProfile.Config):
         validate_assignment = True
 
-    elements: List[FRBCFillLevelTargetProfileElement] = GenFRBCFillLevelTargetProfile.__fields__['elements'].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.__fields__['message_id'].field_info  # type: ignore[assignment]
+    elements: List[
+        FRBCFillLevelTargetProfileElement
+    ] = GenFRBCFillLevelTargetProfile.__fields__[
+        "elements"
+    ].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.__fields__[
+        "message_id"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_fill_level_target_profile_element.py

@@ -1,13 +1,25 @@
 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, ValidateValuesMixin
+from s2python.generated.gen_s2 import (
+    FRBCFillLevelTargetProfileElement as GenFRBCFillLevelTargetProfileElement,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCFillLevelTargetProfileElement(GenFRBCFillLevelTargetProfileElement, ValidateValuesMixin['FRBCFillLevelTargetProfileElement']):
+class FRBCFillLevelTargetProfileElement(
+    GenFRBCFillLevelTargetProfileElement,
+    S2Message["FRBCFillLevelTargetProfileElement"],
+):
     class Config(GenFRBCFillLevelTargetProfileElement.Config):
         validate_assignment = True
 
-    duration: Duration = GenFRBCFillLevelTargetProfileElement.__fields__['duration'].field_info  # type: ignore[assignment]
-    fill_level_range: NumberRange = GenFRBCFillLevelTargetProfileElement.__fields__['fill_level_range'].field_info  # type: ignore[assignment]
+    duration: Duration = GenFRBCFillLevelTargetProfileElement.__fields__[
+        "duration"
+    ].field_info  # type: ignore[assignment]
+    fill_level_range: NumberRange = GenFRBCFillLevelTargetProfileElement.__fields__[
+        "fill_level_range"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_instruction.py

@@ -1,15 +1,18 @@
 import uuid
 
 from s2python.generated.gen_s2 import FRBCInstruction as GenFRBCInstruction
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCInstruction(GenFRBCInstruction, ValidateValuesMixin['FRBCInstruction']):
+class FRBCInstruction(GenFRBCInstruction, S2Message["FRBCInstruction"]):
     class Config(GenFRBCInstruction.Config):
         validate_assignment = True
 
-    actuator_id: uuid.UUID = GenFRBCInstruction.__fields__['actuator_id'].field_info  # type: ignore[assignment]
-    id: uuid.UUID = GenFRBCInstruction.__fields__['id'].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCInstruction.__fields__['message_id'].field_info  # type: ignore[assignment]
-    operation_mode:  uuid.UUID = GenFRBCInstruction.__fields__['operation_mode'].field_info  # type: ignore[assignment]
+    actuator_id: uuid.UUID = GenFRBCInstruction.__fields__["actuator_id"].field_info  # type: ignore[assignment]
+    id: uuid.UUID = GenFRBCInstruction.__fields__["id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCInstruction.__fields__["message_id"].field_info  # type: ignore[assignment]
+    operation_mode: uuid.UUID = GenFRBCInstruction.__fields__["operation_mode"].field_info  # type: ignore[assignment]

s2python/frbc/frbc_leakage_behaviour.py

@@ -1,15 +1,20 @@
 from typing import List
 import uuid
 
-from s2python.frbc import FRBCLeakageBehaviourElement
+from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
 from s2python.generated.gen_s2 import FRBCLeakageBehaviour as GenFRBCLeakageBehaviour
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCLeakageBehaviour(GenFRBCLeakageBehaviour, ValidateValuesMixin['FRBCLeakageBehaviour']):
+class FRBCLeakageBehaviour(GenFRBCLeakageBehaviour, S2Message["FRBCLeakageBehaviour"]):
     class Config(GenFRBCLeakageBehaviour.Config):
         validate_assignment = True
 
-    elements: List[FRBCLeakageBehaviourElement] = GenFRBCLeakageBehaviour.__fields__['elements'].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCLeakageBehaviour.__fields__['message_id'].field_info  # type: ignore[assignment]
+    elements: List[FRBCLeakageBehaviourElement] = GenFRBCLeakageBehaviour.__fields__[
+        "elements"
+    ].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCLeakageBehaviour.__fields__["message_id"].field_info  # type: ignore[assignment]

s2python/frbc/frbc_leakage_behaviour_element.py

@@ -1,11 +1,20 @@
 from s2python.common import NumberRange
-from s2python.generated.gen_s2 import FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.generated.gen_s2 import (
+    FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCLeakageBehaviourElement(GenFRBCLeakageBehaviourElement, ValidateValuesMixin['FRBCLeakageBehaviourElement']):
+class FRBCLeakageBehaviourElement(
+    GenFRBCLeakageBehaviourElement, S2Message["FRBCLeakageBehaviourElement"]
+):
     class Config(GenFRBCLeakageBehaviourElement.Config):
         validate_assignment = True
 
-    fill_level_range: NumberRange = GenFRBCLeakageBehaviourElement.__fields__['fill_level_range'].field_info  # type: ignore[assignment]
+    fill_level_range: NumberRange = GenFRBCLeakageBehaviourElement.__fields__[
+        "fill_level_range"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_operation_mode.py

@@ -1,34 +1,53 @@
-#from itertools import pairwise
+# from itertools import pairwise
 import uuid
-from typing import List, Dict, Any, Generator, Tuple
+from typing import List, Dict, Any
 
 from pydantic import root_validator
 
 from s2python.common import NumberRange
-from s2python.frbc import FRBCOperationModeElement
+from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
 from s2python.generated.gen_s2 import FRBCOperationMode as GenFRBCOperationMode
-from s2python.validate_values_mixin import ValidateValuesMixin, catch_and_convert_exceptions
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
 from s2python.utils import pairwise
 
+
 @catch_and_convert_exceptions
-class FRBCOperationMode(GenFRBCOperationMode, ValidateValuesMixin['FRBCOperationMode']):
+class FRBCOperationMode(GenFRBCOperationMode, S2Message["FRBCOperationMode"]):
     class Config(GenFRBCOperationMode.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenFRBCOperationMode.__fields__['id'].field_info  # type: ignore[assignment]
-    elements: List[FRBCOperationModeElement] = GenFRBCOperationMode.__fields__['elements'].field_info  # type: ignore[assignment]
+    id: uuid.UUID = GenFRBCOperationMode.__fields__["id"].field_info  # type: ignore[assignment]
+    elements: List[FRBCOperationModeElement] = GenFRBCOperationMode.__fields__[
+        "elements"
+    ].field_info  # type: ignore[assignment]
 
     @root_validator(pre=False)
-    def validate_contiguous_fill_levels_operation_mode_elements(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @classmethod
+    def validate_contiguous_fill_levels_operation_mode_elements(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:
         elements_by_fill_level_range: Dict[NumberRange, FRBCOperationModeElement]
-        elements_by_fill_level_range = {element.fill_level_range: element for element in values.get('elements', [])}
+        elements_by_fill_level_range = {
+            element.fill_level_range: element for element in values.get("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:
-                raise ValueError(cls, f'Elements with fill level ranges {current_fill_level_range} and '
-                                      f'{next_fill_level_range} are closest match to each other but not contiguous.')
+        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(
+                    cls,
+                    f"Elements with fill level ranges {current_fill_level_range} and "
+                    f"{next_fill_level_range} are closest match to each other but not contiguous.",
+                )
         return values

s2python/frbc/frbc_operation_mode_element.py

@@ -1,16 +1,29 @@
 from typing import Optional, List
 
 from s2python.common import NumberRange, PowerRange
-from s2python.generated.gen_s2 import FRBCOperationModeElement as GenFRBCOperationModeElement
-from s2python.validate_values_mixin import ValidateValuesMixin, catch_and_convert_exceptions
+from s2python.generated.gen_s2 import (
+    FRBCOperationModeElement as GenFRBCOperationModeElement,
+)
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCOperationModeElement(GenFRBCOperationModeElement, ValidateValuesMixin['FRBCOperationModeElement']):
+class FRBCOperationModeElement(
+    GenFRBCOperationModeElement, S2Message["FRBCOperationModeElement"]
+):
     class Config(GenFRBCOperationModeElement.Config):
         validate_assignment = True
 
-    fill_level_range: NumberRange = GenFRBCOperationModeElement.__fields__['fill_level_range'].field_info  # type: ignore[assignment]
-    fill_rate: NumberRange = GenFRBCOperationModeElement.__fields__['fill_rate'].field_info  # type: ignore[assignment]
-    power_ranges: List[PowerRange] = GenFRBCOperationModeElement.__fields__['power_ranges'].field_info  # type: ignore[assignment]
-    running_costs: Optional[NumberRange] = GenFRBCOperationModeElement.__fields__['running_costs'].field_info  # type: ignore[assignment]
+    fill_level_range: NumberRange = GenFRBCOperationModeElement.__fields__[
+        "fill_level_range"
+    ].field_info  # type: ignore[assignment]
+    fill_rate: NumberRange = GenFRBCOperationModeElement.__fields__["fill_rate"].field_info  # type: ignore[assignment]
+    power_ranges: List[PowerRange] = GenFRBCOperationModeElement.__fields__[
+        "power_ranges"
+    ].field_info  # type: ignore[assignment]
+    running_costs: Optional[NumberRange] = GenFRBCOperationModeElement.__fields__[
+        "running_costs"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_storage_description.py

@@ -1,11 +1,20 @@
 from s2python.common import NumberRange
-from s2python.generated.gen_s2 import FRBCStorageDescription as GenFRBCStorageDescription
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.generated.gen_s2 import (
+    FRBCStorageDescription as GenFRBCStorageDescription,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCStorageDescription(GenFRBCStorageDescription, ValidateValuesMixin['FRBCStorageDescription']):
+class FRBCStorageDescription(
+    GenFRBCStorageDescription, S2Message["FRBCStorageDescription"]
+):
     class Config(GenFRBCStorageDescription.Config):
         validate_assignment = True
 
-    fill_level_range: NumberRange = GenFRBCStorageDescription.__fields__['fill_level_range'].field_info  # type: ignore[assignment]
+    fill_level_range: NumberRange = GenFRBCStorageDescription.__fields__[
+        "fill_level_range"
+    ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_storage_status.py

@@ -1,12 +1,15 @@
 import uuid
 
 from s2python.generated.gen_s2 import FRBCStorageStatus as GenFRBCStorageStatus
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class FRBCStorageStatus(GenFRBCStorageStatus, ValidateValuesMixin['FRBCStorageStatus']):
+class FRBCStorageStatus(GenFRBCStorageStatus, S2Message["FRBCStorageStatus"]):
     class Config(GenFRBCStorageStatus.Config):
         validate_assignment = True
 
-    message_id: uuid.UUID = GenFRBCStorageStatus.__fields__['message_id'].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCStorageStatus.__fields__["message_id"].field_info  # type: ignore[assignment]

s2python/frbc/frbc_system_description.py

@@ -2,15 +2,25 @@ from typing import List
 import uuid
 
 from s2python.generated.gen_s2 import FRBCSystemDescription as GenFRBCSystemDescription
-from s2python.validate_values_mixin import catch_and_convert_exceptions, ValidateValuesMixin
-from s2python.frbc import FRBCActuatorDescription, FRBCStorageDescription
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
+from s2python.frbc.frbc_storage_description import FRBCStorageDescription
 
 
 @catch_and_convert_exceptions
-class FRBCSystemDescription(GenFRBCSystemDescription, ValidateValuesMixin['FRBCSystemDescription']):
+class FRBCSystemDescription(
+    GenFRBCSystemDescription, S2Message["FRBCSystemDescription"]
+):
     class Config(GenFRBCSystemDescription.Config):
         validate_assignment = True
 
-    actuators: List[FRBCActuatorDescription] = GenFRBCSystemDescription.__fields__['actuators'].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCSystemDescription.__fields__['message_id'].field_info  # type: ignore[assignment]
-    storage: FRBCStorageDescription = GenFRBCSystemDescription.__fields__['storage'].field_info  # type: ignore[assignment]
+    actuators: List[FRBCActuatorDescription] = GenFRBCSystemDescription.__fields__[
+        "actuators"
+    ].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenFRBCSystemDescription.__fields__["message_id"].field_info  # type: ignore[assignment]
+    storage: FRBCStorageDescription = GenFRBCSystemDescription.__fields__[
+        "storage"
+    ].field_info  # type: ignore[assignment]