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

{s2-python-0.1.0 → s2_python-0.1.3}/PKG-INFO

@@ -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,6 +12,7 @@ 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: pytz

s2_python-0.1.3/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[tool.pylint.'MESSAGES CONTROL']
+extension-pkg-whitelist = "pydantic"

{s2-python-0.1.0 → s2_python-0.1.3}/setup.cfg

@@ -8,7 +8,7 @@ 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
+version = 0.1.3
 platforms = Linux
 classifiers = 
 	Development Status :: 4 - Beta
@@ -16,6 +16,7 @@ classifiers =
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 
 [options]
 zip_safe = False
@@ -23,7 +24,7 @@ packages = find_namespace:
 include_package_data = True
 package_dir = 
 	=src
-python_requires > = 3.8, <= 3.11
+python_requires > = 3.8, <= 3.12
 install_requires = 
 	pydantic~=1.10.7
 	pytz
@@ -73,6 +74,9 @@ formats = bdist_wheel
 [flake8]
 max_line_length = 88
 extend_ignore = E203, W503
+per-file-ignores = 
+	src/s2python/common/__init__.py:F401
+	src/s2python/frbc/__init__.py:F401
 exclude = 
 	.tox
 	build

{s2-python-0.1.0 → s2_python-0.1.3}/src/s2_python.egg-info/PKG-INFO

@@ -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,6 +12,7 @@ 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: pytz

{s2-python-0.1.0 → s2_python-0.1.3}/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/message.py
 src/s2python/s2_parser.py
 src/s2python/s2_validation_error.py
 src/s2python/utils.py

{s2-python-0.1.0 → s2_python-0.1.3}/src/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
+)

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

s2_python-0.1.3/src/s2python/common/instruction_status_update.py

@@ -0,0 +1,20 @@
+from typing import Literal
+
+from pydantic import Field
+
+from s2python.generated.gen_s2 import (
+    InstructionStatusUpdate as GenInstructionStatusUpdate,
+)
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
+
+
+@catch_and_convert_exceptions
+class InstructionStatusUpdate(
+    GenInstructionStatusUpdate, S2Message["InstructionStatusUpdate"]
+):
+    class Config(GenInstructionStatusUpdate.Config):
+        validate_assignment = True
+
+    message_type: Literal["InstructionStatusUpdate"] = Field(
+        default="InstructionStatusUpdate"
+    )

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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"
+    )

s2_python-0.1.3/src/s2python/common/revoke_object.py

@@ -0,0 +1,14 @@
+from typing import Literal
+
+from pydantic import Field
+
+from s2python.generated.gen_s2 import RevokeObject as GenRevokeObject
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
+
+
+@catch_and_convert_exceptions
+class RevokeObject(GenRevokeObject, S2Message["RevokeObject"]):
+    class Config(GenRevokeObject.Config):
+        validate_assignment = True
+
+    message_type: Literal["RevokeObject"] = Field(default="RevokeObject")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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")

{s2-python-0.1.0 → s2_python-0.1.3}/src/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:

{s2-python-0.1.0 → s2_python-0.1.3}/src/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]

s2_python-0.1.3/src/s2python/common/transition.py

@@ -0,0 +1,15 @@
+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
+
+
+@catch_and_convert_exceptions
+class Transition(GenTransition, S2Message["Transition"]):
+    class Config(GenTransition.Config):
+        validate_assignment = True
+
+    transition_duration: Optional[Duration] = GenTransition.__fields__[
+        "transition_duration"
+    ].field_info  # type: ignore[assignment]

{s2-python-0.1.0 → s2_python-0.1.3}/src/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]

s2_python-0.1.3/src/s2python/frbc/frbc_actuator_status.py

@@ -0,0 +1,14 @@
+from typing import Literal
+
+from pydantic import Field
+
+from s2python.generated.gen_s2 import FRBCActuatorStatus as GenFRBCActuatorStatus
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
+
+
+@catch_and_convert_exceptions
+class FRBCActuatorStatus(GenFRBCActuatorStatus, S2Message["FRBCActuatorStatus"]):
+    class Config(GenFRBCActuatorStatus.Config):
+        validate_assignment = True
+
+    message_type: Literal["FRBC.ActuatorStatus"] = Field(default="FRBC.ActuatorStatus")

{s2-python-0.1.0 → s2_python-0.1.3}/src/s2python/frbc/frbc_fill_level_target_profile.py

@@ -1,5 +1,6 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+from pydantic import Field
 
 from s2python.frbc.frbc_fill_level_target_profile_element import (
     FRBCFillLevelTargetProfileElement,
@@ -7,10 +8,7 @@ from s2python.frbc.frbc_fill_level_target_profile_element import (
 from s2python.generated.gen_s2 import (
     FRBCFillLevelTargetProfile as GenFRBCFillLevelTargetProfile,
 )
-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
@@ -25,6 +23,6 @@ class FRBCFillLevelTargetProfile(
     ] = GenFRBCFillLevelTargetProfile.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCFillLevelTargetProfile.__fields__[
-        "message_id"
-    ].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.FillLevelTargetProfile"] = Field(
+        default="FRBC.FillLevelTargetProfile"
+    )

{s2-python-0.1.0 → s2_python-0.1.3}/src/s2python/frbc/frbc_fill_level_target_profile_element.py

@@ -1,12 +1,8 @@
 from s2python.common import Duration, NumberRange
-
 from s2python.generated.gen_s2 import (
     FRBCFillLevelTargetProfileElement as GenFRBCFillLevelTargetProfileElement,
 )
-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

s2_python-0.1.3/src/s2python/frbc/frbc_instruction.py

@@ -0,0 +1,14 @@
+from typing import Literal
+
+from pydantic import Field
+
+from s2python.generated.gen_s2 import FRBCInstruction as GenFRBCInstruction
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
+
+
+@catch_and_convert_exceptions
+class FRBCInstruction(GenFRBCInstruction, S2Message["FRBCInstruction"]):
+    class Config(GenFRBCInstruction.Config):
+        validate_assignment = True
+
+    message_type: Literal["FRBC.Instruction"] = Field(default="FRBC.Instruction")

{s2-python-0.1.0 → s2_python-0.1.3}/src/s2python/frbc/frbc_leakage_behaviour.py

@@ -1,12 +1,10 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+from pydantic import Field
 
 from s2python.frbc.frbc_leakage_behaviour_element import FRBCLeakageBehaviourElement
 from s2python.generated.gen_s2 import FRBCLeakageBehaviour as GenFRBCLeakageBehaviour
-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
@@ -17,4 +15,6 @@ class FRBCLeakageBehaviour(GenFRBCLeakageBehaviour, S2Message["FRBCLeakageBehavi
     elements: List[FRBCLeakageBehaviourElement] = GenFRBCLeakageBehaviour.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCLeakageBehaviour.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.LeakageBehaviour"] = Field(
+        default="FRBC.LeakageBehaviour"
+    )

{s2-python-0.1.0 → s2_python-0.1.3}/src/s2python/frbc/frbc_leakage_behaviour_element.py

@@ -2,10 +2,7 @@ from s2python.common import NumberRange
 from s2python.generated.gen_s2 import (
     FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement,
 )
-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