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

{s2_python-0.0.1.dist-info → s2_python-0.2.0.dist-info}/METADATA

@@ -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,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: development
 Requires-Dist: pip-tools ; extra == 'development'
 Requires-Dist: datamodel-code-generator ; extra == 'development'
@@ -33,13 +35,14 @@ 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'
 
 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.2.0.dist-info/RECORD

@@ -0,0 +1,54 @@
+s2python/__init__.py,sha256=e5lwvqsPl-z7IfEd0hRQhLBRKBYcuw2eqrecXnMfLdg,384
+s2python/reception_status_awaiter.py,sha256=jKMliFk1XxwsEGtx3vFESbJhUtClB7cTu-td90-qBN8,2137
+s2python/s2_connection.py,sha256=mGnyEWdf1NlSWKxbBLJ4g_2OgmACNR6UJReJ48QFD8U,17892
+s2python/s2_control_type.py,sha256=TPG4ZWEi8RbVg50V4BnNfkYb5EEvNsWuG8S5Qx2W-iQ,1721
+s2python/s2_parser.py,sha256=1ZaCL3bWKHtmidr_VQqp3nzjr8VQjeltRN81stA0mfw,4160
+s2python/s2_validation_error.py,sha256=BkOLoNsrcQ3MzdCYaPDgs1Wu6lPdlQDpZsTpykKGQmE,384
+s2python/utils.py,sha256=QX9b-mi-H_YUGTmGmJsrAbaWWM3dgaoaRLRXHHlaZDE,212
+s2python/validate_values_mixin.py,sha256=hfXW-ViHSwahIgD2r1tmdOtt9uOZEdMCf9Bw2mRJUM8,2541
+s2python/version.py,sha256=IBzoytgbYYYekQnSTfSmWeYAZ4c_yUFU2oLIAG4UYjs,45
+s2python/common/__init__.py,sha256=yEAXCS59XpNOEXbEXoN04SwultP-3evgVzFuEUSgB5I,1345
+s2python/common/duration.py,sha256=Sw1l0-omcPCzlWJP-xkMioQjiBwjTICGoqtYi8BoVOM,649
+s2python/common/handshake.py,sha256=43MGJWjbPT53DQUP2kclMY82wefcW2uJ3UyHezJPZZU,449
+s2python/common/handshake_response.py,sha256=CFZ9tPbYWRqvl8HlvcOSRW1akAf8P63Vv_t0dbxAaKA,505
+s2python/common/instruction_status_update.py,sha256=d-Z_0fZh_yIC-cupkaDG-x19uVxznQVHsyacZW5hwQ0,674
+s2python/common/number_range.py,sha256=SaUhAJU9uLR0c5Du1-iPRDYyMI3JKmGLBvQHRPeNZws,1044
+s2python/common/power_forecast.py,sha256=foJKA9Wmm-CzkK7qIfaW4963NqoY1-pZcvBXmUMPazw,686
+s2python/common/power_forecast_element.py,sha256=HdetbhqTqXa_TWMkpL7P7r3yKdmiNMFmZNtrMT4fAlw,787
+s2python/common/power_forecast_value.py,sha256=o-KegTZjUsrziNenoZZ9pjfYrkrLG_b5Cr8GcVcebD4,393
+s2python/common/power_measurement.py,sha256=t6qDcisnI8xSEmfOZeI35MMgkBB5vFqnnc5KsqrPiqk,675
+s2python/common/power_range.py,sha256=tvzb9cyVs1NLsiN6jo8jdHo9vRqCu4bnvkBvsoqKUbw,668
+s2python/common/power_value.py,sha256=yVo0OotIk1_SccOLMfkDAYp4V5xCoPUgHDEJBGg8GCs,345
+s2python/common/reception_status.py,sha256=hOgLDy7KN0aWPiKfN9u-AUUeXnrpW2UDVZRAcUkefZY,507
+s2python/common/resource_manager_details.py,sha256=CCvnS21vywcaZAAQzPIzU42CkydnBbkAVjgoKbtDeSE,1026
+s2python/common/revoke_object.py,sha256=6PoKLZjPSz43O_W58zSUFNYamRJD-X1YF1gi0WLtt9s,567
+s2python/common/role.py,sha256=N8nYdMquBIwNx5RS8UrMGHDHdXy57P_iAcDpdDYm62A,309
+s2python/common/select_control_type.py,sha256=xCd18THcBthEJjLz9otHscb4pgxsUYghlcxzlEXvhPs,505
+s2python/common/session_request.py,sha256=kFAqUkl9_yVSLvCT3E0BUQKJC-JPhZk3rW01GiT3tQ4,484
+s2python/common/support.py,sha256=Kbrf_KGB45Wfr8j2pqDe1lLde6CIr3nl_LYkWnilmV0,1015
+s2python/common/timer.py,sha256=_zokHPmPHKHx-H9vBau18pcN1HrYBIhWSKkzFzd999w,538
+s2python/common/transition.py,sha256=nUdJaiWgf6tAgfAMqJmdsKmob063NcZJZMt0ysjjkWE,1046
+s2python/frbc/__init__.py,sha256=ROV3qZoldPkdgVFfMQr5Mf3GDfBzXaMfhNNCuXY6T0s,1104
+s2python/frbc/frbc_actuator_description.py,sha256=Ig2jmf2_qsDBfuW90rAVD-e0hkmkIqKdTcQZI3XY3S8,6148
+s2python/frbc/frbc_actuator_status.py,sha256=4XGk-ueXq6o_kOLTXGK_bfEFdJy8p8jjHDLyohzykSQ,955
+s2python/frbc/frbc_fill_level_target_profile.py,sha256=od1w2nR35sckV4Bvp_EpfZaMJxKRrDu66X8mliSRuec,862
+s2python/frbc/frbc_fill_level_target_profile_element.py,sha256=41lYU60Pb9ogBi5Ys2bG0fFnsQ6JuqJSobDkgjLcQNs,818
+s2python/frbc/frbc_instruction.py,sha256=EyNnt2P9w0955eYoeWPqaHSco0NzbvYAGD0F9vYS0SM,791
+s2python/frbc/frbc_leakage_behaviour.py,sha256=Esjmsy9jyi2naokTVu6y9oPBVjjlTyEguPF2snQMj7w,776
+s2python/frbc/frbc_leakage_behaviour_element.py,sha256=5sh9MbcSXT1E9fQmRgCoLLgMD9VZqXCUomSl1NL3j9Y,639
+s2python/frbc/frbc_operation_mode.py,sha256=B30t7ITSCAzBdNZv4hns7VacVsRN0DyydgTvoF9JYdY,1881
+s2python/frbc/frbc_operation_mode_element.py,sha256=uin-wgbySldMBbjk14l_ZOH7lpsyXeo1jjCYolB1RNI,1055
+s2python/frbc/frbc_storage_description.py,sha256=K1bjmG5_2SP14PMIkkldTyvTWQzDTC9KYFuiksW0AS8,604
+s2python/frbc/frbc_storage_status.py,sha256=TKQeX1vsnYrblgS8UeDu0Siy7p0zedYck85vFVkdiT8,505
+s2python/frbc/frbc_system_description.py,sha256=g94kqGRNcPXcQQzpb9Wz7dDncbuJsmA4KHa0r7b3r4w,962
+s2python/frbc/frbc_timer_status.py,sha256=Lh95iJ62FQGeqSTH5oDJnxzWBCzaNZAjunQyGEPOlcM,693
+s2python/frbc/frbc_usage_forecast.py,sha256=e5tvKpVAsKbjQxN-g8T3RDNivwibJVtkjqmlOHpd2ek,729
+s2python/frbc/frbc_usage_forecast_element.py,sha256=Njox8S11L3b_b8F-eengIRCSMvHQwp6LgVCE3_u3DPo,583
+s2python/frbc/rm.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+s2python/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+s2python/generated/gen_s2.py,sha256=eg9J0pcWxCy0oXO8eq9AtoB-GONHZLNd8JANpMhKQCQ,63573
+s2_python-0.2.0.dist-info/METADATA,sha256=BzbWwIg3QjPHe0ZtOEzrEZd6ANAvAJiWRjHpRsUXALw,3342
+s2_python-0.2.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+s2_python-0.2.0.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
+s2_python-0.2.0.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
+s2_python-0.2.0.dist-info/RECORD,,

