jararaca 0.3.11a7__tar.gz → 0.3.11a8__tar.gz

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/PKG-INFO

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

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/pyproject.toml

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

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/cli.py

@@ -17,6 +17,7 @@ from mako.template import Template
 
 from jararaca.messagebus import worker as worker_v1
 from jararaca.messagebus import worker_v2 as worker_v2_mod
+from jararaca.messagebus.decorators import SCHEDULED_ACTION_DATA_SET
 from jararaca.microservice import Microservice
 from jararaca.presentation.http_microservice import HttpMicroservice
 from jararaca.presentation.server import create_http_server
@@ -75,6 +76,8 @@ async def declare_worker_infrastructure(
     exchange: str,
     app: Microservice,
     passive_declare: bool = False,
+    handler_names: set[str] | None = None,
+    force: bool = False,
 ) -> None:
     """
     Declare the infrastructure (exchanges and queues) for worker v1.
@@ -82,6 +85,13 @@ async def declare_worker_infrastructure(
     connection = await aio_pika.connect(url)
     channel = await connection.channel()
 
+    # Force delete infrastructure if requested
+    if force:
+        click.echo(f"→ Force 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)
+
     # Declare main exchange
     main_ex = await RabbitmqUtils.declare_main_exchange(
         channel=channel,
@@ -110,17 +120,27 @@ async def declare_worker_infrastructure(
         handlers, _ = factory(instance)
 
         for handler in handlers:
+            # Filter handlers by name if specified
+            if handler_names is not None and handler.spec.name is not None:
+                if handler.spec.name not in handler_names:
+                    continue
+            elif handler_names is not None and handler.spec.name is None:
+                # Skip handlers without names when filtering is requested
+                continue
+
             queue_name = f"{handler.message_type.MESSAGE_TOPIC}.{handler.instance_callable.__module__}.{handler.instance_callable.__qualname__}"
             routing_key = f"{handler.message_type.MESSAGE_TOPIC}.#"
 
-            queue = await channel.declare_queue(
+            # Force delete queue if requested
+            if force:
+                await RabbitmqUtils.delete_queue(channel, queue_name)
+
+            queue = await RabbitmqUtils.declare_worker_v1_queue(
+                channel=channel,
+                queue_name=queue_name,
+                dlx_name=dlx.name,
+                dlq_name=dlq.name,
                 passive=passive_declare,
-                name=queue_name,
-                arguments={
-                    "x-dead-letter-exchange": dlx.name,
-                    "x-dead-letter-routing-key": dlq.name,
-                },
-                durable=True,
             )
 
             await queue.bind(exchange=main_ex, routing_key=routing_key)
@@ -134,6 +154,8 @@ async def declare_worker_v2_infrastructure(
     broker_url: str,
     app: Microservice,
     passive_declare: bool = False,
+    handler_names: set[str] | None = None,
+    force: bool = False,
 ) -> None:
     """
     Declare the infrastructure (exchanges and queues) for worker v2.
