atk-common 1.44.0__tar.gz → 1.46.0__tar.gz

{atk_common-1.44.0 → atk_common-1.46.0}/PKG-INFO

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

{atk_common-1.44.0 → atk_common-1.46.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.44.0",  # Required
+    version="1.46.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.44.0 → atk_common-1.46.0}/src/atk_common/__init__.py

@@ -10,6 +10,7 @@ from atk_common.http_utils import is_http_status_ok, is_http_status_internal, ge
 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.mq_utils import decode_message
 from atk_common.rabbitmq_consumer import RabbitMQConsumer
 
 __all__ = [
@@ -43,6 +44,7 @@ __all__ = [
     'get_image_file_type',
     'add_log_item',
     'add_log_item_http',
+    'decode_message',
     'RabbitMQConsumer',
     'get_current_container_info',
 ]

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/__init__.py

@@ -12,6 +12,7 @@ from atk_common.enums.history_status_type_enum import HistoryStatusType
 from atk_common.enums.image_encoding_type_enum import ImageEncodingType
 from atk_common.enums.image_part_category_enum import ImagePartCategory
 from atk_common.enums.image_part_type_enum import ImagePartType
+from atk_common.enums.image_shelf_type import ImageShelfType
 from atk_common.enums.metering_direction_enum import MeteringDirection
 from atk_common.enums.piezo_vehicle_type_enum import PiezoVehicleType
 from atk_common.enums.process_status_type_enum import ProcessStatusType
@@ -20,6 +21,7 @@ from atk_common.enums.section_role_enum import SectionRole
 from atk_common.enums.sensor_order_enum import SensorOrder
 from atk_common.enums.sensor_type_enum import SensorType
 from atk_common.enums.speed_control_status_type_enum import SpeedControlStatusType
+from atk_common.enums.test_image_type_enum import TestImageType
 from atk_common.enums.violation_type_enum import ViolationType
 
 __all__ = [
@@ -36,6 +38,7 @@ __all__ = [
     'ImageEncodingType',
     'ImagePartCategory',
     'ImagePartType',
+    'ImageShelfType',
     'MeteringDirection',
     'PiezoVehicleType',
     'ProcessStatusType',
@@ -44,5 +47,6 @@ __all__ = [
     'SensorOrder',
     'SensorType',
     'SpeedControlStatusType',
+    'TestImageType',
     'ViolationType',
 ]

atk_common-1.46.0/src/atk_common/enums/command_type_enum.py

@@ -0,0 +1,13 @@
+from enum import Enum
+ 
+class CommandType(Enum):
+    POINT_ENFORCEMENT = 1
+    SECTION_ENFORCEMENT = 2
+    LOCATION_CONFIG = 3
+    PING = 4
+    CAPTURE_IMAGE = 5
+    GETLAST_IMAGE = 6
+    GETNEXT_IMAGE = 7
+    WRITE_CAMERA_AUX = 8
+    STOP_ENFORCEMENTS = 9
+    RESTART_CAMERA = 10

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/encryption_type_enum.py

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

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/file_exists_enum.py

@@ -1,5 +1,5 @@
 from enum import Enum
  
 class FileExists(Enum):
-    FILEEXIST = 1
-    FILENOTEXIST = 2
+    FILE_EXIST = 1
+    FILE_NOT_EXIST = 2

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/image_part_type_enum.py

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

atk_common-1.46.0/src/atk_common/enums/image_shelf_type.py

@@ -0,0 +1,5 @@
+from enum import Enum
+ 
+class ImageShelfType(Enum):
+    TOP = 1
+    BOTTOM = 2

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/metering_direction_enum.py

@@ -1,5 +1,5 @@
 from enum import Enum
  
 class MeteringDirection(Enum):
-    WITHMETERING = 1
-    AGAINSTMETERING = 2
+    WITH_METERING = 1
+    AGAINST_METERING = 2

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/enums/process_status_type_enum.py

@@ -5,4 +5,4 @@ class ProcessStatusType(Enum):
     STARTED = 2
     FINALIZED = 3
     LOCKED = 4
-    NOTAPPROVED = 5
+    NOT_APPROVED = 5

atk_common-1.46.0/src/atk_common/enums/test_image_type_enum.py

@@ -0,0 +1,7 @@
+from enum import Enum
+ 
+class TestImageType(Enum):
+    CAPTURE_IMAGE = 1
+    GETLAST_IMAGE = 2
+    GETNEXT_IMAGE = 3
+    EXAMPLE = 4

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common/http_response_utils.py

@@ -21,6 +21,6 @@ def http_response(method, response, container_info):
         )
     if is_http_status_internal(response['statusCode']):
         if is_response_http(response):
-            resend_error_entity(response['responseMsg'])
+            return 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.46.0/src/atk_common/mq_utils.py

@@ -0,0 +1,25 @@
+import json
+from atk_common.error_utils import get_message
+from atk_common.log_utils import add_log_item
+
+def decode_message(body, message):
+    import gzip
+    import msgpack
+    try:
+        content_encoding = message.headers.get('content_encoding')
+        if content_encoding is not None and content_encoding == 'gzip':
+            body = gzip.decompress(body)
+        if message.content_type == 'application/json':
+            return body
+        elif message.content_type == 'application/octet-stream':
+            return body
+        elif message.content_type == 'application/x-msgpack' or message.content_type == 'application/msgpack':
+            return msgpack.unpackb(body, raw=False)
+        elif message.content_type.startswith('text/'):
+            return body.decode('utf-8')
+        else:
+            add_log_item('Unknown message content type')
+            return None
+    except Exception as error:
+        add_log_item('Error decoding message: ' + get_message(error))
+        return None

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common.egg-info/PKG-INFO

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

{atk_common-1.44.0 → atk_common-1.46.0}/src/atk_common.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ src/atk_common/enums/history_status_type_enum.py
 src/atk_common/enums/image_encoding_type_enum.py
 src/atk_common/enums/image_part_category_enum.py
 src/atk_common/enums/image_part_type_enum.py
+src/atk_common/enums/image_shelf_type.py
 src/atk_common/enums/metering_direction_enum.py
 src/atk_common/enums/piezo_vehicle_type_enum.py
 src/atk_common/enums/process_status_type_enum.py
@@ -44,6 +45,7 @@ src/atk_common/enums/section_role_enum.py
 src/atk_common/enums/sensor_order_enum.py
 src/atk_common/enums/sensor_type_enum.py
 src/atk_common/enums/speed_control_status_type_enum.py
+src/atk_common/enums/test_image_type_enum.py
 src/atk_common/enums/violation_type_enum.py
 src/shared_python_atk_enforcement/__init__.py
 tests/test_docker_utils.py

atk_common-1.44.0/src/atk_common/enums/command_type_enum.py

@@ -1,13 +0,0 @@
-from enum import Enum
- 
-class CommandType(Enum):
-    POINTENFORCEMENT = 1
-    SECTIONENFORCEMENT = 2
-    LOCATIONCONFIG = 3
-    PING = 4
-    CAPTUREIMAGE = 5
-    GETLASTIMAGE = 6
-    GETNEXTIMAGE = 7
-    WRITECAMERAAUX = 8
-    STOPENFORCEMENTS = 9
-    RESTARTCAMERA = 10