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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.0.1
+Version: 0.1.3
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,34 +12,36 @@ 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~=1.10.7
 Requires-Dist: pytz
 Requires-Dist: click
+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'
-Requires-Dist: datamodel-code-generator ; extra == 'development'
-Requires-Dist: pre-commit ; extra == 'development'
-Requires-Dist: tox ; extra == 'development'
+Requires-Dist: pip-tools; extra == "development"
+Requires-Dist: datamodel-code-generator; extra == "development"
+Requires-Dist: pre-commit; extra == "development"
+Requires-Dist: tox; extra == "development"
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme >=1.2 ; extra == 'docs'
-Requires-Dist: sphinx-tabs ; extra == 'docs'
-Requires-Dist: sphinx-copybutton ; extra == 'docs'
-Requires-Dist: sphinx-fontawesome ; extra == 'docs'
-Requires-Dist: sphinxcontrib.httpdomain ; extra == 'docs'
-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: pylint ; extra == 'testing'
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme>=1.2; extra == "docs"
+Requires-Dist: sphinx-tabs; extra == "docs"
+Requires-Dist: sphinx_copybutton; extra == "docs"
+Requires-Dist: sphinx_fontawesome; extra == "docs"
+Requires-Dist: sphinxcontrib.httpdomain; extra == "docs"
 
 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 +51,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.1.3.dist-info/RECORD

