s2-python 0.0.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

s2python/common/support.py

@@ -1,25 +1,27 @@
-from s2python.common import CommodityQuantity, Commodity
+from s2python.common import Commodity, CommodityQuantity
 
 
 def commodity_has_quantity(commodity: "Commodity", quantity: CommodityQuantity) -> bool:
     if commodity == Commodity.HEAT:
-        return quantity in [
+        result = quantity in [
             CommodityQuantity.HEAT_THERMAL_POWER,
             CommodityQuantity.HEAT_TEMPERATURE,
             CommodityQuantity.HEAT_FLOW_RATE,
         ]
     elif commodity == Commodity.ELECTRICITY:
-        return quantity in [
+        result = quantity in [
             CommodityQuantity.ELECTRIC_POWER_3_PHASE_SYMMETRIC,
             CommodityQuantity.ELECTRIC_POWER_L1,
             CommodityQuantity.ELECTRIC_POWER_L2,
             CommodityQuantity.ELECTRIC_POWER_L3,
         ]
     elif commodity == Commodity.GAS:
-        return quantity in [CommodityQuantity.NATURAL_GAS_FLOW_RATE]
+        result = quantity in [CommodityQuantity.NATURAL_GAS_FLOW_RATE]
     elif commodity == Commodity.OIL:
-        return quantity in [CommodityQuantity.OIL_FLOW_RATE]
+        result = quantity in [CommodityQuantity.OIL_FLOW_RATE]
     else:
         raise RuntimeError(
             f"Unsupported commodity {commodity}. Missing implementation."
         )
+
+    return result

s2python/common/timer.py

@@ -1,17 +1,11 @@
-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]

s2python/common/transition.py

@@ -1,26 +1,15 @@
-import uuid
-from typing import Optional, List
+from typing import Optional
 
-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]

s2python/frbc/__init__.py

@@ -1,17 +1,17 @@
+from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
+from s2python.frbc.frbc_actuator_status import FRBCActuatorStatus
+from s2python.frbc.frbc_fill_level_target_profile import FRBCFillLevelTargetProfile
 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
 from s2python.frbc.frbc_leakage_behaviour import FRBCLeakageBehaviour
-from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement
-from s2python.frbc.frbc_usage_forecast import FRBCUsageForecast
-from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
+from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
 from s2python.frbc.frbc_operation_mode import FRBCOperationMode
-from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
-from s2python.frbc.frbc_actuator_status import FRBCActuatorStatus
+from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
 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
+from s2python.frbc.frbc_usage_forecast import FRBCUsageForecast
+from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement

s2python/frbc/frbc_actuator_description.py

@@ -1,30 +1,24 @@
-import uuid
-
-from typing import List, Any, Dict
+from typing import Any, Dict, List
 
 from pydantic import root_validator
 
-from s2python.common import Transition, Timer, Commodity
+from s2python.common import Commodity, Timer, Transition
 from s2python.common.support import commodity_has_quantity
