plexus-python-common 1.0.73__py3-none-any.whl → 1.0.74__py3-none-any.whl

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.dist-info → plexus_python_common-1.0.74.dist-info}/METADATA

@@ -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.dist-info → plexus_python_common-1.0.74.dist-info}/RECORD

@@ -21,9 +21,9 @@ plexus/common/utils/pathutils.py,sha256=hGJqSLj08tuOeZ7WeC5d4BtjnPI732BuntVQBQsq
 plexus/common/utils/s3utils.py,sha256=zlO4kGs-c2gUeOfPfiKIE5liQZsbYxqAZYCwA8kL0Lo,36017
 plexus/common/utils/sqlutils.py,sha256=D6kTBjhO5YlNRt3uFlPt6z3uH61m9ajEzPYmsI6NoFc,231
 plexus/common/utils/strutils.py,sha256=O9Inv4ffUTf6Xjc5ftoZwbIua1NeG7itCT9S3zjZxBc,16436
-plexus/common/utils/tagutils.py,sha256=MXEaGZc7dHkBY-ilwn8kgtvk68z96cSVHxPxaI0WCV8,61114
+plexus/common/utils/tagutils.py,sha256=4r-g4JQ_zmJI4ttJHvlKq-iQuqA6GSPb3PQwaJfnBkg,61632
 plexus/common/utils/testutils.py,sha256=N8ijLu7X-hlQlHzvv0TtSsQpIF4T1hbr-AjkILoV2Ac,6152
-plexus_python_common-1.0.73.dist-info/METADATA,sha256=iVTkfuM5wiT0SbdB8_kxetj8Tvz5R4e7LirkbrrctCc,1481
-plexus_python_common-1.0.73.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-plexus_python_common-1.0.73.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
-plexus_python_common-1.0.73.dist-info/RECORD,,
+plexus_python_common-1.0.74.dist-info/METADATA,sha256=2RyK_d-GgT_5C4ojTgb5ONTTE0Oi11FB7Mz1Ub7ssyo,1481
+plexus_python_common-1.0.74.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+plexus_python_common-1.0.74.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
+plexus_python_common-1.0.74.dist-info/RECORD,,