plexus-python-pulse-common 1.1.87__py3-none-any.whl → 1.1.88__py3-none-any.whl

plexus/pulse/common/utils/ormutils.py

@@ -551,7 +551,10 @@ def model_revision_type(dialect: str | None = None) -> sa.types.TypeEngine[int]:
     raise ValueError(f"unsupported database dialect '{dialect}'")
 
 
-def index_condition_kwarg(dialect: str | None = None, clause: sa.TextClause | None = None) -> dict[str, sa.TextClause]:
+def index_condition_kwarg(
+    dialect: str | None = None,
+    clause: sa.ClauseElement | None = None
+) -> dict[str, sa.ClauseElement | None]:
     if dialect is None:
         dialect = dialects.postgresql
     if dialect == dialects.postgresql:
@@ -728,7 +731,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
                 index_name,
                 "record_sqn",
                 unique=True,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
         @classmethod
@@ -736,7 +739,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
             return sa.Index(
                 index_name,
                 *fields,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
         @classmethod
@@ -745,7 +748,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
                 index_name,
                 *fields,
                 unique=True,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
     return ModelMixin
@@ -865,7 +868,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
                 index_name,
                 "record_sqn",
                 unique=True,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
         @classmethod
@@ -873,7 +876,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
             return sa.Index(
                 index_name,
                 *fields,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
         @classmethod
@@ -882,7 +885,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
                 index_name,
                 *fields,
                 unique=True,
-                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
+                **index_condition_kwarg(dialect, sa.column("expired_at").is_(None)),
             )
 
     return ModelMixin

plexus/pulse/common/utils/strutils.py

@@ -28,6 +28,8 @@ __all__ = [
     "strict_fragmented_abspath_parser",
     "email_address_pattern",
     "email_address_parser",
+    "numeric_version_pattern",
+    "numeric_version_parser",
     "semver_pattern",
     "semver_parser",
     "colon_tag_pattern",
@@ -91,6 +93,7 @@ sharp_token: pp.ParserElement = pp.Char("#")
 lower_regexp: re.Pattern[str] = re.compile(r"[a-z]")
 upper_regexp: re.Pattern[str] = re.compile(r"[A-Z]")
 digit_regexp: re.Pattern[str] = re.compile(r"[0-9]")
+alpha_regexp: re.Pattern[str] = re.compile(r"[a-zA-Z]")
 lower_digit_regexp: re.Pattern[str] = re.compile(r"[a-z0-9]")
 upper_digit_regexp: re.Pattern[str] = re.compile(r"[A-Z0-9]")
 alpha_digit_regexp: re.Pattern[str] = re.compile(r"[a-zA-Z0-9]")
@@ -99,6 +102,7 @@ hex_digit_regexp: re.Pattern[str] = re.compile(r"[a-f0-9]")
 lowers_regexp: re.Pattern[str] = re.compile(rf"{lower_regexp.pattern}+")
 uppers_regexp: re.Pattern[str] = re.compile(rf"{upper_regexp.pattern}+")
 digits_regexp: re.Pattern[str] = re.compile(rf"{digit_regexp.pattern}+")
+alphas_regexp: re.Pattern[str] = re.compile(rf"{alpha_regexp.pattern}+")
 lower_digits_regexp: re.Pattern[str] = re.compile(rf"{lower_digit_regexp.pattern}+")
 upper_digits_regexp: re.Pattern[str] = re.compile(rf"{upper_digit_regexp.pattern}+")
 alpha_digits_regexp: re.Pattern[str] = re.compile(rf"{alpha_digit_regexp.pattern}+")
@@ -110,6 +114,7 @@ strict_chars_regexp: re.Pattern[str] = re.compile(rf"({alpha_digit_regexp.patter
 lower_element: pp.ParserElement = pp.Regex(lower_regexp.pattern)
 upper_element: pp.ParserElement = pp.Regex(upper_regexp.pattern)
 digit_element: pp.ParserElement = pp.Regex(digit_regexp.pattern)
+alpha_element: pp.ParserElement = pp.Regex(alpha_regexp.pattern)
 lower_digit_element: pp.ParserElement = pp.Regex(lower_digit_regexp.pattern)
 upper_digit_element: pp.ParserElement = pp.Regex(upper_digit_regexp.pattern)
 alpha_digit_element: pp.ParserElement = pp.Regex(alpha_digit_regexp.pattern)
@@ -118,6 +123,7 @@ hex_digit_element: pp.ParserElement = pp.Regex(hex_digit_regexp.pattern)
 lowers_element: pp.ParserElement = pp.Regex(lowers_regexp.pattern)
 uppers_element: pp.ParserElement = pp.Regex(uppers_regexp.pattern)
 digits_element: pp.ParserElement = pp.Regex(digits_regexp.pattern)
+alphas_element: pp.ParserElement = pp.Regex(alphas_regexp.pattern)
 lower_digits_element: pp.ParserElement = pp.Regex(lower_digits_regexp.pattern)
 upper_digits_element: pp.ParserElement = pp.Regex(upper_digits_regexp.pattern)
 alpha_digits_element: pp.ParserElement = pp.Regex(alpha_digits_regexp.pattern)
@@ -184,10 +190,14 @@ email_address_regexp: re.Pattern[str] = re.compile(
     rf"(({lower_digit_regexp.pattern}|[_-])+)(?:\.({lower_digit_regexp.pattern}|[_-])+)*@(?:{kebab_case_regexp.pattern}\.)+({lower_digit_regexp.pattern}{{2,63}})")
 email_address_element: pp.ParserElement = pp.Regex(email_address_regexp.pattern)
 
+numeric_version_regexp: re.Pattern[str] = re.compile(
+    rf"(?:{number_regexp.pattern})(?:\.(?:{number_regexp.pattern}))*")
+numeric_version_element: pp.ParserElement = pp.Regex(numeric_version_regexp.pattern)
+
 semver_regexp: re.Pattern[str] = re.compile(
-    rf"({number_regexp.pattern})\.({number_regexp.pattern})\.({number_regexp.pattern})"
-    rf"(?:-{alpha_digits_regexp.pattern}(?:\.{alpha_digits_regexp.pattern})*)?"
-    rf"(?:\+{alpha_digits_regexp.pattern}(?:\.{alpha_digits_regexp.pattern})*)?")
+    rf"(?:{number_regexp.pattern})\.(?:{number_regexp.pattern})\.(?:{number_regexp.pattern})"
+    rf"(?:-(?:(?:{alpha_digit_regexp.pattern}|-)*(?:{alpha_regexp.pattern}|-)(?:{alpha_digit_regexp.pattern}|-)*|{number_regexp.pattern})(?:\.(?:(?:{alpha_digit_regexp.pattern}|-)*(?:{alpha_regexp.pattern}|-)(?:{alpha_digit_regexp.pattern}|-)*|{number_regexp.pattern}))*)?"
+    rf"(?:\+(?:{alpha_digit_regexp.pattern}|-)+(?:\.(?:{alpha_digit_regexp.pattern}|-)+)*)?")
 semver_element: pp.ParserElement = pp.Regex(semver_regexp.pattern)
 
 colon_tag_regexp: re.Pattern[str] = re.compile(rf"{snake_case_regexp.pattern}(?::{snake_case_regexp.pattern})*")
@@ -229,6 +239,9 @@ strict_fragmented_abspath_parser = make_string_parser(strict_fragmented_abspath_
 email_address_pattern = make_string_pattern(email_address_regexp)
 email_address_parser = make_string_parser(email_address_element)
 
+numeric_version_pattern = make_string_pattern(numeric_version_regexp)
+numeric_version_parser = make_string_parser(numeric_version_element)
+
 semver_pattern = make_string_pattern(semver_regexp)
 semver_parser = make_string_parser(semver_element)
 

{plexus_python_pulse_common-1.1.87.dist-info → plexus_python_pulse_common-1.1.88.dist-info}/METADATA

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

{plexus_python_pulse_common-1.1.87.dist-info → plexus_python_pulse_common-1.1.88.dist-info}/RECORD

@@ -17,14 +17,14 @@ plexus/pulse/common/utils/dockerutils.py,sha256=7DF9yFGz8uHwpYk115xBWqOjs5etz0UE
 plexus/pulse/common/utils/flowutils.py,sha256=MGu15KL9mw-LyGGLceVmY-c2FGer5PURnMZWFSJN--I,10182
 plexus/pulse/common/utils/gisutils.py,sha256=Cx0ZB9-NA_7VuzbuzRArTJ5UfltG-KmvVC8YxPIgPE4,11600
 plexus/pulse/common/utils/jsonutils.py,sha256=zSbW94klN2jrkMdBECu4RNJX6zzNaSxauQ3FuihuB6E,3342
-plexus/pulse/common/utils/ormutils.py,sha256=ycs8MF5EDfxx8TP4gDrD7zIunxB0N3hSvGcB4adopkA,68187
+plexus/pulse/common/utils/ormutils.py,sha256=taaZzpIH0C-ShEmOWf-vt22bgcFFqH1FnJlNcH9tEFM,68222
 plexus/pulse/common/utils/pathutils.py,sha256=eYfNK48wf1xZGK2IbpKxYOn4skZhWWA8OTyUwDXGMIc,9222
 plexus/pulse/common/utils/s3utils.py,sha256=5q5wSOavt-n5EdrflQX7WPGgDeWQkGO9lG5Nq3QXjCk,35904
 plexus/pulse/common/utils/sqlutils.py,sha256=D6kTBjhO5YlNRt3uFlPt6z3uH61m9ajEzPYmsI6NoFc,231
-plexus/pulse/common/utils/strutils.py,sha256=PkmMHCcHN9vALCy_8fJTf00Dg7I2N4QTCXdBmB3t7rk,16440
+plexus/pulse/common/utils/strutils.py,sha256=8kl88-u89FApoaq-D2ulk5DNl9kenP6vqksvVJ0iH4s,17325
 plexus/pulse/common/utils/tagutils.py,sha256=V8eUxtWSijX6nHSCuRX2dTJz3why3TCOzPVK5YXt28s,66944
 plexus/pulse/common/utils/testutils.py,sha256=hKPRvoN4mg8QGQJH121l59a0uo8jN5rntGQAVYplGBw,6166
-plexus_python_pulse_common-1.1.87.dist-info/METADATA,sha256=SnylMrcOPgHpUmVJgX4jAdGVuiBl8KBOsSUlmX2U2xs,1555
-plexus_python_pulse_common-1.1.87.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-plexus_python_pulse_common-1.1.87.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
-plexus_python_pulse_common-1.1.87.dist-info/RECORD,,
+plexus_python_pulse_common-1.1.88.dist-info/METADATA,sha256=bNGz7B5jj23hayiYBRvtfRpfnsD21flHjbg-sgdiKMY,1555
+plexus_python_pulse_common-1.1.88.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+plexus_python_pulse_common-1.1.88.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
+plexus_python_pulse_common-1.1.88.dist-info/RECORD,,