atk-common 1.44.0__py3-none-any.whl → 1.46.0__py3-none-any.whl

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/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/enums/command_type_enum.py

@@ -1,13 +1,13 @@
 from enum import Enum
  
 class CommandType(Enum):
-    POINTENFORCEMENT = 1
-    SECTIONENFORCEMENT = 2
-    LOCATIONCONFIG = 3
+    POINT_ENFORCEMENT = 1
+    SECTION_ENFORCEMENT = 2
+    LOCATION_CONFIG = 3
     PING = 4
-    CAPTUREIMAGE = 5
-    GETLASTIMAGE = 6
-    GETNEXTIMAGE = 7
-    WRITECAMERAAUX = 8
-    STOPENFORCEMENTS = 9
-    RESTARTCAMERA = 10
+    CAPTURE_IMAGE = 5
+    GETLAST_IMAGE = 6
+    GETNEXT_IMAGE = 7
+    WRITE_CAMERA_AUX = 8
+    STOP_ENFORCEMENTS = 9
+    RESTART_CAMERA = 10

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/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/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/enums/image_shelf_type.py

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

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/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/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/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/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.dist-info → atk_common-1.46.0.dist-info}/METADATA

@@ -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.dist-info → atk_common-1.46.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atk_common/__init__.py,sha256=iSBLmDzJX8JxGpJyP4G_ZdtQG0d41JNAjzKTac7YAXk,1907
+atk_common/__init__.py,sha256=d_2XoFaQx5CGiBqbTdA3hx-yZ-CAXd-xXYk1DNBAXMg,1978
 atk_common/datetime_utils.py,sha256=JnhMF3IPEqIcWIcXLFrEugFqqQepeXkwGwT-bVmdqWk,2115
 atk_common/db_utils.py,sha256=odUtXcS7Mumw5eGyVyVimL_U_lP7TqMX9v8nWO5nMvg,902
 atk_common/docker_utils.py,sha256=nkUhp2OhwJsm41JDujHDY-JxQfdDjy91duprH59Esfk,2084
@@ -6,36 +6,37 @@ atk_common/env_utils.py,sha256=66v-S0vlkJNaun6ay1XcOGRtYJb4Ce4odJsWxuaHsQc,373
 atk_common/error_utils.py,sha256=kO-VQlajD8SO9MBxj8MHZRTK_uBXgPa09hy6pfjqZBY,2622
 atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
 atk_common/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKko,1047
-atk_common/http_response_utils.py,sha256=UId_StkOa1QOlji3i7KYElTn0ynsPLPFZQzPPnB9DYE,1465
+atk_common/http_response_utils.py,sha256=7Fw81OVMp6HCvsdtPgvlMywL1srSCVNSvqcBZGTkYpE,1472
 atk_common/http_utils.py,sha256=Av6wMa9984zQqXSrU3jndxLQO1xwv9U7YDFvJqZQAuo,664
 atk_common/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
 atk_common/log_utils.py,sha256=tw6Ph8oTpxrGYe_BcDTYkgrYmFAb1IxTXTodqctAIiY,504
-atk_common/mq_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+atk_common/mq_utils.py,sha256=gMu41yUTZk1Ujxcc2OikrjefShIQPJD_j1d8zM6pGgs,1032
 atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
 atk_common/response_utils.py,sha256=AxlmwkFoDU5XcFOzBQiuZxAQgswihpKXHSo1T0JJw3Q,556
-atk_common/enums/__init__.py,sha256=hejNKl04AfatJ2ovXXu72psSzBYQYC3f8SlqOT2g5GI,2058
+atk_common/enums/__init__.py,sha256=i3HO5i7AEjUo74Qdr2nHpG1SGb5Okl15CVG9nMMqVG0,2230
 atk_common/enums/api_error_type_enum.py,sha256=9oW6ZaZ3lhMwR8r2sVNWGliS9C_jV-otiOYdezAuTp0,91
 atk_common/enums/camera_cabinet_type_enum.py,sha256=U2NVrsTCBgaMRwYJamnjshAW8Y7xlOVjvUzakdgVH9A,90
 atk_common/enums/camera_role_enum.py,sha256=E0TH6zXj5EA889D7UndGP7xsgg5W23SneqJCFkA6BII,82
 atk_common/enums/certificate_issuer_enum.py,sha256=Gsuzn-EQF2LYgkaNZQYb5j5rfMNPdmmF2np5n-ztYrg,98
 atk_common/enums/command_status_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
 atk_common/enums/command_status_type_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
-atk_common/enums/command_type_enum.py,sha256=boAtZMIrikFb1E3_dNV8IjJ4v18xcFr7qk1R4rTNhi0,284
+atk_common/enums/command_type_enum.py,sha256=9dlYyrKA6FVjTG4UTAVbEDxMCwsoD_SCZP3144VgckE,294
 atk_common/enums/detection_status_enum.py,sha256=852t9-LaQAzcTELtHtiGPfgwhX58q4uWMvgzq2Spyzs,84
 atk_common/enums/detection_status_type_enum.py,sha256=oHmoOP2zhcWQBBchj7CwECf99EdT8QSY6T8l5n8Kvcg,88
