s2-python 0.0.1__tar.gz → 0.2.0__tar.gz

{s2-python-0.0.1 → s2_python-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.0.1
+Version: 0.2.0
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,15 +12,18 @@ 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"
 Requires-Dist: pytest-timer; extra == "testing"
 Requires-Dist: mypy; extra == "testing"
+Requires-Dist: types-pytz; extra == "testing"
 Requires-Dist: pylint; extra == "testing"
 Provides-Extra: development
 Requires-Dist: pip-tools; extra == "development"
@@ -39,7 +42,7 @@ Python Wrapper for S2 Flexibility Protocol
 ===========================================
 .. image:: https://img.shields.io/pypi/v/s2-python
    :alt: PyPI - Version
-.. image:: https://img.shields.io/pypi/pyversions/v/s2-python
+.. image:: https://img.shields.io/pypi/pyversions/s2-python
    :alt: PyPI - Python Version
 .. image:: https://img.shields.io/pypi/l/s2-python
    :alt: PyPI - License
@@ -49,14 +52,29 @@ is based on the asyncapi description of the protocol provided in the `s2-ws-json
 
 Currently, the package supports the *common* and *FILL RATE BASED CONTROL* types and messages.
 
+To Install
+-----------
+You can install this package using pip or any Python dependency manager that collects the packages from Pypi:
+
+.. code-block:: bash
+
+    pip install s2-python
+
+The packages on Pypi may be found `here <https://pypi.org/project/s2-python/>`_
 
 Example
 ---------
 
 .. code-block:: python
 
+    from s2python.common import PowerRange, CommodityQuantity
+
     # create s2 messages as Python objects
-    number_range = PowerRange(start_of_range=4.0, end_of_range=5.0, commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1)
+    number_range = PowerRange(
+        start_of_range=4.0,
+        end_of_range=5.0,
+        commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1,
+    )
     # serialize s2 messages
     number_range.to_json()
     # deserialize s2 messages

{s2-python-0.0.1 → s2_python-0.2.0}/README.rst

@@ -2,7 +2,7 @@ Python Wrapper for S2 Flexibility Protocol
 ===========================================
 .. image:: https://img.shields.io/pypi/v/s2-python
    :alt: PyPI - Version
-.. image:: https://img.shields.io/pypi/pyversions/v/s2-python
+.. image:: https://img.shields.io/pypi/pyversions/s2-python
    :alt: PyPI - Python Version
 .. image:: https://img.shields.io/pypi/l/s2-python
    :alt: PyPI - License
@@ -12,14 +12,29 @@ is based on the asyncapi description of the protocol provided in the `s2-ws-json
 
 Currently, the package supports the *common* and *FILL RATE BASED CONTROL* types and messages.
 
+To Install
+-----------
+You can install this package using pip or any Python dependency manager that collects the packages from Pypi:
+
+.. code-block:: bash
+
+    pip install s2-python
+
+The packages on Pypi may be found `here <https://pypi.org/project/s2-python/>`_
 
 Example
 ---------
 
 .. code-block:: python
 
+    from s2python.common import PowerRange, CommodityQuantity
+
     # create s2 messages as Python objects
-    number_range = PowerRange(start_of_range=4.0, end_of_range=5.0, commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1)
+    number_range = PowerRange(
+        start_of_range=4.0,
+        end_of_range=5.0,
+        commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1,
+    )
     # serialize s2 messages
     number_range.to_json()
     # deserialize s2 messages

{s2-python-0.0.1 → s2_python-0.2.0}/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.0.1
+version = 0.2.0
 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.9, <= 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
@@ -40,6 +42,7 @@ testing =
 	pytest-coverage
 	pytest-timer
 	mypy
+	types-pytz
 	pylint
 development = 
 	pip-tools

{s2-python-0.0.1 → s2_python-0.2.0}/src/s2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.0.1
+Version: 0.2.0
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,15 +12,18 @@ 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"
 Requires-Dist: pytest-timer; extra == "testing"
 Requires-Dist: mypy; extra == "testing"
+Requires-Dist: types-pytz; extra == "testing"
 Requires-Dist: pylint; extra == "testing"
 Provides-Extra: development
 Requires-Dist: pip-tools; extra == "development"
@@ -39,7 +42,7 @@ Python Wrapper for S2 Flexibility Protocol
 ===========================================
 .. image:: https://img.shields.io/pypi/v/s2-python
    :alt: PyPI - Version
-.. image:: https://img.shields.io/pypi/pyversions/v/s2-python
+.. image:: https://img.shields.io/pypi/pyversions/s2-python
    :alt: PyPI - Python Version
 .. image:: https://img.shields.io/pypi/l/s2-python
    :alt: PyPI - License
@@ -49,14 +52,29 @@ is based on the asyncapi description of the protocol provided in the `s2-ws-json
 
 Currently, the package supports the *common* and *FILL RATE BASED CONTROL* types and messages.
 
+To Install
+-----------
+You can install this package using pip or any Python dependency manager that collects the packages from Pypi:
+
+.. code-block:: bash
+
+    pip install s2-python
+
+The packages on Pypi may be found `here <https://pypi.org/project/s2-python/>`_
 
 Example
 ---------
 
 .. code-block:: python
 
+    from s2python.common import PowerRange, CommodityQuantity
+
     # create s2 messages as Python objects
-    number_range = PowerRange(start_of_range=4.0, end_of_range=5.0, commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1)
+    number_range = PowerRange(
+        start_of_range=4.0,
+        end_of_range=5.0,
+        commodity_quantity=CommodityQuantity.ELECTRIC_POWER_L1,
+    )
     # serialize s2 messages
     number_range.to_json()
     # deserialize s2 messages

{s2-python-0.0.1 → s2_python-0.2.0}/src/s2_python.egg-info/SOURCES.txt

@@ -10,6 +10,10 @@ 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
 src/s2python/validate_values_mixin.py
@@ -51,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.0.1 → s2_python-0.2.0}/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
@@ -21,4 +22,5 @@ pytest
 pytest-coverage
 pytest-timer
 mypy
