jararaca 0.3.11a11__tar.gz → 0.3.11a12__tar.gz

{jararaca-0.3.11a11 → jararaca-0.3.11a12}/PKG-INFO

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

{jararaca-0.3.11a11 → jararaca-0.3.11a12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.11a11"
+version = "0.3.11a12"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"

{jararaca-0.3.11a11 → jararaca-0.3.11a12}/src/jararaca/cli.py

@@ -142,7 +142,7 @@ async def declare_worker_infrastructure(
                     await RabbitmqUtils.delete_queue(channel, queue_name)
 
                 # Declare queue
-                queue = await RabbitmqUtils.declare_queue(
+                queue = await RabbitmqUtils.declare_worker_queue(
                     channel=channel, queue_name=queue_name, passive=not force
                 )
                 await queue.bind(exchange=exchange, routing_key=routing_key)
@@ -164,7 +164,7 @@ async def declare_worker_infrastructure(
                 if force:
                     await RabbitmqUtils.delete_queue(channel, queue_name)
 
-                queue = await RabbitmqUtils.declare_queue(
+                queue = await RabbitmqUtils.declare_scheduled_action_queue(
                     channel=channel, queue_name=queue_name, passive=not force
                 )
                 await queue.bind(exchange=exchange, routing_key=routing_key)
@@ -539,6 +539,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 +643,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-0.3.11a11 → jararaca-0.3.11a12}/src/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-0.3.11a11 → jararaca-0.3.11a12}/src/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.
         """