plexus-python-common 1.0.69__tar.gz → 1.0.70__tar.gz

{plexus_python_common-1.0.69 → plexus_python_common-1.0.70}/PKG-INFO

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

{plexus_python_common-1.0.69 → plexus_python_common-1.0.70}/src/plexus/common/utils/tagutils.py

@@ -394,15 +394,20 @@ def make_tag_target_model_mixin() -> type[pdt.BaseModel]:
         )
         vehicle_name: str = Field(
             sa_column=sa.Column(sa_sqlite.VARCHAR(128), nullable=False),
-            description="Vehicle name associated with the tag record",
+            description="Name of the tagger's applicability vehicle",
         )
         begin_dt: datetime.datetime = Field(
             sa_column=sa.Column(SQLiteDateTime, nullable=False),
-            description="Begin datetime of the target range associated with the tag record",
+            description="Beginning of the tagger's applicability time range",
         )
         end_dt: datetime.datetime = Field(
             sa_column=sa.Column(SQLiteDateTime, nullable=False),
-            description="End datetime of the target range associated with the tag record",
+            description="End of the tagger's applicability time range",
+        )
+        props: JsonType | None = Field(
+            sa_column=sa.Column(sa_sqlite.JSON, nullable=True),
+            default=None,
+            description="Additional properties of the tag target in JSON format",
         )
 
         @pdt.field_validator("identifier", mode="after")
@@ -414,7 +419,7 @@ def make_tag_target_model_mixin() -> type[pdt.BaseModel]:
         @pdt.field_validator("tagger_name", mode="after")
         @classmethod
         def validate_tagger_name(cls, v: str) -> str:
-            validate_snake_case(v)
+            validate_slash_tag(v)
             return v
 
         @pdt.field_validator("tagger_version", mode="after")
@@ -466,21 +471,21 @@ def make_tag_record_model_mixin() -> type[pdt.BaseModel]:
         )
         begin_dt: datetime.datetime = Field(
             sa_column=sa.Column(SQLiteDateTime, nullable=False),
-            description="Begin datetime of the tag record",
+            description="Begin of the tag record time range",
         )
         end_dt: datetime.datetime = Field(
             sa_column=sa.Column(SQLiteDateTime, nullable=False),
-            description="End datetime of the tag record",
+            description="End of the tag record time range",
         )
         tagset_namespace: str | None = Field(
             sa_column=sa.Column(sa_sqlite.VARCHAR(64), nullable=True),
             default=None,
-            description="Namespace of the tagset that the tag belongs to",
+            description="Namespace of the tagset that the tag in this record belongs to",
         )
         tagset_version: str | None = Field(
             sa_column=sa.Column(sa_sqlite.VARCHAR(32), nullable=True),
             default=None,
-            description="Version of the tagset that the tag belongs to",
+            description="Version of the tagset that the tag in this record belongs to",
         )
         tag: str = Field(
             sa_column=sa.Column(sa_sqlite.VARCHAR(256), nullable=False),
@@ -573,6 +578,7 @@ if typing.TYPE_CHECKING:
         vehicle_name: sa_orm.Mapped[str] = ...
         begin_dt: sa_orm.Mapped[datetime.datetime] = ...
         end_dt: sa_orm.Mapped[datetime.datetime] = ...
+        props: sa_orm.Mapped[JsonType | None] = ...
 
 
     class TagTargetTable(TagTarget, SequenceModelMixinProtocol):
@@ -669,6 +675,7 @@ class TagCache(object):
         vehicle_name: str,
         begin_dt: datetime.datetime,
         end_dt: datetime.datetime,
+        props: JsonType | None = None,
     ) -> TagTargetTable:
         with self.make_session() as session:
             tag_target = TagTarget(
@@ -678,6 +685,7 @@ class TagCache(object):
                 vehicle_name=vehicle_name,
                 begin_dt=begin_dt,
                 end_dt=end_dt,
+                props=props,
             )
             db_tag_target = clone_sequence_model_instance(TagTargetTable, tag_target)
             session.add(db_tag_target)

{plexus_python_common-1.0.69 → plexus_python_common-1.0.70}/src/plexus_python_common.egg-info/PKG-INFO

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

{plexus_python_common-1.0.69 → plexus_python_common-1.0.70}/test/plexus_tests/common/utils/tagutils_test.py

@@ -121,7 +121,8 @@ class TagUtilsTest(unittest.TestCase):
                          "1.0.0",
                          "dummy_vehicle",
                          dt_parse_iso("2020-01-01T00:00:00+00:00"),
-                         dt_parse_iso("2020-01-01T01:00:00+00:00"))
+                         dt_parse_iso("2020-01-01T01:00:00+00:00"),
+                         {"dummy_target_prop": "dummy_value"})
 
         target_cache = cache.with_target("awesome_tagger/20200101_000000/dummy_vehicle/0")
 
@@ -270,11 +271,12 @@ class TagUtilsTest(unittest.TestCase):
 
             for i in range(target_caches_count):
                 cache.add_target(f"concurrent_tagger/20200101_000000/dummy_vehicle/{i}",
-                                 "concurrent_tagger",
+                                 f"concurrent_tagger/tagger_{i}",
                                  f"1.0.{i}",
                                  "dummy_vehicle",
                                  dt_parse_iso("2020-01-01T00:00:00+00:00"),
-                                 dt_parse_iso("2020-01-01T01:00:00+00:00"))
+                                 dt_parse_iso("2020-01-01T01:00:00+00:00"),
+                                 {"dummy_target_prop": "dummy_value"})
 
             target_caches = [cache.with_target(f"concurrent_tagger/20200101_000000/dummy_vehicle/{i}")
                              for i in range(target_caches_count)]