jararaca 0.3.11a11__py3-none-any.whl → 0.3.11a13__py3-none-any.whl

jararaca/cli.py

@@ -78,6 +78,7 @@ async def declare_worker_infrastructure(
     broker_url: str,
     app: Microservice,
     force: bool = False,
+    interactive_mode: bool = False,
 ) -> None:
     """
     Declare the infrastructure (exchanges and queues) for worker.
@@ -100,25 +101,32 @@ async def declare_worker_infrastructure(
     connection = await aio_pika.connect(broker_url)
     channel = await connection.channel()
 
-    # Force delete infrastructure if requested
-    if force:
-        click.echo(f"→ Force deleting existing infrastructure for exchange: {exchange}")
+    # Only force delete infrastructure if requested at the beginning
+    if force or (interactive_mode and click.confirm(f"Delete existing infrastructure for exchange: {exchange}?")):
+        click.echo(f"→ Deleting existing infrastructure for exchange: {exchange}")
         await RabbitmqUtils.delete_exchange(channel, exchange)
         await RabbitmqUtils.delete_exchange(channel, RabbitmqUtils.DEAD_LETTER_EXCHANGE)
         await RabbitmqUtils.delete_queue(channel, RabbitmqUtils.DEAD_LETTER_QUEUE)
 
-    await RabbitmqUtils.declare_main_exchange(
-        channel=channel,
-        exchange_name=exchange,
-        passive=not force,  # If force is True, we already deleted the exchange
-    )
+    try:
+        await RabbitmqUtils.declare_main_exchange(
+            channel=channel,
+            exchange_name=exchange,
+            passive=False,
+        )
 
-    dlx = await RabbitmqUtils.declare_dl_exchange(channel=channel, passive=not force)
-    dlq = await RabbitmqUtils.declare_dl_queue(channel=channel, passive=not force)
-    await dlq.bind(dlx, routing_key=RabbitmqUtils.DEAD_LETTER_EXCHANGE)
+        dlx = await RabbitmqUtils.declare_dl_exchange(channel=channel, passive=False)
+        dlq = await RabbitmqUtils.declare_dl_queue(channel=channel, passive=False)
+        await dlq.bind(dlx, routing_key=RabbitmqUtils.DEAD_LETTER_EXCHANGE)
+    except Exception as e:
+        click.echo(f"Error during exchange declaration: {e}")
+        if force or (interactive_mode and click.confirm("Error occurred. Recreate infrastructure?")):
+            await channel.close()
+            await connection.close()
+            raise
+        click.echo("Skipping main exchange declaration due to error")
 
     # Find all message handlers and scheduled actions
-
     for instance_type in app.controllers:
         controller_spec = MessageBusController.get_messagebus(instance_type)
         if controller_spec is None:
@@ -127,50 +135,46 @@ async def declare_worker_infrastructure(
         _, members = inspect_controller(instance_type)
 
         # Declare queues for message handlers
-        for name, member in members.items():
-
+        for _, member in members.items():
             message_handler = MessageHandler.get_message_incoming(
                 member.member_function
             )
             if message_handler is not None:
-
                 queue_name = f"{message_handler.message_type.MESSAGE_TOPIC}.{member.member_function.__module__}.{member.member_function.__qualname__}"
                 routing_key = f"{message_handler.message_type.MESSAGE_TOPIC}.#"
 
-                # Force delete queue if requested
-                if force:
-                    await RabbitmqUtils.delete_queue(channel, queue_name)
-
-                # Declare queue
-                queue = await RabbitmqUtils.declare_queue(
-                    channel=channel, queue_name=queue_name, passive=not force
-                )
-                await queue.bind(exchange=exchange, routing_key=routing_key)
-                click.echo(
-                    f"✓ Declared message handler queue: {queue_name} (routing key: {routing_key})"
-                )
+                try:
+                    # Try to declare queue
+                    queue = await RabbitmqUtils.declare_worker_queue(
+                        channel=channel, queue_name=queue_name, passive=False
+                    )
+                    await queue.bind(exchange=exchange, routing_key=routing_key)
+                    click.echo(
+                        f"✓ Declared message handler queue: {queue_name} (routing key: {routing_key})"
+                    )
+                except Exception as e:
+                    click.echo(f"⚠ Skipping message handler queue {queue_name} due to error: {e}")
+                    continue
 
             scheduled_action = ScheduledAction.get_scheduled_action(
                 member.member_function
             )
             if scheduled_action is not None:
-
-                # Declare queues for scheduled actions
-
                 queue_name = f"{member.member_function.__module__}.{member.member_function.__qualname__}"
                 routing_key = queue_name
 
-                # Force delete queue if requested
-                if force:
-                    await RabbitmqUtils.delete_queue(channel, queue_name)
-
-                queue = await RabbitmqUtils.declare_queue(
-                    channel=channel, queue_name=queue_name, passive=not force
-                )
-                await queue.bind(exchange=exchange, routing_key=routing_key)
-                click.echo(
-                    f"✓ Declared scheduled action queue: {queue_name} (routing key: {routing_key})"
-                )
+                try:
+                    # Try to declare queue
+                    queue = await RabbitmqUtils.declare_scheduled_action_queue(
+                        channel=channel, queue_name=queue_name, passive=False
+                    )
+                    await queue.bind(exchange=exchange, routing_key=routing_key)
+                    click.echo(
+                        f"✓ Declared scheduled action queue: {queue_name} (routing key: {routing_key})"
+                    )
+                except Exception as e:
+                    click.echo(f"⚠ Skipping scheduled action queue {queue_name} due to error: {e}")
+                    continue
 
     await channel.close()
     await connection.close()
@@ -539,6 +543,7 @@ def gen_entity(entity_name: str, file_path: StreamWriter) -> None:
 @click.argument(
     "app_path",
     type=str,
+    envvar="APP_PATH",
 )
 @click.option(
     "--broker-url",
@@ -642,13 +647,9 @@ def declare(
             click.echo(
                 f"→ Declaring worker infrastructure (URL: {broker_url_with_exchange})"
             )
-            click.echo(
-                f"→ Declaring scheduler infrastructure (URL: {broker_url_with_exchange})"
-            )
-
             await declare_worker_infrastructure(broker_url_with_exchange, app, force)
 
-            click.echo("✓ Worker and scheduler infrastructure declared successfully!")
+            click.echo("✓ Workers infrastructure declared successfully!")
         except Exception as e:
             click.echo(f"ERROR: Failed to declare infrastructure: {e}", err=True)
             raise

jararaca/scheduler/beat_worker.py

@@ -195,7 +195,7 @@ class _RabbitMQBrokerDispatcher(_MessageBrokerDispatcher):
                 queue_name = ScheduledAction.get_function_id(sched_act_data.callable)
 
                 # Try to get existing queue
-                await RabbitmqUtils.get_scheduler_queue(
+                await RabbitmqUtils.get_scheduled_action_queue(
                     channel=channel,
                     queue_name=queue_name,
                 )

jararaca/utils/rabbitmq_utils.py

@@ -222,7 +222,7 @@ class RabbitmqUtils:
             raise
 
     @classmethod
-    async def declare_queue(
+    async def declare_worker_queue(
         cls,
         channel: AbstractChannel,
         queue_name: str,
@@ -243,64 +243,13 @@ class RabbitmqUtils:
         )
 
     @classmethod
-    async def get_worker_v1_queue(
+    async def get_scheduled_action_queue(
         cls,
         channel: AbstractChannel,
         queue_name: str,
     ) -> AbstractQueue:
         """