{s2_python-0.0.1.dist-info → s2_python-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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"

s2python/common/__init__.py

@@ -1,5 +1,6 @@
 from s2python.generated.gen_s2 import (
     RoleType,
+    Currency,
     CommodityQuantity,
     Commodity,
     InstructionStatus,
@@ -7,7 +8,6 @@ from s2python.generated.gen_s2 import (
     EnergyManagementRole,
     SessionRequestType,
     ControlType,
-    Currency,
     RevokableObjects,
 )
 

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)

s2python/common/handshake.py

@@ -3,13 +3,13 @@ import uuid
 from s2python.generated.gen_s2 import Handshake as GenHandshake
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class Handshake(GenHandshake, ValidateValuesMixin["Handshake"]):
-    class Config(GenHandshake.Config):
-        validate_assignment = True
+class Handshake(GenHandshake, S2Message["Handshake"]):
+    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]

s2python/common/handshake_response.py

@@ -3,13 +3,13 @@ import uuid
 from s2python.generated.gen_s2 import HandshakeResponse as GenHandshakeResponse
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class HandshakeResponse(GenHandshakeResponse, ValidateValuesMixin["HandshakeResponse"]):
-    class Config(GenHandshakeResponse.Config):
-        validate_assignment = True
+class HandshakeResponse(GenHandshakeResponse, S2Message["HandshakeResponse"]):
+    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]

