iker-python-common 1.0.31__tar.gz → 1.0.33__tar.gz

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.31
+Version: 1.0.33
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -11,7 +11,7 @@ Requires-Dist: docker>=7.1
 Requires-Dist: numpy>=1.26
 Requires-Dist: psycopg>=3.2
 Requires-Dist: pymysql>=1.1
-Requires-Dist: sqlalchemy>=2.0
+Requires-Dist: sqlalchemy>=1.4
 Provides-Extra: test
 Requires-Dist: ddt>=1.7; extra == "test"
 Requires-Dist: moto[all,ec2,s3]>=5.0; extra == "test"
@@ -20,3 +20,4 @@ Requires-Dist: pytest-mysql>=3.0; extra == "test"
 Requires-Dist: pytest-order>=1.3; extra == "test"
 Requires-Dist: pytest-postgresql>=6.1; extra == "test"
 Requires-Dist: pytest>=8.3; extra == "test"
+Requires-Dist: sqlalchemy>=2.0; extra == "test"

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "numpy>=1.26",
     "psycopg>=3.2",
     "pymysql>=1.1",
-    "sqlalchemy>=2.0",
+    "sqlalchemy>=1.4",
 ]
 
 [project.optional-dependencies]
@@ -34,6 +34,7 @@ test = [
     "pytest-order>=1.3",
     "pytest-postgresql>=6.1",
     "pytest>=8.3",
+    "sqlalchemy>=2.0",
 ]
 
 [tool.setuptools]

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/src/iker/common/utils/dbutils.py

@@ -3,6 +3,7 @@ import dataclasses
 import urllib.parse
 from typing import Any
 
+import packaging.version
 import psycopg
 import pymysql
 import sqlalchemy
@@ -90,10 +91,18 @@ class ConnectionMaker(object):
     def make_session(self, **kwargs) -> contextlib.AbstractContextManager[sqlalchemy.orm.Session]:
         return contextlib.closing(sqlalchemy.orm.sessionmaker(self.engine, **{**self.session_opts, **kwargs})())
 
-    def create_model(self, orm_base: type[sqlalchemy.orm.DeclarativeBase]):
+    def create_model(self, orm_base):
+        if packaging.version.parse(sqlalchemy.__version__) >= packaging.version.parse("2"):
+            if not isinstance(orm_base, type) or not issubclass(orm_base, sqlalchemy.orm.DeclarativeBase):
+                raise TypeError("not a subclass of 'sqlalchemy.orm.DeclarativeBase'")
+
         orm_base.metadata.create_all(self.engine)
 
-    def drop_model(self, orm_base: type[sqlalchemy.orm.DeclarativeBase]):
+    def drop_model(self, orm_base):
+        if packaging.version.parse(sqlalchemy.__version__) >= packaging.version.parse("2"):
+            if not isinstance(orm_base, type) or not issubclass(orm_base, sqlalchemy.orm.DeclarativeBase):
+                raise TypeError("not a subclass of 'sqlalchemy.orm.DeclarativeBase'")
+
         orm_base.metadata.drop_all(self.engine)
 
     def execute(self, sql: str, **params):
@@ -133,17 +142,19 @@ class ConnectionMaker(object):
 DBAdapter = ConnectionMaker
 
 
-def orm_to_dict(orm: sqlalchemy.orm.DeclarativeBase, exclude: set[str] = None) -> dict[str, Any]:
-    if not isinstance(orm, sqlalchemy.orm.DeclarativeBase):
-        raise TypeError('not a SQLAlchemy ORM declarative base')
+def orm_to_dict(orm, exclude: set[str] = None) -> dict[str, Any]:
+    if packaging.version.parse(sqlalchemy.__version__) >= packaging.version.parse("2"):
+        if not isinstance(orm, sqlalchemy.orm.DeclarativeBase):
+            raise TypeError("not an instance of 'sqlalchemy.orm.DeclarativeBase'")
 
     mapper = sqlalchemy.inspect(type(orm))
     return dict((c.key, getattr(orm, c.key)) for c in mapper.columns if c.key not in (exclude or set()))
 
 
-def orm_clone(orm: sqlalchemy.orm.DeclarativeBase, exclude: set[str] = None, no_autoincrement: bool = False):
-    if not isinstance(orm, sqlalchemy.orm.DeclarativeBase):
-        raise TypeError('not a SQLAlchemy ORM declarative base')
+def orm_clone(orm, exclude: set[str] = None, no_autoincrement: bool = False):
+    if packaging.version.parse(sqlalchemy.__version__) >= packaging.version.parse("2"):
+        if not isinstance(orm, sqlalchemy.orm.DeclarativeBase):
+            raise TypeError("not an instance of 'sqlalchemy.orm.DeclarativeBase'")
 
     mapper = sqlalchemy.inspect(type(orm))
     exclude = exclude or (set(c.key for c in mapper.columns if c.autoincrement is True) if no_autoincrement else set())

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.31
+Version: 1.0.33
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -11,7 +11,7 @@ Requires-Dist: docker>=7.1
 Requires-Dist: numpy>=1.26
 Requires-Dist: psycopg>=3.2
 Requires-Dist: pymysql>=1.1