-        Get a worker v1 queue.
-        """
-        try:
-            return await channel.get_queue(queue_name)
-        except ChannelNotFoundEntity as e:
-            logger.error(
-                f"Worker queue '{queue_name}' does not exist. "
-                f"Please use the declare command to create it first. Error: {e}"
-            )
-            raise
-        except ChannelClosed as e:
-            logger.error(
-                f"Channel closed while getting worker queue '{queue_name}'. "
-                f"Error: {e}"
-            )
-            raise
-        except AMQPError as e:
-            logger.error(
-                f"AMQP error while getting worker queue '{queue_name}'. " f"Error: {e}"
-            )
-            raise
-
-    @classmethod
-    async def declare_worker_v1_queue(
-        cls,
-        channel: AbstractChannel,
-        queue_name: str,
-        dlx_name: str,
-        dlq_name: str,
-        passive: bool = False,
-    ) -> AbstractQueue:
-        """
-        Declare a worker v1 queue with custom dead letter exchange and routing key.
-        """
-        return await channel.declare_queue(
-            passive=passive,
-            name=queue_name,
-            arguments={
-                "x-dead-letter-exchange": dlx_name,
-                "x-dead-letter-routing-key": dlq_name,
-            },
-            durable=True,
-        )
-
-    @classmethod
-    async def get_scheduler_queue(
-        cls,
-        channel: AbstractChannel,
-        queue_name: str,
-    ) -> AbstractQueue:
-        """
-        Get a scheduler queue.
+        Get a scheduled action queue.
         """
         try:
             return await channel.get_queue(queue_name)
@@ -324,14 +273,14 @@ class RabbitmqUtils:
             raise
 
     @classmethod
-    async def declare_scheduler_queue(
+    async def declare_scheduled_action_queue(
         cls,
         channel: AbstractChannel,
         queue_name: str,
         passive: bool = False,
     ) -> AbstractQueue:
         """
