iker-python-common 1.0.50__tar.gz → 1.0.52__tar.gz

{iker_python_common-1.0.50 → iker_python_common-1.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.50
+Version: 1.0.52
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_common-1.0.50 → iker_python_common-1.0.52}/src/iker/common/utils/dbutils.py

@@ -65,6 +65,39 @@ class ConnectionMaker(object):
         self.engine_opts = engine_opts or {}
         self.session_opts = session_opts or {}
 
+    @staticmethod
+    def create(
+        driver: str | None = None,
+        host: str | None = None,
+        port: int | None = None,
+        username: str | None = None,
+        password: str | None = None,
+        database: str | None = None,
+        *,
+        engine_opts: dict[str, JsonType] | None = None,
+        session_opts: dict[str, JsonType] | None = None,
+    ):
+        """
+        Creates a new instance of ``ConnectionMaker`` using the provided parameters to construct a SQLAlchemy URL.
+
+        :param driver: Optional database driver.
+        :param host: The database host (e.g., 'localhost').
+        :param port: The database port.
+        :param username: The database username.
+        :param password: The database password.
+        :param database: The name of the database to connect to.
+        :param engine_opts: Optional dictionary of SQLAlchemy engine options.
+        :param session_opts: Optional dictionary of SQLAlchemy session options.
+        """
+        return ConnectionMaker(sqlalchemy.URL.create(drivername=driver,
+                                                     host=host,
+                                                     port=port,
+                                                     username=username,
+                                                     password=password,
+                                                     database=database),
+                               engine_opts=engine_opts,
+                               session_opts=session_opts)
+
     @staticmethod
     def from_url(
         url: str | sqlalchemy.URL,

{iker_python_common-1.0.50 → iker_python_common-1.0.52}/src/iker/common/utils/retry.py

@@ -1,9 +1,9 @@
 import abc
-import datetime
 import random
 import time
 
 from iker.common.utils import logger
+from iker.common.utils.dtutils import dt_utc_now
 
 __all__ = [
     "Attempt",
@@ -21,8 +21,8 @@ class Attempt(object):
         number: int,
         prev_wait: int,
         next_wait: int,
-        start_time: datetime.datetime,
-        check_time: datetime.datetime,
+        start_ts: float,
+        check_ts: float,
         last_exception: Exception,
     ):
         """
@@ -31,15 +31,15 @@ class Attempt(object):
         :param number: The attempt number (1-based).
         :param prev_wait: The wait time before the previous attempt (in seconds).
         :param next_wait: The wait time before the next attempt (in seconds).
-        :param start_time: The start time of the first attempt.
-        :param check_time: The time at which the current attempt is checked.
+        :param start_ts: The start timestamp of the first attempt.
+        :param check_ts: The timestamp at which the current attempt is checked.
         :param last_exception: The exception raised during the last attempt, if any.
         """
         self.number = number
         self.prev_wait = prev_wait
         self.next_wait = next_wait
-        self.start_time = start_time
-        self.check_time = check_time
+        self.start_ts = start_ts
+        self.check_ts = check_ts
         self.last_exception = last_exception
 
 
@@ -127,17 +127,17 @@ class RetryWrapper(object):
         else:
             return 0
 
-    def __check_timeout(self, start_time: datetime.datetime):
+    def __check_timeout(self, start_ts: float) -> tuple[bool, float]:
         """
         Checks if the retry operation has exceeded the configured timeout.
 
-        :param start_time: The start time of the first attempt.
-        :return: Tuple (``True`` if within timeout, current time as ``datetime``).
+        :param start_ts: The start timestamp of the first attempt.
+        :return: Tuple (``True`` if within timeout, current timestamp).
         """
-        now = datetime.datetime.now()
+        current_ts = dt_utc_now().timestamp()
         if self.timeout is None:
-            return True, now
-        return (now < start_time + datetime.timedelta(seconds=self.timeout)), now
+            return True, current_ts
+        return current_ts < start_ts + self.timeout, current_ts
 
     def __run(self, *args, **kwargs):
         """
@@ -150,13 +150,13 @@ class RetryWrapper(object):
         :raises RuntimeError: If all attempts fail or timeout is reached.
         """
         attempt_number = 0
-        start_time = datetime.datetime.now()
+        start_ts = dt_utc_now().timestamp()
         last_exception = None
 
         while self.retrials is None or attempt_number <= self.retrials:
             attempt_number += 1
 
-            check_result, check_time = self.__check_timeout(start_time)
+            check_result, check_ts = self.__check_timeout(start_ts)
             if not check_result:
                 break
 
@@ -164,8 +164,8 @@ class RetryWrapper(object):
                 attempt_number,
                 self.__next_wait(attempt_number - 1),
                 self.__next_wait(attempt_number),
-                start_time,
-                check_time,
+                start_ts,
+                check_ts,
                 last_exception,
             )
             try:

{iker_python_common-1.0.50 → iker_python_common-1.0.52}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.50
+Version: 1.0.52
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_common-1.0.50 → iker_python_common-1.0.52}/test/iker_tests/common/utils/dbutils_test.py

@@ -225,8 +225,13 @@ def test_mysql_connection_maker__sql_text(fixture_mysql_test_proc, fixture_mysql
     user = fixture_mysql_test_proc.user
     database = "test"
 
-    maker = ConnectionMaker.from_url(f"{scheme}://{user}@{host}:{port}/{database}",
-                                     session_opts=dict(expire_on_commit=False))
+    maker = ConnectionMaker.create(scheme,
+                                   host,
+                                   port,
+                                   user,
+                                   None,
+                                   database,
+                                   session_opts=dict(expire_on_commit=False))
 
     maker.create_model(MysqlBaseModel)
 
@@ -655,8 +660,13 @@ def test_postgresql_connection_maker__sql_text(fixture_postgresql_test_proc, fix
     user = fixture_postgresql_test.info.user
     database = fixture_postgresql_test.info.dbname
 
-    maker = ConnectionMaker.from_url(f"{scheme}://{user}@{host}:{port}/{database}",
-                                     session_opts=dict(expire_on_commit=False))
+    maker = ConnectionMaker.create(scheme,
+                                   host,
+                                   port,
+                                   user,
+                                   None,
+                                   database,
+                                   session_opts=dict(expire_on_commit=False))
 
     maker.create_model(PostgresqlBaseModel)