plexus-python-common 1.0.60__tar.gz → 1.0.62__tar.gz

{plexus_python_common-1.0.60 → plexus_python_common-1.0.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.60
+Version: 1.0.62
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.60 → plexus_python_common-1.0.62}/src/plexus/common/utils/ormutils.py

@@ -250,7 +250,6 @@ def make_base_model() -> type[SQLModel]:
 
     class BaseModel(SQLModel):
         metadata = sa.MetaData()
-        model_config = pdt.ConfigDict(json_encoders={datetime.datetime: json_datetime_encoder})
 
     return BaseModel
 
@@ -515,6 +514,14 @@ def make_changing_model_mixin(dialect: str | None = None) -> type[ChangingModelM
                 raise ValueError(f"create time '{self.created_at}' is greater than update time '{self.updated_at}'")
             return self
 
+        @pdt.field_serializer("created_at", mode="plain")
+        def serialize_created_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
+        @pdt.field_serializer("updated_at", mode="plain")
+        def serialize_updated_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
         @classmethod
         def make_index_created_at(cls, index_name: str) -> sa.Index:
             return sa.Index(index_name, "created_at")
@@ -582,6 +589,14 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
                 raise ValueError(f"create time '{self.created_at}' is greater than expire time '{self.expired_at}'")
             return self
 
+        @pdt.field_serializer("created_at", mode="plain")
+        def serialize_created_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
+        @pdt.field_serializer("expired_at", mode="plain")
+        def serialize_expired_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
         @classmethod
         def make_index_created_at_expired_at(cls, index_name: str) -> sa.Index:
             return sa.Index(index_name, "created_at", "expired_at")
@@ -703,6 +718,18 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
                 raise ValueError(f"update time '{self.updated_at}' is greater than expire time '{self.expired_at}'")
             return self
 
+        @pdt.field_serializer("created_at", mode="plain")
+        def serialize_created_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
+        @pdt.field_serializer("updated_at", mode="plain")
+        def serialize_updated_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
+        @pdt.field_serializer("expired_at", mode="plain")
+        def serialize_expired_at(self, v: datetime.datetime | None) -> str | None:
+            return json_datetime_encoder(v) if v is not None else None
+
         @classmethod
         def make_index_created_at_updated_at_expired_at(cls, index_name: str) -> sa.Index:
             return sa.Index(index_name, "created_at", "updated_at", "expired_at")

{plexus_python_common-1.0.60 → plexus_python_common-1.0.62}/src/plexus/common/utils/tagutils.py

@@ -382,11 +382,11 @@ class TagTarget(BaseModel):
         description="Name of the tagger that generates the tag records for the target",
     )
     tagger_version: str = Field(
-        sa_column=sa.Column(sa_sqlite.VARCHAR(64), nullable=False),
+        sa_column=sa.Column(sa_sqlite.VARCHAR(32), nullable=False),
         description="Version of the tagger that generates the tag records for the target",
     )
     vehicle_name: str = Field(
-        sa_column=sa.Column(sa_sqlite.TEXT, nullable=False),
+        sa_column=sa.Column(sa_sqlite.VARCHAR(128), nullable=False),
         description="Vehicle name associated with the tag record",
     )
     begin_dt: datetime.datetime = Field(
@@ -455,12 +455,12 @@ class TagRecord(BaseModel):
         description="End datetime of the tag record",
     )
     tagset_namespace: str | None = Field(
-        sa_column=sa.Column(sa_sqlite.VARCHAR(128), nullable=True),
+        sa_column=sa.Column(sa_sqlite.VARCHAR(64), nullable=True),
         default=None,
         description="Namespace of the tagset that the tag belongs to",
     )
     tagset_version: str | None = Field(
-        sa_column=sa.Column(sa_sqlite.VARCHAR(64), nullable=True),
+        sa_column=sa.Column(sa_sqlite.VARCHAR(32), nullable=True),
         default=None,
         description="Version of the tagset that the tag belongs to",
     )
@@ -469,7 +469,7 @@ class TagRecord(BaseModel):
         description="Tag name",
     )
     props: JsonType | None = Field(
-        sa_column=sa.Column(sa_sqlite.TEXT, nullable=True),
+        sa_column=sa.Column(sa_sqlite.JSON, nullable=True),
         default=None,
         description="Additional properties of the tag record in JSON format",
     )

{plexus_python_common-1.0.60 → plexus_python_common-1.0.62}/src/plexus_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.60
+Version: 1.0.62
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.60 → plexus_python_common-1.0.62}/test/plexus_tests/common/utils/tagutils_test.py

@@ -133,6 +133,19 @@ class TagUtilsTest(unittest.TestCase):
                 dt_parse_iso("2020-01-01T00:00:00+00:00") + datetime.timedelta(seconds=i),
                 dt_parse_iso("2020-01-02T00:00:00+00:00") + datetime.timedelta(seconds=i + 1),
                 tag,
+                props={
+                    "dummy_int": 1,
+                    "dummy_float": 1.0e-1,
+                    "dummy_bool": True,
+                    "dummy_str": "dummy_string",
+                    "dummy_list": [1, 1.0e-1, True, "dummy_string"],
+                    "dummy_dict": {
+                        "dummy_int": 1,
+                        "dummy_float": 1.0e-1,
+                        "dummy_bool": True,
+                        "dummy_str": "dummy_string",
+                    },
+                },
             )
 
         self.assertEqual(len(list(target_cache.iter_tags())), tag_records_count)
@@ -271,6 +284,19 @@ class TagUtilsTest(unittest.TestCase):
                         dt_parse_iso("2020-01-01T00:00:00+00:00") + datetime.timedelta(seconds=i),
                         dt_parse_iso("2020-01-02T00:00:00+00:00") + datetime.timedelta(seconds=i + 1),
                         tag,
+                        props={
+                            "dummy_int": 1,
+                            "dummy_float": 1.0e-1,
+                            "dummy_bool": True,
+                            "dummy_str": "dummy_string",
+                            "dummy_list": [1, 1.0e-1, True, "dummy_string"],
+                            "dummy_dict": {
+                                "dummy_int": 1,
+                                "dummy_float": 1.0e-1,
+                                "dummy_bool": True,
+                                "dummy_str": "dummy_string",
+                            },
+                        },
                     )
 
             threads = [threading.Thread(target=worker, args=(tid,)) for tid in range(total_threads_count)]