+types-pytz
 pylint

{s2-python-0.0.1 → s2_python-0.2.0}/src/s2python/__init__.py

@@ -2,7 +2,7 @@ from importlib.metadata import PackageNotFoundError, version  # pragma: no cover
 
 try:
     # Change here if project is renamed and does not equal the package name
-    dist_name = "s2-python"
+    dist_name = "s2-python"  # pylint: disable=invalid-name
     __version__ = version(dist_name)
 except PackageNotFoundError:  # pragma: no cover
     __version__ = "unknown"

{s2-python-0.0.1 → s2_python-0.2.0}/src/s2python/common/duration.py

@@ -4,19 +4,19 @@ import math
 from s2python.generated.gen_s2 import Duration as GenDuration
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class Duration(GenDuration, ValidateValuesMixin["Duration"]):
+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.2.0/src/s2python/common/handshake.py

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

s2_python-0.2.0/src/s2python/common/handshake_response.py

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

s2_python-0.2.0/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.0/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.2.0/src/s2python/common/power_forecast.py

@@ -0,0 +1,18 @@
+from typing import List
+import uuid
+
+from s2python.common.power_forecast_element import PowerForecastElement
+from s2python.generated.gen_s2 import PowerForecast as GenPowerForecast
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class PowerForecast(GenPowerForecast, S2Message["PowerForecast"]):
+    model_config = GenPowerForecast.model_config
+    model_config["validate_assignment"] = True
+
+    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.2.0/src/s2python/common/power_forecast_element.py

@@ -0,0 +1,20 @@
+from typing import List
+
+from s2python.generated.gen_s2 import PowerForecastElement as GenPowerForecastElement
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+from s2python.common.duration import Duration
+from s2python.common.power_forecast_value import PowerForecastValue
+
+
+@catch_and_convert_exceptions
+class PowerForecastElement(GenPowerForecastElement, S2Message["PowerForecastElement"]):
+    model_config = GenPowerForecastElement.model_config
+    model_config["validate_assignment"] = True
+
+    duration: Duration = GenPowerForecastElement.model_fields["duration"]  # type: ignore[assignment]
+    power_values: List[PowerForecastValue] = GenPowerForecastElement.model_fields[
+        "power_values"
+    ]  # type: ignore[assignment]

