atk-common 3.3.0__py3-none-any.whl → 3.5.0__py3-none-any.whl

atk_common/classes/bo_logger.py

@@ -3,8 +3,7 @@ from typing import Optional
 from opentelemetry.trace import get_current_span
 from atk_common.interfaces import ILogger
 from atk_common.enums import LogLevel
-from atk_common.utils.datetime_utils import get_utc_date_time_str
-from atk_common.enums.log_level_enum import LogLevel
+from atk_common.utils.datetime_utils import get_utc_iso_date_time
 
 class BoLogger(ILogger):
     def __init__(self, log_level: LogLevel, component, version):
@@ -12,9 +11,17 @@ class BoLogger(ILogger):
             self.log_level = LogLevel.INFO
         else:
             self.log_level = log_level
-        self.component = component
+        self.component = self._parse_component_name(component)
         self.version = version
 
+    # Example: ghcr.io/perspictech/bo-status-mq-consumer
+    def _parse_component_name(self, component: str) -> str:
+        if component.startswith("ghcr"):
+            parts = component.split('/')
+            if len(parts) == 3:
+                return parts[2]
+        return component
+
     def _get_trace_context(self):
         span = get_current_span()
         ctx = span.get_span_context()
@@ -38,7 +45,7 @@ class BoLogger(ILogger):
 
     def _log(self, level: LogLevel, message: str):
         if level.value >= self.log_level.value:
-            timestamp = get_utc_date_time_str()
+            timestamp = str(get_utc_iso_date_time())
             log_json = self._create_log_json(timestamp, level, message)
             print(json.dumps(log_json))
 
@@ -54,9 +61,6 @@ class BoLogger(ILogger):
     def error(self, message: str):
         self._log(LogLevel.ERROR, message)
 
-    def critical(self, message: str):
-        self._log(LogLevel.CRITICAL, message)
-
     def set_level(self, log_level: LogLevel):
         self.log_level = log_level
 

atk_common/classes/env_handler.py

@@ -28,7 +28,7 @@ class EnvHandler(IEnvHandler):
         if val is None and abort_on_error:
             err_msg = f"Environment variable '{key}' is not set."
             if self.logger:
-                self.logger.critical(err_msg)
+                self.logger.error(err_msg)
             raise ValueError(err_msg)
         if self.is_value_null_or_empty(val):
             return None

atk_common/classes/error_handler.py

@@ -32,7 +32,7 @@ class ErrorHandler(IErrorHandler):
             err_str += ', imageName: <none>'
             err_str += ', imageVersion: <none>'
             err_str += ', containerName: <none>'
-        self.logger.critical(err_str)
+        self.logger.error(err_str)
 
     def get_error_entity(self, error, method, error_type, status_code, container_info):
         data = {}

atk_common/classes/rabbitmq_consumer.py

@@ -41,10 +41,10 @@ class RabbitMQConsumer:
                 self.logger.debug("Socket timeout, checking heartbeat...")
                 conn.heartbeat_check()
             except CONNECTION_ERRORS as e:
-                self.logger.critical(f"Connection lost: {e}. Reconnecting...")
+                self.logger.error(f"Connection lost: {e}. Reconnecting...")
                 return  # break loop and re-establish connection
             except Exception as e:
-                self.logger.critical(f"Top-level exception in consume loop: {e}. Restarting after delay...")
+                self.logger.error(f"Top-level exception in consume loop: {e}. Restarting after delay...")
                 return
 
     def _establish_connection(self):
@@ -68,5 +68,5 @@ class RabbitMQConsumer:
             try:
                 self._consume()
             except Exception as e:
-                self.logger.critical(f"Top-level exception in run loop: {e}. Restarting after delay...")
+                self.logger.error(f"Top-level exception in run loop: {e}. Restarting after delay...")
                 time.sleep(5)

atk_common/enums/log_level_enum.py

