talentro-commons 0.20.6__tar.gz → 0.20.8__tar.gz

{talentro_commons-0.20.6 → talentro_commons-0.20.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talentro-commons
-Version: 0.20.6
+Version: 0.20.8
 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.6 → talentro_commons-0.20.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "talentro-commons"
-version = "0.20.6"
+version = "0.20.8"
 description = "This package contains all globally used code, services, models and data structures for Talentro"
 authors = ["Emiel van Essen <emiel@marksmen.nl>"]
 license = "Proprietary"

{talentro_commons-0.20.6 → talentro_commons-0.20.8}/src/talentro/services/rabbitmq.py

@@ -95,9 +95,9 @@ class RabbitMQ:
                         durable=True,
                         arguments=retry_queue_args
                     )
-                    await retry_queue.bind(retry_exchange, routing_key=f"{queue_name}.retry")
+                    await retry_queue.bind(retry_exchange, routing_key=f"{queue_name}.dead")
                     print(f"  RabbitMQ - Retry queue enabled: {retry_queue.name} "
-                          f"(TTL: {ttl_ms}ms)")
+                          f"(TTL: {ttl_ms * 0.001} seconds)")
 
     async def consume(
             self,
@@ -124,15 +124,17 @@ class RabbitMQ:
                     await queue_object.bind(exchange, routing_key=queue)
 
                 async for message in queue_object:
+                    message_processed = False
                     try:
-                        # Use ignore_processed=True to prevent auto-ack on successful processing
-                        async with message.process(ignore_processed=True, requeue=False):
-                            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()
+                        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}")
@@ -146,10 +148,12 @@ class RabbitMQ:
 
                         if death_count >= max_retries:
                             print(f"  RabbitMQ ({queue}) - ❌ Max retries ({max_retries}) exceeded. Sending to DLQ.")
-                            await message.nack(requeue=False)
                         else:
                             print(f"  RabbitMQ ({queue}) - Sending to retry queue...")
-                            await message.nack(requeue=False)
+
+                        # 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...")