iker-python-common 1.0.40__tar.gz → 1.0.42__tar.gz

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/.github/workflows/pr.yml

@@ -24,7 +24,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
-          python -m pip install .[test]
+          python -m pip install .[test,all]
           python -m pytest . --cov --cov-report xml --cov-config pyproject.toml
 
   build-python312:
@@ -43,7 +43,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
-          python -m pip install .[test]
+          python -m pip install .[test,all]
           python -m pytest . --cov --cov-report xml --cov-config pyproject.toml
 
   build-python313:
@@ -62,5 +62,5 @@ jobs:
           sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
-          python -m pip install .[test]
+          python -m pip install .[test,all]
           python -m pytest . --cov --cov-report xml --cov-config pyproject.toml

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/.github/workflows/push.yml

@@ -24,7 +24,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip build twine
-          python -m pip install .[test]
+          python -m pip install .[test,all]
           python -m pytest . --cov --cov-report xml --cov-config pyproject.toml
           python -m build -sw .
           python -m twine upload --username __token__ --password ${{ secrets.PYPI_TOKEN }} dist/*

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.40
+Version: 1.0.42
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -13,6 +13,8 @@ Requires-Dist: psycopg>=3.2
 Requires-Dist: pymysql>=1.1
 Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: typing-extensions; python_version < "3.12"
+Provides-Extra: all
+Requires-Dist: iker-python-common; extra == "all"
 Provides-Extra: test
 Requires-Dist: ddt>=1.7; extra == "test"
 Requires-Dist: moto[all,ec2,s3]>=5.0; extra == "test"

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/pyproject.toml

@@ -6,6 +6,27 @@ requires = [
 ]
 build-backend = "setuptools.build_meta"
 
+[dependency-groups]
+dev = [
+    "boto3>=1.35",
+    "docker>=7.1",
+    "numpy>=1.26",
+    "psycopg>=3.2",
+    "pymysql>=1.1",
+    "sqlalchemy>=1.4",
+    "typing-extensions; python_version<'3.12'"
+]
+test = [
+    "ddt>=1.7",
+    "moto[ec2,s3,all]>=5.0",
+    "pytest-cov>=5.0",
+    "pytest-mysql>=3.0",
+    "pytest-order>=1.3",
+    "pytest-postgresql>=6.1",
+    "pytest>=8.3",
+    "sqlalchemy>=2.0",
+]
+
 [project]
 name = "iker-python-common"
 dynamic = ["version"]
@@ -27,6 +48,9 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+all = [
+    "iker-python-common",
+]
 test = [
     "ddt>=1.7",
     "moto[ec2,s3,all]>=5.0",

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/src/iker/common/utils/dtutils.py

@@ -23,7 +23,9 @@ __all__ = [
     "dt_utc_now",
     "dt_utc",
     "dt_to_ts",
+    "dt_to_ts_us",
     "dt_from_ts",
+    "dt_from_ts_us",
     "dt_parse",
     "dt_format",
     "dt_parse_iso",
@@ -152,6 +154,17 @@ def dt_utc(
     return datetime.datetime(year, month, day, hour, minute, second, microsecond, tzinfo=datetime.timezone.utc)
 
 
+def dt_to_td(dt: datetime.datetime) -> datetime.timedelta:
+    """
+    Returns corresponding timedelta of the given datetime
+
+    :param dt: the given datetime
+
+    :return: timedelta from POSIX epoch
+    """
+    return dt.replace(tzinfo=datetime.timezone.utc) - dt_utc_epoch()
+
+
 def dt_to_ts(dt: datetime.datetime) -> float:
     """
     Returns corresponding timestamp in seconds of the given datetime
@@ -160,7 +173,30 @@ def dt_to_ts(dt: datetime.datetime) -> float:
 
     :return: timestamp in seconds from POSIX epoch
     """
-    return (dt.replace(tzinfo=datetime.timezone.utc) - dt_utc_epoch()).total_seconds()
+    return dt_to_ts_us(dt) / 1.0e6
+
+
+def dt_to_ts_us(dt: datetime.datetime) -> int:
+    """
+    Returns corresponding timestamp in microseconds of the given datetime
+
+    :param dt: the given datetime
+
+    :return: timestamp in microseconds from POSIX epoch
+    """
+    td = dt_to_td(dt)
+    return (td.days * 86400 + td.seconds) * 1000000 + td.microseconds
+
+
+def dt_from_td(td: datetime.timedelta) -> datetime.datetime:
+    """
+    Returns corresponding datetime in UTC of the given timedelta
+
+    :param td: timedelta from POSIX epoch
+
+    :return: the given datetime in UTC
+    """
+    return dt_utc_epoch() + td
 
 
 def dt_from_ts(ts: float) -> datetime.datetime:
@@ -171,11 +207,26 @@ def dt_from_ts(ts: float) -> datetime.datetime:
 
     :return: the given datetime in UTC
     """
-    return datetime.datetime.fromtimestamp(ts, tz=datetime.timezone.utc)
+    return dt_from_ts_us(round(ts * 1.0e6))
+
+
+def dt_from_ts_us(ts: int) -> datetime.datetime:
+    """
+    Returns corresponding datetime in UTC of the given timestamp in microseconds
+
+    :param ts: timestamp in microseconds from POSIX epoch
+
+    :return: the given datetime in UTC
+    """
+    return dt_from_td(datetime.timedelta(microseconds=ts))
 
 
-basic_tz_regexp = re.compile(r"([+-])(\d{2})(\d{2})")
-extended_tz_regexp = re.compile(r"([+-])(\d{2}):(\d{2})")
+basic_date_regex: re.Pattern[str] = re.compile(r"(\d{4})(\d{2})(\d{2})")
+extended_date_regex: re.Pattern[str] = re.compile(r"(\d{4})-(\d{2})-(\d{2})")
+basic_time_regex: re.Pattern[str] = re.compile(r"T(\d{2})(\d{2})(\d{2})(\.\d{1,6})?")
+extended_time_regex: re.Pattern[str] = re.compile(r"T(\d{2}):(\d{2}):(\d{2})(\.\d{1,6})?")
+basic_tz_regexp: re.Pattern[str] = re.compile(r"([+-])(\d{2})(\d{2})")
+extended_tz_regexp: re.Pattern[str] = re.compile(r"([+-])(\d{2}):(\d{2})")
 
 
 def dt_parse(dt_str: str, fmt_str: str | Sequence[str]) -> datetime.datetime | None:
@@ -191,7 +242,7 @@ def dt_parse(dt_str: str, fmt_str: str | Sequence[str]) -> datetime.datetime | N
         return None
 
     if isinstance(fmt_str, str):
-        for tz_directive in ["%z", "%:z", "%Z"]:
+        for tz_directive in ["%z", "%:z"]:
             if tz_directive in fmt_str:
                 if tz_directive == "%:z":
                     # Replaces ISO 8601 timezone format "%:z" (e.g., "+01:00") with "%z" (e.g., "+0100")

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.40
+Version: 1.0.42
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -13,6 +13,8 @@ Requires-Dist: psycopg>=3.2
 Requires-Dist: pymysql>=1.1
 Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: typing-extensions; python_version < "3.12"
+Provides-Extra: all
+Requires-Dist: iker-python-common; extra == "all"
 Provides-Extra: test
 Requires-Dist: ddt>=1.7; extra == "test"
 Requires-Dist: moto[all,ec2,s3]>=5.0; extra == "test"

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/src/iker_python_common.egg-info/requires.txt

@@ -8,6 +8,9 @@ sqlalchemy>=1.4
 [:python_version < "3.12"]
 typing-extensions
 
+[all]
+iker-python-common
+
 [test]
 ddt>=1.7
 moto[all,ec2,s3]>=5.0

{iker_python_common-1.0.40 → iker_python_common-1.0.42}/test/iker_tests/common/utils/dtutils_test.py

@@ -4,7 +4,7 @@ import ddt
 
 from iker.common.utils.dtutils import basic_format, extended_format, iso_format
 from iker.common.utils.dtutils import dt_format, dt_format_iso, dt_parse, dt_parse_iso
-from iker.common.utils.dtutils import dt_from_ts, dt_to_ts
+from iker.common.utils.dtutils import dt_from_ts, dt_from_ts_us, dt_to_ts, dt_to_ts_us
 from iker.common.utils.dtutils import dt_utc
 from iker.common.utils.dtutils import dt_utc_epoch, dt_utc_max, dt_utc_min
 
@@ -63,6 +63,34 @@ class DtUtilsTest(unittest.TestCase):
     def test_dt_to_ts(self, data, expect):
         self.assertEqual(expect, dt_to_ts(data))
 
+    data_dt_to_ts_us = [
+        (dt_utc(1970, 1, 1), 0),
+        (dt_utc(1969, 12, 31, 23, 59, 59), -1000000),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 1), -999999),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 1000), -999000),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 999999), -1),
+        (dt_utc(1970, 1, 1, 0, 0, 1), 1000000),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 1), 1000001),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 1000), 1001000),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 999999), 1999999),
+        (dt_utc(1970, 1, 1, 0, 0, 0, 1), 1),
+        (dt_utc(1970, 1, 1, 0, 0, 0, 1000), 1000),
+        (dt_utc(1970, 1, 1, 0, 0, 0, 999999), 999999),
+        (dt_utc(2025, 1, 1, 0, 0, 0), 1735689600000000),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 1), 1735689600000001),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 1000), 1735689600001000),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 999999), 1735689600999999),
+        (dt_utc(2100, 1, 1, 0, 0, 0), 4102444800000000),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 1), 4102444800000001),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 1000), 4102444800001000),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 999999), 4102444800999999),
+    ]
+
+    @ddt.idata(data_dt_to_ts_us)
+    @ddt.unpack
+    def test_dt_to_ts_us(self, data, expect):
+        self.assertEqual(expect, dt_to_ts_us(data))
+
     data_dt_from_ts = [
         (0.0, dt_utc(1970, 1, 1)),
         (-1.0, dt_utc(1969, 12, 31, 23, 59, 59)),
@@ -91,6 +119,34 @@ class DtUtilsTest(unittest.TestCase):
     def test_dt_from_ts(self, data, expect):
         self.assertEqual(expect, dt_from_ts(data))
 
+    data_dt_from_ts_us = [
+        (0, dt_utc(1970, 1, 1)),
+        (-1000000, dt_utc(1969, 12, 31, 23, 59, 59)),
+        (-999999, dt_utc(1969, 12, 31, 23, 59, 59, 1)),
+        (-999000, dt_utc(1969, 12, 31, 23, 59, 59, 1000)),
+        (-1, dt_utc(1969, 12, 31, 23, 59, 59, 999999)),
+        (1000000, dt_utc(1970, 1, 1, 0, 0, 1)),
+        (1000001, dt_utc(1970, 1, 1, 0, 0, 1, 1)),
+        (1001000, dt_utc(1970, 1, 1, 0, 0, 1, 1000)),
+        (1999999, dt_utc(1970, 1, 1, 0, 0, 1, 999999)),
+        (1, dt_utc(1970, 1, 1, 0, 0, 0, 1)),
+        (1000, dt_utc(1970, 1, 1, 0, 0, 0, 1000)),
+        (999999, dt_utc(1970, 1, 1, 0, 0, 0, 999999)),
+        (1735689600000000, dt_utc(2025, 1, 1, 0, 0, 0)),
+        (1735689600000001, dt_utc(2025, 1, 1, 0, 0, 0, 1)),
+        (1735689600001000, dt_utc(2025, 1, 1, 0, 0, 0, 1000)),
+        (1735689600999999, dt_utc(2025, 1, 1, 0, 0, 0, 999999)),
+        (4102444800000000, dt_utc(2100, 1, 1, 0, 0, 0)),
+        (4102444800000001, dt_utc(2100, 1, 1, 0, 0, 0, 1)),
+        (4102444800001000, dt_utc(2100, 1, 1, 0, 0, 0, 1000)),
+        (4102444800999999, dt_utc(2100, 1, 1, 0, 0, 0, 999999)),
+    ]
+
+    @ddt.idata(data_dt_from_ts_us)
+    @ddt.unpack
+    def test_dt_from_ts_us(self, data, expect):
+        self.assertEqual(expect, dt_from_ts_us(data))
+
     data_dt_parse = [
         ("00010101T000000", basic_format(), dt_utc(1, 1, 1, 0, 0, 0)),
         ("00010101T000000.000000", basic_format(with_ms=True), dt_utc(1, 1, 1, 0, 0, 0)),