-from s2python.frbc import FRBCOperationMode
+from s2python.frbc.frbc_operation_mode import FRBCOperationMode
+from s2python.generated.gen_s2 import CommodityQuantity
 from s2python.generated.gen_s2 import (
     FRBCActuatorDescription as GenFRBCActuatorDescription,
-    CommodityQuantity,
-)
-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 FRBCActuatorDescription(
-    GenFRBCActuatorDescription, ValidateValuesMixin["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]
@@ -37,6 +31,7 @@ class FRBCActuatorDescription(
     ].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
@@ -60,6 +55,7 @@ class FRBCActuatorDescription(
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_timers_unique_ids(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         ids = []
         timer: Timer
@@ -73,6 +69,7 @@ class FRBCActuatorDescription(
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_operation_modes_in_transitions(
         cls, values: Dict[str, Any]
     ) -> Dict[str, Any]:
@@ -99,6 +96,7 @@ class FRBCActuatorDescription(
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_operation_modes_unique_ids(
         cls, values: Dict[str, Any]
     ) -> Dict[str, Any]:
@@ -115,6 +113,7 @@ class FRBCActuatorDescription(
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_operation_mode_elements_have_all_supported_commodities(
         cls, values: Dict[str, Any]
     ) -> Dict[str, Any]:
@@ -148,10 +147,11 @@ class FRBCActuatorDescription(
         return values
 
     @root_validator(pre=False)
+    @classmethod
     def validate_unique_supported_commodities(
         cls, values: Dict[str, Any]
     ) -> Dict[str, Any]:
-        supported_commodities: list[CommodityQuantity] = values.get(
+        supported_commodities: List[CommodityQuantity] = values.get(
             "supported_commodities", []
         )
 

s2python/frbc/frbc_actuator_status.py

@@ -1,25 +1,14 @@
-from typing import Optional
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 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 S2Message, catch_and_convert_exceptions
 
 
 @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]
+    message_type: Literal["FRBC.ActuatorStatus"] = Field(default="FRBC.ActuatorStatus")

s2python/frbc/frbc_fill_level_target_profile.py

@@ -1,19 +1,19 @@
-from typing import List
-import uuid
+from typing import List, Literal
 
-from s2python.frbc import FRBCFillLevelTargetProfileElement
+from pydantic import Field
+
+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,
-    ValidateValuesMixin,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCFillLevelTargetProfile(
-    GenFRBCFillLevelTargetProfile, ValidateValuesMixin["FRBCFillLevelTargetProfile"]
+    GenFRBCFillLevelTargetProfile, S2Message["FRBCFillLevelTargetProfile"]
 ):
     class Config(GenFRBCFillLevelTargetProfile.Config):
         validate_assignment = True
@@ -23,6 +23,6 @@ class FRBCFillLevelTargetProfile(
     ] = GenFRBCFillLevelTargetProfile.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.__fields__[
-        "message_id"
-    ].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.FillLevelTargetProfile"] = Field(
+        default="FRBC.FillLevelTargetProfile"
+    )

s2python/frbc/frbc_fill_level_target_profile_element.py

@@ -1,18 +1,14 @@
 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.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCFillLevelTargetProfileElement(
     GenFRBCFillLevelTargetProfileElement,
-    ValidateValuesMixin["FRBCFillLevelTargetProfileElement"],
+    S2Message["FRBCFillLevelTargetProfileElement"],
 ):
     class Config(GenFRBCFillLevelTargetProfileElement.Config):
         validate_assignment = True

s2python/frbc/frbc_instruction.py

@@ -1,18 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 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 S2Message, catch_and_convert_exceptions
 
 
 @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]
+    message_type: Literal["FRBC.Instruction"] = Field(default="FRBC.Instruction")

s2python/frbc/frbc_leakage_behaviour.py

@@ -1,22 +1,20 @@
-from typing import List
-import uuid
+from typing import List, Literal
 
-from s2python.frbc import FRBCLeakageBehaviourElement
+from pydantic import Field
+
+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 S2Message, catch_and_convert_exceptions
 
 
 @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]
+    message_type: Literal["FRBC.LeakageBehaviour"] = Field(
+        default="FRBC.LeakageBehaviour"
+    )

s2python/frbc/frbc_leakage_behaviour_element.py

@@ -2,15 +2,12 @@ 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.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCLeakageBehaviourElement(
-    GenFRBCLeakageBehaviourElement, ValidateValuesMixin["FRBCLeakageBehaviourElement"]
+    GenFRBCLeakageBehaviourElement, S2Message["FRBCLeakageBehaviourElement"]
 ):
     class Config(GenFRBCLeakageBehaviourElement.Config):
         validate_assignment = True

s2python/frbc/frbc_operation_mode.py

@@ -1,30 +1,26 @@
 # from itertools import pairwise
-import uuid
-from typing import List, Dict, Any, Generator, Tuple
+from typing import Any, Dict, List
 
 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.utils import pairwise
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @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]
 
     @root_validator(pre=False)
+    @classmethod
     def validate_contiguous_fill_levels_operation_mode_elements(
         cls, values: Dict[str, Any]
     ) -> Dict[str, Any]:

s2python/frbc/frbc_operation_mode_element.py

@@ -1,18 +1,15 @@
-from typing import Optional, List
+from typing import List, Optional
 
 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.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCOperationModeElement(
-    GenFRBCOperationModeElement, ValidateValuesMixin["FRBCOperationModeElement"]
+    GenFRBCOperationModeElement, S2Message["FRBCOperationModeElement"]
 ):
     class Config(GenFRBCOperationModeElement.Config):
         validate_assignment = True

s2python/frbc/frbc_storage_description.py

@@ -2,15 +2,12 @@ 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.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCStorageDescription(
-    GenFRBCStorageDescription, ValidateValuesMixin["FRBCStorageDescription"]
+    GenFRBCStorageDescription, S2Message["FRBCStorageDescription"]
 ):
     class Config(GenFRBCStorageDescription.Config):
         validate_assignment = True

s2python/frbc/frbc_storage_status.py

@@ -1,15 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 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 S2Message, catch_and_convert_exceptions
 
 
 @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_type: Literal["FRBC.StorageStatus"] = Field(default="FRBC.StorageStatus")

s2python/frbc/frbc_system_description.py

@@ -1,17 +1,16 @@
-from typing import List
-import uuid
+from typing import List, Literal
 
+from pydantic import Field
+
+from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
+from s2python.frbc.frbc_storage_description import FRBCStorageDescription
 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 S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCSystemDescription(
-    GenFRBCSystemDescription, ValidateValuesMixin["FRBCSystemDescription"]
+    GenFRBCSystemDescription, S2Message["FRBCSystemDescription"]
 ):
     class Config(GenFRBCSystemDescription.Config):
         validate_assignment = True
@@ -19,7 +18,9 @@ class FRBCSystemDescription(
     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]
+    message_type: Literal["FRBC.SystemDescription"] = Field(
+        default="FRBC.SystemDescription"
+    )

s2python/frbc/frbc_timer_status.py

@@ -1,17 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import FRBCTimerStatus as GenFRBCTimerStatus
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    ValidateValuesMixin,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
-class FRBCTimerStatus(GenFRBCTimerStatus, ValidateValuesMixin["FRBCTimerStatus"]):
+class FRBCTimerStatus(GenFRBCTimerStatus, S2Message["FRBCTimerStatus"]):
     class Config(GenFRBCTimerStatus.Config):
         validate_assignment = True
 
-    actuator_id: uuid.UUID = GenFRBCTimerStatus.__fields__["actuator_id"].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCTimerStatus.__fields__["message_id"].field_info  # type: ignore[assignment]
-    timer_id: uuid.UUID = GenFRBCTimerStatus.__fields__["timer_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.TimerStatus"] = Field(default="FRBC.TimerStatus")

s2python/frbc/frbc_usage_forecast.py

@@ -1,20 +1,18 @@
-from typing import List
-import uuid
+from typing import List, Literal
 
+from pydantic import Field
+
+from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement
 from s2python.generated.gen_s2 import FRBCUsageForecast as GenFRBCUsageForecast
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    ValidateValuesMixin,
-)
-from s2python.frbc import FRBCUsageForecastElement
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
-class FRBCUsageForecast(GenFRBCUsageForecast, ValidateValuesMixin["FRBCUsageForecast"]):
+class FRBCUsageForecast(GenFRBCUsageForecast, S2Message["FRBCUsageForecast"]):
     class Config(GenFRBCUsageForecast.Config):
         validate_assignment = True
 
     elements: List[FRBCUsageForecastElement] = GenFRBCUsageForecast.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCUsageForecast.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.UsageForecast"] = Field(default="FRBC.UsageForecast")

s2python/frbc/frbc_usage_forecast_element.py

@@ -1,17 +1,13 @@
 from s2python.common import Duration
-
 from s2python.generated.gen_s2 import (
     FRBCUsageForecastElement as GenFRBCUsageForecastElement,
 )
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    ValidateValuesMixin,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class FRBCUsageForecastElement(
-    GenFRBCUsageForecastElement, ValidateValuesMixin["FRBCUsageForecastElement"]
+    GenFRBCUsageForecastElement, S2Message["FRBCUsageForecastElement"]
 ):
     class Config(GenFRBCUsageForecastElement.Config):
         validate_assignment = True