plexus-python-common 1.0.21__tar.gz → 1.0.23__tar.gz

{plexus_python_common-1.0.21 → plexus_python_common-1.0.23}/PKG-INFO

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

{plexus_python_common-1.0.21 → plexus_python_common-1.0.23}/src/plexus/common/utils/s3utils.py

@@ -9,10 +9,10 @@ import os.path
 import tempfile
 from collections.abc import Callable, Generator
 from pathlib import Path
-from typing import Iterable, Literal
+from typing import Literal
 
 import boto3
-from cloudpathlib import AnyPath, CloudPath, S3Client, S3Path
+from cloudpathlib import CloudPath, S3Client, S3Path
 from iker.common.utils.shutils import glob_match, listfile, path_depth
 from iker.common.utils.strutils import is_empty, trim_to_none
 from rich.progress import BarColumn, DownloadColumn, Progress, TaskID, TextColumn, TransferSpeedColumn
@@ -63,7 +63,7 @@ def s3_make_client(
     yield S3Client(boto3_session=session, endpoint_url=trim_to_none(endpoint_url))
 
 
-def s3_list_objects(client: S3Client, bucket: str, prefix: str, limit: int = None) -> Iterable[S3ObjectMeta]:
+def s3_list_objects(client: S3Client, bucket: str, prefix: str, limit: int = None) -> Generator[S3ObjectMeta]:
     """
     Lists all objects from the given S3 ``bucket`` and ``prefix``.
 
@@ -105,7 +105,7 @@ def s3_listfile(
     include_patterns: list[str] | None = None,
     exclude_patterns: list[str] | None = None,
     depth: int = 0,
-) -> Iterable[S3ObjectMeta]:
+) -> Generator[S3ObjectMeta]:
     """
     Lists all objects from the given S3 ``bucket`` and ``prefix``, filtered by patterns and directory depth.
 
@@ -323,7 +323,7 @@ class S3TransferCallbackClient(S3Client):
     def __init__(
         self,
         *args,
-        transfer_callback: Callable[[CloudPath, TransferDirection, TransferState, int], None],
+        transfer_callback: Callable[[Path | CloudPath, TransferDirection, TransferState, int], None],
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
@@ -367,10 +367,12 @@ class S3TransferCallbackClient(S3Client):
         return cloud_path
 
 
-def s3_make_progress_callback(progress: Progress) -> Callable[[AnyPath, TransferDirection, TransferState, int], None]:
-    task_ids: dict[AnyPath, TaskID] = {}
+def s3_make_progress_callback(
+    progress: Progress,
+) -> Callable[[Path | CloudPath, TransferDirection, TransferState, int], None]:
+    task_ids: dict[Path | CloudPath, TaskID] = {}
 
-    def progress_callback(path: AnyPath, direction: TransferDirection, state: TransferState, bytes_sent: int):
+    def progress_callback(path: Path | CloudPath, direction: TransferDirection, state: TransferState, bytes_sent: int):
         if state == "start":
             size = path.stat().st_size
             task_ids[path] = progress.add_task(direction, total=size, filename=path.name)

{plexus_python_common-1.0.21 → plexus_python_common-1.0.23}/src/plexus/common/utils/strutils.py

@@ -22,6 +22,8 @@ __all__ = [
     "strict_relpath_parser",
     "strict_abspath_pattern",
     "strict_abspath_parser",
+    "email_address_pattern",
+    "email_address_parser",
     "semver_pattern",
     "semver_parser",
     "colon_tag_pattern",
@@ -74,16 +76,39 @@ def make_string_parser(element: pp.ParserElement) -> pp.ParserElement:
     return pp.Combine(pp.StringStart() + element + pp.StringEnd())
 
 
-lowers_regexp: re.Pattern[str] = re.compile(r"[a-z]+")
-uppers_regexp: re.Pattern[str] = re.compile(r"[A-Z]+")
-digits_regexp: re.Pattern[str] = re.compile(r"[0-9]+")
-lower_digits_regexp: re.Pattern[str] = re.compile(r"[a-z0-9]+")
-upper_digits_regexp: re.Pattern[str] = re.compile(r"[A-Z0-9]+")
-alpha_digits_regexp: re.Pattern[str] = re.compile(r"[a-zA-Z0-9]+")
-hex_digits_regexp: re.Pattern[str] = re.compile(r"[a-f0-9]+")
-lower_identifier_regexp: re.Pattern[str] = re.compile(r"[a-z][a-z0-9]*")
-upper_identifier_regexp: re.Pattern[str] = re.compile(r"[A-Z][A-Z0-9]*")
-strict_chars_regexp: re.Pattern[str] = re.compile(r"[a-zA-Z0-9._-]+")
+underscore_token: pp.ParserElement = pp.Char("_")
+hyphen_token: pp.ParserElement = pp.Char("-")
+period_token: pp.ParserElement = pp.Char(".")
+colon_token: pp.ParserElement = pp.Char(":")
+slash_token: pp.ParserElement = pp.Char("/")
+plus_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]")
+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]")
+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}+")
+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}+")
+hex_digits_regexp: re.Pattern[str] = re.compile(rf"{hex_digit_regexp.pattern}+")
+lower_identifier_regexp: re.Pattern[str] = re.compile(rf"{lower_regexp.pattern}{lower_digit_regexp.pattern}*")
+upper_identifier_regexp: re.Pattern[str] = re.compile(rf"{upper_regexp.pattern}{upper_digit_regexp.pattern}*")
+strict_chars_regexp: re.Pattern[str] = re.compile(rf"({alpha_digit_regexp.pattern}|[._-])+")
+
+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)
+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)
+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)
@@ -96,24 +121,17 @@ lower_identifier_element: pp.ParserElement = pp.Regex(lower_identifier_regexp.pa
 upper_identifier_element: pp.ParserElement = pp.Regex(upper_identifier_regexp.pattern)
 strict_chars_element: pp.ParserElement = pp.Regex(strict_chars_regexp.pattern)
 
-underscore_token: pp.ParserElement = pp.Char("_")
-hyphen_token: pp.ParserElement = pp.Char("-")
-period_token: pp.ParserElement = pp.Char(".")
-colon_token: pp.ParserElement = pp.Char(":")
-slash_token: pp.ParserElement = pp.Char("/")
-plus_token: pp.ParserElement = pp.Char("+")
-
 basic_datetime_regexp: re.Pattern[str] = re.compile(r"\d{8}T\d{6}")
 extended_datetime_regexp: re.Pattern[str] = re.compile(r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}")
 
 basic_datetime_element: pp.ParserElement = pp.Regex(basic_datetime_regexp.pattern)
 extended_datetime_element: pp.ParserElement = pp.Regex(extended_datetime_regexp.pattern)
 
-number_regexp: re.Pattern[str] = re.compile(r"0|([1-9][0-9]*)")
-positive_number_regexp: re.Pattern[str] = re.compile(r"[1-9][0-9]*")
+positive_number_regexp: re.Pattern[str] = re.compile(rf"[1-9]{digit_regexp.pattern}*")
+number_regexp: re.Pattern[str] = re.compile(rf"0|({positive_number_regexp.pattern})")
 
-number_element: pp.ParserElement = pp.Regex(number_regexp.pattern)
 positive_number_element: pp.ParserElement = pp.Regex(positive_number_regexp.pattern)
+number_element: pp.ParserElement = pp.Regex(number_regexp.pattern)
 
 snake_case_regexp: re.Pattern[str] = re.compile(
     rf"{lower_digits_regexp.pattern}(?:_{lower_digits_regexp.pattern})*")
@@ -129,7 +147,8 @@ kebab_case_element: pp.ParserElement = pp.Combine(
 dot_case_element: pp.ParserElement = pp.Combine(
     lower_digits_element + (period_token + lower_digits_element)[...])
 
-uuid_regexp: re.Pattern[str] = re.compile(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
+uuid_regexp: re.Pattern[str] = re.compile(
+    rf"{hex_digit_regexp.pattern}{{8}}(-{hex_digit_regexp.pattern}{{4}}){{3}}-{hex_digit_regexp.pattern}{{12}}")
 uuid_element: pp.ParserElement = pp.Regex(uuid_regexp.pattern)
 
 strict_relpath_regexp: re.Pattern[str] = re.compile(
@@ -146,6 +165,10 @@ strict_relpath_element: pp.ParserElement = pp.Combine(
 strict_abspath_element: pp.ParserElement = pp.Combine(
     slash_token + (strict_path_chars_element + slash_token)[...] + strict_path_chars_element[0, 1])
 
+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)
+
 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})*)?"
@@ -184,6 +207,9 @@ strict_relpath_parser = make_string_parser(strict_relpath_element)
 strict_abspath_pattern = make_string_pattern(strict_abspath_regexp)
 strict_abspath_parser = make_string_parser(strict_abspath_element)
 
+email_address_pattern = make_string_pattern(email_address_regexp)
+email_address_parser = make_string_parser(email_address_element)
+
 semver_pattern = make_string_pattern(semver_regexp)
 semver_parser = make_string_parser(semver_element)
 

{plexus_python_common-1.0.21 → plexus_python_common-1.0.23}/src/plexus_python_common.egg-info/PKG-INFO

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

{plexus_python_common-1.0.21 → plexus_python_common-1.0.23}/test/plexus_tests/common/utils/strutils_test.py

@@ -7,10 +7,10 @@ from iker.common.utils.dtutils import dt_parse_iso
 from plexus.common.utils.strutils import BagName, UserEmail, 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 email_address_parser, email_address_pattern, semver_parser, semver_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
 from plexus.common.utils.strutils import parse_bag_name, parse_user_email, parse_user_name, parse_vehicle_name
-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
@@ -377,6 +377,43 @@ class StrUtilsTest(unittest.TestCase):
         with self.assertRaises(pp.ParseException):
             strict_abspath_parser.parse_string(data, parse_all=True)
 
+    data_email_address_pattern = [
+        ("someone@dummy.com",),
+        ("some.one@dummy.com",),
+        ("some.1@dummy.com",),
+        ("some-one@dummy.com",),
+        ("someone-@dummy.com",),
+        ("someone@dummy.company.com",),
+        ("some.one@dummy-company.com",),
+        ("some.1@dummy.company-company.com",),
+        ("some_one@dummy-1st-company.co-ltd.com",),
+    ]
+
+    @ddt.idata(data_email_address_pattern)
+    @ddt.unpack
+    def test_email_address_pattern(self, data):
+        self.assertIsNotNone(email_address_pattern.match(data))
+        self.assertIsNotNone(email_address_parser.parse_string(data, parse_all=True))
+
+    data_email_address_pattern__bad_cases = [
+        ("",),
+        ("some.one",),
+        ("@dummy.com",),
+        ("someone@dummy",),
+        ("someone@dummy.methionylthreonylthreonylglutaminylarginyltyrosylglutamylserylleucine",),
+        ("someone+one@dummy.com",),
+        ("someone.@dummy.com",),
+        ("someone@.dummy.com",),
+        ("someone@dummy-.com",),
+    ]
+
+    @ddt.idata(data_email_address_pattern__bad_cases)
+    @ddt.unpack
+    def test_email_address_pattern__bad_cases(self, data):
+        self.assertIsNone(email_address_pattern.match(data))
+        with self.assertRaises(pp.ParseException):
+            email_address_parser.parse_string(data, parse_all=True)
+
     data_semver_pattern = [
         ("0.0.0",),
         ("1.2.3",),