atk-common 1.35.0__tar.gz → 1.37.0__tar.gz

{atk_common-1.35.0 → atk_common-1.37.0}/PKG-INFO

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

{atk_common-1.35.0 → atk_common-1.37.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.35.0",  # Required
+    version="1.37.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.35.0 → atk_common-1.37.0}/src/atk_common/__init__.py

@@ -3,8 +3,8 @@ from atk_common.datetime_utils import get_utc_date_time, seconds_to_utc_timestam
 from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date_time_utc_column
 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, 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
+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.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
@@ -24,12 +24,14 @@ __all__ = [
     'get_message',
     'create_error_log',
     'get_error_entity',
+    'resend_error_entity',
     'handle_error',
     'get_response_error',
     'get_error_type',
     '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',

{atk_common-1.35.0 → atk_common-1.37.0}/src/atk_common/error_utils.py

@@ -43,6 +43,14 @@ def get_error_entity(error, method, error_type, status_code, container_info):
         mimetype='application/json'
     )
 
+def resend_error_entity(error_entity):
+    create_error_log(error_entity)
+    return Response(
+        response=json.dumps(error_entity),
+        status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        mimetype='application/json'
+    )
+
 def handle_error(resp, status):
     if is_http_status_internal(resp.status_code):
         add_log_item(resp.json().get('message'))

atk_common-1.37.0/src/atk_common/http_utils.py

@@ -0,0 +1,42 @@
+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.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
+
+def is_http_status_internal(status_code):
+    return status_code >= HTTPStatus.INTERNAL_SERVER_ERROR.value
+
+def get_test_response(docker_container_data, component):
+    data = {}
+    data['utcDateTime'] = get_utc_date_time()
+    if docker_container_data is None:
+        data['containerData'] = None
+        data['component'] = 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.35.0 → atk_common-1.37.0}/src/atk_common.egg-info/PKG-INFO

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

atk_common-1.35.0/src/atk_common/http_utils.py

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