@@ -0,0 +1,51 @@
+s2python/__init__.py,sha256=e5lwvqsPl-z7IfEd0hRQhLBRKBYcuw2eqrecXnMfLdg,384
+s2python/message.py,sha256=BeKrzLQRkBYkJseo4O9vrMgKwG2YBLRIMNHllPcp82s,1048
+s2python/s2_parser.py,sha256=aDd_gt0YSa-OeYa9Ot8ZYNomOI61yU9uVBVem4-SBO0,4087
+s2python/s2_validation_error.py,sha256=fdV2tdRhYslDStTw8Cvb3mly7PpLiCbXbrkfOe3n2_w,295
+s2python/utils.py,sha256=SHYxnU4IlM6vN-WmnBEj-qMYG4_ykP93ZyvEtVIUEOU,212
+s2python/validate_values_mixin.py,sha256=YHWXbOdom6v3DcVta2uY6TxHtT-Squn6rOrAzlmf96c,4230
+s2python/version.py,sha256=w9Iw7QVvd8lme2wKwEbCo5IgetVjSfFBOOYAcA_Q0Ns,18
+s2python/common/__init__.py,sha256=OO5eEuRFNB29yoChcXmKYqimsmJ29nAunb3xTUtJnU0,1443
+s2python/common/duration.py,sha256=WtPr2GJAZ0lkKW6yxKTHsN8QxTonQ3xQIlxmK68bv4g,648
+s2python/common/handshake.py,sha256=yVItASWui00KHewhk1kf9J-APcLNPoPJ4ifNI8NOlgg,433
+s2python/common/handshake_response.py,sha256=zIgmBaNZD5_GK0yhc8hInPeO-FCtqC03Gd2D9GZ05qM,497
+s2python/common/instruction_status_update.py,sha256=qqGWn6eX34GaZy2ikJ1XG2HIvR8DgfATpqKDRafHFds,574
+s2python/common/number_range.py,sha256=uTtrTctuqFK8dIgOwP9ctqRyUq-ZRGHoIzZgGzNNkl0,1150
+s2python/common/power_forecast.py,sha256=jBtoUROMugvj0nhYZbnBmi9_h8XpjeBp3p93SUawNaQ,679
+s2python/common/power_forecast_element.py,sha256=miSykpw6wtU8opQS_REw1YxB8z_2or7QylRpVkVzSYg,774
+s2python/common/power_forecast_value.py,sha256=mWrinzXl9Hv8Wwz1u7zPlM-q67QEDHab7ZE6yBSYMzg,362
+s2python/common/power_measurement.py,sha256=qi00R2GT2Hg1prJ4pP2frDzUqKpJQDOehUY66fYMo4Q,657
+s2python/common/power_range.py,sha256=XA_2SuAL3s3ahtLOrEFYtnhmYFg-xsZQ74_WeGkJaVI,783
+s2python/common/power_value.py,sha256=yUw5vE4SUjgJwhQd7q8q3k9-0ylEBuWL3ksNuZ_11SA,314
+s2python/common/reception_status.py,sha256=lEMQf1_22rxYFGcHEsWosnybtr2I-EneoptqJARmqoo,481
+s2python/common/resource_manager_details.py,sha256=Wxs8C9PEeZdOofJvzYQ4PwbXvi_YXvnUbqNnzgTDBsE,933
+s2python/common/revoke_object.py,sha256=Lu6jzUvLjBwtcRK8Me4PGoo87JnwRTTJYCtNEBF4F_0,457
+s2python/common/role.py,sha256=_OQP-sZ_T_qOP_Qf44cYoxVMRJYToMj-ZRCxyQI7TJ4,278
+s2python/common/select_control_type.py,sha256=NWdo44cN9xmEPMmuy5bRoNgJnGLA9sBtUToloolteGE,497
+s2python/common/session_request.py,sha256=bo9qsjWAbDhdRxEp0-bJ3rC61N8fFv6M-IU0-ljo73E,473
+s2python/common/support.py,sha256=cARbi4LIf0g64jhZ5gcqeWJLJkM7YBHt1OAZDeRQV0M,1015
+s2python/common/timer.py,sha256=rcCK5wZvsSNEe-0MislFg8OPnhkqKpQjq9gD_vt-z9c,427
+s2python/common/transition.py,sha256=SLkVT1BdWqhk_MAGEc3aWEHy6a2onSTgEuNwblZ55Q4,537
+s2python/frbc/__init__.py,sha256=4oYGzsgbaFB4KLV-t8fIAtyaMK5UCEzVr5lALwDamcU,1104
+s2python/frbc/frbc_actuator_description.py,sha256=eE4WFXB1_60DS717B-J5lSgluQadB__a5Jj1ikJRl5w,6705
+s2python/frbc/frbc_actuator_status.py,sha256=FpHcBmdrxrAxh9Vbp6u2rOmJj7HGJqApVM4MDrmfmvs,507
+s2python/frbc/frbc_fill_level_target_profile.py,sha256=xAgJ4WR4Fs-I8LsOpbsQHk5CKyjydMl1TUovgiyN6Tk,890
+s2python/frbc/frbc_fill_level_target_profile_element.py,sha256=6Aoh2Gb7kZBwa1rGmHIw5fphkH5uYH9bGeLaQFro8rc,818
+s2python/frbc/frbc_instruction.py,sha256=eeSDW4mdI-KMx-8htSBSk59GsQ5V-UDYWcCZCiynfJc,483
+s2python/frbc/frbc_leakage_behaviour.py,sha256=XpgVugZoc6CRLHGUHfJHgtIXb03Fwk8KbwTkqsTG5XE,778
+s2python/frbc/frbc_leakage_behaviour_element.py,sha256=AJ0La_3jnHuXYgwvXA32lOB41dP8SOXpiHfQuEsOr3w,623
+s2python/frbc/frbc_operation_mode.py,sha256=P6Nq28AUxplhhyeuQaDKBxGBoM-uCiGC5rhwqiL66r0,1908
+s2python/frbc/frbc_operation_mode_element.py,sha256=wQsLskoFV99U9FhJOVeerz3ej_frfajWvwaVpsjKsc8,1066
+s2python/frbc/frbc_storage_description.py,sha256=OtY830EHP1m4JxHNKfA3drJ6q-akgSSEP6ncd8VxmWo,588
+s2python/frbc/frbc_storage_status.py,sha256=Z2Oppbzv3fcJJGqnmZBoXKUi8JQLoOjt5wUof15aSC4,499
+s2python/frbc/frbc_system_description.py,sha256=d5QRik3nuhhudx7CT3YwuMRv4353JMoE9qehiYeupnE,994
+s2python/frbc/frbc_timer_status.py,sha256=rMdEoZhAO0S5_fNN0VjgtZSGCgCB50AymEV4Ym8HRE8,483
+s2python/frbc/frbc_usage_forecast.py,sha256=5G4zl9e7TBfGYFCZ7K-HdR_QZTVOxYVS43wcuXenrjs,728
+s2python/frbc/frbc_usage_forecast_element.py,sha256=7wYAlNPNStW485-yVMqjkoQlHnWmG_I5ILCF2UhMaCU,566
+s2python/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+s2python/generated/gen_s2.py,sha256=5efQyo-hqCYa9Rm09V0C-ifbIFy89Ywoz8OX1Xm4GEM,62370
+s2_python-0.1.3.dist-info/METADATA,sha256=wFwlXOSLIk48DFAbN3T2_GgzxH2XEQ0Cn3Sd3OG2UkA,3290
+s2_python-0.1.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+s2_python-0.1.3.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
+s2_python-0.1.3.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
+s2_python-0.1.3.dist-info/RECORD,,

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

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (75.6.0)
 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,32 +1,33 @@
