atk-common 1.36.0__tar.gz → 1.38.0__tar.gz

{atk_common-1.36.0 → atk_common-1.38.0}/PKG-INFO

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

{atk_common-1.36.0 → atk_common-1.38.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.36.0",  # Required
+    version="1.38.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.36.0 → atk_common-1.38.0}/src/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_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.response_utils import create_response, is_response_ok, is_response_http, is_response_internal
 
 __all__ = [
     'get_utc_date_time',
@@ -28,16 +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',
-    '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-1.36.0 → atk_common-1.38.0}/src/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'):
@@ -43,18 +43,10 @@ def get_error_entity(error, method, error_type, status_code, container_info):
         mimetype='application/json'
     )
 
-def resend_error_entity(error_entity, method, container_info):
-    data = {}
-    data['statusCode'] = error_entity['statusCode']
-    data['exceptionType'] = error_entity['exceptionType']
-    data['errorType'] = error_entity['errorType']
-    data['message'] = error_entity['message']
-    data['method'] = method
-    data['timestamp'] = get_utc_date_time()
-    data['containerInfo'] = container_info
-    create_error_log(data)
+def resend_error_entity(error_entity):
+    create_error_log(error_entity)
     return Response(
-        response=json.dumps(data),
+        response=json.dumps(error_entity),
         status=HTTPStatus.INTERNAL_SERVER_ERROR,
         mimetype='application/json'
     )

atk_common-1.38.0/src/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-1.36.0 → atk_common-1.38.0}/src/atk_common/http_utils.py

@@ -1,3 +1,4 @@
+from flask import Response
 from http import HTTPStatus
 from atk_common.datetime_utils import get_utc_date_time
 

atk_common-1.36.0/src/atk_common/response_utils.py → atk_common-1.38.0/src/atk_common/internal_response_utils.py

@@ -15,3 +15,4 @@ def is_response_http(response):
 
 def is_response_internal(response):
     return response['status'] == ResponseStatusType.INTERNAL
+    

{atk_common-1.36.0 → atk_common-1.38.0}/src/atk_common.egg-info/PKG-INFO

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

{atk_common-1.36.0 → atk_common-1.38.0}/src/atk_common.egg-info/SOURCES.txt

@@ -10,11 +10,12 @@ src/atk_common/docker_utils.py
 src/atk_common/env_utils.py
 src/atk_common/error_utils.py
 src/atk_common/file_utils.py
+src/atk_common/http_response_utils.py
 src/atk_common/http_utils.py
+src/atk_common/internal_response_utils.py
 src/atk_common/log_utils.py
 src/atk_common/mq_utils.py
 src/atk_common/rabbitmq_consumer.py
-src/atk_common/response_utils.py
 src/atk_common.egg-info/PKG-INFO
 src/atk_common.egg-info/SOURCES.txt
 src/atk_common.egg-info/dependency_links.txt