@@ -5,4 +5,3 @@ class LogLevel(Enum):
     INFO = 2
     WARNING = 3
     ERROR = 4
-    CRITICAL = 5

atk_common/interfaces/logger_interface.py

@@ -8,5 +8,4 @@ class ILogger(Protocol):
     def info(self, msg: str) -> None: ...
     def warning(self, msg: str) -> None: ...
     def error(self, msg: str) -> None: ...
-    def critical(self, msg: str) -> None: ...
     def set_level(self, log_level: LogLevel) -> None: ...

atk_common/utils/__init__.py

@@ -6,6 +6,7 @@ from atk_common.utils.datetime_utils import \
     get_utc_date_time_str_with_z, \
     seconds_to_utc_timestamp, \
     get_utc_date_from_iso, \
+    get_utc_iso_date_time, \
     adjust_millisescond, \
     convert_to_utc, \
     convert_to_utc_image_dt
@@ -25,6 +26,7 @@ __all__ = [
     'get_utc_date_time_str_with_z',
     'seconds_to_utc_timestamp',
     'get_utc_date_from_iso',
+    'get_utc_iso_date_time',
     'adjust_millisescond',
     'convert_to_utc',
     'convert_to_utc_image_dt',

atk_common/utils/consumer_retry_handler.py

@@ -37,19 +37,19 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
                             )
                         message.ack()
                     else:
-                        logger.critical("Sending to DLQ...")
+                        logger.error("Sending to DLQ...")
                         message.reject(requeue=False)
                 else:
                     if should_retry(process_response):
-                        logger.critical("Sending to DLQ...")
+                        logger.error("Sending to DLQ...")
                         message.reject(requeue=False)
-                        # bo_logger.critical("Requing...")
+                        # bo_logger.error("Requing...")
                         # message.requeue()
                     else:
-                        logger.critical("Discarding message...")
+                        logger.error("Discarding message...")
                         message.ack()
         except Exception as e:
-            logger.critical(f"Error during processing: {e}, sending to DLQ...")
+            logger.error(f"Error during processing: {e}, sending to DLQ...")
             message.reject(requeue=False)
 
     return handler

atk_common/utils/datetime_utils.py

@@ -18,6 +18,9 @@ def get_utc_date_from_iso(date_time):
     dt_utc = dt.astimezone(timezone.utc)
     return str(dt_utc.date())
 
+def get_utc_iso_date_time():
+    return datetime.now(timezone.utc).isoformat().replace('+00:00', 'Z')
+
 def adjust_millisescond(dt_str):
     if '.' in dt_str:
         dt_part, frac = dt_str.split('.')

atk_common/utils/mq_utils.py

@@ -23,8 +23,8 @@ def decode_message(body, message, logger: ILogger):
         elif message.content_type.startswith('text/'):
             return create_response(ResponseStatusType.OK, HTTPStatus.OK, body.decode('utf-8'))
         else:
-            logger.critical(f"Unknown message content type {message.content_type}. Cannot decode message.")
+            logger.error(f"Unknown message content type {message.content_type}. Cannot decode message.")
             return create_response(ResponseStatusType.INTERNAL, HTTPStatus.INTERNAL_SERVER_ERROR, get_message(error))
     except Exception as error:
-        logger.critical('Error decoding message: ' + get_message(error))
+        logger.error('Error decoding message: ' + get_message(error))
         return create_response(ResponseStatusType.INTERNAL, HTTPStatus.INTERNAL_SERVER_ERROR, get_message(error))

{atk_common-3.3.0.dist-info → atk_common-3.5.0.dist-info}/METADATA

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

{atk_common-3.3.0.dist-info → atk_common-3.5.0.dist-info}/RECORD