-from s2python.generated.gen_s2 import (
-    RoleType,
-    CommodityQuantity,
-    Commodity,
-    InstructionStatus,
-    ReceptionStatusValues,
-    EnergyManagementRole,
-    SessionRequestType,
-    ControlType,
-    Currency,
-    RevokableObjects,
-)
+# noqa
 
 from s2python.common.duration import Duration
-from s2python.common.role import Role
 from s2python.common.handshake import Handshake
 from s2python.common.handshake_response import HandshakeResponse
 from s2python.common.instruction_status_update import InstructionStatusUpdate
 from s2python.common.number_range import NumberRange
-from s2python.common.power_forecast_value import PowerForecastValue
-from s2python.common.power_forecast_element import PowerForecastElement
 from s2python.common.power_forecast import PowerForecast
-from s2python.common.power_value import PowerValue
+from s2python.common.power_forecast_element import PowerForecastElement
+from s2python.common.power_forecast_value import PowerForecastValue
 from s2python.common.power_measurement import PowerMeasurement
 from s2python.common.power_range import PowerRange
+from s2python.common.power_value import PowerValue
 from s2python.common.reception_status import ReceptionStatus
 from s2python.common.resource_manager_details import ResourceManagerDetails
 from s2python.common.revoke_object import RevokeObject
+from s2python.common.role import Role
 from s2python.common.select_control_type import SelectControlType
 from s2python.common.session_request import SessionRequest
 from s2python.common.timer import Timer
 from s2python.common.transition import Transition
+from s2python.generated.gen_s2 import (
+    Commodity,
+    CommodityQuantity,
+    ControlType,
+    Currency,  # noqa F401
+    EnergyManagementRole,  # noqa F401
+    InstructionStatus,  # noqa F401
+    ReceptionStatusValues,  # noqa F401
+    RevokableObjects,  # noqa F401
+    RoleType,  # noqa F401
+    SessionRequestType,  # noqa F401
+)

s2python/common/duration.py

@@ -1,15 +1,12 @@
-from datetime import timedelta
 import math
+from datetime import timedelta
 
 from s2python.generated.gen_s2 import Duration as GenDuration
-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 Duration(GenDuration, ValidateValuesMixin["Duration"]):
+class Duration(GenDuration, S2Message["Duration"]):
     def to_timedelta(self) -> timedelta:
         return timedelta(milliseconds=self.__root__)
 

s2python/common/handshake.py