@@ -157,6 +179,13 @@ async def declare_worker_v2_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}")
+        await RabbitmqUtils.delete_exchange(channel, exchange)
+        await RabbitmqUtils.delete_exchange(channel, RabbitmqUtils.DEAD_LETTER_EXCHANGE)
+        await RabbitmqUtils.delete_queue(channel, RabbitmqUtils.DEAD_LETTER_QUEUE)
+
     # Declare main exchange
     await RabbitmqUtils.declare_main_exchange(
         channel=channel,
@@ -188,9 +217,21 @@ async def declare_worker_v2_infrastructure(
 
         # Declare queues for message handlers
         for handler in handlers:
+            # Filter handlers by name if specified
+            if handler_names is not None and handler.spec.name is not None:
+                if handler.spec.name not in handler_names:
+                    continue
+            elif handler_names is not None and handler.spec.name is None:
+                # Skip handlers without names when filtering is requested
+                continue
+
             queue_name = f"{handler.message_type.MESSAGE_TOPIC}.{handler.instance_callable.__module__}.{handler.instance_callable.__qualname__}"
             routing_key = f"{handler.message_type.MESSAGE_TOPIC}.#"
 
+            # 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=passive_declare
             )
@@ -204,6 +245,10 @@ async def declare_worker_v2_infrastructure(
             queue_name = f"{scheduled_action.callable.__module__}.{scheduled_action.callable.__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=passive_declare
             )
@@ -220,6 +265,8 @@ async def declare_scheduler_v2_infrastructure(
     broker_url: str,
     app: Microservice,
     passive_declare: bool = False,
+    scheduler_names: set[str] | None = None,
+    force: bool = False,
 ) -> None:
     """
     Declare the infrastructure (exchanges and queues) for scheduler v2.
@@ -245,6 +292,10 @@ async def declare_scheduler_v2_infrastructure(
     connection = await aio_pika.connect(broker_url)
     channel = await connection.channel()
 
+    # Force delete exchange if requested
+    if force:
+        await RabbitmqUtils.delete_exchange(channel, exchange)
+
     # Declare exchange for scheduler
     await channel.declare_exchange(
         name=exchange,
@@ -269,13 +320,29 @@ async def declare_scheduler_v2_infrastructure(
         instance: Any = container.get_by_type(instance_type)
         factory = controller.get_messagebus_factory()
         _, actions = factory(instance)
+
+        # Filter scheduled actions by name if specified
+        if scheduler_names is not None:
+            filtered_actions: SCHEDULED_ACTION_DATA_SET = set()
+            for action in actions:
+                # Include actions that have a name and it's in the provided set
+                if action.spec.name and action.spec.name in scheduler_names:
+                    filtered_actions.add(action)
+                # Skip actions without names when filtering is active
+            actions = filtered_actions
+
         scheduled_actions.extend(actions)
 
     for scheduled_action in scheduled_actions:
         queue_name = ScheduledAction.get_function_id(scheduled_action.callable)
-        queue = await channel.declare_queue(
-            name=queue_name,
-            durable=True,
+
+        # Force delete queue if requested
+        if force:
+            await RabbitmqUtils.delete_queue(channel, queue_name)
+
+        queue = await RabbitmqUtils.declare_scheduler_queue(
+            channel=channel,
+            queue_name=queue_name,
             passive=passive_declare,
         )
         await queue.bind(
@@ -328,6 +395,11 @@ def cli() -> None:
     is_flag=True,
     default=False,
 )
+@click.option(
+    "--handlers",
+    type=str,
+    help="Comma-separated list of handler names to listen to. If not specified, all handlers will be used.",
+)
 def worker(
     app_path: str,
     url: str,
@@ -336,6 +408,7 @@ def worker(
     exchange: str,
     prefetch_count: int,
     passive_declare: bool,
+    handlers: str | None,
 ) -> None:
 
     app = find_microservice_by_module_path(app_path)
@@ -362,6 +435,11 @@ def worker(
 
     url = parsed_url.geturl()
 
+    # Parse handler names if provided
+    handler_names: set[str] | None = None
+    if handlers:
+        handler_names = {name.strip() for name in handlers.split(",") if name.strip()}
+
     config = worker_v1.AioPikaWorkerConfig(
         url=url,
         exchange=exchange,
@@ -370,6 +448,7 @@ def worker(
 
     worker_v1.MessageBusWorker(app, config=config).start_sync(
         passive_declare=passive_declare,
+        handler_names=handler_names,
     )
 
 
@@ -389,14 +468,27 @@ def worker(
     type=str,
     envvar="BACKEND_URL",
 )
-def worker_v2(app_path: str, broker_url: str, backend_url: str) -> None:
+@click.option(
+    "--handlers",
+    type=str,
+    help="Comma-separated list of handler names to listen to. If not specified, all handlers will be used.",
+)
+def worker_v2(
+    app_path: str, broker_url: str, backend_url: str, handlers: str | None
+) -> None:
 
     app = find_microservice_by_module_path(app_path)
 
+    # Parse handler names if provided
+    handler_names: set[str] | None = None
+    if handlers:
+        handler_names = {name.strip() for name in handlers.split(",") if name.strip()}
+
     worker_v2_mod.MessageBusWorker(
         app=app,
         broker_url=broker_url,
         backend_url=backend_url,
+        handler_names=handler_names,
     ).start_sync()
 
 
@@ -449,13 +541,26 @@ def server(app_path: str, host: str, port: int) -> None:
     type=int,
     default=1,
 )
+@click.option(
+    "--schedulers",
+    type=str,
+    help="Comma-separated list of scheduler names to run (only run schedulers with these names)",
+)
 def scheduler(
     app_path: str,
     interval: int,
+    schedulers: str | None = None,
 ) -> None:
     app = find_microservice_by_module_path(app_path)
 
-    Scheduler(app, interval=interval).run()
+    # Parse scheduler names if provided
+    scheduler_names: set[str] | None = None
+    if schedulers:
+        scheduler_names = {
+            name.strip() for name in schedulers.split(",") if name.strip()
+        }
+
+    Scheduler(app, interval=interval, scheduler_names=scheduler_names).run()
 
 
 @cli.command()
@@ -479,19 +584,34 @@ def scheduler(
     type=str,
     required=True,
 )
+@click.option(
+    "--schedulers",
+    type=str,
+    help="Comma-separated list of scheduler names to run (only run schedulers with these names)",
+)
 def scheduler_v2(
     interval: int,
     broker_url: str,
     backend_url: str,
     app_path: str,
+    schedulers: str | None = None,
 ) -> None:
 
     app = find_microservice_by_module_path(app_path)
+
+    # Parse scheduler names if provided
+    scheduler_names: set[str] | None = None
+    if schedulers:
+        scheduler_names = {
+            name.strip() for name in schedulers.split(",") if name.strip()
+        }
+
     scheduler = SchedulerV2(
         app=app,
         interval=interval,
         backend_url=backend_url,
         broker_url=broker_url,
+        scheduler_names=scheduler_names,
     )
     scheduler.run()
 
@@ -740,11 +860,24 @@ def gen_entity(entity_name: str, file_path: StreamWriter) -> None:
     default=False,
     help="Use passive declarations (check if infrastructure exists without creating it)",
 )
+@click.option(
+    "--handlers",
+    type=str,
+    help="Comma-separated list of handler names to declare queues for. If not specified, all handlers will be declared.",
+)
+@click.option(
+    "--force",
+    is_flag=True,
+    default=False,
+    help="Force recreation by deleting existing exchanges and queues before declaring them",
+)
 def declare_queues_v1(
     app_path: str,
     broker_url: str | None,
     exchange: str,
     passive_declare: bool,
+    handlers: str | None,
+    force: bool,
 ) -> None:
     """
     Declare RabbitMQ infrastructure (exchanges and queues) for worker v1.
@@ -779,13 +912,20 @@ def declare_queues_v1(
             )
             return
 
+        # Parse handler names if provided
+        handler_names: set[str] | None = None
+        if handlers:
+            handler_names = {
+                name.strip() for name in handlers.split(",") if name.strip()
+            }
+
         click.echo(
             f"→ Declaring worker v1 infrastructure (URL: {broker_url}, Exchange: {exchange})"
         )
 
         try:
             await declare_worker_infrastructure(
-                broker_url, exchange, app, passive_declare
+                broker_url, exchange, app, passive_declare, handler_names, force
             )
             click.echo("✓ Worker v1 infrastructure declared successfully!")
         except Exception as e:
@@ -821,11 +961,30 @@ def declare_queues_v1(
     default=False,
     help="Use passive declarations (check if infrastructure exists without creating it)",
 )
+@click.option(
+    "--handlers",
+    type=str,
+    help="Comma-separated list of handler names to declare queues for. If not specified, all handlers will be declared.",
+)
+@click.option(
+    "--schedulers",
+    type=str,
+    help="Comma-separated list of scheduler names to declare queues for. If not specified, all schedulers will be declared.",
+)
+@click.option(
+    "--force",
+    is_flag=True,
+    default=False,
+    help="Force recreation by deleting existing exchanges and queues before declaring them",
+)
 def declare_queues_v2(
     app_path: str,
     broker_url: str | None,
     exchange: str,
     passive_declare: bool,
+    handlers: str | None,
+    schedulers: str | None,
+    force: bool,
 ) -> None:
     """
     Declare RabbitMQ infrastructure (exchanges and queues) for worker v2 and scheduler v2.
@@ -860,6 +1019,20 @@ def declare_queues_v2(
             )
             return
 
+        # Parse handler names if provided
+        handler_names: set[str] | None = None
+        if handlers:
+            handler_names = {
+                name.strip() for name in handlers.split(",") if name.strip()
+            }
+
+        # Parse scheduler names if provided
+        scheduler_names: set[str] | None = None
+        if schedulers:
+            scheduler_names = {
+                name.strip() for name in schedulers.split(",") if name.strip()
+            }
+
         # For v2, create the broker URL with exchange parameter
         v2_broker_url = f"{broker_url}?exchange={exchange}"
 
@@ -868,9 +1041,11 @@ def declare_queues_v2(
 
         try:
             await asyncio.gather(
-                declare_worker_v2_infrastructure(v2_broker_url, app, passive_declare),
+                declare_worker_v2_infrastructure(
+                    v2_broker_url, app, passive_declare, handler_names, force
+                ),
                 declare_scheduler_v2_infrastructure(
-                    v2_broker_url, app, passive_declare
+                    v2_broker_url, app, passive_declare, scheduler_names, force
                 ),
             )
             click.echo(

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/messagebus/decorators.py

@@ -24,6 +24,7 @@ class MessageHandler(Generic[INHERITS_MESSAGE_CO]):
         exception_handler: Callable[[BaseException], None] | None = None,
         nack_on_exception: bool = False,
         auto_ack: bool = True,
+        name: str | None = None,
     ) -> None:
         self.message_type = message
 
@@ -31,6 +32,7 @@ class MessageHandler(Generic[INHERITS_MESSAGE_CO]):
         self.exception_handler = exception_handler
         self.requeue_on_exception = nack_on_exception
         self.auto_ack = auto_ack
+        self.name = name
 
     def __call__(
         self, func: Callable[[Any, MessageOf[INHERITS_MESSAGE_CO]], Awaitable[None]]

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/messagebus/worker.py

@@ -118,13 +118,14 @@ class AioPikaMicroserviceConsumer:
 
             self.incoming_map[queue_name] = handler
 
-            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,
-                },
+            queue: aio_pika.abc.AbstractQueue = (
+                await RabbitmqUtils.declare_worker_v1_queue(
+                    channel=channel,
+                    queue_name=queue_name,
+                    dlx_name=dlx.name,
+                    dlq_name=dlq.name,
+                    passive=passive_declare,
+                )
             )
 
             await queue.bind(exchange=main_ex, routing_key=routing_key)
@@ -337,7 +338,9 @@ class MessageBusWorker:
             raise RuntimeError("Consumer not started")
         return self._consumer
 
-    async def start_async(self, passive_declare: bool) -> None:
+    async def start_async(
+        self, passive_declare: bool, handler_names: set[str] | None = None
+    ) -> None:
         all_message_handlers_set: MESSAGE_HANDLER_DATA_SET = set()
         async with self.lifecycle():
             for instance_type in self.app.controllers:
@@ -356,6 +359,15 @@ class MessageBusWorker:
                 for handler_data in handlers:
                     message_type = handler_data.spec.message_type
                     topic = message_type.MESSAGE_TOPIC
+
+                    # Filter handlers by name if specified
+                    if handler_names is not None and handler_data.spec.name is not None:
+                        if handler_data.spec.name not in handler_names:
+                            continue
+                    elif handler_names is not None and handler_data.spec.name is None:
+                        # Skip handlers without names when filtering is requested
+                        continue
+
                     if (
                         topic in message_handler_data_map
                         and message_type.MESSAGE_TYPE == "task"
@@ -376,7 +388,9 @@ class MessageBusWorker:
 
             await consumer.consume(passive_declare=passive_declare)
 
-    def start_sync(self, passive_declare: bool) -> None:
+    def start_sync(
+        self, passive_declare: bool, handler_names: set[str] | None = None
+    ) -> None:
 
         def on_shutdown(loop: asyncio.AbstractEventLoop) -> None:
             logger.info("Shutting down")
@@ -386,7 +400,11 @@ class MessageBusWorker:
             runner.get_loop().add_signal_handler(
                 signal.SIGINT, on_shutdown, runner.get_loop()
             )
-            runner.run(self.start_async(passive_declare=passive_declare))
+            runner.run(
+                self.start_async(
+                    passive_declare=passive_declare, handler_names=handler_names
+                )
+            )
 
 
 class AioPikaMessageBusController(BusMessageController):

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/messagebus/worker_v2.py

@@ -515,10 +515,17 @@ async def none_context() -> AsyncGenerator[None, None]:
 
 
 class MessageBusWorker:
-    def __init__(self, app: Microservice, broker_url: str, backend_url: str) -> None:
+    def __init__(
+        self,
+        app: Microservice,
+        broker_url: str,
+        backend_url: str,
+        handler_names: set[str] | None = None,
+    ) -> None:
         self.app = app
         self.backend_url = backend_url
         self.broker_url = broker_url
+        self.handler_names = handler_names
 
         self.container = Container(app)
         self.lifecycle = AppLifecycle(app, self.container)
@@ -555,6 +562,21 @@ class MessageBusWorker:
                 for handler_data in handlers:
                     message_type = handler_data.spec.message_type
                     topic = message_type.MESSAGE_TOPIC
+
+                    # Filter handlers by name if specified
+                    if (
+                        self.handler_names is not None
+                        and handler_data.spec.name is not None
+                    ):
+                        if handler_data.spec.name not in self.handler_names:
+                            continue
+                    elif (
+                        self.handler_names is not None
+                        and handler_data.spec.name is None
+                    ):
+                        # Skip handlers without names when filtering is requested
+                        continue
+
                     if (
                         topic in message_handler_data_map
                         and message_type.MESSAGE_TYPE == "task"

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/scheduler/decorators.py

@@ -20,6 +20,7 @@ class ScheduledAction:
         exclusive: bool = True,
         timeout: int | None = None,
         exception_handler: Callable[[BaseException], None] | None = None,
+        name: str | None = None,
     ) -> None:
         """
         :param cron: A string representing the cron expression for the scheduled action.
@@ -27,6 +28,7 @@ class ScheduledAction:
         :param exclusive: A boolean indicating if the scheduled action should be executed in one instance of the application. (Requires a distributed lock provided by a backend)
         :param exception_handler: A callable that will be called when an exception is raised during the execution of the scheduled action.
         :param timeout: An integer representing the timeout for the scheduled action in seconds. If the scheduled action takes longer than this time, it will be terminated.
+        :param name: An optional name for the scheduled action, used for filtering which actions to run.
         """
         self.cron = cron
         """
@@ -55,6 +57,11 @@ class ScheduledAction:
         If the scheduled action takes longer than this time, it will be terminated.
         """
 
+        self.name = name
+        """
+        An optional name for the scheduled action, used for filtering which actions to run.
+        """
+
     def __call__(self, func: DECORATED_FUNC) -> DECORATED_FUNC:
         ScheduledAction.register(func, self)
         return func

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/scheduler/scheduler.py

@@ -34,7 +34,7 @@ class SchedulerConfig:
 
 
 def extract_scheduled_actions(
-    app: Microservice, container: Container
+    app: Microservice, container: Container, scheduler_names: set[str] | None = None
 ) -> list[ScheduledActionData]:
     scheduled_actions: list[ScheduledActionData] = []
     for controllers in app.controllers:
@@ -42,6 +42,17 @@ def extract_scheduled_actions(
         controller_instance: Any = container.get_by_type(controllers)
 
         controller_scheduled_actions = get_type_scheduled_actions(controller_instance)
+
+        # Filter scheduled actions by name if scheduler_names is provided
+        if scheduler_names is not None:
+            filtered_actions = []
+            for action in controller_scheduled_actions:
+                # Include actions that have a name and it's in the provided set
+                if action.spec.name and action.spec.name in scheduler_names:
+                    filtered_actions.append(action)
+                # Skip actions without names when filtering is active
+            controller_scheduled_actions = filtered_actions
+
         scheduled_actions.extend(controller_scheduled_actions)
 
     return scheduled_actions
@@ -59,10 +70,12 @@ class Scheduler:
         self,
         app: Microservice,
         interval: int,
+        scheduler_names: set[str] | None = None,
     ) -> None:
         self.app = app
 
         self.interval = interval
+        self.scheduler_names = scheduler_names
         self.container = Container(self.app)
         self.uow_provider = UnitOfWorkContextProvider(app, self.container)
 
@@ -146,7 +159,9 @@ class Scheduler:
         async def run_scheduled_actions() -> None:
 
             async with self.lifceycle():
-                scheduled_actions = extract_scheduled_actions(self.app, self.container)
+                scheduled_actions = extract_scheduled_actions(
+                    self.app, self.container, self.scheduler_names
+                )
 
                 while True:
                     for action in scheduled_actions:

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/scheduler/scheduler_v2.py

@@ -31,12 +31,13 @@ from jararaca.scheduler.decorators import (
     get_type_scheduled_actions,
 )
 from jararaca.scheduler.types import DelayedMessageData
+from jararaca.utils.rabbitmq_utils import RabbitmqUtils
 
 logger = logging.getLogger(__name__)
 
 
 def extract_scheduled_actions(
-    app: Microservice, container: Container
+    app: Microservice, container: Container, scheduler_names: set[str] | None = None
 ) -> list[ScheduledActionData]:
     scheduled_actions: list[ScheduledActionData] = []
     for controllers in app.controllers:
@@ -44,6 +45,17 @@ def extract_scheduled_actions(
         controller_instance: Any = container.get_by_type(controllers)
 
         controller_scheduled_actions = get_type_scheduled_actions(controller_instance)
+
+        # Filter scheduled actions by name if scheduler_names is provided
+        if scheduler_names is not None:
+            filtered_actions = []
+            for action in controller_scheduled_actions:
+                # Include actions that have a name and it's in the provided set
+                if action.spec.name and action.spec.name in scheduler_names:
+                    filtered_actions.append(action)
+                # Skip actions without names when filtering is active
+            controller_scheduled_actions = filtered_actions
+
         scheduled_actions.extend(controller_scheduled_actions)
 
     return scheduled_actions
@@ -187,9 +199,10 @@ class RabbitMQBrokerDispatcher(MessageBrokerDispatcher):
             )
 
             for sched_act_data in scheduled_actions:
-                queue = await channel.declare_queue(
-                    name=ScheduledAction.get_function_id(sched_act_data.callable),
-                    durable=True,
+                queue = await RabbitmqUtils.declare_scheduler_queue(
+                    channel=channel,
+                    queue_name=ScheduledAction.get_function_id(sched_act_data.callable),
+                    passive=False,
                 )
 
                 await queue.bind(
@@ -226,6 +239,7 @@ class SchedulerV2:
         interval: int,
         broker_url: str,
         backend_url: str,
+        scheduler_names: set[str] | None = None,
     ) -> None:
         self.app = app
 
@@ -237,6 +251,7 @@ class SchedulerV2:
         )
 
         self.interval = interval
+        self.scheduler_names = scheduler_names
         self.container = Container(self.app)
         self.uow_provider = UnitOfWorkContextProvider(app, self.container)
 
@@ -262,7 +277,9 @@ class SchedulerV2:
         """
         async with self.lifecycle():
 
-            scheduled_actions = extract_scheduled_actions(self.app, self.container)
+            scheduled_actions = extract_scheduled_actions(
+                self.app, self.container, self.scheduler_names
+            )
 
             await self.broker.initialize(scheduled_actions)
 

{jararaca-0.3.11a7 → jararaca-0.3.11a8}/src/jararaca/utils/rabbitmq_utils.py

@@ -90,3 +90,81 @@ class RabbitmqUtils:
                 "x-dead-letter-routing-key": cls.DEAD_LETTER_EXCHANGE,
             },
         )
