plexus-python-common 1.0.10__tar.gz → 1.0.12__tar.gz

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.10
+Version: 1.0.12
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/src/plexus/common/utils/datautils.py

@@ -9,12 +9,13 @@ from iker.common.utils.jsonutils import JsonType
 from iker.common.utils.randutils import randomizer
 
 from plexus.common.utils.strutils import BagName, UserName, VehicleName
+from plexus.common.utils.strutils import colon_tag_parser, slash_tag_parser
 from plexus.common.utils.strutils import dot_case_parser, kebab_case_parser, snake_case_parser
 from plexus.common.utils.strutils import hex_string_parser
 from plexus.common.utils.strutils import parse_bag_name, parse_user_name, parse_vehicle_name
+from plexus.common.utils.strutils import semver_parser, uuid_parser
 from plexus.common.utils.strutils import strict_abspath_parser, strict_relpath_parser
-from plexus.common.utils.strutils import tag_parser, topic_parser, vin_code_chars, vin_code_parser
-from plexus.common.utils.strutils import uuid_parser
+from plexus.common.utils.strutils import topic_parser, vin_code_chars, vin_code_parser
 
 
 def make_compute_vin_code_check_digit() -> Callable[[str], str]:
@@ -55,7 +56,11 @@ validate_uuid = make_validate_string(uuid_parser)
 validate_strict_relpath = make_validate_string(strict_relpath_parser)
 validate_strict_abspath = make_validate_string(strict_abspath_parser)
 
-validate_tag = make_validate_string(tag_parser)
+validate_semver = make_validate_string(semver_parser)
+
+validate_colon_tag = make_validate_string(colon_tag_parser)
+validate_slash_tag = make_validate_string(slash_tag_parser)
+
 validate_topic = make_validate_string(topic_parser)
 
 

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/src/plexus/common/utils/ormutils.py

@@ -153,7 +153,13 @@ class RecordModelMixinProto(Protocol):
     updated_at: datetime.datetime | None
 
     @classmethod
-    def make_index_created_at(cls, index_name: str) -> sa.Index: ...
+    def make_index_created_at(cls, index_name: str) -> sa.Index:
+        """
+        Helper to create an index on the `created_at` field with the given index name.
+        :param index_name: Name of the index to create.
+        :return: The created SQLAlchemy Index object.
+        """
+        ...
 
 
 def make_record_model_mixin() -> type[RecordModelMixinProto]:
@@ -202,9 +208,6 @@ def make_record_model_mixin() -> type[RecordModelMixinProto]:
 
         @classmethod
         def make_index_created_at(cls, index_name: str) -> sa.Index:
-            """
-            Helper to create an index on the `created_at` field with the given index name.
-            """
             return sa.Index(index_name, "created_at")
 
     return ModelMixin
@@ -217,13 +220,35 @@ class SnapshotModelMixinProto(Protocol):
     record_sid: int | None
 
     @classmethod
-    def make_index_created_at_expired_at(cls, index_name: str) -> sa.Index: ...
+    def make_index_created_at_expired_at(cls, index_name: str) -> sa.Index:
+        """
+        Helper to create an index on the `created_at` and `expired_at` fields with the given index name.
+        :param index_name: Name of the index to create.
+        :return: The created SQLAlchemy Index object.
+        """
+        ...
 
     @classmethod
-    def make_active_unique_index_record_sid(cls, index_name: str) -> sa.Index: ...
+    def make_active_unique_index_record_sid(cls, index_name: str) -> sa.Index:
+        """
+        Helper to create a unique index on the `record_sid` field for active records (where `expired_at` is NULL).
+        This ensures that there is only one active snapshot per record at any given time.
+        :param index_name: Name of the index to create.
+        :return: The created SQLAlchemy Index object.
+        """
+        ...
 
     @classmethod
-    def make_active_unique_index_for(cls, index_name: str, *fields: str) -> sa.Index: ...
+    def make_active_unique_index_for(cls, index_name: str, *fields: str) -> sa.Index:
+        """
+        Helper to create a unique index on the specified fields for active records (where `expired_at` is NULL).
+        This ensures that there is only one active snapshot per combination of the specified fields at any given
+        time.
+        :param index_name: Name of the index to create.
+        :param fields: Fields to include in the unique index.
+        :return: The created SQLAlchemy Index object.
+        """
+        ...
 
 
 def make_snapshot_model_mixin() -> type[SnapshotModelMixinProto]:
@@ -289,10 +314,6 @@ def make_snapshot_model_mixin() -> type[SnapshotModelMixinProto]:
 
         @classmethod
         def make_active_unique_index_record_sid(cls, index_name: str) -> sa.Index:
-            """
-            Helper to create a unique index on the `record_sid` field for active records (where `expired_at` is NULL).
-            This ensures that there is only one active snapshot per record at any given time.
-            """
             return sa.Index(
                 index_name,
                 "record_sid",
@@ -302,11 +323,6 @@ def make_snapshot_model_mixin() -> type[SnapshotModelMixinProto]:
 
         @classmethod
         def make_active_unique_index_for(cls, index_name: str, *fields: str) -> sa.Index:
-            """
-            Helper to create a unique index on the specified fields for active records (where `expired_at` is NULL).
-            This ensures that there is only one active snapshot per combination of the specified fields at any given
-            time.
-            """
             return sa.Index(
                 index_name,
                 *fields,

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/src/plexus/common/utils/strutils.py

@@ -24,8 +24,10 @@ __all__ = [
     "strict_abspath_parser",
     "semver_pattern",
     "semver_parser",
-    "tag_pattern",
-    "tag_parser",
+    "colon_tag_pattern",
+    "colon_tag_parser",
+    "slash_tag_pattern",
+    "slash_tag_parser",
     "topic_pattern",
     "topic_parser",
     "vin_code_chars",
@@ -146,8 +148,11 @@ semver_regexp: re.Pattern[str] = re.compile(
     rf"(?:\+{alpha_digits_regexp.pattern}(?:\.{alpha_digits_regexp.pattern})*)?")
 semver_element: pp.ParserElement = pp.Regex(semver_regexp.pattern)
 
-tag_regexp: re.Pattern[str] = re.compile(rf"{snake_case_regexp.pattern}(?:::{snake_case_regexp.pattern})*")
-tag_element: pp.ParserElement = pp.Combine(snake_case_element + (colon_token + colon_token + snake_case_element)[...])
+colon_tag_regexp: re.Pattern[str] = re.compile(rf"{snake_case_regexp.pattern}(?::{snake_case_regexp.pattern})*")
+colon_tag_element: pp.ParserElement = pp.Combine(snake_case_element + (colon_token + snake_case_element)[...])
+
+slash_tag_regexp: re.Pattern[str] = re.compile(rf"{snake_case_regexp.pattern}(?:/{snake_case_regexp.pattern})*")
+slash_tag_element: pp.ParserElement = pp.Combine(snake_case_element + (slash_token + snake_case_element)[...])
 
 topic_regexp: re.Pattern[str] = re.compile(rf"(?:/{snake_case_regexp.pattern})+")
 topic_element: pp.ParserElement = pp.Combine((slash_token + snake_case_element)[1, ...])
@@ -178,8 +183,10 @@ strict_abspath_parser = make_string_parser(strict_abspath_element)
 semver_pattern = make_string_pattern(semver_regexp)
 semver_parser = make_string_parser(semver_element)
 
-tag_pattern = make_string_pattern(tag_regexp)
-tag_parser = make_string_parser(tag_element)
+colon_tag_pattern = make_string_pattern(colon_tag_regexp)
+colon_tag_parser = make_string_parser(colon_tag_element)
+slash_tag_pattern = make_string_pattern(slash_tag_regexp)
+slash_tag_parser = make_string_parser(slash_tag_element)
 topic_pattern = make_string_pattern(topic_regexp)
 topic_parser = make_string_parser(topic_element)
 vin_code_pattern = make_string_pattern(vin_code_regexp)

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/src/plexus_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.10
+Version: 1.0.12
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{plexus_python_common-1.0.10 → plexus_python_common-1.0.12}/test/plexus_tests/common/utils/strutils_test.py

@@ -5,6 +5,7 @@ import pyparsing as pp
 from iker.common.utils.dtutils import dt_parse_iso
 
 from plexus.common.utils.strutils import BagName, UserName, VehicleName
+from plexus.common.utils.strutils import colon_tag_parser, colon_tag_pattern, slash_tag_parser, slash_tag_pattern
 from plexus.common.utils.strutils import dot_case_parser, dot_case_pattern
 from plexus.common.utils.strutils import hex_string_parser, hex_string_pattern
 from plexus.common.utils.strutils import kebab_case_parser, kebab_case_pattern
@@ -13,7 +14,6 @@ from plexus.common.utils.strutils import semver_parser, semver_pattern
 from plexus.common.utils.strutils import snake_case_parser, snake_case_pattern
 from plexus.common.utils.strutils import strict_abspath_parser, strict_abspath_pattern
 from plexus.common.utils.strutils import strict_relpath_parser, strict_relpath_pattern
-from plexus.common.utils.strutils import tag_parser, tag_pattern
 from plexus.common.utils.strutils import topic_parser, topic_pattern
 from plexus.common.utils.strutils import vin_code_parser, vin_code_pattern
 
@@ -415,36 +415,67 @@ class StrUtilsTest(unittest.TestCase):
         with self.assertRaises(pp.ParseException):
             semver_parser.parse_string(data, parse_all=True)
 
-    data_tag_pattern = [
+    data_colon_tag_pattern = [
         ("dummy",),
-        ("dummy::dummy",),
-        ("dummy::dummy::dummy",),
-        ("dummy_12345::dummy_12345::dummy_12345",),
+        ("dummy:dummy",),
+        ("dummy:dummy:dummy",),
+        ("dummy_12345:dummy_12345:dummy_12345",),
     ]
 
-    @ddt.idata(data_tag_pattern)
+    @ddt.idata(data_colon_tag_pattern)
     @ddt.unpack
-    def test_tag_pattern(self, data):
-        self.assertIsNotNone(tag_pattern.match(data))
-        self.assertIsNotNone(tag_parser.parse_string(data, parse_all=True))
+    def test_colon_tag_pattern(self, data):
+        self.assertIsNotNone(colon_tag_pattern.match(data))
+        self.assertIsNotNone(colon_tag_parser.parse_string(data, parse_all=True))
 
-    data_tag_pattern__bad_cases = [
+    data_colon_tag_pattern__bad_cases = [
         ("",),
-        ("::",),
+        (":",),
         ("dummy_",),
         ("_dummy",),
-        ("dummy_::",),
-        ("_dummy::",),
-        ("dummy::dummy_",),
-        ("dummy::_dummy",),
+        ("dummy_:",),
+        ("_dummy:",),
+        ("dummy:dummy_",),
+        ("dummy:_dummy",),
     ]
 
-    @ddt.idata(data_tag_pattern__bad_cases)
+    @ddt.idata(data_colon_tag_pattern__bad_cases)
     @ddt.unpack
-    def test_tag_pattern__bad_cases(self, data):
-        self.assertIsNone(tag_pattern.match(data))
+    def test_colon_tag_pattern__bad_cases(self, data):
+        self.assertIsNone(colon_tag_pattern.match(data))
         with self.assertRaises(pp.ParseException):
-            tag_parser.parse_string(data, parse_all=True)
+            colon_tag_parser.parse_string(data, parse_all=True)
+
+    data_slash_tag_pattern = [
+        ("dummy",),
+        ("dummy/dummy",),
+        ("dummy/dummy/dummy",),
+        ("dummy_12345/dummy_12345/dummy_12345",),
+    ]
+
+    @ddt.idata(data_slash_tag_pattern)
+    @ddt.unpack
+    def test_slash_tag_pattern(self, data):
+        self.assertIsNotNone(slash_tag_pattern.match(data))
+        self.assertIsNotNone(slash_tag_parser.parse_string(data, parse_all=True))
+
+    data_slash_tag_pattern__bad_cases = [
+        ("",),
+        ("/",),
+        ("dummy_",),
+        ("_dummy",),
+        ("dummy_/",),
+        ("_dummy/",),
+        ("dummy/dummy_",),
+        ("dummy/_dummy",),
+    ]
+
+    @ddt.idata(data_slash_tag_pattern__bad_cases)
+    @ddt.unpack
+    def test_slash_tag_pattern__bad_cases(self, data):
+        self.assertIsNone(slash_tag_pattern.match(data))
+        with self.assertRaises(pp.ParseException):
+            slash_tag_parser.parse_string(data, parse_all=True)
 
     data_topic_pattern = [
         ("/dummy_sensor",),