plexus-python-common 1.0.73__tar.gz → 1.0.74__tar.gz

{plexus_python_common-1.0.73 → plexus_python_common-1.0.74}/PKG-INFO

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

{plexus_python_common-1.0.73 → plexus_python_common-1.0.74}/src/plexus/common/utils/tagutils.py

@@ -38,6 +38,8 @@ from plexus.common.utils.ormutils import clone_sequence_model_instance, make_bas
 from plexus.common.utils.sqlutils import escape_sql_like
 
 __all__ = [
+    "versioned_identifier",
+    "split_versioned_identifier",
     "RichDesc",
     "Tag",
     "BoundTag",
@@ -60,6 +62,21 @@ __all__ = [
 ]
 
 
+def versioned_identifier(identifier: str | None, version: str | None) -> str | None:
+    if identifier is None or version is None:
+        return identifier
+    return f"{identifier}@{version}"
+
+
+def split_versioned_identifier(s: str | None) -> tuple[str | None, str | None]:
+    if s is None:
+        return None, None
+    if "@" not in s:
+        return s, None
+    identifier, version = s.rsplit("@", 1)
+    return identifier, version
+
+
 @dataclasses.dataclass(frozen=True, eq=True, order=True)
 class RichDesc(object):
     type: str
@@ -331,7 +348,7 @@ def predefined_tagsets() -> dict[str, Tagset]:
         else:
             latest_targets[tagset.namespace] = (version, tagset)
 
-        tagsets[f"{tagset.namespace}:{tagset.version}"] = tagset
+        tagsets[versioned_identifier(tagset.namespace, tagset.version)] = tagset
 
     for _, tagset in latest_targets.values():
         tagsets[tagset.namespace] = tagset

{plexus_python_common-1.0.73 → plexus_python_common-1.0.74}/src/plexus_python_common.egg-info/PKG-INFO

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

{plexus_python_common-1.0.73 → plexus_python_common-1.0.74}/test/plexus_tests/common/utils/tagutils_test.py

@@ -13,6 +13,7 @@ from plexus.common.utils.tagutils import MutableTagset, Tag, TagCache, Tagset
 from plexus.common.utils.tagutils import populate_clip_ranges
 from plexus.common.utils.tagutils import predefined_tagsets, render_tagset_markdown_readme
 from plexus.common.utils.tagutils import tag_cache_file_path
+from plexus.common.utils.tagutils import versioned_identifier
 
 
 @ddt.ddt
@@ -46,7 +47,8 @@ class TagUtilsTest(unittest.TestCase):
 
             print(markdown)
 
-        self.assertEqual(predefined_tagsets().get("unittest"), predefined_tagsets().get("unittest:1.0.0"))
+        self.assertEqual(predefined_tagsets().get("unittest"),
+                         predefined_tagsets().get(versioned_identifier("unittest", "1.0.0")))
 
     data_tag_validate = [
         ("level_1_tag", {"dummy_property": "dummy_value"}, True,),