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

atk_common/__init__.py

@@ -8,7 +8,7 @@ from atk_common.http_utils import is_http_status_ok, is_http_status_internal, ge
 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, is_response_http, is_response_internal
+from atk_common.internal_response_utils import create_response, is_response_ok, is_response_http, is_response_internal
 
 __all__ = [
     'get_utc_date_time',

atk_common/error_utils.py

@@ -7,7 +7,7 @@ from atk_common.datetime_utils import get_utc_date_time
 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
-from atk_common.response_utils import create_response
+from atk_common.internal_response_utils import create_response
 
 def get_message(error):
     if hasattr(error, 'message'):

atk_common/http_response_utils.py

@@ -0,0 +1,26 @@
+import json
+from flask import Response
+from http import HTTPStatus
+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.http_utils import is_http_status_internal, is_http_status_ok
+from atk_common.internal_response_utils import is_response_http
+
+# 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/http_utils.py

@@ -4,7 +4,7 @@ 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.response_utils import is_response_http
+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

atk_common/internal_response_utils.py

@@ -0,0 +1,18 @@
+from atk_common.enums.response_status_type_enum import ResponseStatusType
+
+def create_response(status, status_code, response_msg):
+    data = {}
+    data['status'] = status
+    data['statusCode'] = status_code
+    data['responseMsg'] = response_msg
+    return data
+
+def is_response_ok(response):
+    return response['status'] == ResponseStatusType.OK
+
+def is_response_http(response):
+    return response['status'] == ResponseStatusType.HTTP
+
+def is_response_internal(response):
+    return response['status'] == ResponseStatusType.INTERNAL
+    

{atk_common-1.37.0.dist-info → atk_common-1.38.0.dist-info}/METADATA

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

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

@@ -1,11 +1,13 @@
-atk_common/__init__.py,sha256=csSn6oq7DBZQ7-Ji9rAgNbWv5MfdEX118REj4W_6TBM,1725
+atk_common/__init__.py,sha256=3BAQv-w7ngwXmAlYdEHLrHy9WB_gHXEm_zAiub1QXwc,1734
 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=6sEWTmqIoz4gk_GL3I6QeyMfRYz1iYdptMn-bCYLbLQ,2636
+atk_common/error_utils.py,sha256=l0V4I34Jio-uJf9in8ZoTfnXqWoUY1ILIURSKsc1EFY,2645
 atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
-atk_common/http_utils.py,sha256=ujGHxLbB5-5HgdhkMWgxochdF-j1Dd9ZCpBh1Hx1LDk,1963
+atk_common/http_response_utils.py,sha256=Zvm52yHAAxooRA_op6HR23t3qxuilqbrLOHERoLIhoU,1423
+atk_common/http_utils.py,sha256=Vcs2qWLNtKLYE0s-alXfHQ4QANLHaJVyuUJcqPwiB2E,1972
+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
 atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
@@ -42,11 +44,11 @@ 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.37.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
-atk_package/__init__.py,sha256=EceDa352WFHTdC_LxYANXf_TS9pGzK3MCx87bwAKTvg,811
+atk_common-1.38.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
-atk_package/error_utils.py,sha256=cBDe5zOzOOuzRCs5WHo55knx74-ZUnDvaqrQtXBuZKw,1421
+atk_package/error_utils.py,sha256=C-1GPo4hXHd0reW1gMEqyTjLMt257adGDjdYIyftiRE,1430
 atk_package/http_utils.py,sha256=5PjGYy-TiBbtNOElEDhsCs3BPDTfqg_aMQBNCuHfcrQ,90
 atk_package/log_utils.py,sha256=DGGwXjD5jvpMZJNW1QBoJRdDaTY1e1Z69j0LSOOzsWA,419
 atk_package/rabbitmq_consumer.py,sha256=wmZQieeONkfXB5RmM6yiNkwl0_QK4oWWDBSfiD47CdA,1753
@@ -55,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.37.0.dist-info/METADATA,sha256=XO-0ZTatJq7tuXy7HsawtmpNz80kpy2PjP7y7mJGeqE,1464
-atk_common-1.37.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-atk_common-1.37.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.37.0.dist-info/RECORD,,
+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_package/__init__.py

@@ -5,7 +5,7 @@ from atk_common.error_utils import get_message, get_error_entity, handle_error,
 from atk_common.http_utils import is_status_code_ok
 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_save_resp
+from atk_common.internal_response_utils import create_save_resp
 
 __all__ = [
     'date_time_utc',

atk_package/error_utils.py

@@ -2,7 +2,7 @@ from datetime import datetime
 import json
 from atk_common.datetime_utils import get_utc_date_time
 from atk_common.log_utils import add_log_item
-from atk_common.response_utils import create_save_resp
+from atk_common.internal_response_utils import create_save_resp
 
 def get_message(error):
     if hasattr(error, 'message'):