s2python/common/instruction_status_update.py

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

s2python/common/number_range.py

@@ -1,36 +1,32 @@
-from typing import Any, Dict
+from typing import Any
+from typing_extensions import Self
 
-from pydantic import root_validator
+from pydantic import model_validator
 
 from s2python.validate_values_mixin import (
-    ValidateValuesMixin,
+    S2Message,
     catch_and_convert_exceptions,
 )
 from s2python.generated.gen_s2 import NumberRange as GenNumberRange
 
 
 @catch_and_convert_exceptions
-class NumberRange(GenNumberRange, ValidateValuesMixin["NumberRange"]):
-    class Config(GenNumberRange.Config):
-        validate_assignment = True
+class NumberRange(GenNumberRange, S2Message["NumberRange"]):
+    model_config = GenNumberRange.model_config
+    model_config["validate_assignment"] = True
 
-    @root_validator(pre=False)
-    def validate_start_end_order(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        if values.get("start_of_range", 0.0) > values.get("end_of_range", 0.0):
-            raise ValueError(
-                cls, "start_of_range should not be higher than end_of_range"
-            )
+    @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 values
+        return self
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(f"{self.start_of_range}|{self.end_of_range}")
 
-    def __eq__(self, other):
+    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
-            )
-        else:
-            return False
+            return self.start_of_range == other.start_of_range and self.end_of_range == other.end_of_range
+
+        return False

s2python/common/power_forecast.py

@@ -1,20 +1,18 @@
 from typing import List
 import uuid
 
-from s2python.common import PowerForecastElement
+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,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class PowerForecast(GenPowerForecast, ValidateValuesMixin["PowerForecast"]):
-    class Config(GenPowerForecast.Config):
-        validate_assignment = True
+class PowerForecast(GenPowerForecast, S2Message["PowerForecast"]):
+    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]

s2python/common/power_forecast_element.py

@@ -3,19 +3,18 @@ from typing import List
 from s2python.generated.gen_s2 import PowerForecastElement as GenPowerForecastElement
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
-from s2python.common import Duration, PowerForecastValue
+from s2python.common.duration import Duration
+from s2python.common.power_forecast_value import PowerForecastValue
 
 
 @catch_and_convert_exceptions
-class PowerForecastElement(
-    GenPowerForecastElement, ValidateValuesMixin["PowerForecastElement"]
-):
-    class Config(GenPowerForecastElement.Config):
-        validate_assignment = True
+class PowerForecastElement(GenPowerForecastElement, S2Message["PowerForecastElement"]):
+    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]

s2python/common/power_forecast_value.py

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

s2python/common/power_measurement.py

@@ -1,18 +1,18 @@
 from typing import List
 import uuid
 
-from s2python.common import PowerValue
+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,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class PowerMeasurement(GenPowerMeasurement, ValidateValuesMixin["PowerMeasurement"]):
-    class Config(GenPowerMeasurement.Config):
-        validate_assignment = True
+class PowerMeasurement(GenPowerMeasurement, S2Message["PowerMeasurement"]):
+    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]

s2python/common/power_range.py

@@ -1,24 +1,22 @@
-from typing import Any, Dict
+from typing_extensions import Self
 
-from pydantic import root_validator
+from pydantic import model_validator
 
 from s2python.generated.gen_s2 import PowerRange as GenPowerRange
 from s2python.validate_values_mixin import (
-    ValidateValuesMixin,
+    S2Message,
     catch_and_convert_exceptions,
 )
 
 
 @catch_and_convert_exceptions
