talentro-commons 0.20.5__py3-none-any.whl → 0.20.7__py3-none-any.whl

talentro/services/rabbitmq.py

@@ -100,12 +100,12 @@ class RabbitMQ:
                           f"(TTL: {ttl_ms}ms)")
 
     async def consume(
-        self,
-        exchange_name: str,
-        queue: str,
-        callback: Callable,
-        dlx_name: Optional[str] = None,
-        max_retries: int = 3
+            self,
+            exchange_name: str,
+            queue: str,
+            callback: Callable,
+            dlx_name: Optional[str] = None,
+            max_retries: int = 3
     ):
         while True:
             try:
@@ -124,63 +124,45 @@ class RabbitMQ:
                     await queue_object.bind(exchange, routing_key=queue)
 
                 async for message in queue_object:
+                    message_processed = False
                     try:
-                        async with message.process():
-                            event: Event = Event.decode(message.body)
-                            print(f"  RabbitMQ ({queue}) - [x] Received event: {event.meta.event_type} (trace: {event.meta.trace_id})")
-                            await callback(queue, event)
+                        event: Event = Event.decode(message.body)
+                        print(
+                            f"  RabbitMQ ({queue}) - [x] Received event: {event.meta.event_type} (trace: {event.meta.trace_id})")
+                        await callback(queue, event)
+
+                        # If we reach here, callback succeeded - manually ack
+                        await message.ack()
+                        message_processed = True
+
                     except Exception as e:
                         # Handle callback exception - send to retry queue
                         print(f"  RabbitMQ ({queue}) - ⚠️ Error processing message: {e}")
                         traceback.print_exc()
-                        await self._handle_failed_message(message, queue, exchange_name, dlx_name, max_retries)
+
+                        # Get retry count from headers
+                        x_death = message.headers.get('x-death', [])
+                        death_count = len(x_death) if x_death else 0
+
+                        print(f"  RabbitMQ ({queue}) - Retry attempt {death_count + 1}/{max_retries + 1}")
+
+                        if death_count >= max_retries:
+                            print(f"  RabbitMQ ({queue}) - ❌ Max retries ({max_retries}) exceeded. Sending to DLQ.")
+                        else:
+                            print(f"  RabbitMQ ({queue}) - Sending to retry queue...")
+
+                        # Nack outside of any context manager
+                        await message.nack(requeue=False)
+                        message_processed = True
 
             except (aio_pika.exceptions.AMQPConnectionError, aio_pika.exceptions.ChannelClosed):
                 print(f"  RabbitMQ - Connection lost while consuming {queue}. Retrying in 5 seconds...")
                 await asyncio.sleep(5)
             except Exception as e:
                 print(f"  RabbitMQ - Unexpected error in consumer {queue}: {e}")
+                traceback.print_exc()
                 await asyncio.sleep(5)
 
-    @staticmethod
-    async def _handle_failed_message(
-            message: aio_pika.IncomingMessage,
-            queue_name: str,
-            exchange_name: str,
-            dlx_name: Optional[str] = None,
-            max_retries: int = 3
-    ):
-        """
-        Handle failed messages by sending them to the retry queue or DLQ.
-        """
-        try:
-            # Get death count from headers
-            x_death = message.headers.get('x-death', [])
-            death_count = 0
-
-            if x_death:
-                # x-death is a list of death info dicts
-                death_count = len(x_death)
-
-            print(f"  RabbitMQ ({queue_name}) - Retry attempt {death_count + 1}/{max_retries + 1}")
-
-            if death_count >= max_retries:
-                # Max retries exceeded - send to DLQ
-                print(f"  RabbitMQ ({queue_name}) - ❌ Max retries ({max_retries}) exceeded. Sending to DLQ.")
-                await message.nack(requeue=False)
-            else:
-                # Still have retries left - send to retry queue
-                if dlx_name:
-                    await message.nack(requeue=False)
-                    print(f"  RabbitMQ ({queue_name}) - Sending to retry queue...")
-                else:
-                    await message.nack(requeue=True)
-                    print(f"  RabbitMQ ({queue_name}) - Message requeued")
-
-        except Exception as e:
-            print(f"  RabbitMQ ({queue_name}) - Error handling failed message: {e}")
-            await message.nack(requeue=False)
-
     async def send_message(self, message: Message):
         # Haal de exchange op
         if message.exchange == "default":

{talentro_commons-0.20.5.dist-info → talentro_commons-0.20.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talentro-commons
-Version: 0.20.5
+Version: 0.20.7
 Summary: This package contains all globally used code, services, models and data structures for Talentro
 License: Proprietary
 Author: Emiel van Essen

{talentro_commons-0.20.5.dist-info → talentro_commons-0.20.7.dist-info}/RECORD

@@ -29,7 +29,7 @@ talentro/services/caching.py,sha256=mmjhXAMJ_g8D8cJqn15YqZ7ST-G5lD9MS-PmlowI7pU,
 talentro/services/clients.py,sha256=vluOrdYdDAQLyGR9-EmogLjA9OUlJtHy0tYD9LhwxKg,2174
 talentro/services/db.py,sha256=cnKCrYG7GwIu7ZZhA25D-yaXaiCJqPpzfcanWquyrBY,822
 talentro/services/google_storage.py,sha256=5r5uiDZD-76Dylc7yyRG5Ni4XNTc9xK8rC0glCRG8_8,6014
-talentro/services/rabbitmq.py,sha256=7WYW94IAVWRg1utCDWG5BjsB8CTj-5m5_rspCTHxIyI,10995
+talentro/services/rabbitmq.py,sha256=79WgdUzq2PIx9UUHKxAoi08YaBa7t-NS42eboNVXRVQ,10357
 talentro/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 talentro/util/attributes.py,sha256=PgJnn9LMtHkiNIaMov2HQt5944HweD6gRlAHBZrJGPA,448
 talentro/util/enum.py,sha256=YftsoJKnrn8HAjA2Q1tqIYBMrNnlq6m1b34N8hfykbE,155
@@ -41,6 +41,6 @@ talentro/vacancies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 talentro/vacancies/dataclasses.py,sha256=E6H5fsZH4IwtBFSLDolzF6u39tEIrANtWiNVoB65P0c,15074
 talentro/vacancies/models.py,sha256=GoXr71CNzU6csf8gdmv84etb3Rm-Cdfigp1yqPI_jjQ,4822
 talentro/vacancies/taxanomy.py,sha256=B6DMq9Wbs0aXFwD9aZveSlLwAC9eq1iCO_KM-FmrV7M,6384
-talentro_commons-0.20.5.dist-info/METADATA,sha256=1ROUYwJqviM43oHc9sta_CSOV6LgWsl2qFZFpDAOAHQ,1507
-talentro_commons-0.20.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-talentro_commons-0.20.5.dist-info/RECORD,,
+talentro_commons-0.20.7.dist-info/METADATA,sha256=ocrU8-lGoyvuWhx3CEf1DTXnKN-uqgwi1myOifIyLNw,1507
+talentro_commons-0.20.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+talentro_commons-0.20.7.dist-info/RECORD,,