-Requires-Dist: sqlalchemy>=2.0
+Requires-Dist: sqlalchemy>=1.4
 Provides-Extra: test
 Requires-Dist: ddt>=1.7; extra == "test"
 Requires-Dist: moto[all,ec2,s3]>=5.0; extra == "test"
@@ -20,3 +20,4 @@ Requires-Dist: pytest-mysql>=3.0; extra == "test"
 Requires-Dist: pytest-order>=1.3; extra == "test"
 Requires-Dist: pytest-postgresql>=6.1; extra == "test"
 Requires-Dist: pytest>=8.3; extra == "test"
+Requires-Dist: sqlalchemy>=2.0; extra == "test"

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/src/iker_python_common.egg-info/requires.txt

@@ -3,7 +3,7 @@ docker>=7.1
 numpy>=1.26
 psycopg>=3.2
 pymysql>=1.1
-sqlalchemy>=2.0
+sqlalchemy>=1.4
 
 [test]
 ddt>=1.7
@@ -13,3 +13,4 @@ pytest-mysql>=3.0
 pytest-order>=1.3
 pytest-postgresql>=6.1
 pytest>=8.3
+sqlalchemy>=2.0

{iker_python_common-1.0.31 → iker_python_common-1.0.33}/test/iker_tests/common/utils/dtutils_test.py

@@ -38,8 +38,24 @@ class DtUtilsTest(unittest.TestCase):
     @ddt.data(
         (dt_utc(1970, 1, 1), 0.0),
         (dt_utc(1969, 12, 31, 23, 59, 59), -1.0),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 1), -0.999999),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 1000), -0.999),
+        (dt_utc(1969, 12, 31, 23, 59, 59, 999999), -0.000001),
         (dt_utc(1970, 1, 1, 0, 0, 1), 1.0),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 1), 1.000001),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 1000), 1.001),
+        (dt_utc(1970, 1, 1, 0, 0, 1, 999999), 1.999999),
+        (dt_utc(1970, 1, 1, 0, 0, 0, 1), 0.000001),
         (dt_utc(1970, 1, 1, 0, 0, 0, 1000), 0.001),
+        (dt_utc(1970, 1, 1, 0, 0, 0, 999999), 0.999999),
+        (dt_utc(2025, 1, 1, 0, 0, 0), 1735689600.0),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 1), 1735689600.000001),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 1000), 1735689600.001),
+        (dt_utc(2025, 1, 1, 0, 0, 0, 999999), 1735689600.999999),
+        (dt_utc(2100, 1, 1, 0, 0, 0), 4102444800.0),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 1), 4102444800.000001),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 1000), 4102444800.001),
+        (dt_utc(2100, 1, 1, 0, 0, 0, 999999), 4102444800.999999),
     )
     @ddt.unpack
     def test_dt_to_ts(self, data, expect):
@@ -48,11 +64,27 @@ class DtUtilsTest(unittest.TestCase):
     @ddt.data(
         (0.0, dt_utc(1970, 1, 1)),
         (-1.0, dt_utc(1969, 12, 31, 23, 59, 59)),
+        (-0.999999, dt_utc(1969, 12, 31, 23, 59, 59, 1)),
+        (-0.999, dt_utc(1969, 12, 31, 23, 59, 59, 1000)),
+        (-0.000001, dt_utc(1969, 12, 31, 23, 59, 59, 999999)),
         (1.0, dt_utc(1970, 1, 1, 0, 0, 1)),
+        (1.000001, dt_utc(1970, 1, 1, 0, 0, 1, 1)),
+        (1.001, dt_utc(1970, 1, 1, 0, 0, 1, 1000)),
+        (1.999999, dt_utc(1970, 1, 1, 0, 0, 1, 999999)),
+        (0.000001, dt_utc(1970, 1, 1, 0, 0, 0, 1)),
         (0.001, dt_utc(1970, 1, 1, 0, 0, 0, 1000)),
+        (0.999999, dt_utc(1970, 1, 1, 0, 0, 0, 999999)),
+        (1735689600.0, dt_utc(2025, 1, 1, 0, 0, 0)),
+        (1735689600.000001, dt_utc(2025, 1, 1, 0, 0, 0, 1)),
+        (1735689600.001, dt_utc(2025, 1, 1, 0, 0, 0, 1000)),
+        (1735689600.999999, dt_utc(2025, 1, 1, 0, 0, 0, 999999)),
+        (4102444800.0, dt_utc(2100, 1, 1, 0, 0, 0)),
+        (4102444800.000001, dt_utc(2100, 1, 1, 0, 0, 0, 1)),
+        (4102444800.001, dt_utc(2100, 1, 1, 0, 0, 0, 1000)),
+        (4102444800.999999, dt_utc(2100, 1, 1, 0, 0, 0, 999999)),
     )
     @ddt.unpack
-    def test_dt_to_from(self, data, expect):
+    def test_dt_from_ts(self, data, expect):
         self.assertEqual(expect, dt_from_ts(data))
 
     @ddt.data(