atk-common 1.60.0__tar.gz → 1.62.0__tar.gz

{atk_common-1.60.0 → atk_common-1.62.0}/PKG-INFO

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

{atk_common-1.60.0 → atk_common-1.62.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.60.0",  # Required
+    version="1.62.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.60.0 → atk_common-1.62.0}/src/atk_common/__init__.py

@@ -1,4 +1,5 @@
 # __init__.py
+from atk_common.consumer_retry_handler import create_retry_handler
 from atk_common.datetime_utils import \
     get_utc_date_time, \
     get_utc_date_time_str, \
@@ -9,6 +10,7 @@ from atk_common.datetime_utils import \
     convert_to_utc, \
     convert_to_utc_image_dt
 from atk_common.db_utils import sql, sql_with_record, convert_none_to_null, date_time_utc_column
+from atk_common.default_should_retry import default_should_retry
 from atk_common.docker_utils import get_current_container_info, set_container_metadata
 from atk_common.env_utils import get_env_value
 from atk_common.error_utils import get_message, create_error_log, get_error_entity, resend_error_entity, handle_error, get_response_error, get_error_type
@@ -22,6 +24,7 @@ from atk_common.mq_utils import decode_message
 from atk_common.rabbitmq_consumer import RabbitMQConsumer
 
 __all__ = [
+    'create_retry_handler',
     'get_utc_date_time',
     'get_utc_date_time_str',
     'get_utc_date_time_str_with_z',
@@ -34,6 +37,7 @@ __all__ = [
     'sql_with_record',
     'convert_none_to_null',
     'date_time_utc_column',
+    'default_should_retry',
     'get_current_container_info',
     'set_container_metadata',
     'get_env_value',

atk_common-1.62.0/src/atk_common/consumer_retry_handler.py

@@ -0,0 +1,49 @@
+from kombu import Producer
+from atk_common import *
+
+def create_retry_handler(process_func, connection, exchange, routing_key, should_retry, log, declare=None):
+    """
+    process_func: your original handler function (body, message)
+    retry_queue: kombu.Queue instance to republish to
+    should_retry: function(message_status) -> bool
+    log: function for logging
+    """
+
+    def handler(body, message):
+        try:
+            process_response = process_func(body, message)
+            if is_response_ok(process_response):
+                message.ack()
+            else:
+                if connection is not None:
+                    # Use retry queue
+                    if should_retry(process_response):
+                        log("Retrying after delay...")
+                        with connection.Producer() as producer:
+                            producer.publish(
+                                message.body,
+                                exchange=exchange,
+                                routing_key=routing_key,
+                                retry=True,
+                                declare=declare,
+                                content_type=message.content_type,
+                                content_encoding=message.content_encoding,
+                                headers=message.headers,
+                                timestamp=message.properties.get("timestamp")
+                            )
+                        message.ack()
+                    else:
+                        log("Sending to DLQ...")
+                        message.reject(requeue=False)
+                else:
+                    if should_retry(process_response):
+                        log("Requing...")
+                        message.requeue()
+                    else:
+                        log("Sending to DLQ...")
+                        message.reject(requeue=False)
+        except Exception as e:
+            log(f"Error during processing: {e}")
+            message.reject(requeue=False)
+
+    return handler

atk_common-1.62.0/src/atk_common/default_should_retry.py

@@ -0,0 +1,19 @@
+from atk_common.enums.api_error_type_enum import ApiErrorType
+from atk_common.enums.response_status_type_enum import ResponseStatusType
+from atk_common.http_utils import is_http_status_internal, is_http_status_ok
+
+def default_should_retry(message_status):
+    if message_status['status'] == ResponseStatusType.HTTP:
+        status_code = message_status['statusCode']
+        if is_http_status_ok(status_code):
+            return False
+        elif is_http_status_internal(status_code):
+            #errorType = 1: connection error
+            #errorType = 2: api internal error (database, etc)
+            if message_status['responseMsg']['errorType'] == ApiErrorType.CONNECTION.value:
+                return True
+            else:
+                return False
+        else:
+            return True
+    return True

{atk_common-1.60.0 → atk_common-1.62.0}/src/atk_common/env_utils.py

@@ -3,16 +3,25 @@ from atk_common.log_utils import add_log_item
 
 def val_str(value):
     if value is None:
-        return 'Empty'
+        return '<Empty>'
     if isinstance(value, str):
+        if value.strip() == '' or value.lower() == 'null':
+            return '<Null>'
         return value
     return str(value)
 
+def is_value_null_or_empty(value):
+    if isinstance(value, str):
+        return value.strip() == '' or value.lower() == 'null'
+    return False
+
 def get_env_value(key, abort_on_error=True):
     val = os.environ.get(key)
+    add_log_item(key + ':' + val_str(val))
     if val is None and abort_on_error:
         err_msg = f"Environment variable '{key}' is not set."
         add_log_item(err_msg)
         raise ValueError(err_msg)
-    add_log_item(key + ':' + val_str(val))
+    if is_value_null_or_empty(val):
+        return None
     return val

{atk_common-1.60.0 → atk_common-1.62.0}/src/atk_common.egg-info/PKG-INFO

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

{atk_common-1.60.0 → atk_common-1.62.0}/src/atk_common.egg-info/SOURCES.txt

@@ -4,8 +4,10 @@ pyproject.toml
 setup.cfg
 setup.py
 src/atk_common/__init__.py
+src/atk_common/consumer_retry_handler.py
 src/atk_common/datetime_utils.py
 src/atk_common/db_utils.py
+src/atk_common/default_should_retry.py
 src/atk_common/docker_utils.py
 src/atk_common/env_utils.py
 src/atk_common/error_utils.py