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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s2-python
-Version: 0.1.0
+Version: 0.1.3
 Summary: S2 Protocol Python Wrapper
 Home-page: https://github.com/flexiblepower/s2-ws-json-python
 Author: Flexiblepower
@@ -12,29 +12,30 @@ 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: types-pytz ; 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
 ===========================================

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.1.0.dist-info → s2_python-0.1.3.dist-info}/WHEEL

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

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,11 +1,8 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/handshake.py

@@ -1,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,4 +11,4 @@ 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,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,4 +11,4 @@ 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,12 +1,11 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -16,7 +15,6 @@ class 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,11 +2,8 @@ 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
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/power_forecast.py

@@ -1,12 +1,10 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -14,7 +12,7 @@ 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,12 +1,9 @@
 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
+from s2python.generated.gen_s2 import PowerForecastElement as GenPowerForecastElement
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/power_forecast_value.py

@@ -1,8 +1,5 @@
 from s2python.generated.gen_s2 import PowerForecastValue as GenPowerForecastValue
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/power_measurement.py

@@ -1,12 +1,10 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -14,5 +12,5 @@ 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,10 +3,7 @@ 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,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/power_value.py

@@ -1,8 +1,5 @@
 from s2python.generated.gen_s2 import PowerValue as GenPowerValue
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/reception_status.py

@@ -1,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,6 +11,4 @@ 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,15 +1,13 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -22,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,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,5 +11,4 @@ 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,8 +1,5 @@
 from s2python.generated.gen_s2 import Role as GenRole
-from s2python.validate_values_mixin import (
-    S2Message,
-    catch_and_convert_exceptions,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions

s2python/common/select_control_type.py

@@ -1,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,4 +11,4 @@ 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,10 +1,9 @@
-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,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -12,4 +11,4 @@ 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")

s2python/common/support.py

@@ -1,4 +1,4 @@
-from s2python.common import CommodityQuantity, Commodity
+from s2python.common import Commodity, CommodityQuantity
 
 
 def commodity_has_quantity(commodity: "Commodity", quantity: CommodityQuantity) -> bool:

s2python/common/timer.py

@@ -1,11 +1,6 @@
-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,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -13,5 +8,4 @@ class Timer(GenTimer, S2Message["Timer"]):
     class Config(GenTimer.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenTimer.__fields__["id"].field_info  # type: ignore[assignment]
     duration: Duration = GenTimer.__fields__["duration"].field_info  # type: ignore[assignment]

s2python/common/transition.py

@@ -1,12 +1,8 @@
-import uuid
-from typing import Optional, List
+from typing import Optional
 
 from s2python.common.duration import Duration
 from s2python.generated.gen_s2 import Transition as GenTransition
-from s2python.validate_values_mixin import (
-    S2Message,
-    catch_and_convert_exceptions,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -14,13 +10,6 @@ class Transition(GenTransition, S2Message["Transition"]):
     class Config(GenTransition.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenTransition.__fields__["id"].field_info  # type: ignore[assignment]
-    from_: uuid.UUID = GenTransition.__fields__["from_"].field_info  # type: ignore[assignment]
-    to: uuid.UUID = GenTransition.__fields__["to"].field_info  # type: ignore[assignment]
-    start_timers: List[uuid.UUID] = GenTransition.__fields__["start_timers"].field_info  # type: ignore[assignment]
-    blocking_timers: List[uuid.UUID] = GenTransition.__fields__[
-        "blocking_timers"
-    ].field_info  # type: ignore[assignment]
     transition_duration: Optional[Duration] = GenTransition.__fields__[
         "transition_duration"
     ].field_info  # type: ignore[assignment]

s2python/frbc/__init__.py

@@ -1,17 +1,17 @@
+from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
+from s2python.frbc.frbc_actuator_status import FRBCActuatorStatus
+from s2python.frbc.frbc_fill_level_target_profile import FRBCFillLevelTargetProfile
 from s2python.frbc.frbc_fill_level_target_profile_element import (
     FRBCFillLevelTargetProfileElement,
 )
-from s2python.frbc.frbc_fill_level_target_profile import FRBCFillLevelTargetProfile
 from s2python.frbc.frbc_instruction import FRBCInstruction
-from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
 from s2python.frbc.frbc_leakage_behaviour import FRBCLeakageBehaviour
-from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement
-from s2python.frbc.frbc_usage_forecast import FRBCUsageForecast
-from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
+from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
 from s2python.frbc.frbc_operation_mode import FRBCOperationMode
-from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
-from s2python.frbc.frbc_actuator_status import FRBCActuatorStatus
+from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
 from s2python.frbc.frbc_storage_description import FRBCStorageDescription
 from s2python.frbc.frbc_storage_status import FRBCStorageStatus
 from s2python.frbc.frbc_system_description import FRBCSystemDescription
 from s2python.frbc.frbc_timer_status import FRBCTimerStatus
+from s2python.frbc.frbc_usage_forecast import FRBCUsageForecast
+from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement

s2python/frbc/frbc_actuator_description.py

@@ -1,20 +1,15 @@
-import uuid
-
-from typing import List, Any, Dict
+from typing import Any, Dict, List
 
 from pydantic import root_validator
 
-from s2python.common import Transition, Timer, Commodity
+from s2python.common import Commodity, Timer, Transition
 from s2python.common.support import commodity_has_quantity
 from s2python.frbc.frbc_operation_mode import FRBCOperationMode
+from s2python.generated.gen_s2 import CommodityQuantity
 from s2python.generated.gen_s2 import (
     FRBCActuatorDescription as GenFRBCActuatorDescription,
-    CommodityQuantity,
-)
-from s2python.validate_values_mixin import (
-    S2Message,
-    catch_and_convert_exceptions,
 )
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -24,7 +19,6 @@ class FRBCActuatorDescription(
     class Config(GenFRBCActuatorDescription.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenFRBCActuatorDescription.__fields__["id"].field_info  # type: ignore[assignment]
     operation_modes: List[FRBCOperationMode] = GenFRBCActuatorDescription.__fields__[
         "operation_modes"
     ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_actuator_status.py

@@ -1,11 +1,9 @@
-from typing import Optional
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import FRBCActuatorStatus as GenFRBCActuatorStatus
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    S2Message,
-)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -13,11 +11,4 @@ class FRBCActuatorStatus(GenFRBCActuatorStatus, S2Message["FRBCActuatorStatus"])
     class Config(GenFRBCActuatorStatus.Config):
         validate_assignment = True
 
-    active_operation_mode_id: uuid.UUID = GenFRBCActuatorStatus.__fields__[
-        "active_operation_mode_id"
-    ].field_info  # type: ignore[assignment]
-    actuator_id: uuid.UUID = GenFRBCActuatorStatus.__fields__["actuator_id"].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCActuatorStatus.__fields__["message_id"].field_info  # type: ignore[assignment]
-    previous_operation_mode_id: Optional[uuid.UUID] = GenFRBCActuatorStatus.__fields__[
-        "previous_operation_mode_id"
-    ].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.ActuatorStatus"] = Field(default="FRBC.ActuatorStatus")