openmodule 16.0.2__tar.gz → 16.0.3rc1__tar.gz

{openmodule-16.0.2 → openmodule-16.0.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 16.0.2
+Version: 16.0.3rc1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown; charset=UTF-8
 License-File: LICENSE
-Requires-Dist: pydantic~=2.0
+Requires-Dist: pydantic!=2.12.0,~=2.0
 Requires-Dist: sentry-sdk~=2.19.0
 Requires-Dist: orjson<4,>=3.4.7
 Requires-Dist: pyzmq~=26.2

{openmodule-16.0.2 → openmodule-16.0.3rc1}/openmodule/models/base.py

@@ -5,13 +5,13 @@ 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, ClassVar
+from typing import Annotated
 
 import orjson
 from pydantic_core import PydanticUndefined
 import zmq
 from dateutil.tz import UTC
-from pydantic import AfterValidator, ConfigDict, Field, BaseModel, PrivateAttr, RootModel, model_validator, field_validator
+from pydantic import AfterValidator, ConfigDict, Field, BaseModel, RootModel
 
 from openmodule import sentry
 from openmodule.config import run_checks, settings
@@ -158,10 +158,7 @@ def datetime_to_timestamp(dt: datetime):
 
 
 class ZMQMessage(OpenModuleModel):
-    _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
@@ -183,28 +180,6 @@ class ZMQMessage(OpenModuleModel):
         data["timestamp"] = datetime_to_timestamp(data["timestamp"])
         return data
 
-    @classmethod
-    def model_validate(cls, obj: Any, *, context: Optional[Any] = None, **kwargs) -> Self:
-        context = {**(context or {}), "from_model_validate": True}
-        return super().model_validate(obj, context=context, **kwargs)
-
-    @model_validator(mode="before")
-    @classmethod
-    def check_default_timestamp(cls, data: dict):
-        cls._using_default_timestamp = "timestamp" not in data
-        return data
-
-    @field_validator("timestamp", mode="before")
-    @classmethod
-    def check_custom_timestamp(cls, v, info):
-        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")
-        return v
-
 
 class Direction(StrEnum):
     UNKNOWN = ""

{openmodule-16.0.2 → openmodule-16.0.3rc1}/openmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 16.0.2
+Version: 16.0.3rc1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown; charset=UTF-8
 License-File: LICENSE
-Requires-Dist: pydantic~=2.0
+Requires-Dist: pydantic!=2.12.0,~=2.0
 Requires-Dist: sentry-sdk~=2.19.0
 Requires-Dist: orjson<4,>=3.4.7
 Requires-Dist: pyzmq~=26.2

{openmodule-16.0.2 → openmodule-16.0.3rc1}/openmodule.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pydantic~=2.0
+pydantic!=2.12.0,~=2.0
 sentry-sdk~=2.19.0
 orjson<4,>=3.4.7
 pyzmq~=26.2

{openmodule-16.0.2 → openmodule-16.0.3rc1}/tests/test_model.py

@@ -16,12 +16,6 @@ class TestModel(OpenModuleModel):
 
 
 class ModelTestCase(TestCase):
-    def setUp(self):
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = True
-
-    def tearDown(self):
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = False
-
     def test_json_is_forbidden(self):
         instance = TestModel(value="Hello World")
         with self.assertRaises(AssertionError):
@@ -148,14 +142,3 @@ class ZMQMessageTestCase(TestCase):
 
         res1.pop("timestamp")
         self.assertDictEqual(res1, {"name": "tä\nst", "type": "tö\tst"})
-
-    def test_allow_custom_timestamp(self):
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = False
-        with self.assertRaises(ValueError):
-            ZMQMessage(timestamp=1607586354631, name="test", type="test")
-        instance = ZMQMessage(name="test", type="test")
-        instance.type="asdf"
-        with self.assertRaises(ValueError):
-            instance.timestamp = datetime.datetime(2020, 1, 1, 0, 0, 0, 0)
-        ZMQMessage._ALLOW_CUSTOM_TIMESTAMP = True
-        instance.timestamp = datetime.datetime(2020, 1, 1, 0, 0, 0, 0)