atk-common 3.13.0__py3-none-any.whl → 3.15.0__py3-none-any.whl

atk_common/classes/rabbitmq_consumer.py

@@ -10,7 +10,7 @@ CONNECTION_ERRORS = (
 )
 
 class RabbitMQConsumer:
-    def __init__(self, queue_name, user, pwd, host, vhost, dlx, dlq, content_type, message_handler, logger: ILogger):
+    def __init__(self, queue_name, user, pwd, host, vhost, dlx, dlq, content_type, message_handler, prefetch_count, logger: ILogger):
         self.logger = logger
 
         rabbit_url = 'amqp://' + user + ':' + pwd + '@' + host + '/' + vhost
@@ -26,8 +26,9 @@ class RabbitMQConsumer:
         else:
             queue = Queue(name=queue_name)
         self.queue = queue
-        self.content_type = content_type  # Optional content type for message handling
-        self.message_handler = message_handler  # Custom message handler
+        self.content_type = content_type
+        self.message_handler = message_handler
+        self.prefetch_count = prefetch_count
     
     def _consume(self):
         conn = self._establish_connection()
@@ -59,6 +60,7 @@ class RabbitMQConsumer:
             accept=[self.content_type] if self.content_type else None)
         consumer.revive(channel)
         consumer.consume()
+        consumer.qos(prefetch_count=self.prefetch_count, apply_global=False)
         self.logger.info("Connection revived!")
         return revived_connection
         

atk_common/utils/consumer_retry_handler.py

@@ -15,6 +15,12 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
 
     def handler(body, message):
         try:
+            retry_policy = {
+                "max_retries": 5,
+                "interval_start": 0.2,
+                "interval_step": 0.5,
+                "interval_max": 5,
+            }
             process_response = process_func(body, message)
             if is_response_ok(process_response):
                 message.ack()
@@ -29,11 +35,13 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
                                 exchange=exchange,
                                 routing_key=routing_key,
                                 retry=True,
+                                retry_policy=retry_policy,
                                 declare=declare,
                                 content_type=message.content_type,
                                 content_encoding=message.content_encoding,
                                 headers=message.headers,
                                 timestamp=message.properties.get("timestamp"),
+                                mandatory=True,
                                 delivery_mode=2
                             )
                         message.ack()
@@ -44,8 +52,6 @@ def create_retry_handler(process_func, connection, exchange, routing_key, should
                     if should_retry(process_response):
                         logger.error("Sending to DLQ...")
                         message.reject(requeue=False)
-                        # bo_logger.error("Requing...")
-                        # message.requeue()
                     else:
                         logger.error("Discarding message...")
                         message.ack()

{atk_common-3.13.0.dist-info → atk_common-3.15.0.dist-info}/METADATA

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

{atk_common-3.13.0.dist-info → atk_common-3.15.0.dist-info}/RECORD

@@ -22,7 +22,7 @@ atk_common/classes/docker_handler.py,sha256=VNJecc2ZWcpwNBa61QTGM_kYrsoZTjktMcFR
 atk_common/classes/env_handler.py,sha256=h3snKwHwDvfc2dt1vgHasqv8n_vnsI9J2MAr-XM5oow,1283
 atk_common/classes/error_handler.py,sha256=DgRzWx4Yu8PKX1bqj55aWhrkqb92ebDaEwtxgKhTLls,3270
 atk_common/classes/http_response_handler.py,sha256=qgtGyEwUe4lIiayS6syWanr2VE6GaKHddazNL_PxEFM,2327
-atk_common/classes/rabbitmq_consumer.py,sha256=jct1UnfP-PU3IeWW2S_9dQ7FxmY0_M8YwZadFMv52j8,2936
+atk_common/classes/rabbitmq_consumer.py,sha256=alqn12Hfdl0dc4B0lMe4jNB4sYDzsRWwcWSwY-wGPzE,3004
 atk_common/enums/__init__.py,sha256=JjIQ_bHIGxfWtf9Mlj36Gumll4otgLj0cR_oXF46XyY,2736
 atk_common/enums/api_error_type_enum.py,sha256=9oW6ZaZ3lhMwR8r2sVNWGliS9C_jV-otiOYdezAuTp0,91
 atk_common/enums/camera_cabinet_type_enum.py,sha256=U2NVrsTCBgaMRwYJamnjshAW8Y7xlOVjvUzakdgVH9A,90
@@ -71,7 +71,7 @@ atk_common/interfaces/error_handler_interface.py,sha256=ErhQ69T3fCYUl6sS5GwiMgW-
 atk_common/interfaces/http_response_handler_interface.py,sha256=Cl_njN_klHz1u06FCJPata1dua1w4Cs-Qt9Rg7uaB1c,169
 atk_common/interfaces/logger_interface.py,sha256=jK1gwkB_XmvqsTENhfOsw2QBplay16yVzc_qDSkgFyk,423
 atk_common/utils/__init__.py,sha256=hU5xicoI6dXRDz0gQADIDo2YbiL2UptTehVBISReIDo,1857
-atk_common/utils/consumer_retry_handler.py,sha256=F859moeAEtHg5YvC7pA1sxR7duZ6_tZjTorQXiQLVaM,2609
+atk_common/utils/consumer_retry_handler.py,sha256=aumO5iwVP90UI3aYpMQeQXuDElSZfSmI5wxz6pbNnJY,2811
 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
@@ -82,7 +82,7 @@ atk_common/utils/http_utils.py,sha256=eSRuQeDgN0ISQdByZqE6cIGXoorcAXz7PEtVntHUKA
 atk_common/utils/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
 atk_common/utils/mq_utils.py,sha256=DmVcXIZHG45p7cQVvgen6OT8QbW_UifFFJGJBybTkJQ,1835
 atk_common/utils/str_utils.py,sha256=sg3jwTTIfQvgGP-lcY5Xh4PXXhKWse_4HswBQYQKEo4,260
-atk_common-3.13.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-3.15.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
@@ -95,7 +95,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.13.0.dist-info/METADATA,sha256=3bqNmIYytqi8exHwBEQ3W3I8UGX6oncoxRiCngRtTus,1761
-atk_common-3.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atk_common-3.13.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-3.13.0.dist-info/RECORD,,
+atk_common-3.15.0.dist-info/METADATA,sha256=a8E6d-jE1YhKZwFb90pPdAVyn2TTen_bcvh8OPInjLo,1761
+atk_common-3.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atk_common-3.15.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-3.15.0.dist-info/RECORD,,