-class PowerRange(GenPowerRange, ValidateValuesMixin["PowerRange"]):
-    class Config(GenPowerRange.Config):
-        validate_assignment = True
+class PowerRange(GenPowerRange, S2Message["PowerRange"]):
+    model_config = GenPowerRange.model_config
+    model_config["validate_assignment"] = True
 
-    @root_validator(pre=False)
-    def validate_start_end_order(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        if values.get("start_of_range", 0.0) > values.get("end_of_range", 0.0):
-            raise ValueError(
-                cls, "start_of_range should not be higher than end_of_range"
-            )
+    @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 values
+        return self

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

s2python/common/reception_status.py

@@ -3,15 +3,13 @@ import uuid
 from s2python.generated.gen_s2 import ReceptionStatus as GenReceptionStatus
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class ReceptionStatus(GenReceptionStatus, ValidateValuesMixin["ReceptionStatus"]):
-    class Config(GenReceptionStatus.Config):
-        validate_assignment = True
+class ReceptionStatus(GenReceptionStatus, S2Message["ReceptionStatus"]):
+    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]

s2python/common/resource_manager_details.py

@@ -1,26 +1,25 @@
 from typing import List
 import uuid
 
-from s2python.common import Duration, Role
+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,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class ResourceManagerDetails(
-    GenResourceManagerDetails, ValidateValuesMixin["ResourceManagerDetails"]
-):
-    class Config(GenResourceManagerDetails.Config):
-        validate_assignment = True
+class ResourceManagerDetails(GenResourceManagerDetails, S2Message["ResourceManagerDetails"]):
+    model_config = GenResourceManagerDetails.model_config
+    model_config["validate_assignment"] = True
 
-    instruction_processing_delay: Duration = GenResourceManagerDetails.__fields__[
+    instruction_processing_delay: Duration = GenResourceManagerDetails.model_fields[
         "instruction_processing_delay"
-    ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenResourceManagerDetails.__fields__["message_id"].field_info  # type: ignore[assignment]
-    resource_id: uuid.UUID = GenResourceManagerDetails.__fields__["resource_id"].field_info  # type: ignore[assignment]
-    roles: List[Role] = GenResourceManagerDetails.__fields__["roles"].field_info  # type: ignore[assignment]
+    ]  # 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]

s2python/common/revoke_object.py

@@ -3,14 +3,14 @@ import uuid
 from s2python.generated.gen_s2 import RevokeObject as GenRevokeObject
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class RevokeObject(GenRevokeObject, ValidateValuesMixin["RevokeObject"]):
-    class Config(GenRevokeObject.Config):
-        validate_assignment = True
+class RevokeObject(GenRevokeObject, S2Message["RevokeObject"]):
+    model_config = GenRevokeObject.model_config
+    model_config["validate_assignment"] = True
 
-    message_id: uuid.UUID = GenRevokeObject.__fields__["message_id"].field_info  # type: ignore[assignment]
-    object_id: uuid.UUID = GenRevokeObject.__fields__["object_id"].field_info  # type: ignore[assignment]
+    message_id: uuid.UUID = GenRevokeObject.model_fields["message_id"]  # type: ignore[assignment]
+    object_id: uuid.UUID = GenRevokeObject.model_fields["object_id"]  # type: ignore[assignment]

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

s2python/common/select_control_type.py

@@ -3,13 +3,13 @@ import uuid
 from s2python.generated.gen_s2 import SelectControlType as GenSelectControlType
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class SelectControlType(GenSelectControlType, ValidateValuesMixin["SelectControlType"]):
-    class Config(GenSelectControlType.Config):
-        validate_assignment = True
+class SelectControlType(GenSelectControlType, S2Message["SelectControlType"]):
+    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]

s2python/common/session_request.py

@@ -3,13 +3,13 @@ import uuid
 from s2python.generated.gen_s2 import SessionRequest as GenSessionRequest
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
-    ValidateValuesMixin,
+    S2Message,
 )
 
 
 @catch_and_convert_exceptions
-class SessionRequest(GenSessionRequest, ValidateValuesMixin["SessionRequest"]):
-    class Config(GenSessionRequest.Config):
-        validate_assignment = True
+class SessionRequest(GenSessionRequest, S2Message["SessionRequest"]):
+    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]

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