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

s2-python-0.1.0/PKG-INFO

@@ -0,0 +1,99 @@
+Metadata-Version: 2.1
+Name: s2-python
+Version: 0.1.0
+Summary: S2 Protocol Python Wrapper
+Home-page: https://github.com/flexiblepower/s2-ws-json-python
+Author: Flexiblepower
+Author-email: info@info.nl
+License: APACHE
+Platform: Linux
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Description-Content-Type: text/x-rst; charset=UTF-8
+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"
+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"
+
+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/s2-python
+   :alt: PyPI - Python Version
+.. image:: https://img.shields.io/pypi/l/s2-python
+   :alt: PyPI - License
+
+This Python package implements the message validation for the EN50491-12-2 "S2" standard for home and building energy management. This implementation
+is based on the asyncapi description of the protocol provided in the `s2-ws-json <https://github.com/flexiblepower/s2-ws-json/>`_ repository. 
+
+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,
+    )
+    # serialize s2 messages
+    number_range.to_json()
+    # deserialize s2 messages
+    json_str = '{"start_of_range": 4.0, "end_of_range": 5.0, "commodity_quantity": "ELECTRIC.POWER.L1"}'
+    PowerRange.from_json(json_str)
+
+Development
+-------------
+
+For development, you can install the required dependencies using the following command:
+
+    pip install -e .[testing,development]
+
+
+The tests can be run using tox:
+
+    tox
+
+To build the package, you can use tox as well:
+
+    tox -e build,clean
+    
+
+

s2-python-0.1.0/README.rst

@@ -0,0 +1,61 @@
+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/s2-python
+   :alt: PyPI - Python Version
+.. image:: https://img.shields.io/pypi/l/s2-python
+   :alt: PyPI - License
+
+This Python package implements the message validation for the EN50491-12-2 "S2" standard for home and building energy management. This implementation
+is based on the asyncapi description of the protocol provided in the `s2-ws-json <https://github.com/flexiblepower/s2-ws-json/>`_ repository. 
+
+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,
+    )
+    # serialize s2 messages
+    number_range.to_json()
+    # deserialize s2 messages
+    json_str = '{"start_of_range": 4.0, "end_of_range": 5.0, "commodity_quantity": "ELECTRIC.POWER.L1"}'
+    PowerRange.from_json(json_str)
+
+Development
+-------------
+
+For development, you can install the required dependencies using the following command:
+
+    pip install -e .[testing,development]
+
+
+The tests can be run using tox:
+
+    tox
+
+To build the package, you can use tox as well:
+
+    tox -e build,clean
+    
+
+

{s2-python-0.0.0 → s2-python-0.1.0}/setup.cfg

@@ -8,10 +8,14 @@ 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
 platforms = Linux
 classifiers = 
 	Development Status :: 4 - Beta
-	Programming Language :: Python
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 
 [options]
 zip_safe = False
@@ -19,9 +23,9 @@ packages = find_namespace:
 include_package_data = True
 package_dir = 
 	=src
-python_requires > = 3.9
+python_requires > = 3.8, <= 3.11
 install_requires = 
-	pydantic<=1.10.7
+	pydantic~=1.10.7
 	pytz
 	click
 
@@ -36,6 +40,7 @@ testing =
 	pytest-coverage
 	pytest-timer
 	mypy
+	types-pytz
 	pylint
 development = 
 	pip-tools

s2-python-0.1.0/src/s2_python.egg-info/PKG-INFO

@@ -0,0 +1,99 @@
+Metadata-Version: 2.1
+Name: s2-python
+Version: 0.1.0
+Summary: S2 Protocol Python Wrapper
+Home-page: https://github.com/flexiblepower/s2-ws-json-python
+Author: Flexiblepower
+Author-email: info@info.nl
+License: APACHE
+Platform: Linux
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Description-Content-Type: text/x-rst; charset=UTF-8
+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"
+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"
+
+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/s2-python
+   :alt: PyPI - Python Version
+.. image:: https://img.shields.io/pypi/l/s2-python
+   :alt: PyPI - License
+
+This Python package implements the message validation for the EN50491-12-2 "S2" standard for home and building energy management. This implementation
+is based on the asyncapi description of the protocol provided in the `s2-ws-json <https://github.com/flexiblepower/s2-ws-json/>`_ repository. 
+
+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,
+    )
+    # serialize s2 messages
+    number_range.to_json()
+    # deserialize s2 messages
+    json_str = '{"start_of_range": 4.0, "end_of_range": 5.0, "commodity_quantity": "ELECTRIC.POWER.L1"}'
+    PowerRange.from_json(json_str)
+
+Development
+-------------
+
+For development, you can install the required dependencies using the following command:
+
+    pip install -e .[testing,development]
+
+
+The tests can be run using tox:
+
+    tox
+
+To build the package, you can use tox as well:
+
+    tox -e build,clean
+    
+
+

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

@@ -10,6 +10,7 @@ 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/s2_parser.py
 src/s2python/s2_validation_error.py
 src/s2python/utils.py
 src/s2python/validate_values_mixin.py

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