@@ -17,12 +17,12 @@ atk_common/mq_utils.py,sha256=6z4l7LsZWCzldsCZPsWnCtN4lIQ3gyoSuywQoQOh5Ak,1137
 atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
 atk_common/response_utils.py,sha256=AxlmwkFoDU5XcFOzBQiuZxAQgswihpKXHSo1T0JJw3Q,556
 atk_common/classes/__init__.py,sha256=O_VHYxAilmoz3i9L6jkwS-JZ4UaTezdhFiA5liNl1lY,532
-atk_common/classes/bo_logger.py,sha256=WI_6Xyx2H0XSzo_brYDnvs3zo0K5142fPTAHtUGlrCE,2062
+atk_common/classes/bo_logger.py,sha256=pEdk4bl0Vr60yWVihT7Fm395lMmO8JBBNeEhtDyIO5c,2250
 atk_common/classes/docker_handler.py,sha256=73WiebIT_RwGgwyvIed_Q5p8Tsb1b22JChBDyUmf1IU,2949
-atk_common/classes/env_handler.py,sha256=XbBPGJZ0n3q5coStHAbmbLnAVqOrFuFcs5JtIdJxUd8,1286
-atk_common/classes/error_handler.py,sha256=PrQ3njxYrqVCJzwdS2cSyshNktT_AHFMMRaC9vKtjyg,3257
+atk_common/classes/env_handler.py,sha256=h3snKwHwDvfc2dt1vgHasqv8n_vnsI9J2MAr-XM5oow,1283
+atk_common/classes/error_handler.py,sha256=uev5LFh2YIQRZo--es2F84bAz-ndh2G02H2DgvBx3wc,3254
 atk_common/classes/http_response_handler.py,sha256=B83UW-W6pE5BcUaoYcIb1RS-TzZEeZ22vgWmvB7xT30,2176
-atk_common/classes/rabbitmq_consumer.py,sha256=EHCAZzO2PLugBYSMMd9cshqzZznbkzz0pzc1eNXhw2k,2945
+atk_common/classes/rabbitmq_consumer.py,sha256=jct1UnfP-PU3IeWW2S_9dQ7FxmY0_M8YwZadFMv52j8,2936
 atk_common/enums/__init__.py,sha256=hOSoKWIBUpRFaMN2tNJiel6iGI1MHj229OYnU1J8Jg0,2636
 atk_common/enums/api_error_type_enum.py,sha256=9oW6ZaZ3lhMwR8r2sVNWGliS9C_jV-otiOYdezAuTp0,91
 atk_common/enums/camera_cabinet_type_enum.py,sha256=U2NVrsTCBgaMRwYJamnjshAW8Y7xlOVjvUzakdgVH9A,90
@@ -46,7 +46,7 @@ atk_common/enums/image_part_type.py,sha256=tg6W9kYMRShOlsxhAJRNRdWH50gC-eF0sqvqs
 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/image_shelf_type_enum.py,sha256=m2-nWi83tWi-KYpTMphyt-yhK5iGNvHrJBNYjodx1P4,84
-atk_common/enums/log_level_enum.py,sha256=yQstmsXRGrwvu4EI1s5AldBVtzjWDgNgiQt7dgTyuSM,128
+atk_common/enums/log_level_enum.py,sha256=FxLCM0WQefqmAIA-I8TZNFalDgcMv7c85HDeUZcUIHA,110
 atk_common/enums/metering_direction_enum.py,sha256=ramBPt0fK_NsToCqiYmtzDVNsLVGbeF39TmSpn_ghTY,107
 atk_common/enums/multimotor_status_type_enum.py,sha256=TaoqSb6OjU17VAmFun28o8XhU3fkAKg_TQ9Kq8Y0Ff4,88
 atk_common/enums/piezo_vehicle_type_enum.py,sha256=tlFk9dP7KkJVBna8SIJf6MH9zJD_szSUcDxFATJ6LZE,89