-        Declare a scheduler queue with simple durable configuration.
+        Declare a scheduled action queue with simple durable configuration.
         The queue has a max length of 1 to ensure only one scheduled task
         is processed at a time.
         """

{jararaca-0.3.11a11.dist-info → jararaca-0.3.11a13.dist-info}/METADATA

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

{jararaca-0.3.11a11.dist-info → jararaca-0.3.11a13.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=OkeemUnq3_Zk8XaMerzTct3La1NLVhZdQd-N-3lEP2c,19253
+jararaca/cli.py,sha256=pmwWDk7muP_BsDgWTcyiCOIhSbEJuuEoNFSiH2g27b4,19753
 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
@@ -57,7 +57,7 @@ jararaca/rpc/http/backends/otel.py,sha256=Uc6CjHSCZ5hvnK1fNFv3ota5xzUFnvIl1JOpG3
 jararaca/rpc/http/decorators.py,sha256=oUSzgMGI8w6SoKiz3GltDbd3BWAuyY60F23cdRRNeiw,11897
 jararaca/rpc/http/httpx.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/scheduler/beat_worker.py,sha256=7uSr4sth9jy8ppWiMNgV-pnGSYI0xdbdf8WJuBcgJVY,11598
+jararaca/scheduler/beat_worker.py,sha256=JZXjkEMmZkvSwjfqgY4ClJE9Fwi6O-u2G_lHnjptVys,11605
 jararaca/scheduler/decorators.py,sha256=iyWFvPLCRh9c0YReQRemI2mLuaUv7r929So-xuKIWUs,4605
 jararaca/scheduler/types.py,sha256=4HEQOmVIDp-BYLSzqmqSFIio1bd51WFmgFPIzPpVu04,135
 jararaca/tools/app_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,9 +65,9 @@ jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaN
 jararaca/tools/app_config/interceptor.py,sha256=HV8h4AxqUc_ACs5do4BSVlyxlRXzx7HqJtoVO9tfRnQ,2611
 jararaca/tools/typescript/interface_parser.py,sha256=35xbOrZDQDyTXdMrVZQ8nnFw79f28lJuLYNHAspIqi8,30492
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/utils/rabbitmq_utils.py,sha256=LxGc4_AsjDrwzRFeiKzf0O8fgzMTq47uWvxzXqJZJ4o,12401
-jararaca-0.3.11a11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.11a11.dist-info/METADATA,sha256=Bw1zSZApDCkGCTrM-uj3BjAB2g21k_ii04Q4bsik7SM,4998
-jararaca-0.3.11a11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-jararaca-0.3.11a11.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.11a11.dist-info/RECORD,,
+jararaca/utils/rabbitmq_utils.py,sha256=ytdAFUyv-OBkaVnxezuJaJoLrmN7giZgtKeet_IsMBs,10918
+jararaca-0.3.11a13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.11a13.dist-info/METADATA,sha256=akkZ-YQwyNhyiFNRgvBCooSVevh2SlRmNH5I_tdeJCE,4998
+jararaca-0.3.11a13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+jararaca-0.3.11a13.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.11a13.dist-info/RECORD,,