jararaca 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

jararaca/cli.py

@@ -102,6 +102,11 @@ def cli() -> None:
     type=int,
     default=1,
 )
+@click.option(
+    "--passive-declare",
+    is_flag=True,
+    default=False,
+)
 def worker(
     app_path: str,
     url: str,
@@ -109,6 +114,7 @@ def worker(
     password: str | None,
     exchange: str,
     prefetch_count: int,
+    passive_declare: bool,
 ) -> None:
 
     app = find_microservice_by_module_path(app_path)
@@ -141,7 +147,9 @@ def worker(
         prefetch_count=prefetch_count,
     )
 
-    worker_v1.MessageBusWorker(app, config=config).start_sync()
+    worker_v1.MessageBusWorker(app, config=config).start_sync(
+        passive_declare=passive_declare,
+    )
 
 
 @cli.command()

jararaca/messagebus/worker.py

@@ -91,7 +91,7 @@ class AioPikaMicroserviceConsumer:
         self.lock = asyncio.Lock()
         self.tasks: set[asyncio.Task[Any]] = set()
 
-    async def consume(self) -> None:
+    async def consume(self, passive_declare: bool) -> None:
 
         connection = await aio_pika.connect(self.config.url)
 
@@ -99,14 +99,13 @@ class AioPikaMicroserviceConsumer:
 
         await channel.set_qos(prefetch_count=self.config.prefetch_count)
 
-        main_ex = await channel.get_exchange(
-            name=self.config.exchange, ensure=False
-        ) or await RabbitmqUtils.declare_main_exchange(
+        main_ex = await RabbitmqUtils.declare_main_exchange(
             channel=channel,
             exchange_name=self.config.exchange,
+            passive=passive_declare,
         )
 
-        dlx, dlq = await RabbitmqUtils.delcare_dl_kit(channel=channel)
+        dlx, dlq = await RabbitmqUtils.declare_dl_kit(channel=channel)
 
         for handler in self.message_handler_set:
 
@@ -115,10 +114,9 @@ class AioPikaMicroserviceConsumer:
 
             self.incoming_map[queue_name] = handler
 
-            queue = await channel.get_queue(
-                queue_name, ensure=False
-            ) or await channel.declare_queue(
-                queue_name,
+            queue: aio_pika.abc.AbstractQueue = await channel.declare_queue(
+                passive=passive_declare,
+                name=queue_name,
                 arguments={
                     "x-dead-letter-exchange": dlx.name,
                     "x-dead-letter-routing-key": dlq.name,
@@ -332,7 +330,7 @@ class MessageBusWorker:
             raise RuntimeError("Consumer not started")
         return self._consumer
 
-    async def start_async(self) -> None:
+    async def start_async(self, passive_declare: bool) -> None:
         all_message_handlers_set: MESSAGE_HANDLER_DATA_SET = set()
         async with self.lifecycle():
             for instance_type in self.app.controllers:
@@ -369,9 +367,9 @@ class MessageBusWorker:
                 uow_context_provider=self.uow_context_provider,
             )
 
-            await consumer.consume()
+            await consumer.consume(passive_declare=passive_declare)
 
-    def start_sync(self) -> None:
+    def start_sync(self, passive_declare: bool) -> None:
 
         def on_shutdown(loop: asyncio.AbstractEventLoop) -> None:
             logger.info("Shutting down")
@@ -381,7 +379,7 @@ class MessageBusWorker:
             runner.get_loop().add_signal_handler(
                 signal.SIGINT, on_shutdown, runner.get_loop()
             )
-            runner.run(self.start_async())
+            runner.run(self.start_async(passive_declare=passive_declare))
 
 
 class AioPikaMessageBusController(BusMessageController):

jararaca/messagebus/worker_v2.py

@@ -112,6 +112,7 @@ class AioPikaMicroserviceConsumer(MessageBusConsumer):
         message_handler_set: MESSAGE_HANDLER_DATA_SET,
         scheduled_actions: SCHEDULED_ACTION_DATA_SET,
         uow_context_provider: UnitOfWorkContextProvider,
+        passive_declare: bool = False,
     ):
 
         self.broker_backend = broker_backend
@@ -123,6 +124,7 @@ class AioPikaMicroserviceConsumer(MessageBusConsumer):
         self.shutdown_event = asyncio.Event()
         self.lock = asyncio.Lock()
         self.tasks: set[asyncio.Task[Any]] = set()
+        self.passive_declare = passive_declare
 
     async def consume(self) -> None:
 
@@ -135,11 +137,16 @@ class AioPikaMicroserviceConsumer(MessageBusConsumer):
         await RabbitmqUtils.declare_main_exchange(
             channel=channel,
             exchange_name=self.config.exchange,
+            passive=self.passive_declare,
         )
 
-        dlx = await RabbitmqUtils.declare_dl_exchange(channel=channel)
+        dlx = await RabbitmqUtils.declare_dl_exchange(
+            channel=channel, passive=self.passive_declare
+        )
 
-        dlq = await RabbitmqUtils.declare_dl_queue(channel=channel)
+        dlq = await RabbitmqUtils.declare_dl_queue(
+            channel=channel, passive=self.passive_declare
+        )
 
         await dlq.bind(dlx, routing_key=RabbitmqUtils.DEAD_LETTER_EXCHANGE)
 
@@ -151,7 +158,7 @@ class AioPikaMicroserviceConsumer(MessageBusConsumer):
             self.incoming_map[queue_name] = handler
 
             queue = await RabbitmqUtils.declare_queue(
-                channel=channel, queue_name=queue_name
+                channel=channel, queue_name=queue_name, passive=self.passive_declare
             )
 
             await queue.bind(exchange=self.config.exchange, routing_key=routing_key)
@@ -174,9 +181,9 @@ class AioPikaMicroserviceConsumer(MessageBusConsumer):
 
             routing_key = queue_name
 
-            queue = await channel.get_queue(
-                name=queue_name, ensure=False
-            ) or await channel.declare_queue(queue_name, durable=True)
+            queue = await RabbitmqUtils.declare_queue(
+                channel=channel, queue_name=queue_name, passive=self.passive_declare
+            )
 
             await queue.bind(exchange=self.config.exchange, routing_key=routing_key)
 

jararaca/utils/rabbitmq_utils.py

@@ -7,20 +7,25 @@ class RabbitmqUtils:
     DEAD_LETTER_QUEUE = "dlq"
 
     @classmethod
-    async def declare_dl_exchange(cls, channel: AbstractChannel) -> AbstractExchange:
+    async def declare_dl_exchange(
+        cls, channel: AbstractChannel, passive: bool
+    ) -> AbstractExchange:
         """
         Declare a Dead Letter Exchange (DLX) for the given channel.
         """
         await channel.set_qos(prefetch_count=1)
         return await channel.declare_exchange(
             cls.DEAD_LETTER_EXCHANGE,
+            passive=passive,
             type="direct",
             durable=True,
             auto_delete=False,
         )
 
     @classmethod
-    async def declare_dl_queue(cls, channel: AbstractChannel) -> AbstractQueue:
+    async def declare_dl_queue(
+        cls, channel: AbstractChannel, passive: bool
+    ) -> AbstractQueue:
         """
         Declare a Dead Letter Queue (DLQ) for the given queue.
         """
@@ -28,6 +33,7 @@ class RabbitmqUtils:
         return await channel.declare_queue(
             cls.DEAD_LETTER_QUEUE,
             durable=True,
+            passive=passive,
             arguments={
                 "x-dead-letter-exchange": "",
                 "x-dead-letter-routing-key": cls.DEAD_LETTER_EXCHANGE,
@@ -35,23 +41,22 @@ class RabbitmqUtils:
         )
 
     @classmethod
-    async def delcare_dl_kit(
+    async def declare_dl_kit(
         cls,
         channel: AbstractChannel,
+        passive: bool = False,
     ) -> tuple[AbstractExchange, AbstractQueue]:
         """
         Declare a Dead Letter Exchange and Queue (DLX and DLQ) for the given channel.
         """
-        dlx = await cls.declare_dl_exchange(channel)
-        dlq = await cls.declare_dl_queue(channel)
+        dlx = await cls.declare_dl_exchange(channel, passive=passive)
+        dlq = await cls.declare_dl_queue(channel, passive=passive)
         await dlq.bind(dlx, routing_key=cls.DEAD_LETTER_EXCHANGE)
         return dlx, dlq
 
     @classmethod
     async def declare_main_exchange(
-        cls,
-        channel: AbstractChannel,
-        exchange_name: str,
+        cls, channel: AbstractChannel, exchange_name: str, passive: bool
     ) -> AbstractExchange:
         """
         Declare a main exchange for the given channel.
@@ -59,6 +64,7 @@ class RabbitmqUtils:
         await channel.set_qos(prefetch_count=1)
         return await channel.declare_exchange(
             exchange_name,
+            passive=passive,
             type="topic",
             durable=True,
             auto_delete=False,
@@ -69,6 +75,7 @@ class RabbitmqUtils:
         cls,
         channel: AbstractChannel,
         queue_name: str,
+        passive: bool = False,
     ) -> AbstractQueue:
         """
         Declare a queue with the given name and properties.
@@ -76,6 +83,7 @@ class RabbitmqUtils:
         await channel.set_qos(prefetch_count=1)
         return await channel.declare_queue(
             queue_name,
+            passive=passive,
             durable=True,
             arguments={
                 "x-dead-letter-exchange": cls.DEAD_LETTER_EXCHANGE,

{jararaca-0.3.5.dist-info → jararaca-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jararaca
-Version: 0.3.5
+Version: 0.3.7
 Summary: A simple and fast API framework for Python
 Author: Lucas S
 Author-email: me@luscasleo.dev

{jararaca-0.3.5.dist-info → jararaca-0.3.7.dist-info}/RECORD

@@ -3,7 +3,7 @@ jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
 jararaca/broker_backend/mapper.py,sha256=vTsi7sWpNvlga1PWPFg0rCJ5joJ0cdzykkIc2Tuvenc,696
 jararaca/broker_backend/redis_broker_backend.py,sha256=a7DHchy3NAiD71Ix8SwmQOUnniu7uup-Woa4ON_4J7I,5786
-jararaca/cli.py,sha256=oaLqJlb-GAbhYpQHzl-P8ajPdo-G_ddIuSu2SsZNDh8,10244
+jararaca/cli.py,sha256=jHn9ohHuBr1Jt-i8MtQq644EK3rzu11AJGMsLaLdYg4,10396
 jararaca/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/core/providers.py,sha256=wktH84FK7c1s2wNq-fudf1uMfi3CQBR0neU2czJ_L0U,434
@@ -20,8 +20,8 @@ jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=Aex87wo
 jararaca/messagebus/interceptors/publisher_interceptor.py,sha256=fQFFW9hH6ZU3UOyR7kMPrNp9wA71qEy5XlgrBQdBMS4,1230
 jararaca/messagebus/message.py,sha256=U6cyd2XknX8mtm0333slz5fanky2PFLWCmokAO56vvU,819
 jararaca/messagebus/publisher.py,sha256=K7WsOMVTyLmdms3ZKEshqrQc_DhNreiFK-HnmOT9Ce0,1965
-jararaca/messagebus/worker.py,sha256=g8dOaU82N673_ixJnLkM_vk5YcMjHAaojgyuzCdFNaI,13712
-jararaca/messagebus/worker_v2.py,sha256=9dJDn1QPN7U4GgV3DdDNLF4sMv1s09uTM4EeFkvyTlc,20429
+jararaca/messagebus/worker.py,sha256=2jReCepgMQktdLh4A3OqmOmx6KNgqUGpXIOXoBUtXSg,13778
+jararaca/messagebus/worker_v2.py,sha256=Ey9HPgVSuIYJUggJGPKmgymZHz7-2TUSYgDB52u9T10,20683
 jararaca/microservice.py,sha256=C_Txqm3xSmdHIghJigKk6TOycL5eTJv9PF6XP7TA8j4,6638
 jararaca/observability/decorators.py,sha256=XffBinFXdiNkY6eo8_1nkr_GapM0RUGBg0aicBIelag,2220
 jararaca/observability/interceptor.py,sha256=GHkuGKFWftN7MDjvYeGFGEPnuJETNhtxRK6yuPrCrpU,1462
@@ -65,9 +65,9 @@ jararaca/tools/app_config/interceptor.py,sha256=nfFZiS80hrbnL7-XEYrwmp2rwaVYBqxv
 jararaca/tools/metadata.py,sha256=7nlCDYgItNybentPSSCc2MLqN7IpBd0VyQzfjfQycVI,1402
 jararaca/tools/typescript/interface_parser.py,sha256=_4cqte3OMAiHP-dPqUCWzWar4Ur04F-0x4ZUEnSTN-c,30040
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/utils/rabbitmq_utils.py,sha256=zFqZE-j6TSWFOEPbkIaB2hy2sqsXup-5421jIiPLfXY,2543
-jararaca-0.3.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.5.dist-info/METADATA,sha256=iHsZXwp4VkhgXbPy2j0IyDzNsluJeQO6qktGARDBGzQ,4951
-jararaca-0.3.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-jararaca-0.3.5.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.5.dist-info/RECORD,,
+jararaca/utils/rabbitmq_utils.py,sha256=FPDP8ZVgvitZXV-oK73D7EIANsqUzXTW7HdpEKsIsyI,2811
+jararaca-0.3.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.7.dist-info/METADATA,sha256=91LMUP1lkRvrHrVttwT6NSXZ5xWISWNo-ZFsL5BjTMU,4951
+jararaca-0.3.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+jararaca-0.3.7.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.7.dist-info/RECORD,,