atk-common 1.38.0__py3-none-any.whl → 1.40.0__py3-none-any.whl

atk_common/__init__.py

@@ -4,11 +4,12 @@ from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date
 from atk_common.docker_utils import get_current_container_info
 from atk_common.env_utils import get_env_value
 from atk_common.error_utils import get_message, create_error_log, get_error_entity, resend_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, create_http_response
+# from atk_common.http_response_utils import create_http_response
+from atk_common.http_utils import is_http_status_ok, is_http_status_internal, get_test_response
+from atk_common.internal_response_utils import create_response, is_response_ok, is_response_http, is_response_internal
 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.internal_response_utils import create_response, is_response_ok, is_response_http, is_response_internal
 
 __all__ = [
     'get_utc_date_time',
@@ -28,17 +29,17 @@ __all__ = [
     'handle_error',
     'get_response_error',
     'get_error_type',
+    # 'create_http_response',
     'is_http_status_ok',
     'is_http_status_internal',
     'get_test_response',
-    'create_http_response',
-    'get_image_file_type',
-    'add_log_item',
-    'add_log_item_http',
-    'RabbitMQConsumer',
     'create_response',
     'is_response_ok',
     'is_response_http',
     'is_response_internal',
+    'get_image_file_type',
+    'add_log_item',
+    'add_log_item_http',
+    'RabbitMQConsumer',
     'get_current_container_info',
 ]

atk_common/error_utils.py

@@ -1,6 +1,5 @@
 from http import HTTPStatus
 from flask import Response
-from datetime import datetime
 from enum import Enum
 import json
 from atk_common.datetime_utils import get_utc_date_time

atk_common/http_utils.py

@@ -1,10 +1,5 @@
-from flask import Response
-import json
 from http import HTTPStatus
 from atk_common.datetime_utils import get_utc_date_time
-from atk_common.enums.api_error_type_enum import ApiErrorType
-from atk_common.error_utils import get_error_entity, resend_error_entity
-from atk_common.internal_response_utils import is_response_http
 
 def is_http_status_ok(status_code):
     return status_code >= HTTPStatus.OK.value and status_code < HTTPStatus.MULTIPLE_CHOICES.value
@@ -21,22 +16,3 @@ def get_test_response(docker_container_data, component):
     else:
         data['containerData'] = docker_container_data
     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
-#   If response['status'] == 2 (INTERNAL): create new error entity and return as response
-# If http status other value: create new error entity and return as response
-def create_http_response(method, response, container_info):
-    if is_http_status_ok(response['statusCode']):
-        return Response(
-            response=json.dumps(response['responseMsg']),
-            status=HTTPStatus.OK,
-            mimetype='application/json'
-        )
-    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-1.38.0.dist-info → atk_common-1.40.0.dist-info}/METADATA

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

{atk_common-1.38.0.dist-info → atk_common-1.40.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-atk_common/__init__.py,sha256=3BAQv-w7ngwXmAlYdEHLrHy9WB_gHXEm_zAiub1QXwc,1734
+atk_common/__init__.py,sha256=U4EDU9oyr52btCGOFRjUQ4hTS5N6Ca1lfqYin2ToIbM,1781
 atk_common/datetime_utils.py,sha256=3OIzPCt7W3vA4HvjnlfV0KJjRAjXuTaJ_QOa-cCMNns,2044
 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=l0V4I34Jio-uJf9in8ZoTfnXqWoUY1ILIURSKsc1EFY,2645
+atk_common/error_utils.py,sha256=gY_YYRkwgC-rwVBvdv3A4MWmDWKkCKZeev9fEMq4_Tw,2614
 atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
 atk_common/http_response_utils.py,sha256=Zvm52yHAAxooRA_op6HR23t3qxuilqbrLOHERoLIhoU,1423
-atk_common/http_utils.py,sha256=Vcs2qWLNtKLYE0s-alXfHQ4QANLHaJVyuUJcqPwiB2E,1972
+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/mq_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,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.38.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.40.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
@@ -57,7 +57,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.38.0.dist-info/METADATA,sha256=oREqM-3i5coACoQfuJ66ktPeQ-uAvSVtJFz-ZKhtF2I,1464
-atk_common-1.38.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-atk_common-1.38.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.38.0.dist-info/RECORD,,
+atk_common-1.40.0.dist-info/METADATA,sha256=B0wD0dLfSPNYGuWDDLXyZObE2Cawezu8gFjvAk99a1c,1464
+atk_common-1.40.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+atk_common-1.40.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.40.0.dist-info/RECORD,,