s2-python 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

{s2_python-0.6.0.dist-info → s2_python-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s2-python
-Version: 0.6.0
+Version: 0.7.0
 Summary: S2 Protocol Python Wrapper
 Author-email: Flexiblepower <info@info.nl>
 License-Expression: Apache-2.0
@@ -54,8 +54,6 @@ Python Wrapper for S2 Flexibility Protocol
 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:

{s2_python-0.6.0.dist-info → s2_python-0.7.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-s2_python-0.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+s2_python-0.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 s2python/__init__.py,sha256=e5lwvqsPl-z7IfEd0hRQhLBRKBYcuw2eqrecXnMfLdg,384
 s2python/message.py,sha256=62DtKyfovcDM4Eroc33i72ZnQScWDV7sUvYifagXcmI,3352
 s2python/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 s2python/reception_status_awaiter.py,sha256=jKMliFk1XxwsEGtx3vFESbJhUtClB7cTu-td90-qBN8,2137
 s2python/s2_connection.py,sha256=QGpYtIxoRXIKeiw-1C7MywxxLwT1OwwqMxUVZ-NJ79Y,21685
 s2python/s2_control_type.py,sha256=uLZb_7l2mmqY6tJk3KuQYGpKRnZaDyLZ-E8YvAGFCwQ,4192
-s2python/s2_parser.py,sha256=uYR-8yTzqyf7xerX7ULk6prm7_Cc5h_2EC9CGCKHIJM,4583
-s2python/s2_validation_error.py,sha256=paWJAkmjOwigeFmF8Zwo-5ithRJ2SRqOLX-rHRZ6ces,398
+s2python/s2_parser.py,sha256=LoeqLmKkm3ZLU4gv4IwaxLUSt0mq5rFN94KFSOFgGXI,4556
+s2python/s2_validation_error.py,sha256=FVf5Vm7ilS2BwkJac4G2xxDO8f3tOK92mD1ygHq_d0k,173
 s2python/utils.py,sha256=QX9b-mi-H_YUGTmGmJsrAbaWWM3dgaoaRLRXHHlaZDE,212
-s2python/validate_values_mixin.py,sha256=AsycGNUjH9oMAYdOXgJR1QelyNEiM31Cp0HpBzenMxU,2539
+s2python/validate_values_mixin.py,sha256=OQAnD0ZgGh8nmGE-jF1GjWkh1eEwwL25-P29tsj8io8,2713
 s2python/version.py,sha256=IBzoytgbYYYekQnSTfSmWeYAZ4c_yUFU2oLIAG4UYjs,45
 s2python/common/__init__.py,sha256=zJizo6qfnWGQ75iWZZZsojPv_ATjVqT-Sj4hBKgE8X0,1991
 s2python/common/duration.py,sha256=7u2SF7rWtwLfehD9RUiY1Mhntnah1ctvYjin04ZiYnI,714
@@ -17,9 +17,9 @@ s2python/common/handshake_response.py,sha256=aJyZSl62wUUdtrJ4WFzu4ZIlhl-4wjxdyQ7
 s2python/common/instruction_status_update.py,sha256=z1nt5ToXinuX44N-t-w5oCYXQtG27q9QZEsg1xsISwY,735
 s2python/common/number_range.py,sha256=twkIKKtSHtxb4eegwPaDSIGRDWzHAH3gm5t3SPbIyfo,739
 s2python/common/power_forecast.py,sha256=XXtRJWeHDa-mkr4FnHrN55Fp_byBmTLsaAQKqO7Zcpo,757
-s2python/common/power_forecast_element.py,sha256=Uy0dOe6Lo_WEswS8pHHZXSeC5UnrrwpYb8R7NENNUKQ,1606
+s2python/common/power_forecast_element.py,sha256=nJedTRyMusdAZRD2HFps0Q1c3LvccBxHVnSQZm-Va6Y,1612
 s2python/common/power_forecast_value.py,sha256=-tIGJn1ME4ozVmg1jdoEWUYT4Eb5uxvp443TmJpmBB0,389
-s2python/common/power_measurement.py,sha256=4c6OEIG9-75M9aiqmvUUWMwGkAkQEVGRcVvi_Iz6mlk,1486
+s2python/common/power_measurement.py,sha256=m6OnsZsb_DQ8RCFtcO7BvjVOTJ7T-i7ReE-fJMlKAFw,1492
 s2python/common/power_range.py,sha256=zb8Juw9WtV-UvkICRIO6LGvCt19eqErryKoQe2S3Kog,702
 s2python/common/power_value.py,sha256=mjHEPWFzMAZPJ0P5M9zASHf5uIW47kM8SqqdVaZCkAs,349
 s2python/common/reception_status.py,sha256=Lf6c81jq5VWUTFgGmmTUly3PK82MmRrt4n6T3zdG-aA,541
@@ -61,9 +61,9 @@ s2python/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 s2python/generated/gen_s2.py,sha256=l1jzvXGSRa09nu6GBN8Mg4z_2HfwtY3aQeBHbmrBJFM,63431
 s2python/ombc/__init__.py,sha256=gwSNmlgU35lm4W1y-pvaP5h7urpdWhy0rUuUL16qaO4,309
 s2python/ombc/ombc_instruction.py,sha256=_my3X76uUPwDXMjqfkSLPzHQhw1eeFV54nBrFkzDqCE,944
-s2python/ombc/ombc_operation_mode.py,sha256=-jpw1ccIrV1-DkgH4pbvihheRBTDZt79l5Lsn89HAsc,856
+s2python/ombc/ombc_operation_mode.py,sha256=g8KLLHrLm5Yt6kogPZXv8K4yoKPdMcKrcQPMTI3sy4I,908
 s2python/ombc/ombc_status.py,sha256=4SDZUYAGGYiTEo68swDo_9IrmJPfMby3aPQ9XnLzmUo,593
-s2python/ombc/ombc_system_description.py,sha256=mPUfow7sEw8uzvMRZaBNnmmHOzjFsv1CtIFCNrXAhXs,1095
+s2python/ombc/ombc_system_description.py,sha256=tdbL_dWgwhB-zE3IK7NTas_qSjjrGc1ci_L3istNvUE,1147
 s2python/ombc/ombc_timer_status.py,sha256=qaLyY9Jl16hqoIEDR5tTuoSttMHHsRdh-AxvTgODxx0,606
 s2python/pebc/__init__.py,sha256=O8CONhsj4ZEN9bPbPPZwxvr3DxMN8HnGAwdlXVT2kA8,781
 s2python/pebc/pebc_allowed_limit_range.py,sha256=_-6cuAd2wtbe7p3WPr_8WS9BD-_mb8Nmr2oKpNdS0jo,1996
@@ -82,8 +82,8 @@ s2python/ppbc/ppbc_power_sequence_container_status.py,sha256=KhbyqgzX2yncYT6TkHG
 s2python/ppbc/ppbc_power_sequence_element.py,sha256=AbCk4lqpBkP8ppE4gMfOGLpcC53pBIcm81fUDZp5xAM,850
 s2python/ppbc/ppbc_schedule_instruction.py,sha256=C-MUpHhUMPKebmHlT8ClpmKvtLzPgs4MAq10mVcmi6Y,1291
 s2python/ppbc/ppbc_start_interruption_instruction.py,sha256=cZndUsFhBtKAmTM89qYTF74Y_SUIy1jukn7-Zz-YLo8,1420
-s2_python-0.6.0.dist-info/METADATA,sha256=Yn_Nam6WQGtdbU6a92XiXK7hXjzOwV8xlX4aJcbZUJ8,3814
-s2_python-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-s2_python-0.6.0.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
-s2_python-0.6.0.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
-s2_python-0.6.0.dist-info/RECORD,,
+s2_python-0.7.0.dist-info/METADATA,sha256=X2knF3WhTMa-xiBGZ0I76rq3dL_CuaXOzMlKYLRHbwM,3718
+s2_python-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+s2_python-0.7.0.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
+s2_python-0.7.0.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
+s2_python-0.7.0.dist-info/RECORD,,

s2python/common/power_forecast_element.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Dict
 from typing_extensions import Self
 
 from pydantic import model_validator
@@ -29,7 +29,7 @@ class PowerForecastElement(GenPowerForecastElement, S2MessageComponent):
     def validate_values_at_most_one_per_commodity_quantity(self) -> Self:
         """Validates the power measurement values to check that there is at most 1 PowerValue per CommodityQuantity."""
 
-        has_value: dict[CommodityQuantity, bool] = {}
+        has_value: Dict[CommodityQuantity, bool] = {}
 
         for value in self.power_values:
             if has_value.get(value.commodity_quantity, False):

s2python/common/power_measurement.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import List
+from typing import List, Dict
 from typing_extensions import Self
 
 from pydantic import model_validator
@@ -26,7 +26,7 @@ class PowerMeasurement(GenPowerMeasurement, S2MessageComponent):
     def validate_values_at_most_one_per_commodity_quantity(self) -> Self:
         """Validates the power measurement values to check that there is at most 1 PowerValue per CommodityQuantity."""
 
-        has_value: dict[CommodityQuantity, bool] = {}
+        has_value: Dict[CommodityQuantity, bool] = {}
 
         for value in self.values:
             if has_value.get(value.commodity_quantity, False):

s2python/ombc/ombc_operation_mode.py

@@ -17,7 +17,7 @@ class OMBCOperationMode(GenOMBCOperationMode, S2MessageComponent):
     model_config["validate_assignment"] = True
 
     id: uuid.UUID = GenOMBCOperationMode.model_fields["id"]  # type: ignore[assignment]
-    power_ranges: List[PowerRange] = GenOMBCOperationMode.model_fields[
+    power_ranges: List[PowerRange] = GenOMBCOperationMode.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "power_ranges"
     ]  # type: ignore[assignment]
     abnormal_condition_only: bool = GenOMBCOperationMode.model_fields[

s2python/ombc/ombc_system_description.py

@@ -18,7 +18,7 @@ class OMBCSystemDescription(GenOMBCSystemDescription, S2MessageComponent):
     model_config["validate_assignment"] = True
 
     message_id: uuid.UUID = GenOMBCSystemDescription.model_fields["message_id"]  # type: ignore[assignment]
-    operation_modes: List[OMBCOperationMode] = GenOMBCSystemDescription.model_fields[
+    operation_modes: List[OMBCOperationMode] = GenOMBCSystemDescription.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "operation_modes"
     ]  # type: ignore[assignment]
     transitions: List[Transition] = GenOMBCSystemDescription.model_fields["transitions"]  # type: ignore[assignment]

s2python/s2_parser.py

@@ -88,10 +88,9 @@ class S2Parser:
                 None,
                 message_json,
                 f"Unable to parse {message_type} as an S2 message. Type unknown.",
-                None,
             )
 
-        return TYPE_TO_MESSAGE_CLASS[message_type].model_validate(message_json)
+        return TYPE_TO_MESSAGE_CLASS[message_type].from_dict(message_json)
 
     @staticmethod
     def parse_as_message(

s2python/s2_validation_error.py

@@ -1,8 +1,5 @@
 from dataclasses import dataclass
-from typing import Union, Type, Optional
-
-from pydantic import ValidationError
-from pydantic.v1.error_wrappers import ValidationError as ValidationErrorV1
+from typing import Type, Optional
 
 
 @dataclass
@@ -10,6 +7,3 @@ class S2ValidationError(Exception):
     class_: Optional[Type]
     obj: object
     msg: str
-    pydantic_validation_error: Union[
-        ValidationErrorV1, ValidationError, TypeError, None
-    ]

s2python/validate_values_mixin.py

@@ -12,8 +12,6 @@ from typing import (
 
 from typing_extensions import Self
 
-from pydantic.v1.error_wrappers import display_errors  # pylint: disable=no-name-in-module
-
 from pydantic import (  # pylint: disable=no-name-in-module
     BaseModel,
     ValidationError,
@@ -28,12 +26,20 @@ MappingIntStrAny = Mapping[IntStr, Any]
 
 
 class S2MessageComponent(BaseModel):
+    def __setattr__(self, name: str, value: Any) -> None:
+        try:
+            super().__setattr__(name, value)
+        except (ValidationError, TypeError) as e:
+            raise S2ValidationError(
+                type(self), self, "Pydantic raised a validation error.",
+            ) from e
+
     def to_json(self) -> str:
         try:
             return self.model_dump_json(by_alias=True, exclude_none=True)
         except (ValidationError, TypeError) as e:
             raise S2ValidationError(
-                type(self), self, "Pydantic raised a format validation error.", e
+                type(self), self, "Pydantic raised a validation error.",
             ) from e
 
     def to_dict(self) -> Dict[str, Any]:
@@ -41,12 +47,22 @@ class S2MessageComponent(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:
-        gen_model = cls.model_validate_json(json_str)
+        try:
+            gen_model = cls.model_validate_json(json_str)
+        except (ValidationError, TypeError) as e:
+            raise S2ValidationError(
+                type(cls), cls, "Pydantic raised a validation error.",
+            ) from e
         return gen_model
 
     @classmethod
     def from_dict(cls, json_dict: Dict[str, Any]) -> Self:
-        gen_model = cls.model_validate(json_dict)
+        try:
+            gen_model = cls.model_validate(json_dict)
+        except (ValidationError, TypeError) as e:
+            raise S2ValidationError(
+                type(cls), cls, "Pydantic raised a validation error.",
+            ) from e
         return gen_model
 
 
@@ -61,9 +77,9 @@ def convert_to_s2exception(f: Callable) -> Callable:
             else:
                 class_type = None
 
-            raise S2ValidationError(class_type, args, display_errors(e.errors()), e) from e  # type: ignore[arg-type]
+            raise S2ValidationError(class_type, args, str(e)) from e
         except TypeError as e:
-            raise S2ValidationError(None, args, str(e), e) from e
+            raise S2ValidationError(None, args, str(e)) from e
 
     inner.__doc__ = f.__doc__
     inner.__annotations__ = f.__annotations__
@@ -76,10 +92,5 @@ S = TypeVar("S", bound=S2MessageComponent)
 
 def catch_and_convert_exceptions(input_class: Type[S]) -> Type[S]:
     input_class.__init__ = convert_to_s2exception(input_class.__init__)  # type: ignore[method-assign]
-    input_class.__setattr__ = convert_to_s2exception(input_class.__setattr__)  # type: ignore[method-assign]
-    input_class.model_validate_json = convert_to_s2exception(  # type: ignore[method-assign]
-        input_class.model_validate_json
-    )
-    input_class.model_validate = convert_to_s2exception(input_class.model_validate)  # type: ignore[method-assign]
 
     return input_class