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

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"
+    )

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

s2python/frbc/frbc_instruction.py

@@ -1,10 +1,9 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import FRBCInstruction as GenFRBCInstruction
-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,7 +11,4 @@ class FRBCInstruction(GenFRBCInstruction, S2Message["FRBCInstruction"]):
     class Config(GenFRBCInstruction.Config):
         validate_assignment = True
 
-    actuator_id: uuid.UUID = GenFRBCInstruction.__fields__["actuator_id"].field_info  # type: ignore[assignment]
-    id: uuid.UUID = GenFRBCInstruction.__fields__["id"].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCInstruction.__fields__["message_id"].field_info  # type: ignore[assignment]
-    operation_mode: uuid.UUID = GenFRBCInstruction.__fields__["operation_mode"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.Instruction"] = Field(default="FRBC.Instruction")

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"
+    )

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

s2python/frbc/frbc_operation_mode.py

@@ -1,17 +1,13 @@
 # from itertools import pairwise
-import uuid
-from typing import List, Dict, Any
+from typing import Any, Dict, List
 
 from pydantic import root_validator
 
 from s2python.common import NumberRange
 from s2python.frbc.frbc_operation_mode_element import FRBCOperationModeElement
 from s2python.generated.gen_s2 import FRBCOperationMode as GenFRBCOperationMode
-from s2python.validate_values_mixin import (
-    S2Message,
-    catch_and_convert_exceptions,
-)
 from s2python.utils import pairwise
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -19,7 +15,6 @@ class FRBCOperationMode(GenFRBCOperationMode, S2Message["FRBCOperationMode"]):
     class Config(GenFRBCOperationMode.Config):
         validate_assignment = True
 
-    id: uuid.UUID = GenFRBCOperationMode.__fields__["id"].field_info  # type: ignore[assignment]
     elements: List[FRBCOperationModeElement] = GenFRBCOperationMode.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]

s2python/frbc/frbc_operation_mode_element.py

@@ -1,13 +1,10 @@
-from typing import Optional, List
+from typing import List, Optional
 
 from s2python.common import NumberRange, PowerRange
 from s2python.generated.gen_s2 import (
     FRBCOperationModeElement as GenFRBCOperationModeElement,
 )
-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/frbc/frbc_storage_description.py

@@ -2,10 +2,7 @@ from s2python.common import NumberRange
 from s2python.generated.gen_s2 import (
     FRBCStorageDescription as GenFRBCStorageDescription,
 )
-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/frbc/frbc_storage_status.py

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

s2python/frbc/frbc_system_description.py

@@ -1,13 +1,11 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+from pydantic import Field
 
-from s2python.generated.gen_s2 import FRBCSystemDescription as GenFRBCSystemDescription
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    S2Message,
-)
 from s2python.frbc.frbc_actuator_description import FRBCActuatorDescription
 from s2python.frbc.frbc_storage_description import FRBCStorageDescription
+from s2python.generated.gen_s2 import FRBCSystemDescription as GenFRBCSystemDescription
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -20,7 +18,9 @@ class FRBCSystemDescription(
     actuators: List[FRBCActuatorDescription] = GenFRBCSystemDescription.__fields__[
         "actuators"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCSystemDescription.__fields__["message_id"].field_info  # type: ignore[assignment]
     storage: FRBCStorageDescription = GenFRBCSystemDescription.__fields__[
         "storage"
     ].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.SystemDescription"] = Field(
+        default="FRBC.SystemDescription"
+    )

s2python/frbc/frbc_timer_status.py

@@ -1,10 +1,9 @@
-import uuid
+from typing import Literal
+
+from pydantic import Field
 
 from s2python.generated.gen_s2 import FRBCTimerStatus as GenFRBCTimerStatus
-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 FRBCTimerStatus(GenFRBCTimerStatus, S2Message["FRBCTimerStatus"]):
     class Config(GenFRBCTimerStatus.Config):
         validate_assignment = True
 
-    actuator_id: uuid.UUID = GenFRBCTimerStatus.__fields__["actuator_id"].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCTimerStatus.__fields__["message_id"].field_info  # type: ignore[assignment]
-    timer_id: uuid.UUID = GenFRBCTimerStatus.__fields__["timer_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.TimerStatus"] = Field(default="FRBC.TimerStatus")

s2python/frbc/frbc_usage_forecast.py

@@ -1,12 +1,10 @@
-from typing import List
-import uuid
+from typing import List, Literal
+
+from pydantic import Field
 
-from s2python.generated.gen_s2 import FRBCUsageForecast as GenFRBCUsageForecast
-from s2python.validate_values_mixin import (
-    catch_and_convert_exceptions,
-    S2Message,
-)
 from s2python.frbc.frbc_usage_forecast_element import FRBCUsageForecastElement
+from s2python.generated.gen_s2 import FRBCUsageForecast as GenFRBCUsageForecast
+from s2python.validate_values_mixin import S2Message, catch_and_convert_exceptions
 
 
 @catch_and_convert_exceptions
@@ -17,4 +15,4 @@ class FRBCUsageForecast(GenFRBCUsageForecast, S2Message["FRBCUsageForecast"]):
     elements: List[FRBCUsageForecastElement] = GenFRBCUsageForecast.__fields__[
         "elements"
     ].field_info  # type: ignore[assignment]
-    message_id: uuid.UUID = GenFRBCUsageForecast.__fields__["message_id"].field_info  # type: ignore[assignment]
+    message_type: Literal["FRBC.UsageForecast"] = Field(default="FRBC.UsageForecast")

s2python/frbc/frbc_usage_forecast_element.py

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