@@ -1,15 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import Handshake as GenHandshake
-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 Handshake(GenHandshake, ValidateValuesMixin["Handshake"]):
+class Handshake(GenHandshake, S2Message["Handshake"]):
     class Config(GenHandshake.Config):
         validate_assignment = True
 
-    message_id: uuid.UUID = GenHandshake.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["Handshake"] = Field(default="Handshake")

s2python/common/handshake_response.py

@@ -1,15 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import HandshakeResponse as GenHandshakeResponse
-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 HandshakeResponse(GenHandshakeResponse, ValidateValuesMixin["HandshakeResponse"]):
+class HandshakeResponse(GenHandshakeResponse, S2Message["HandshakeResponse"]):
     class Config(GenHandshakeResponse.Config):
         validate_assignment = True
 
-    message_id: uuid.UUID = GenHandshakeResponse.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["HandshakeResponse"] = Field(default="HandshakeResponse")

s2python/common/instruction_status_update.py

@@ -1,22 +1,20 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import (
     InstructionStatusUpdate as GenInstructionStatusUpdate,
 )
-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 InstructionStatusUpdate(
-    GenInstructionStatusUpdate, ValidateValuesMixin["InstructionStatusUpdate"]
+    GenInstructionStatusUpdate, S2Message["InstructionStatusUpdate"]
 ):
     class Config(GenInstructionStatusUpdate.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_type: Literal["InstructionStatusUpdate"] = Field(
+        default="InstructionStatusUpdate"
+    )

s2python/common/number_range.py

@@ -2,20 +2,20 @@ from typing import Any, Dict
 
 from pydantic import root_validator
 
-from s2python.validate_values_mixin import (
-    ValidateValuesMixin,
-    catch_and_convert_exceptions,
-)
 from s2python.generated.gen_s2 import NumberRange as GenNumberRange
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
-class NumberRange(GenNumberRange, ValidateValuesMixin["NumberRange"]):
+class NumberRange(GenNumberRange, S2Message["NumberRange"]):
     class Config(GenNumberRange.Config):
         validate_assignment = True
 
     @root_validator(pre=False)
-    def validate_start_end_order(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @classmethod
+    def validate_start_end_order(  # pylint: disable=duplicate-code
+        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"
@@ -23,14 +23,14 @@ class NumberRange(GenNumberRange, ValidateValuesMixin["NumberRange"]):
 
         return values
 
-    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 False

s2python/common/power_forecast.py

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

s2python/common/power_forecast_element.py

@@ -1,17 +1,13 @@
 from typing import List
 
+from s2python.common.duration import Duration
+from s2python.common.power_forecast_value import PowerForecastValue
 from s2python.generated.gen_s2 import PowerForecastElement as GenPowerForecastElement
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    ValidateValuesMixin,
-)
-from s2python.common import Duration, PowerForecastValue
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
-class PowerForecastElement(
-    GenPowerForecastElement, ValidateValuesMixin["PowerForecastElement"]
-):
+class PowerForecastElement(GenPowerForecastElement, S2Message["PowerForecastElement"]):
     class Config(GenPowerForecastElement.Config):
         validate_assignment = True
 

s2python/common/power_forecast_value.py

@@ -1,13 +1,8 @@
 from s2python.generated.gen_s2 import PowerForecastValue as GenPowerForecastValue
-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 PowerForecastValue(
-    GenPowerForecastValue, ValidateValuesMixin["PowerForecastValue"]
-):
+class PowerForecastValue(GenPowerForecastValue, S2Message["PowerForecastValue"]):
     class Config(GenPowerForecastValue.Config):
         validate_assignment = True

s2python/common/power_measurement.py

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

s2python/common/power_range.py

@@ -3,19 +3,19 @@ from typing import Any, Dict
 from pydantic import root_validator
 
 from s2python.generated.gen_s2 import PowerRange as GenPowerRange
-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 PowerRange(GenPowerRange, ValidateValuesMixin["PowerRange"]):
+class PowerRange(GenPowerRange, S2Message["PowerRange"]):
     class Config(GenPowerRange.Config):
         validate_assignment = True
 
     @root_validator(pre=False)
-    def validate_start_end_order(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+    @classmethod
+    def validate_start_end_order(
+        cls, values: Dict[str, Any]
+    ) -> Dict[str, Any]:  # pylint: disable=duplicate-code
         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"

s2python/common/power_value.py

@@ -1,11 +1,8 @@
 from s2python.generated.gen_s2 import PowerValue as GenPowerValue
-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 PowerValue(GenPowerValue, ValidateValuesMixin["PowerValue"]):
+class PowerValue(GenPowerValue, S2Message["PowerValue"]):
     class Config(GenPowerValue.Config):
         validate_assignment = True

s2python/common/reception_status.py

@@ -1,17 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import ReceptionStatus as GenReceptionStatus
-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 ReceptionStatus(GenReceptionStatus, ValidateValuesMixin["ReceptionStatus"]):
+class ReceptionStatus(GenReceptionStatus, S2Message["ReceptionStatus"]):
     class Config(GenReceptionStatus.Config):
         validate_assignment = True
 
-    subject_message_id: uuid.UUID = GenReceptionStatus.__fields__[
-        "subject_message_id"
-    ].field_info  # type: ignore[assignment]
+    message_type: Literal["ReceptionStatus"] = Field(default="ReceptionStatus")

s2python/common/resource_manager_details.py

@@ -1,19 +1,18 @@
-from typing import List
-import uuid
+from typing import List, Literal
 
-from s2python.common import Duration, Role
+from pydantic import Field
+
+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,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
 class ResourceManagerDetails(
-    GenResourceManagerDetails, ValidateValuesMixin["ResourceManagerDetails"]
+    GenResourceManagerDetails, S2Message["ResourceManagerDetails"]
 ):
     class Config(GenResourceManagerDetails.Config):
         validate_assignment = True
@@ -21,6 +20,8 @@ class ResourceManagerDetails(
     instruction_processing_delay: Duration = GenResourceManagerDetails.__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]
+    message_type: Literal["ResourceManagerDetails"] = Field(
+        default="ResourceManagerDetails"
+    )

s2python/common/revoke_object.py

@@ -1,16 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import RevokeObject as GenRevokeObject
-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 RevokeObject(GenRevokeObject, ValidateValuesMixin["RevokeObject"]):
+class RevokeObject(GenRevokeObject, S2Message["RevokeObject"]):
     class Config(GenRevokeObject.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_type: Literal["RevokeObject"] = Field(default="RevokeObject")

s2python/common/role.py

@@ -1,11 +1,8 @@
 from s2python.generated.gen_s2 import Role as GenRole
-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 Role(GenRole, ValidateValuesMixin["Role"]):
+class Role(GenRole, S2Message["Role"]):
     class Config(GenRole.Config):
         validate_assignment = True

s2python/common/select_control_type.py

@@ -1,15 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import SelectControlType as GenSelectControlType
-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 SelectControlType(GenSelectControlType, ValidateValuesMixin["SelectControlType"]):
+class SelectControlType(GenSelectControlType, S2Message["SelectControlType"]):
     class Config(GenSelectControlType.Config):
         validate_assignment = True
 
-    message_id: uuid.UUID = GenSelectControlType.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["SelectControlType"] = Field(default="SelectControlType")

s2python/common/session_request.py

@@ -1,15 +1,14 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import SessionRequest as GenSessionRequest
-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 SessionRequest(GenSessionRequest, ValidateValuesMixin["SessionRequest"]):
+class SessionRequest(GenSessionRequest, S2Message["SessionRequest"]):
     class Config(GenSessionRequest.Config):
         validate_assignment = True
 
-    message_id: uuid.UUID = GenSessionRequest.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["SessionRequest"] = Field(default="SessionRequest")