-atk_common/enums/encryption_type_enum.py,sha256=jlrKeH2-Iakkuby8pwq8uXhX8A2FTvdULe633edGOc4,91
-atk_common/enums/file_exists_enum.py,sha256=5qAl-bHzFwArxE5sVRFsteyg6eCsgi-SVrO72A_hzpY,92
+atk_common/enums/encryption_type_enum.py,sha256=vy_1B-lUYZTyBvqAC5bOfhB3bPr5g9K8s5rjfsnm_AE,93
+atk_common/enums/file_exists_enum.py,sha256=SUmzyczBCRaa9XWjqdFRsg4OczdF0_Z4NX77Ev4vzOo,95
 atk_common/enums/history_status_type_enum.py,sha256=itxQEQL8zQhkCR-fzKk3PcMDN1YcrbrcDlLcNCQDNHs,152
 atk_common/enums/http_status_enum.py,sha256=bJSTmkLxHnb04fWSDKuhTWrh_v9iCQM7otAVr731JDk,139
 atk_common/enums/image_encoding_type_enum.py,sha256=s32PjcrprGUf7MG4UQNE3ssH-y9RiLtbwtNwKQxWMvE,98
 atk_common/enums/image_part_category.py,sha256=YQ7xtO8v7Ja77Tu-Wo_wewLOULtalPtDsmHvEEWsnsw,87
 atk_common/enums/image_part_category_enum.py,sha256=YQ7xtO8v7Ja77Tu-Wo_wewLOULtalPtDsmHvEEWsnsw,87
 atk_common/enums/image_part_type.py,sha256=tg6W9kYMRShOlsxhAJRNRdWH50gC-eF0sqvqsponP-M,111
-atk_common/enums/image_part_type_enum.py,sha256=tg6W9kYMRShOlsxhAJRNRdWH50gC-eF0sqvqsponP-M,111
-atk_common/enums/metering_direction_enum.py,sha256=HKRNy4DPI10F7XJs6eyYw4CBhiFp8SzWE4jSdGoRwnk,105
+atk_common/enums/image_part_type_enum.py,sha256=NREEtLNMVVFo-RiOWR_krUSZWRscWMCo2PHHTnZnmLg,113
+atk_common/enums/image_shelf_type.py,sha256=m2-nWi83tWi-KYpTMphyt-yhK5iGNvHrJBNYjodx1P4,84
+atk_common/enums/metering_direction_enum.py,sha256=ramBPt0fK_NsToCqiYmtzDVNsLVGbeF39TmSpn_ghTY,107
 atk_common/enums/piezo_vehicle_type_enum.py,sha256=tlFk9dP7KkJVBna8SIJf6MH9zJD_szSUcDxFATJ6LZE,89
 atk_common/enums/process_status_enum.py,sha256=09kRE5Cy8Sc7e7wf5gSkIw0RnNzFAWxIrMvn-aElqt8,140
-atk_common/enums/process_status_type_enum.py,sha256=eihCfOTTWvmS1hEp_wYzl0PqIPawuUcrlWgyhbyKd48,144
+atk_common/enums/process_status_type_enum.py,sha256=FHtg8Hrf0sAHNGCWiEFTo1hKGBGp6Wb6oyZvFbeL23U,145
 atk_common/enums/response_status_enum.py,sha256=ogYXlGm0gJJDGlY6Fwq9Kvl861aGPop2qzfXXExzMKw,99
 atk_common/enums/response_status_type_enum.py,sha256=LjGttBOMwbf5JB-DTXbKCIC7BU8nntP0mW-c8GTeu90,103
 atk_common/enums/section_role_enum.py,sha256=9rwep4Wmvyvnlrey08TRRoi8VQYAPkylpP00uafIQMg,74
@@ -44,8 +45,9 @@ atk_common/enums/sensor_order_enum.py,sha256=TQtLlvjyc8-CnhmA6-iHLhreQziPoBlgFV_
 atk_common/enums/sensor_type_enum.py,sha256=UBa3LPyGTKgEJV578CqFlwXjnlXqVlybrvzdjsHhjSU,80
 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/test_image_type_enum.py,sha256=HUjxJorehnzRXMNF2uHk2DrAJ3Y_ajQvp0jW-mtlOhU,140
 atk_common/enums/violation_type_enum.py,sha256=01qTHOj-O8bOc-nwIHVnxLosm4cusD_YuqXM3ZsiRRk,86
-atk_common-1.44.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.46.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
@@ -58,7 +60,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.44.0.dist-info/METADATA,sha256=89hfW8nZQKL8hkkDQi1k6BrNutzFOtOj0NkUM8ivVoM,1464
-atk_common-1.44.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-atk_common-1.44.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.44.0.dist-info/RECORD,,
+atk_common-1.46.0.dist-info/METADATA,sha256=OXmN4i1RvhlZi5X_6rcbA-Xt9i0HxFwTipIzfvJ5yps,1464
+atk_common-1.46.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+atk_common-1.46.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.46.0.dist-info/RECORD,,