@@ -1,4 +1,4 @@
-pydantic<=1.10.7
+pydantic~=1.10.7
 pytz
 click
 
@@ -21,4 +21,5 @@ pytest
 pytest-coverage
 pytest-timer
 mypy
+types-pytz
 pylint

{s2-python-0.0.0 → s2-python-0.1.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.0 → s2-python-0.1.0}/src/s2python/common/__init__.py

@@ -1,5 +1,15 @@
-from s2python.generated.gen_s2 import (RoleType, CommodityQuantity, Commodity, InstructionStatus, ReceptionStatusValues,
-                                       EnergyManagementRole, SessionRequestType, ControlType, Currency, RevokableObjects)
+from s2python.generated.gen_s2 import (
+    RoleType,
+    CommodityQuantity,
+    Commodity,
+    InstructionStatus,
+    ReceptionStatusValues,
+    EnergyManagementRole,
+    SessionRequestType,
+    ControlType,
+    Currency,
+    RevokableObjects,
+)
 
 from s2python.common.duration import Duration
 from s2python.common.role import Role

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

@@ -2,18 +2,21 @@ from datetime import timedelta
 import math
 
 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 (
+    catch_and_convert_exceptions,
+    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__)
 
     @staticmethod
-    def from_timedelta(duration: timedelta) -> 'Duration':
+    def from_timedelta(duration: timedelta) -> "Duration":
         return Duration(__root__=math.ceil(duration.total_seconds() * 1000))
 
     @staticmethod
-    def from_milliseconds(milliseconds: int) -> 'Duration':
+    def from_milliseconds(milliseconds: int) -> "Duration":
         return Duration(__root__=milliseconds)

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

@@ -1,12 +1,15 @@
 import uuid
 
 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 (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @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_id: uuid.UUID = GenHandshake.__fields__["message_id"].field_info  # type: ignore[assignment]

s2-python-0.1.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"]):
+    class Config(GenHandshakeResponse.Config):
+        validate_assignment = True
+
+    message_id: uuid.UUID = GenHandshakeResponse.__fields__["message_id"].field_info  # type: ignore[assignment]

s2-python-0.1.0/src/s2python/common/instruction_status_update.py

@@ -0,0 +1,22 @@
+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"]
+):
+    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]

s2-python-0.1.0/src/s2python/common/number_range.py

@@ -0,0 +1,39 @@
+from typing import Any, Dict
+
+from pydantic import root_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"]):
+    class Config(GenNumberRange.Config):
+        validate_assignment = True
+
+    @root_validator(pre=False)
+    @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"
+            )
+
+        return values
+
+    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/src/s2python/common/power_forecast.py

@@ -0,0 +1,20 @@
+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"]):
+    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]

s2-python-0.1.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"]):
+    class Config(GenPowerForecastElement.Config):
+        validate_assignment = True
+
+    duration: Duration = GenPowerForecastElement.__fields__["duration"].field_info  # type: ignore[assignment]
+    power_values: List[PowerForecastValue] = GenPowerForecastElement.__fields__[
+        "power_values"
+    ].field_info  # type: ignore[assignment]

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

@@ -1,8 +1,11 @@
 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 (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class PowerForecastValue(GenPowerForecastValue, ValidateValuesMixin['PowerForecastValue']):
+class PowerForecastValue(GenPowerForecastValue, S2Message["PowerForecastValue"]):
     class Config(GenPowerForecastValue.Config):
         validate_assignment = True

s2-python-0.1.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"]):
+    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]

s2-python-0.1.0/src/s2python/common/power_range.py

@@ -0,0 +1,27 @@
+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 (
+    S2Message,
+    catch_and_convert_exceptions,
+)
+
+
+@catch_and_convert_exceptions
+class PowerRange(GenPowerRange, S2Message["PowerRange"]):
+    class Config(GenPowerRange.Config):
+        validate_assignment = True
+
+    @root_validator(pre=False)
+    @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"
+            )
+
+        return values

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

@@ -1,8 +1,11 @@
 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 (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @catch_and_convert_exceptions
-class PowerValue(GenPowerValue, ValidateValuesMixin['PowerValue']):
+class PowerValue(GenPowerValue, S2Message["PowerValue"]):
     class Config(GenPowerValue.Config):
         validate_assignment = True

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

@@ -1,12 +1,17 @@
 import uuid
 
 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 (
+    catch_and_convert_exceptions,
+    S2Message,
+)
 
 
 @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]
+    subject_message_id: uuid.UUID = GenReceptionStatus.__fields__[
+        "subject_message_id"
+    ].field_info  # type: ignore[assignment]

s2-python-0.1.0/src/s2python/common/resource_manager_details.py

@@ -0,0 +1,27 @@
+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"]
+):
+    class Config(GenResourceManagerDetails.Config):
+        validate_assignment = True
+
+    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]

s2-python-0.1.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"]):
+    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]

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

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