atk-common 1.42.0__py3-none-any.whl → 1.44.0__py3-none-any.whl

atk_common/error_utils.py

@@ -2,7 +2,7 @@ from http import HTTPStatus
 from flask import Response
 from enum import Enum
 import json
-from atk_common.datetime_utils import get_utc_date_time
+from atk_common.datetime_utils import get_utc_date_time_str
 from atk_common.enums.api_error_type_enum import ApiErrorType
 from atk_common.http_utils import is_http_status_internal
 from atk_common.log_utils import add_log_item
@@ -33,7 +33,7 @@ def get_error_entity(error, method, error_type, status_code, container_info):
     data['errorType'] = error_type.value if isinstance(error_type, Enum) else error_type
     data['message'] = get_message(error)
     data['method'] = method
-    data['timestamp'] = get_utc_date_time()
+    data['timestamp'] = get_utc_date_time_str()
     data['containerInfo'] = container_info
     create_error_log(data)
     return Response(

atk_common/http_response_utils.py

@@ -16,11 +16,11 @@ def http_response(method, response, container_info):
         return Response(
             response=json.dumps(response['responseMsg']),
             status=HTTPStatus.OK,
-            mimetype='application/json'
+            mimetype=response['contentType'],
+            headers=response['httpHeaders']
         )
     if is_http_status_internal(response['statusCode']):
         if is_response_http(response):
             resend_error_entity(response['responseMsg'])
         return get_error_entity(response['responseMsg'], method, ApiErrorType.INTERNAL, response['statusCode'], container_info)
     return get_error_entity(response['responseMsg'], method, ApiErrorType.CONNECTION, response['statusCode'], container_info)
-

atk_common/http_utils.py

@@ -1,5 +1,5 @@
 from http import HTTPStatus
-from atk_common.datetime_utils import get_utc_date_time
+from atk_common.datetime_utils import get_utc_date_time_str
 
 def is_http_status_ok(status_code):
     return status_code >= HTTPStatus.OK.value and status_code < HTTPStatus.MULTIPLE_CHOICES.value
@@ -9,7 +9,7 @@ def is_http_status_internal(status_code):
 
 def get_test_response(docker_container_data, component):
     data = {}
-    data['utcDateTime'] = get_utc_date_time()
+    data['utcDateTime'] = get_utc_date_time_str()
     if docker_container_data is None:
         data['containerData'] = None
         data['component'] = component

atk_common/internal_response_utils.py

@@ -1,10 +1,12 @@
 from atk_common.enums.response_status_type_enum import ResponseStatusType
 
-def create_response(status, status_code, response_msg):
+def create_response(status, status_code, response_msg, http_headers=None, content_type='application/json'):
     data = {}
     data['status'] = status
     data['statusCode'] = status_code
     data['responseMsg'] = response_msg
+    data['httpHeaders'] = http_headers
+    data['contentType'] = content_type
     return data
 
 def is_response_ok(response):

atk_common/log_utils.py

@@ -1,8 +1,8 @@
-from atk_common.datetime_utils import get_utc_date_time
+from atk_common.datetime_utils import get_utc_date_time_str
 from atk_common.http_utils import is_http_status_internal
 
 def create_date_time():
-    date_time = get_utc_date_time()
+    date_time = get_utc_date_time_str()
     return '[' + date_time + '] '
 
 def add_log_item(text):

{atk_common-1.42.0.dist-info → atk_common-1.44.0.dist-info}/METADATA

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

{atk_common-1.42.0.dist-info → atk_common-1.44.0.dist-info}/RECORD

@@ -3,13 +3,13 @@ atk_common/datetime_utils.py,sha256=JnhMF3IPEqIcWIcXLFrEugFqqQepeXkwGwT-bVmdqWk,
 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=gY_YYRkwgC-rwVBvdv3A4MWmDWKkCKZeev9fEMq4_Tw,2614
+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=a6DyA3QW8LSlVv_BvP-CgaXT3I-VOOxm8CCu4yUNORc,1416
-atk_common/http_utils.py,sha256=M1Qz2Cus3Ek8nUOqraT-30GKSj7nkAvJx2f7rnpX5Pk,656
-atk_common/internal_response_utils.py,sha256=nEbNxv4y03Qzhs1yRn--RnCfPrT7-ThlmqarAAQJtbw,562
-atk_common/log_utils.py,sha256=k7VaknmSGvHQV6-eznltNUa3BOAywjFHkhVzDT1P0Hs,496
+atk_common/http_response_utils.py,sha256=UId_StkOa1QOlji3i7KYElTn0ynsPLPFZQzPPnB9DYE,1465
+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
 atk_common/mq_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
 atk_common/response_utils.py,sha256=AxlmwkFoDU5XcFOzBQiuZxAQgswihpKXHSo1T0JJw3Q,556
@@ -45,7 +45,7 @@ atk_common/enums/sensor_type_enum.py,sha256=UBa3LPyGTKgEJV578CqFlwXjnlXqVlybrvzd
 atk_common/enums/speed_control_status_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
 atk_common/enums/speed_control_status_type_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
 atk_common/enums/violation_type_enum.py,sha256=01qTHOj-O8bOc-nwIHVnxLosm4cusD_YuqXM3ZsiRRk,86
-atk_common-1.42.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.44.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
@@ -58,7 +58,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.42.0.dist-info/METADATA,sha256=zr7sF8D-eY3Gv4l5RUEYvaNsTdRF4dzq5Le6W1rK0bA,1464
-atk_common-1.42.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-atk_common-1.42.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.42.0.dist-info/RECORD,,
+atk_common-1.44.0.dist-info/METADATA,sha256=89hfW8nZQKL8hkkDQi1k6BrNutzFOtOj0NkUM8ivVoM,1464
+atk_common-1.44.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+atk_common-1.44.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.44.0.dist-info/RECORD,,