s2-python 0.1.0__tar.gz → 0.2.1__tar.gz

{s2-python-0.1.0 → s2_python-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.1.0
+Version: 0.2.1
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,10 +12,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/x-rst; charset=UTF-8
-Requires-Dist: pydantic~=1.10.7
+Requires-Dist: pydantic~=2.8.2
 Requires-Dist: pytz
 Requires-Dist: click
+Requires-Dist: websockets~=13.0.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-coverage; extra == "testing"

{s2-python-0.1.0 → s2_python-0.2.1}/setup.cfg

@@ -8,7 +8,7 @@ license_files = LICENSE.txt
 long_description = file: README.rst
 long_description_content_type = text/x-rst; charset=UTF-8
 url = https://github.com/flexiblepower/s2-ws-json-python
-version = 0.1.0
+version = 0.2.1
 platforms = Linux
 classifiers = 
 	Development Status :: 4 - Beta
@@ -16,6 +16,7 @@ classifiers =
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 
 [options]
 zip_safe = False
@@ -23,11 +24,12 @@ packages = find_namespace:
 include_package_data = True
 package_dir = 
 	=src
-python_requires > = 3.8, <= 3.11
+python_requires > = 3.8, <= 3.12
 install_requires = 
-	pydantic~=1.10.7
+	pydantic~=2.8.2
 	pytz
 	click
+	websockets~=13.0.1
 
 [options.packages.find]
 where = src

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.1.0
+Version: 0.2.1
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,10 +12,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/x-rst; charset=UTF-8
-Requires-Dist: pydantic~=1.10.7
+Requires-Dist: pydantic~=2.8.2
 Requires-Dist: pytz
 Requires-Dist: click
+Requires-Dist: websockets~=13.0.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-coverage; extra == "testing"

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2_python.egg-info/SOURCES.txt

@@ -10,6 +10,9 @@ src/s2_python.egg-info/not-zip-safe
 src/s2_python.egg-info/requires.txt
 src/s2_python.egg-info/top_level.txt
 src/s2python/__init__.py
+src/s2python/reception_status_awaiter.py
+src/s2python/s2_connection.py
+src/s2python/s2_control_type.py
 src/s2python/s2_parser.py
 src/s2python/s2_validation_error.py
 src/s2python/utils.py
@@ -52,5 +55,6 @@ src/s2python/frbc/frbc_system_description.py
 src/s2python/frbc/frbc_timer_status.py
 src/s2python/frbc/frbc_usage_forecast.py
 src/s2python/frbc/frbc_usage_forecast_element.py
+src/s2python/frbc/rm.py
 src/s2python/generated/__init__.py
 src/s2python/generated/gen_s2.py

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2_python.egg-info/requires.txt

@@ -1,6 +1,7 @@
-pydantic~=1.10.7
+pydantic~=2.8.2
 pytz
 click
+websockets~=13.0.1
 
 [development]
 pip-tools

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/duration.py

@@ -11,12 +11,12 @@ from s2python.validate_values_mixin import (
 @catch_and_convert_exceptions
 class Duration(GenDuration, S2Message["Duration"]):
     def to_timedelta(self) -> timedelta:
-        return timedelta(milliseconds=self.__root__)
+        return timedelta(milliseconds=self.root)
 
     @staticmethod
     def from_timedelta(duration: timedelta) -> "Duration":
-        return Duration(__root__=math.ceil(duration.total_seconds() * 1000))
+        return Duration(root=math.ceil(duration.total_seconds() * 1000))
 
     @staticmethod
     def from_milliseconds(milliseconds: int) -> "Duration":
-        return Duration(__root__=milliseconds)
+        return Duration(root=milliseconds)

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/handshake.py

@@ -9,7 +9,7 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class Handshake(GenHandshake, S2Message["Handshake"]):
-    class Config(GenHandshake.Config):
-        validate_assignment = True
+    model_config = GenHandshake.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenHandshake.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenHandshake.model_fields["message_id"]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/handshake_response.py

@@ -9,7 +9,7 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class HandshakeResponse(GenHandshakeResponse, S2Message["HandshakeResponse"]):
-    class Config(GenHandshakeResponse.Config):
-        validate_assignment = True
+    model_config = GenHandshakeResponse.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenHandshakeResponse.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenHandshakeResponse.model_fields["message_id"]  # type: ignore[assignment]

s2_python-0.2.1/src/s2python/common/instruction_status_update.py

@@ -0,0 +1,18 @@
+import uuid
+
+from s2python.generated.gen_s2 import (
+    InstructionStatusUpdate as GenInstructionStatusUpdate,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class InstructionStatusUpdate(GenInstructionStatusUpdate, S2Message["InstructionStatusUpdate"]):
+    model_config = GenInstructionStatusUpdate.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenInstructionStatusUpdate.model_fields["message_id"]  # type: ignore[assignment]
+    instruction_id: uuid.UUID = GenInstructionStatusUpdate.model_fields["instruction_id"]  # type: ignore[assignment]

s2_python-0.2.1/src/s2python/common/number_range.py

@@ -0,0 +1,32 @@
+from typing import Any
+from typing_extensions import Self
+
+from pydantic import model_validator
+
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
+from s2python.generated.gen_s2 import NumberRange as GenNumberRange
+
+
+@catch_and_convert_exceptions
+class NumberRange(GenNumberRange, S2Message["NumberRange"]):
+    model_config = GenNumberRange.model_config
+    model_config["validate_assignment"] = True
+
+    @model_validator(mode="after")
+    def validate_start_end_order(self) -> Self:  # pylint: disable=duplicate-code
+        if self.start_of_range > self.end_of_range:
+            raise ValueError(self, "start_of_range should not be higher than end_of_range")
+
+        return self
+
+    def __hash__(self) -> int:
+        return hash(f"{self.start_of_range}|{self.end_of_range}")
+
+    def __eq__(self, other: Any) -> bool:
+        if isinstance(other, NumberRange):
+            return self.start_of_range == other.start_of_range and self.end_of_range == other.end_of_range
+
+        return False

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/power_forecast.py

@@ -11,10 +11,8 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class PowerForecast(GenPowerForecast, S2Message["PowerForecast"]):
-    class Config(GenPowerForecast.Config):
-        validate_assignment = True
+    model_config = GenPowerForecast.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenPowerForecast.__fields__["message_id"].field_info  # type: ignore[assignment]
-    elements: List[PowerForecastElement] = GenPowerForecast.__fields__[
-        "elements"
-    ].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenPowerForecast.model_fields["message_id"]  # type: ignore[assignment]
+    elements: List[PowerForecastElement] = GenPowerForecast.model_fields["elements"]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/power_forecast_element.py

@@ -11,10 +11,10 @@ from s2python.common.power_forecast_value import PowerForecastValue
 
 @catch_and_convert_exceptions
 class PowerForecastElement(GenPowerForecastElement, S2Message["PowerForecastElement"]):
-    class Config(GenPowerForecastElement.Config):
-        validate_assignment = True
+    model_config = GenPowerForecastElement.model_config
+    model_config["validate_assignment"] = True
 
-    duration: Duration = GenPowerForecastElement.__fields__["duration"].field_info  # type: ignore[assignment]
-    power_values: List[PowerForecastValue] = GenPowerForecastElement.__fields__[
+    duration: Duration = GenPowerForecastElement.model_fields["duration"]  # type: ignore[assignment]
+    power_values: List[PowerForecastValue] = GenPowerForecastElement.model_fields[
         "power_values"
-    ].field_info  # type: ignore[assignment]
+    ]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/power_forecast_value.py

@@ -7,5 +7,5 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class PowerForecastValue(GenPowerForecastValue, S2Message["PowerForecastValue"]):
-    class Config(GenPowerForecastValue.Config):
-        validate_assignment = True
+    model_config = GenPowerForecastValue.model_config
+    model_config["validate_assignment"] = True

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/power_measurement.py

@@ -11,8 +11,8 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class PowerMeasurement(GenPowerMeasurement, S2Message["PowerMeasurement"]):
-    class Config(GenPowerMeasurement.Config):
-        validate_assignment = True
+    model_config = GenPowerMeasurement.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenPowerMeasurement.__fields__["message_id"].field_info  # type: ignore[assignment]
-    values: List[PowerValue] = GenPowerMeasurement.__fields__["values"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenPowerMeasurement.model_fields["message_id"]  # type: ignore[assignment]
+    values: List[PowerValue] = GenPowerMeasurement.model_fields["values"]  # type: ignore[assignment]

s2_python-0.2.1/src/s2python/common/power_range.py

@@ -0,0 +1,22 @@
+from typing_extensions import Self
+
+from pydantic import model_validator
+
+from s2python.generated.gen_s2 import PowerRange as GenPowerRange
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
+
+
+@catch_and_convert_exceptions
+class PowerRange(GenPowerRange, S2Message["PowerRange"]):
+    model_config = GenPowerRange.model_config
+    model_config["validate_assignment"] = True
+
+    @model_validator(mode="after")
+    def validate_start_end_order(self) -> Self:
+        if self.start_of_range > self.end_of_range:
+            raise ValueError(self, "start_of_range should not be higher than end_of_range")
+
+        return self

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/power_value.py

@@ -7,5 +7,5 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class PowerValue(GenPowerValue, S2Message["PowerValue"]):
-    class Config(GenPowerValue.Config):
-        validate_assignment = True
+    model_config = GenPowerValue.model_config
+    model_config["validate_assignment"] = True

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/reception_status.py

@@ -9,9 +9,7 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class ReceptionStatus(GenReceptionStatus, S2Message["ReceptionStatus"]):
-    class Config(GenReceptionStatus.Config):
-        validate_assignment = True
+    model_config = GenReceptionStatus.model_config
+    model_config["validate_assignment"] = True
 
-    subject_message_id: uuid.UUID = GenReceptionStatus.__fields__[
-        "subject_message_id"
-    ].field_info  # type: ignore[assignment]
+    subject_message_id: uuid.UUID = GenReceptionStatus.model_fields["subject_message_id"]  # type: ignore[assignment]

s2_python-0.2.1/src/s2python/common/resource_manager_details.py

@@ -0,0 +1,25 @@
+from typing import List
+import uuid
+
+from s2python.common.duration import Duration
+from s2python.common.role import Role
+from s2python.generated.gen_s2 import (
+    ResourceManagerDetails as GenResourceManagerDetails,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class ResourceManagerDetails(GenResourceManagerDetails, S2Message["ResourceManagerDetails"]):
+    model_config = GenResourceManagerDetails.model_config
+    model_config["validate_assignment"] = True
+
+    instruction_processing_delay: Duration = GenResourceManagerDetails.model_fields[
+        "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]

s2_python-0.2.1/src/s2python/common/revoke_object.py

@@ -0,0 +1,16 @@
+import uuid
+
+from s2python.generated.gen_s2 import RevokeObject as GenRevokeObject
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class RevokeObject(GenRevokeObject, S2Message["RevokeObject"]):
+    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]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/role.py

@@ -7,5 +7,5 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class Role(GenRole, S2Message["Role"]):
-    class Config(GenRole.Config):
-        validate_assignment = True
+    model_config = GenRole.model_config
+    model_config["validate_assignment"] = True

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/select_control_type.py

@@ -9,7 +9,7 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class SelectControlType(GenSelectControlType, S2Message["SelectControlType"]):
-    class Config(GenSelectControlType.Config):
-        validate_assignment = True
+    model_config = GenSelectControlType.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenSelectControlType.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenSelectControlType.model_fields["message_id"]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/session_request.py

@@ -9,7 +9,7 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class SessionRequest(GenSessionRequest, S2Message["SessionRequest"]):
-    class Config(GenSessionRequest.Config):
-        validate_assignment = True
+    model_config = GenSessionRequest.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenSessionRequest.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenSessionRequest.model_fields["message_id"]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/common/timer.py

@@ -10,8 +10,8 @@ from s2python.validate_values_mixin import (
 
 @catch_and_convert_exceptions
 class Timer(GenTimer, S2Message["Timer"]):
-    class Config(GenTimer.Config):
-        validate_assignment = True
+    model_config = GenTimer.model_config
+    model_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.model_fields["id"]  # type: ignore[assignment]
+    duration: Duration = GenTimer.model_fields["duration"]  # type: ignore[assignment]

s2_python-0.2.1/src/s2python/common/transition.py

@@ -0,0 +1,24 @@
+import uuid
+from typing import Optional, List
+
+from s2python.common.duration import Duration
+from s2python.generated.gen_s2 import Transition as GenTransition
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
+
+
+@catch_and_convert_exceptions
+class Transition(GenTransition, S2Message["Transition"]):
+    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[
+        "transition_duration"
+    ]  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.2.1}/src/s2python/frbc/frbc_actuator_description.py

@@ -1,15 +1,15 @@
 import uuid
 
-from typing import List, Any, Dict
+from typing import List
+from typing_extensions import Self
 
-from pydantic import root_validator
+from pydantic import model_validator
 
 from s2python.common import Transition, Timer, Commodity
 from s2python.common.support import commodity_has_quantity
 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,
@@ -18,34 +18,29 @@ from s2python.validate_values_mixin import (
 
 
 @catch_and_convert_exceptions
-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__[
+class FRBCActuatorDescription(GenFRBCActuatorDescription, S2Message["FRBCActuatorDescription"]):
+    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[
         "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__[
+    ]  # type: ignore[assignment]
+    transitions: List[Transition] = GenFRBCActuatorDescription.model_fields["transitions"]  # type: ignore[assignment]
+    timers: List[Timer] = GenFRBCActuatorDescription.model_fields["timers"]  # type: ignore[assignment]
+    supported_commodities: List[Commodity] = GenFRBCActuatorDescription.model_fields[
         "supported_commodities"
-    ].field_info  # type: ignore[assignment]
+    ]  # 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", {})}
+    @model_validator(mode="after")
+    def validate_timers_in_transitions(self) -> Self:
+        timers_by_id = {timer.id: timer for timer in self.timers}
         transition: Transition
-        for transition in values.get("transitions", []):
+        for transition in self.transitions:
             for start_timer_id in transition.start_timers:
                 if start_timer_id not in timers_by_id:
                     raise ValueError(
-                        cls,
+                        self,
                         f"{start_timer_id} was referenced as start timer in transition "
                         f"{transition.id} but was not defined in 'timers'.",
                     )
@@ -53,118 +48,96 @@ class FRBCActuatorDescription(
             for blocking_timer_id in transition.blocking_timers:
                 if blocking_timer_id not in timers_by_id:
                     raise ValueError(
-                        cls,
+                        self,
                         f"{blocking_timer_id} was referenced as blocking timer in transition "
                         f"{transition.id} but was not defined in 'timers'.",
                     )
 
-        return values
+        return self
 
-    @root_validator(pre=False)
-    @classmethod
-    def validate_timers_unique_ids(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @model_validator(mode="after")
+    def validate_timers_unique_ids(self) -> Self:
         ids = []
         timer: Timer
-        for timer in values.get("timers", []):
+        for timer in self.timers:
             if timer.id in ids:
-                raise ValueError(
-                    cls, 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 values
-
-    @root_validator(pre=False)
-    @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", [])
-        }
+        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}
         transition: Transition
-        for transition in values.get("transitions", []):
+        for transition in self.transitions:
             if transition.from_ not in operation_mode_by_id:
                 raise ValueError(
-                    cls,
+                    self,
                     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,
+                    self,
                     f"Operation mode {transition.to} was referenced as 'to' in transition "
                     f"{transition.id} but was not defined in 'operation_modes'.",
                 )
 
-        return values
+        return self
 
-    @root_validator(pre=False)
-    @classmethod
-    def validate_operation_modes_unique_ids(
-        cls, values: Dict[str, Any]
-    ) -> Dict[str, Any]:
+    @model_validator(mode="after")
+    def validate_operation_modes_unique_ids(self) -> Self:
         ids = []
         operation_mode: FRBCOperationMode
-        for operation_mode in values.get("operation_modes", []):
+        for operation_mode in self.operation_modes:
             if operation_mode.id in ids:
                 raise ValueError(
-                    cls,
+                    self,
                     f"Id {operation_mode.id} was found multiple times in 'operation_modes'.",
                 )
             ids.append(operation_mode.id)
 
-        return values
+        return self
 
-    @root_validator(pre=False)
-    @classmethod
-    def validate_operation_mode_elements_have_all_supported_commodities(
-        cls, values: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        supported_commodities = values.get("supported_commodities", [])
+    @model_validator(mode="after")
+    def validate_operation_mode_elements_have_all_supported_commodities(self) -> Self:
+        supported_commodities = self.supported_commodities
         operation_mode: FRBCOperationMode
-        for operation_mode in values.get("operation_modes", []):
+        for operation_mode in self.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
-                        )
+                        if commodity_has_quantity(commodity, power_range.commodity_quantity)
                     ]
 
                     if len(power_ranges_for_commodity) > 1:
                         raise ValueError(
-                            cls,
+                            self,
                             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,
+                            self,
                             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
+        return self
 
-    @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", []
-        )
+    @model_validator(mode="after")
+    def validate_unique_supported_commodities(self) -> Self:
+        supported_commodities: List[Commodity] = self.supported_commodities
 
         for supported_commodity in supported_commodities:
             if supported_commodities.count(supported_commodity) > 1:
                 raise ValueError(
-                    cls,
+                    self,
                     f"Found duplicate {supported_commodity} commodity in 'supported_commodities'",
                 )
-        return values
+        return self