s2_python-0.2.0/src/s2python/common/power_forecast_value.py

@@ -0,0 +1,11 @@
+from s2python.generated.gen_s2 import PowerForecastValue as GenPowerForecastValue
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class PowerForecastValue(GenPowerForecastValue, S2Message["PowerForecastValue"]):
+    model_config = GenPowerForecastValue.model_config
+    model_config["validate_assignment"] = True

s2_python-0.2.0/src/s2python/common/power_measurement.py

@@ -0,0 +1,18 @@
+from typing import List
+import uuid
+
+from s2python.common.power_value import PowerValue
+from s2python.generated.gen_s2 import PowerMeasurement as GenPowerMeasurement
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class PowerMeasurement(GenPowerMeasurement, S2Message["PowerMeasurement"]):
+    model_config = GenPowerMeasurement.model_config
+    model_config["validate_assignment"] = True
+
+    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.0/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.0.1 → s2_python-0.2.0}/src/s2python/common/power_value.py

@@ -1,11 +1,11 @@
 from s2python.generated.gen_s2 import PowerValue as GenPowerValue
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class PowerValue(GenPowerValue, ValidateValuesMixin["PowerValue"]):
-    class Config(GenPowerValue.Config):
-        validate_assignment = True
+class PowerValue(GenPowerValue, S2Message["PowerValue"]):
+    model_config = GenPowerValue.model_config
+    model_config["validate_assignment"] = True

s2_python-0.2.0/src/s2python/common/reception_status.py

@@ -0,0 +1,15 @@
+import uuid
+
+from s2python.generated.gen_s2 import ReceptionStatus as GenReceptionStatus
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2Message,
+)
+
+
+@catch_and_convert_exceptions
+class ReceptionStatus(GenReceptionStatus, S2Message["ReceptionStatus"]):
+    model_config = GenReceptionStatus.model_config
+    model_config["validate_assignment"] = True
+
+    subject_message_id: uuid.UUID = GenReceptionStatus.model_fields["subject_message_id"]  # type: ignore[assignment]

s2_python-0.2.0/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.0/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.0.1 → s2_python-0.2.0}/src/s2python/common/role.py

@@ -1,11 +1,11 @@
 from s2python.generated.gen_s2 import Role as GenRole
 from s2python.validate_values_mixin import (
-    ValidateValuesMixin,
+    S2Message,
     catch_and_convert_exceptions,
 )
 
 
 @catch_and_convert_exceptions
-class Role(GenRole, ValidateValuesMixin["Role"]):
-    class Config(GenRole.Config):
-        validate_assignment = True
+class Role(GenRole, S2Message["Role"]):
+    model_config = GenRole.model_config
+    model_config["validate_assignment"] = True

s2_python-0.2.0/src/s2python/common/select_control_type.py

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

s2_python-0.2.0/src/s2python/common/session_request.py

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

{s2-python-0.0.1 → s2_python-0.2.0}/src/s2python/common/support.py

@@ -3,23 +3,25 @@ from s2python.common import CommodityQuantity, Commodity
 
 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

s2_python-0.2.0/src/s2python/common/timer.py

@@ -0,0 +1,17 @@
+import uuid
+
+from s2python.common.duration import Duration
+from s2python.generated.gen_s2 import Timer as GenTimer
+from s2python.validate_values_mixin import (
+    S2Message,
+    catch_and_convert_exceptions,
+)
+
+
+@catch_and_convert_exceptions
+class Timer(GenTimer, S2Message["Timer"]):
+    model_config = GenTimer.model_config
+    model_config["validate_assignment"] = True
+
+    id: uuid.UUID = GenTimer.model_fields["id"]  # type: ignore[assignment]
+    duration: Duration = GenTimer.model_fields["duration"]  # type: ignore[assignment]