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

atk_common/classes/bo_logger.py

@@ -28,7 +28,7 @@ class BoLogger(ILogger):
     def _create_log_json(self, timestamp, level: LogLevel, message: str):
         log_entry = {
             "timestamp": timestamp,
-            "severity": level.name,
+            "level": level.name,
             "message": message,
             "component": self.component,
             "version": self.version,

atk_common/classes/rabbitmq_consumer.py

@@ -29,8 +29,8 @@ class RabbitMQConsumer:
         self.content_type = content_type  # Optional content type for message handling
         self.message_handler = message_handler  # Custom message handler
     
-    def consume(self):
-        conn = self.establish_connection()
+    def _consume(self):
+        conn = self._establish_connection()
         self.logger.info("Begin consuming messages...")
 
         while True:
@@ -47,7 +47,7 @@ class RabbitMQConsumer:
                 self.logger.critical(f"Top-level exception in consume loop: {e}. Restarting after delay...")
                 return
 
-    def establish_connection(self):
+    def _establish_connection(self):
         revived_connection = self.connection.clone()
         revived_connection.ensure_connection(max_retries=3)
         channel = revived_connection.channel()
@@ -66,7 +66,7 @@ class RabbitMQConsumer:
         self.logger.info("Starting RabbitMQ consumer run loop...")
         while True:
             try:
-                self.consume()
+                self._consume()
             except Exception as e:
                 self.logger.critical(f"Top-level exception in run loop: {e}. Restarting after delay...")
                 time.sleep(5)

atk_common/interfaces/logger_interface.py

@@ -1,9 +1,12 @@
 # interfaces/logger_interface.py
 from typing import Protocol
 
+from atk_common.enums.log_level_enum import LogLevel
+
 class ILogger(Protocol):
     def debug(self, msg: str) -> None: ...
     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/consumer_retry_handler.py

@@ -1,5 +1,5 @@
 from kombu import Producer
-from atk_common.classes.bo_logger import BoLogger
+from atk_common.interfaces import ILogger
 from atk_common.utils.internal_response_utils import is_response_ok
 
 """
@@ -11,7 +11,7 @@ should_retry: function(message_status) -> bool
 bo_logger: BoLogger instance for logging
 declare: optional kombu.DeclarativeExchange or Queue to declare before publishing
 """
-def create_retry_handler(process_func, connection, exchange, routing_key, should_retry, bo_logger: BoLogger, declare=None):
+def create_retry_handler(process_func, connection, exchange, routing_key, should_retry, logger: ILogger, declare=None):
 
     def handler(body, message):
         try:
@@ -22,7 +22,7 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
                 if connection is not None:
                     # Use retry queue
                     if should_retry(process_response):
-                        bo_logger.info("Retrying after delay...")
+                        logger.info("Retrying after delay...")
                         with connection.Producer() as producer:
                             producer.publish(
                                 message.body,
@@ -37,19 +37,19 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
                             )
                         message.ack()
                     else:
-                        bo_logger.critical("Sending to DLQ...")
+                        logger.critical("Sending to DLQ...")
                         message.reject(requeue=False)
                 else:
                     if should_retry(process_response):
-                        bo_logger.critical("Sending to DLQ...")
+                        logger.critical("Sending to DLQ...")
                         message.reject(requeue=False)
                         # bo_logger.critical("Requing...")
                         # message.requeue()
                     else:
-                        bo_logger.critical("Discarding message...")
+                        logger.critical("Discarding message...")
                         message.ack()
         except Exception as e:
-            bo_logger.critical(f"Error during processing: {e}, sending to DLQ...")
+            logger.critical(f"Error during processing: {e}, sending to DLQ...")
             message.reject(requeue=False)
 
     return handler

atk_common/utils/mq_utils.py

@@ -1,11 +1,11 @@
 import json
 from http import HTTPStatus
-from atk_common.classes.bo_logger import BoLogger
+from atk_common.interfaces import ILogger
 from atk_common.enums.response_status_type_enum import ResponseStatusType
 from atk_common.utils.error_utils import get_message
 from atk_common.utils.internal_response_utils import create_response
 
-def decode_message(body, message, bo_logger: BoLogger):
+def decode_message(body, message, logger: ILogger):
     import gzip
     import msgpack
     try:
@@ -23,8 +23,8 @@ def decode_message(body, message, bo_logger: BoLogger):
         elif message.content_type.startswith('text/'):
             return create_response(ResponseStatusType.OK, HTTPStatus.OK, body.decode('utf-8'))
         else:
-            bo_logger.critical(f"Unknown message content type {message.content_type}. Cannot decode message.")
+            logger.critical(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:
-        bo_logger.critical('Error decoding message: ' + get_message(error))
+        logger.critical('Error decoding message: ' + get_message(error))
         return create_response(ResponseStatusType.INTERNAL, HTTPStatus.INTERNAL_SERVER_ERROR, get_message(error))

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

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

{atk_common-3.1.0.dist-info → atk_common-3.3.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=TvSAeECElnrKmkbvuksxNO9XcqQ64DmX3WftA6iVp3M,2065
+atk_common/classes/bo_logger.py,sha256=WI_6Xyx2H0XSzo_brYDnvs3zo0K5142fPTAHtUGlrCE,2062
 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/http_response_handler.py,sha256=B83UW-W6pE5BcUaoYcIb1RS-TzZEeZ22vgWmvB7xT30,2176
-atk_common/classes/rabbitmq_consumer.py,sha256=aPMF5H50k__a1HEy8GGwNdhSqu-wjbw2L3TESyd1cEg,2941
+atk_common/classes/rabbitmq_consumer.py,sha256=EHCAZzO2PLugBYSMMd9cshqzZznbkzz0pzc1eNXhw2k,2945
 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
@@ -68,9 +68,9 @@ 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=w9bhheJFCQ76qpoO_o0N-F6KVKf4HaHOKLRx_c7Jgsk,315
+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=TxlcX7JzU7XBXxGrpWHyisrpouItU0cLisVgTwO0boc,2601
+atk_common/utils/consumer_retry_handler.py,sha256=DvKXDnpkOmVqIfghWnOGMcnI430c39BCJyXSVbIFerE,2574
 atk_common/utils/datetime_utils.py,sha256=0SC5-Nai4RJH9B0VzvGKUQts_QeRXGb7tJLlsh73LJw,3556
 atk_common/utils/db_utils.py,sha256=odUtXcS7Mumw5eGyVyVimL_U_lP7TqMX9v8nWO5nMvg,902
 atk_common/utils/default_should_retry.py,sha256=qghFbU71ygC8ARc0jkbDlxwZtwEPUqO8vGhIhGJX-Ao,838
@@ -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=W4EVbM9FMPEwk7QJGksTqPN_of3yL1kBIhWpQNi6v_I,1859
-atk_common-3.1.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+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_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.1.0.dist-info/METADATA,sha256=Avy3JWuWbP1Su7TFAGp58xVCgY1U7WjoNy31Y7VqWT4,1760
-atk_common-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atk_common-3.1.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-3.1.0.dist-info/RECORD,,
+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,,