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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "talentro-commons"
-version = "0.20.8"
+version = "0.21.0"
 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.8 → talentro_commons-0.21.0}/src/talentro/messaging/topology.py

@@ -45,7 +45,7 @@ APPLICATIONS_TOPOLOGY = TopologyConfig(
     bindings=[
         # Integrations
         ("q.applications.raw.integrations", "applications.raw"),
-        ("q.applications.send.integrations", "applications.send"),
+        ("q.applications.external.upsert.integrations", "applications.send"),
 
         # Acquisitions
         ("q.applications.saved.acquisitions", "applications.saved"),
@@ -61,7 +61,7 @@ APPLICATIONS_TOPOLOGY = TopologyConfig(
     retry_config={
         # Integrations
         "q.applications.raw.integrations": {"enabled": True, "ttl_ms": FIVE_MINUTES, "max_retries": 3},
-        "q.applications.send.integrations": {"enabled": True, "ttl_ms": FIVE_MINUTES, "max_retries": 3},
+        "q.applications.external.upsert.integrations": {"enabled": True, "ttl_ms": FIVE_MINUTES, "max_retries": 3},
 
         # Acquisitions
         "q.applications.saved.acquisitions": {"enabled": True, "ttl_ms": FIVE_MINUTES, "max_retries": 3},

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

@@ -141,18 +141,25 @@ class RabbitMQ:
                         traceback.print_exc()
 
                         # Get retry count from headers
-                        x_death = message.headers.get('x-death', [])
-                        death_count = len(x_death) if x_death else 0
+                        x_death = message.headers.get('x-death')
+                        death_count = 0
+
+                        if isinstance(x_death, dict):
+                            death_count = x_death.get('count', 0)
+                        elif isinstance(x_death, list) and len(x_death) > 0:
+                            death_count = x_death[0].get('count', 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.")
+                            await message.nack(requeue=False)
                         else:
                             print(f"  RabbitMQ ({queue}) - Sending to retry queue...")
+                            retry_exchange = await self.channel.get_exchange(f"{dlx_name}.retry")
+                            await retry_exchange.publish(message, routing_key=f"{queue}.dead")
+                            await message.ack()
 
-                        # Nack outside of any context manager
-                        await message.nack(requeue=False)
                         message_processed = True
 
             except (aio_pika.exceptions.AMQPConnectionError, aio_pika.exceptions.ChannelClosed):