atk-common 3.3.0__tar.gz → 3.5.0__tar.gz

{atk_common-3.3.0 → atk_common-3.5.0}/PKG-INFO

@@ -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 → atk_common-3.5.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="3.3.0",  # Required
+    version="3.5.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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/atk_common/enums/log_level_enum.py

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

{atk_common-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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-3.3.0 → atk_common-3.5.0}/src/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 → atk_common-3.5.0}/src/atk_common.egg-info/PKG-INFO

@@ -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