openmodule 16.0.0__tar.gz → 16.0.1__tar.gz

{openmodule-16.0.0 → openmodule-16.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 16.0.0
+Version: 16.0.1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

{openmodule-16.0.0 → openmodule-16.0.1}/openmodule/models/base.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from decimal import Decimal
 from enum import StrEnum
 from json.encoder import ESCAPE_ASCII
-from typing import Annotated, Optional, Any, Self
+from typing import Annotated, Optional, Any, Self, ClassVar
 
 import orjson
 from pydantic_core import PydanticUndefined
@@ -158,10 +158,11 @@ def datetime_to_timestamp(dt: datetime):
 
 
 class ZMQMessage(OpenModuleModel):
-    _ALLOW_CUSTOM_TIMESTAMP: bool = PrivateAttr(default=False)  # set to true for tools scripts, where you need to set the timestamp manually
-    _using_default_timestamp: bool = PrivateAttr()
+    _ALLOW_CUSTOM_TIMESTAMP: ClassVar[bool] = False  # set to true for tools scripts, where you need to set the timestamp manually
 
     timestamp: Datetime = Field(default_factory=lambda: utcnow())
+    _using_default_timestamp: bool = PrivateAttr()
+
     name: str = Field(default_factory=lambda: settings.NAME)
     type: str
     baggage: str | None = None
@@ -196,9 +197,9 @@ class ZMQMessage(OpenModuleModel):
     @field_validator("timestamp", mode="before")
     @classmethod
     def check_custom_timestamp(cls, v, info):
-        from_model_validate = (info.context or {}).get("from_model_validate", False)
-        using_default_timestamp = cls._using_default_timestamp
-        custom_constructor_timestamp_allowed = cls._ALLOW_CUSTOM_TIMESTAMP
+        from_model_validate = (info.context or {}).get("from_model_validate", False) is True
+        using_default_timestamp = cls._using_default_timestamp is True
+        custom_constructor_timestamp_allowed = cls._ALLOW_CUSTOM_TIMESTAMP is True
 
         if not using_default_timestamp and not custom_constructor_timestamp_allowed and not from_model_validate:
             raise ValueError("timestamp must not be set manually")

{openmodule-16.0.0 → openmodule-16.0.1}/openmodule/rpc/server.py

@@ -185,7 +185,7 @@ class RPCServer(object):
         handler: HandlerEntry = self.find_handler(channel, message.type)
         if handler:
             try:
-                request = handler.request_class(**message.request)
+                request = handler.request_class.model_validate(message.request)
             except ValidationError as e:
                 self.log.exception("exception in parsing request. request not processed and error returned")
                 return {"status": RPCServerError.validation_error, "exception": e.json()}
@@ -225,7 +225,7 @@ class RPCServer(object):
                     return
 
                 try:
-                    message = RPCRequest(**message)
+                    message = RPCRequest.model_validate(message)
                     message_type = message.type
                     rpc_id = message.rpc_id
                 except ValidationError as e:

{openmodule-16.0.0 → openmodule-16.0.1}/openmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 16.0.0
+Version: 16.0.1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

{openmodule-16.0.0 → openmodule-16.0.1}/tests/test_utils_eventlog.py

@@ -9,14 +9,6 @@ from openmodule_test.core import OpenModuleCoreTestMixin
 class TestEvents(OpenModuleCoreTestMixin):
     topics = ["eventlog"]
 
-    def setUp(self):
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = True
-        return super().setUp()
-
-    def tearDown(self):
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = False
-        return super().tearDown()
-
     def test_event_generation(self):
         with self.assertLogs("Eventlog") as cm:
             send_event(
@@ -28,7 +20,7 @@ class TestEvents(OpenModuleCoreTestMixin):
         self.assertIn("INFO:Eventlog:Sending event at gate1: LPR plate='G ARIVO 1' country='A': "
                       "customer Test User, medium QR1, price 1", cm.output)
 
-        msg = EventlogMessage(**self.zmq_client.wait_for_message_on_topic("eventlog"))
+        msg = EventlogMessage.model_validate(self.zmq_client.wait_for_message_on_topic("eventlog"))
         self.assertEqual(msg.event.infos.type, "test_1")
         self.assertEqual(msg.event.infos.timestamp, datetime.min)
         self.assertEqual(msg.event.infos.gate, "gate1")
@@ -56,5 +48,5 @@ class TestEvents(OpenModuleCoreTestMixin):
         with self.assertLogs("Eventlog") as cm:
             send_event(EventInfo.create("test_1"), "test")
         self.assertIn("INFO:Eventlog:Sending event: test", cm.output)
-        msg = EventlogMessage(**self.zmq_client.wait_for_message_on_topic("eventlog"))
+        msg = EventlogMessage.model_validate(self.zmq_client.wait_for_message_on_topic("eventlog"))
         self.assertIsNotNone(msg.event.infos.timestamp)