@@ -68,10 +68,10 @@ atk_common/interfaces/docker_handler_interface.py,sha256=aCJ6cELRlrbZC-sB-RQEpKh
 atk_common/interfaces/env_handler_interface.py,sha256=yrmtTplH5tnuOAs7CW5RtzLMTE5q9sdzTYjiS2naNQQ,300
 atk_common/interfaces/error_handler_interface.py,sha256=H43hSeeThT_7EbNzh-rygAJWNAmyzFetodiXdmqKshU,522
 atk_common/interfaces/http_response_handler_interface.py,sha256=QjDmhVj4AnUyoRtSHk_sfFPI-cto6TV7Mx2_87tiOrs,185
-atk_common/interfaces/logger_interface.py,sha256=Jdm3gBHFGAJQinyP4xRW1LcOTZB0uYnJCzYg4vFLsxc,428
-atk_common/utils/__init__.py,sha256=HPqGmoNy6y1Bgu3Um_o1g0R5DnS-UZv1_ueC4i0uP30,1708
-atk_common/utils/consumer_retry_handler.py,sha256=DvKXDnpkOmVqIfghWnOGMcnI430c39BCJyXSVbIFerE,2574
-atk_common/utils/datetime_utils.py,sha256=0SC5-Nai4RJH9B0VzvGKUQts_QeRXGb7tJLlsh73LJw,3556
+atk_common/interfaces/logger_interface.py,sha256=36impIkvGZbL5CUMKyaLkYi3jVyin_KRRUqvtyMh05E,381
+atk_common/utils/__init__.py,sha256=IaP851DJXND3OPkjy-OJxpaNG1zkGlg5bHsUg7mqr-I,1768
+atk_common/utils/consumer_retry_handler.py,sha256=-qnqxA07XLn0KKOGJCuyixqwmWYzM3g8Ii-ei2At3bY,2559
+atk_common/utils/datetime_utils.py,sha256=h3tv6iPD4peBXLCAcws41nuxIM4KpR1vk71LYXTDHKo,3662
 atk_common/utils/db_utils.py,sha256=odUtXcS7Mumw5eGyVyVimL_U_lP7TqMX9v8nWO5nMvg,902
 atk_common/utils/default_should_retry.py,sha256=qghFbU71ygC8ARc0jkbDlxwZtwEPUqO8vGhIhGJX-Ao,838
 atk_common/utils/error_utils.py,sha256=i6AAW7g0CJJYRgnyruoTI6jujuC2vAH5938fb4mjeCw,133
@@ -79,8 +79,8 @@ atk_common/utils/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk
 atk_common/utils/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKko,1047
 atk_common/utils/http_utils.py,sha256=eSRuQeDgN0ISQdByZqE6cIGXoorcAXz7PEtVntHUKAo,670
 atk_common/utils/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
-atk_common/utils/mq_utils.py,sha256=jd3TUzqtS-wHu_Gu7LsrTRjqfEyGCn639nCzV_vzC7s,1841
-atk_common-3.3.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common/utils/mq_utils.py,sha256=DmVcXIZHG45p7cQVvgen6OT8QbW_UifFFJGJBybTkJQ,1835
+atk_common-3.5.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
 atk_package/__init__.py,sha256=okIFEefQhQrw6DZg6oCEVWsEdkVCk-57VXBW0IUG_wU,834
 atk_package/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
 atk_package/env_utils.py,sha256=bXOrxM3fZUslqfmZt75iphbEJHbG4riJa8XOVzPwIII,313
@@ -93,7 +93,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-3.3.0.dist-info/METADATA,sha256=bT7ov05Kmm1rfg3zHAmT-ZgzGL_rX0DOIBV6pdNTgWU,1760
-atk_common-3.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atk_common-3.3.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-3.3.0.dist-info/RECORD,,
+atk_common-3.5.0.dist-info/METADATA,sha256=7wB0gmqZQrjR4A6KTFsmVqLkPnnPu_TAlbpt7EBYGEg,1760
+atk_common-3.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atk_common-3.5.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-3.5.0.dist-info/RECORD,,