atk-common 1.52.0__tar.gz → 1.54.0__tar.gz

{atk_common-1.52.0 → atk_common-1.54.0}/PKG-INFO

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

{atk_common-1.52.0 → atk_common-1.54.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.52.0",  # Required
+    version="1.54.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.52.0 → atk_common-1.54.0}/src/atk_common/__init__.py

@@ -1,5 +1,12 @@
 # __init__.py
-from atk_common.datetime_utils import get_utc_date_time, get_utc_date_time_str, seconds_to_utc_timestamp, get_utc_date_from_iso, adjust_millisescond, convert_to_utc
+from atk_common.datetime_utils import \
+    get_utc_date_time, \
+    get_utc_date_time_str, \
+    seconds_to_utc_timestamp, \
+    get_utc_date_from_iso, \
+    adjust_millisescond, \
+    convert_to_utc, \
+    convert_to_utc_image_dt
 from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date_time_utc_column
 from atk_common.docker_utils import get_current_container_info
 from atk_common.env_utils import get_env_value
@@ -20,6 +27,7 @@ __all__ = [
     'get_utc_date_from_iso',
     'adjust_millisescond',
     'convert_to_utc',
+    'convert_to_utc_image_dt',
     'sql',
     'sql_with_record',
     'convert_none_to_null',

{atk_common-1.52.0 → atk_common-1.54.0}/src/atk_common/datetime_utils.py

@@ -60,3 +60,44 @@ def convert_to_utc(dt_str):
         # Convert to UTC
         dt_utc =dt_with_tz.astimezone(timezone.utc)
         return dt_utc.strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+
+# Original datetime string, handles:
+# dt_str = '2023-02-01 14:13:08.653133 +01:00'
+def convert_to_utc_image_dt(dt_str):
+    dt_str = dt_str.strip()
+    # Detect offset
+    if '+' in dt_str:
+        parts = dt_str.split('+')
+        sign = '+'
+    elif '-' in dt_str[10:]:  # avoid confusion with date part
+        parts = dt_str.split('-')
+        sign = '-'
+    else:
+        parts = [dt_str]
+        sign = None
+
+    if len(parts) == 2:
+        dt_part = parts[0].strip()
+        offset_part = parts[1].strip()
+        if sign == '-':
+            offset_part = '-' + offset_part
+        else:
+            offset_part = '+' + offset_part
+    else:
+        dt_part = parts[0].strip()
+        offset_part = None
+
+    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"))
+    else:
+        offset_hours, offset_minutes = map(int, offset_part.split(':'))
+        delta = timedelta(hours=offset_hours, minutes=offset_minutes)
+        tz = timezone(delta)
+        dt_aware = dt_naive.replace(tzinfo=tz)
+        dt_utc = dt_aware.astimezone(timezone.utc)
+
+    return dt_utc.strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]

{atk_common-1.52.0 → atk_common-1.54.0}/src/atk_common.egg-info/PKG-INFO

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