atk-common 1.18.0__tar.gz → 1.20.0__tar.gz

{atk_common-1.18.0 → atk_common-1.20.0}/PKG-INFO

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

{atk_common-1.18.0 → atk_common-1.20.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.18.0",  # Required
+    version="1.20.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.20.0/src/atk_common/enums/__init__.py

@@ -0,0 +1,28 @@
+# __init__.py
+from atk_common.enums.api_error_type_enum import ApiErrorType
+from atk_common.enums.command_status_enum import CommandStatusType
+from atk_common.enums.encryption_type_enum import EncryptionType
+from atk_common.enums.image_encoding_type_enum import ImageEncodingType
+from atk_common.enums.image_part_category import ImagePartCategory
+from atk_common.enums.image_part_type import ImagePartType
+from atk_common.enums.process_status_enum import ProcessStatus
+from atk_common.enums.response_status_enum import ResponseStatus
+from atk_common.enums.section_role_enum import SectionRole
+from atk_common.enums.sensor_type_enum import SensorType
+from atk_common.enums.speed_control_status_enum import SpeedControlStatusType
+from atk_common.enums.violation_type_enum import ViolationType
+
+__all__ = [
+    'ApiErrorType',
+    'CommandStatusType',
+    'EncryptionType',
+    'ImageEncodingType',
+    'ImagePartCategory',
+    'ImagePartType',
+    'ProcessStatus',
+    'ResponseStatus',
+    'SectionRole',
+    'SensorType',
+    'SpeedControlStatusType',
+    'ViolationType',
+]

atk_common-1.20.0/src/atk_common/enums/encryption_type_enum.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class EncryptionType(Enum):
+    NONE = 1
+    X25519AESGCM = 2

atk_common-1.20.0/src/atk_common/enums/image_encoding_type_enum.py

@@ -0,0 +1,6 @@
+from enum import Enum
+ 
+class ImageEncodingType(Enum):
+    RAW = 1
+    JPEG = 2
+    JXL = 3

atk_common-1.20.0/src/atk_common/enums/image_part_category.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class ImagePartCategory(Enum):
+    PART = 1
+    HATCH = 2

atk_common-1.20.0/src/atk_common/enums/image_part_type.py

@@ -0,0 +1,6 @@
+from enum import Enum
+ 
+class ImagePartType(Enum):
+    LICENSEPLATE = 1
+    DRIVER = 2
+    PHOTOZONE = 3

atk_common-1.20.0/src/atk_common/enums/process_status_enum.py

@@ -0,0 +1,8 @@
+from enum import Enum
+ 
+class ProcessStatus(Enum):
+    NEW = 1
+    STARTED = 2
+    FINALIZED = 3
+    LOCKED = 4
+    NOTAPPROVED = 5

atk_common-1.20.0/src/atk_common/enums/section_role_enum.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class SectionRole(Enum):
+    A = 1
+    B = 2

atk_common-1.20.0/src/atk_common/enums/sensor_type_enum.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class SensorType(Enum):
+    PIEZO = 1
+    LOOP = 2

atk_common-1.20.0/src/atk_common/enums/violation_type_enum.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class ViolationType(Enum):
+    POINT = 1
+    SECTION = 2

{atk_common-1.18.0 → atk_common-1.20.0}/src/atk_common/error_utils.py

@@ -1,5 +1,7 @@
 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
 from atk_common.enums.api_error_type_enum import ApiErrorType
@@ -25,23 +27,21 @@ def create_error_log(data):
         err_str += ', containerName: <none>'
     add_log_item(err_str)
 
-def get_error_entity(app, error, method, error_type, status_code, container_info):
+def get_error_entity(error, method, error_type, status_code, container_info):
     data = {}
     data['statusCode'] = status_code
     data['exceptionType'] = str(type(error))
-    data['errorType'] = error_type
+    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['containerInfo'] = container_info
     create_error_log(data)
-    if app is not None:
-        return app.response_class(
-            response=json.dumps(data),
-            status=HTTPStatus.INTERNAL_SERVER_ERROR,
-            mimetype='application/json'
-        )
-    return None
+    return Response(
+        response=json.dumps(data),
+        status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        mimetype='application/json'
+    )
 
 def handle_error(resp, status):
     if is_http_status_internal(resp.status_code):

{atk_common-1.18.0 → atk_common-1.20.0}/src/atk_common.egg-info/PKG-INFO

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

{atk_common-1.18.0 → atk_common-1.20.0}/src/atk_common.egg-info/SOURCES.txt

@@ -22,8 +22,16 @@ src/atk_common.egg-info/top_level.txt
 src/atk_common/enums/__init__.py
 src/atk_common/enums/api_error_type_enum.py
 src/atk_common/enums/command_status_enum.py
+src/atk_common/enums/encryption_type_enum.py
+src/atk_common/enums/image_encoding_type_enum.py
+src/atk_common/enums/image_part_category.py
+src/atk_common/enums/image_part_type.py
+src/atk_common/enums/process_status_enum.py
 src/atk_common/enums/response_status_enum.py
+src/atk_common/enums/section_role_enum.py
+src/atk_common/enums/sensor_type_enum.py
 src/atk_common/enums/speed_control_status_enum.py
+src/atk_common/enums/violation_type_enum.py
 src/shared_python_atk_enforcement/__init__.py
 tests/test_docker_utils.py
 tests/test_error_utils.py

{atk_common-1.18.0 → atk_common-1.20.0}/tests/test_docker_utils.py

@@ -1,6 +1,8 @@
 import unittest
 import sys, os
-from atk_common.docker_utils import get_current_container_info
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
+from atk_common import *
+from atk_common.enums import *
 
 class TestDockerUtils(unittest.TestCase):
 

atk_common-1.20.0/tests/test_error_utils.py

@@ -0,0 +1,28 @@
+import unittest
+from http import HTTPStatus
+import sys, os
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
+from atk_common import *
+from atk_common.enums import *
+
+class TestErrorUtils(unittest.TestCase):
+
+    def create_dummy_container_info(self):
+        data = {}
+        data['imageName'] = 'bo-test-api'
+        data['imageVersion'] = '1.0.0'
+        data['containerName'] = 'bo-test-api'
+        data['ports'] = []
+        data['ports'].append({'port': 8080, 'binding': 8080})
+        return data
+
+    def test_get_error_entity_enum(self):
+        http_response = get_error_entity('An new error occured', 'get-configuration', ApiErrorType.INTERNAL, HTTPStatus.INTERNAL_SERVER_ERROR, self.create_dummy_container_info())
+        self.assertIsNotNone(http_response)
+
+    def test_get_error_entity_enum_value(self):
+        http_response = get_error_entity('An new error occured', 'get-configuration', ApiErrorType.INTERNAL.value, HTTPStatus.INTERNAL_SERVER_ERROR, self.create_dummy_container_info())
+        self.assertIsNotNone(http_response)
+
+if __name__ == "__main__":
+    unittest.main()

{atk_common-1.18.0 → atk_common-1.20.0}/tests/test_http_utils.py

@@ -1,6 +1,8 @@
 import unittest
 import sys, os
-from atk_common.http_utils import get_test_response
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
+from atk_common import *
+from atk_common.enums import *
 
 class TestHttpUtils(unittest.TestCase):
 

{atk_common-1.18.0 → atk_common-1.20.0}/tests/test_log_utils.py

@@ -1,6 +1,8 @@
 import unittest
 import sys, os
-from atk_common.log_utils import add_log_item
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
+from atk_common import *
+from atk_common.enums import *
 
 class TestLogUtils(unittest.TestCase):
     

atk_common-1.18.0/src/atk_common/enums/__init__.py

@@ -1,12 +0,0 @@
-# __init__.py
-from atk_common.enums.command_status_enum import CommandStatusType
-from atk_common.enums.speed_control_status_enum import SpeedControlStatusType
-from atk_common.enums.api_error_type_enum import ApiErrorType
-from atk_common.enums.response_status_enum import ResponseStatus
-
-__all__ = [
-    'CommandStatusType',
-    'SpeedControlStatusType',
-    'ApiErrorType',
-    'ResponseStatus',
-]

atk_common-1.18.0/tests/test_error_utils.py

@@ -1,21 +0,0 @@
-import unittest
-import sys, os
-from atk_common.error_utils import get_error_entity
-
-class TestErrorUtils(unittest.TestCase):
-
-    def create_dummy_container_info(self):
-        data = {}
-        data['imageName'] = 'bo-test-api'
-        data['imageVersion'] = '1.0.0'
-        data['containerName'] = 'bo-test-api'
-        data['ports'] = []
-        data['ports'].append({'port': 8080, 'binding': 8080})
-        return data
-
-    def test_get_error_entity(self):
-        resp_json = get_error_entity(None, 'An new error occured', 'get-configuration', 1, 404, self.create_dummy_container_info())
-        self.assertIsNone(resp_json)
-
-if __name__ == "__main__":
-    unittest.main()