atk-common 1.29.0__tar.gz → 1.31.0__tar.gz

{atk_common-1.29.0 → atk_common-1.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atk_common
-Version: 1.29.0
+Version: 1.31.0
 Summary: ATK common methods
 Home-page: https://github.com/pypa/atk_common
 Author: Roger

{atk_common-1.29.0 → atk_common-1.31.0}/setup.py

@@ -36,7 +36,7 @@ setup(
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version="1.29.0",  # Required
+    version="1.31.0",  # Required
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:
     # https://packaging.python.org/specifications/core-metadata/#summary

{atk_common-1.29.0 → atk_common-1.31.0}/src/atk_common/__init__.py

@@ -1,9 +1,10 @@
 # __init__.py
-from atk_common.datetime_utils import get_utc_date_time, seconds_to_utc_timestamp, get_utc_date_from_iso
+from atk_common.datetime_utils import get_utc_date_time, seconds_to_utc_timestamp, get_utc_date_from_iso, adjust_millisescond, convert_to_utc
 from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date_time_utc_column
 from atk_common.env_utils import get_env_value
 from atk_common.error_utils import get_message, create_error_log, get_error_entity, handle_error, get_response_error, get_error_type
 from atk_common.http_utils import is_http_status_ok, is_http_status_internal, get_test_response
+from atk_common.file_utils import get_image_file_type
 from atk_common.log_utils import add_log_item, add_log_item_http
 from atk_common.rabbitmq_consumer import RabbitMQConsumer
 from atk_common.response_utils import create_response, is_response_ok
@@ -13,6 +14,8 @@ __all__ = [
     'get_utc_date_time',
     'seconds_to_utc_timestamp',
     'get_utc_date_from_iso',
+    'adjust_millisescond',
+    'convert_to_utc',
     'sql',
     'sql_with_record',
     'convert_none_to_null',
@@ -27,6 +30,7 @@ __all__ = [
     'is_http_status_ok',
     'is_http_status_internal',
     'get_test_response',
+    'get_image_file_type',
     'add_log_item',
     'add_log_item_http',
     'RabbitMQConsumer',

atk_common-1.31.0/src/atk_common/datetime_utils.py

@@ -0,0 +1,59 @@
+from datetime import datetime, timezone, timedelta
+from zoneinfo import ZoneInfo
+
+def get_utc_date_time():
+    return str(datetime.now(timezone.utc))
+
+def seconds_to_utc_timestamp(seconds):
+    return str(datetime.fromtimestamp(seconds, tz=timezone.utc))
+
+def get_utc_date_from_iso(date_time):
+    dt = datetime.fromisoformat(date_time)
+    dt_utc = dt.astimezone(timezone.utc)
+    return str(dt_utc.date())
+
+def adjust_millisescond(dt_str):
+    if '.' in dt_str:
+        dt_part, frac = dt_str.split('.')
+        frac = frac[:6]  # keep only the first 6 digits
+        dt_str_clean = f"{dt_part}.{frac}"
+        return dt_str_clean
+    else:
+        dt_str_clean = dt_str
+        return dt_str_clean
+
+# Original datetime string, handles:
+# dt_str = '2023-02-01T14:13:08.653133+01:00'
+# dt_str = '2023-02-01T14:13:08.653133 01:00'
+# dt_str = '2024-01-03T08:13:52.705474147'
+def convert_to_utc(dt_str):
+    # Split datetime and offset
+    if '+' in dt_str:
+        parts = dt_str.split('+')
+    else:
+        parts = dt_str.split(' ')
+    if len(parts) == 2:
+        dt_part, offset_part = parts
+    else:
+        dt_part = parts[0]
+        offset_part = None  # or set a default if needed
+
+    dt_part = adjust_millisescond(dt_part)
+    dt_naive  = datetime.fromisoformat(dt_part)
+
+    if offset_part is None:
+        dt_aware = dt_naive.replace(tzinfo=ZoneInfo("Europe/Berlin"))
+        dt_utc = dt_aware.astimezone(ZoneInfo("UTC"))
+        return dt_utc.strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+    else:
+        # Create a timezone object using the offset
+        hours_offset = int(offset_part.split(':')[0])
+        minutes_offset = int(offset_part.split(':')[1])
+        tzinfo = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+
+        # Assign the timezone to the datetime
+        dt_with_tz = dt_naive.replace(tzinfo=tzinfo)
+
+        # Convert to UTC
+        dt_utc =dt_with_tz.astimezone(timezone.utc)
+        return dt_utc.strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]

{atk_common-1.29.0 → atk_common-1.31.0}/src/atk_common/db_utils.py

@@ -1,7 +1,5 @@
-import psycopg2
-from psycopg2.extras import RealDictCursor
-
 def sql(connection, sql, get_one):
+    from psycopg2.extras import RealDictCursor
     with connection:
         with connection.cursor(cursor_factory=RealDictCursor) as cursor:
             cursor.execute(sql)
@@ -10,6 +8,7 @@ def sql(connection, sql, get_one):
             return cursor.fetchall()
 
 def sql_with_record(connection, sql, record):
+    from psycopg2.extras import RealDictCursor
     with connection:
         with connection.cursor(cursor_factory=RealDictCursor) as cursor:
             cursor.execute(sql, record)

atk_common-1.31.0/src/atk_common/file_utils.py

@@ -0,0 +1,4 @@
+def get_image_file_type(encoding):
+    if (encoding == 'Raw'):
+        return '.ATKIMAGE'
+    return '.jpg'

{atk_common-1.29.0 → atk_common-1.31.0}/src/atk_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atk_common
-Version: 1.29.0
+Version: 1.31.0
 Summary: ATK common methods
 Home-page: https://github.com/pypa/atk_common
 Author: Roger

{atk_common-1.29.0 → atk_common-1.31.0}/src/atk_common.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/atk_common/db_utils.py
 src/atk_common/docker_utils.py
 src/atk_common/env_utils.py
 src/atk_common/error_utils.py
+src/atk_common/file_utils.py
 src/atk_common/http_utils.py
 src/atk_common/log_utils.py
 src/atk_common/mq_utils.py

atk_common-1.29.0/src/atk_common/datetime_utils.py

@@ -1,12 +0,0 @@
-from datetime import datetime, timezone
-
-def get_utc_date_time():
-    return str(datetime.now(timezone.utc))
-
-def seconds_to_utc_timestamp(seconds):
-    return str(datetime.fromtimestamp(seconds, tz=timezone.utc))
-
-def get_utc_date_from_iso(date_time):
-    dt = datetime.fromisoformat(date_time)
-    dt_utc = dt.astimezone(timezone.utc)
-    return str(dt_utc.date())