+
+    @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 declare_scheduler_queue(
+        cls,
+        channel: AbstractChannel,
+        queue_name: str,
+        passive: bool = False,
+    ) -> AbstractQueue:
+        """
+        Declare a scheduler queue with simple durable configuration.
+        """
+        return await channel.declare_queue(
+            name=queue_name,
+            durable=True,
+            passive=passive,
+        )
+
+    @classmethod
+    async def delete_queue(
+        cls,
+        channel: AbstractChannel,
+        queue_name: str,
+        if_unused: bool = False,
+        if_empty: bool = False,
+    ) -> None:
+        """
+        Delete a queue.
+        """
+        try:
+            await channel.queue_delete(
+                queue_name=queue_name,
+                if_unused=if_unused,
+                if_empty=if_empty,
+            )
+        except Exception:
+            # Queue might not exist, which is fine
+            pass
+
+    @classmethod
+    async def delete_exchange(
+        cls,
+        channel: AbstractChannel,
+        exchange_name: str,
+        if_unused: bool = False,
+    ) -> None:
+        """
+        Delete an exchange.
+        """
+        try:
+            await channel.exchange_delete(
+                exchange_name=exchange_name,
+                if_unused=if_unused,
+            )
+        except Exception:
+            # Exchange might not exist, which is fine
+            pass