atk-common 1.51.0__py3-none-any.whl → 1.53.0__py3-none-any.whl

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/http_response_utils.py

@@ -6,6 +6,17 @@ from atk_common.error_utils import get_error_entity, resend_error_entity
 from atk_common.http_utils import is_http_status_internal, is_http_status_ok
 from atk_common.internal_response_utils import is_response_http
 
+def convert_response_data(data):
+    if isinstance(data, dict):
+        return json.dumps(data)
+    elif isinstance(data, list):
+        return json.dumps(data)
+    elif isinstance(data, str):
+        json_data = json.loads(data)
+        return json.dumps(json_data)
+    else:
+        return data
+
 # If response['status'] == 0 (OK, http status = 200): create Response and return response['responseMsg']   
 # If http status == 500: 
 #   If response['status'] == 1 (HTTP): resend received error entity
@@ -14,12 +25,12 @@ from atk_common.internal_response_utils import is_response_http
 def http_response(method, response, container_info):
     if is_http_status_ok(response['statusCode']):
         return Response(
-            response=json.dumps(response['responseMsg']),
+            response=convert_response_data(response['responseMsg']),
             status=HTTPStatus.OK,
             mimetype=response['contentType'],
             headers=response['httpHeaders']
         )
-    if is_http_status_internal(response['statusCode']):
+    elif is_http_status_internal(response['statusCode']):
         if is_response_http(response):
             return resend_error_entity(response['responseMsg'])
         return get_error_entity(response['responseMsg'], method, ApiErrorType.INTERNAL, response['statusCode'], container_info)

{atk_common-1.51.0.dist-info → atk_common-1.53.0.dist-info}/METADATA

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

{atk_common-1.51.0.dist-info → atk_common-1.53.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 atk_common/__init__.py,sha256=d_2XoFaQx5CGiBqbTdA3hx-yZ-CAXd-xXYk1DNBAXMg,1978
-atk_common/datetime_utils.py,sha256=JnhMF3IPEqIcWIcXLFrEugFqqQepeXkwGwT-bVmdqWk,2115
+atk_common/datetime_utils.py,sha256=v5WKmx49mUUSXW3oTBHKP_ryZwWf0hGZ0K2oQAI0SVo,3447
 atk_common/db_utils.py,sha256=odUtXcS7Mumw5eGyVyVimL_U_lP7TqMX9v8nWO5nMvg,902
 atk_common/docker_utils.py,sha256=nkUhp2OhwJsm41JDujHDY-JxQfdDjy91duprH59Esfk,2084
 atk_common/env_utils.py,sha256=66v-S0vlkJNaun6ay1XcOGRtYJb4Ce4odJsWxuaHsQc,373
 atk_common/error_utils.py,sha256=kO-VQlajD8SO9MBxj8MHZRTK_uBXgPa09hy6pfjqZBY,2622
 atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
 atk_common/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKko,1047
-atk_common/http_response_utils.py,sha256=7Fw81OVMp6HCvsdtPgvlMywL1srSCVNSvqcBZGTkYpE,1472
+atk_common/http_response_utils.py,sha256=xS3d3AkfpNDkvRRGSfdGhSaIR6MM0ZIC5N9ZoJs4cNo,1794
 atk_common/http_utils.py,sha256=Av6wMa9984zQqXSrU3jndxLQO1xwv9U7YDFvJqZQAuo,664
 atk_common/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
 atk_common/log_utils.py,sha256=tw6Ph8oTpxrGYe_BcDTYkgrYmFAb1IxTXTodqctAIiY,504
@@ -52,7 +52,7 @@ atk_common/enums/speed_control_status_type_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe
 atk_common/enums/speed_control_stop_reason.py,sha256=pvLS6fpDhsCiIDAmiQBsHctxZnq-Dl2BOgJOxQnT5Hc,200
 atk_common/enums/test_image_type_enum.py,sha256=HUjxJorehnzRXMNF2uHk2DrAJ3Y_ajQvp0jW-mtlOhU,140
 atk_common/enums/violation_type_enum.py,sha256=01qTHOj-O8bOc-nwIHVnxLosm4cusD_YuqXM3ZsiRRk,86
-atk_common-1.51.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.53.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
 atk_package/__init__.py,sha256=NcsmwFadivgIeWV0-5ACZxqmfo4EzTkJX0r4N6DFAdg,820
 atk_package/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
 atk_package/env_utils.py,sha256=bXOrxM3fZUslqfmZt75iphbEJHbG4riJa8XOVzPwIII,313
@@ -65,7 +65,7 @@ atk_package/enums/__init__.py,sha256=EtUr_--MQj1Rc_R0sF_ELXIThmhpfmhDWq3YaK9oQMk
 atk_package/enums/command_status_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
 atk_package/enums/speed_control_status_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
 shared_python_atk_enforcement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atk_common-1.51.0.dist-info/METADATA,sha256=jlS_-WW3afEd-YdNb8WmwHo0xvs62OQuC4GgIG8RDsk,1464
-atk_common-1.51.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-atk_common-1.51.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.51.0.dist-info/RECORD,,
+atk_common-1.53.0.dist-info/METADATA,sha256=SCo6wDQsXbRv78Eu04goLCm8xtvbY8GgSj1O40g7S3c,1464
+atk_common-1.53.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+atk_common-1.53.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.53.0.dist-info/RECORD,,