jararaca 0.3.11a10__tar.gz → 0.3.11a12__tar.gz

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

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

{jararaca-0.3.11a10 → jararaca-0.3.11a12}/docs/index.md

@@ -33,25 +33,9 @@ Starts a message bus worker that processes asynchronous messages from a message
 
 **Options:**
 
-- `--url`: AMQP URL (default: "amqp://guest:guest@localhost/")
-- `--username`: AMQP username (optional)
-- `--password`: AMQP password (optional)
-- `--exchange`: Exchange name (default: "jararaca_ex")
-- `--queue`: Queue name (default: "jararaca_q")
-- `--prefetch-count`: Number of messages to prefetch (default: 1)
-
-### `worker_v2` - Enhanced Message Bus Worker
-
-```bash
-jararaca worker_v2 APP_PATH [OPTIONS]
-```
-
-Starts an enhanced version of the message bus worker with improved backend support.
-
-**Options:**
-
 - `--broker-url`: The URL for the message broker (required)
 - `--backend-url`: The URL for the message broker backend (required)
+- `--handlers`: Comma-separated list of handler names to listen to (optional)
 
 ### `server` - HTTP Server
 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.11a10"
+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.11a10 → jararaca-0.3.11a12}/src/jararaca/__init__.py

@@ -79,7 +79,6 @@ if TYPE_CHECKING:
     )
     from .messagebus.message import Message, MessageOf
     from .messagebus.publisher import use_publisher
-    from .messagebus.worker import MessageBusWorker
     from .microservice import (
         Microservice,
         use_app_context,
@@ -215,7 +214,6 @@ if TYPE_CHECKING:
         "AIOSqlAlchemySessionInterceptor",
         "AIOSQAConfig",
         "create_http_server",
-        "MessageBusWorker",
         "Container",
         "WebSocketInterceptor",
         "use_session",
@@ -367,7 +365,6 @@ _dynamic_imports: "dict[str, tuple[str, str, str | None]]" = {
         None,
     ),
     "create_http_server": (__SPEC_PARENT__, "presentation.server", None),
-    "MessageBusWorker": (__SPEC_PARENT__, "messagebus.worker", None),
     "Container": (__SPEC_PARENT__, "di", None),
     "WebSocketInterceptor": (
         __SPEC_PARENT__,

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

@@ -8,23 +8,21 @@ import time
 from codecs import StreamWriter
 from pathlib import Path
 from typing import Any
-from urllib.parse import parse_qs, urlparse, urlunsplit
+from urllib.parse import parse_qs, urlparse
 
 import aio_pika
 import click
 import uvicorn
 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 import worker as worker_mod
 from jararaca.messagebus.decorators import MessageBusController, MessageHandler
 from jararaca.microservice import Microservice
 from jararaca.presentation.http_microservice import HttpMicroservice
 from jararaca.presentation.server import create_http_server
 from jararaca.reflect.controller_inspect import inspect_controller
+from jararaca.scheduler.beat_worker import BeatWorker
 from jararaca.scheduler.decorators import ScheduledAction
-from jararaca.scheduler.scheduler import Scheduler
-from jararaca.scheduler.scheduler_v2 import SchedulerV2
 from jararaca.tools.typescript.interface_parser import (
     write_microservice_to_typescript_interface,
 )
@@ -144,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)
@@ -166,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)
@@ -183,98 +181,6 @@ def cli() -> None:
     pass
 
 
-@cli.command()
-@click.argument(
-    "app_path",
-    type=str,
-)
-@click.option(
-    "--url",
-    type=str,
-    envvar="BROKER_URL",
-)
-@click.option(
-    "--username",
-    type=str,
-    default=None,
-)
-@click.option(
-    "--password",
-    type=str,
-    default=None,
-)
-@click.option(
-    "--exchange",
-    type=str,
-    default="jararaca_ex",
-)
-@click.option(
-    "--prefetch-count",
-    type=int,
-    default=1,
-)
-@click.option(
-    "--passive-declare",
-    is_flag=True,
-    default=False,
-    help="[DEPRECATED] Use passive declarations (check if infrastructure exists without creating it)",
-)
-@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,
-    username: str | None,
-    password: str | None,
-    exchange: str,
-    prefetch_count: int,
-    handlers: str | None,
-    passive_declare: bool,
-) -> None:
-
-    app = find_microservice_by_module_path(app_path)
-
-    parsed_url = urlparse(url)
-
-    if password is not None:
-        parsed_url = urlparse(
-            urlunsplit(
-                parsed_url._replace(
-                    netloc=f"{parsed_url.username or ''}:{password}@{parsed_url.netloc}"
-                )
-            )
-        )
-
-    if username is not None:
-        parsed_url = urlparse(
-            urlunsplit(
-                parsed_url._replace(
-                    netloc=f"{username}{':%s' % password if password is not None else ''}@{parsed_url.netloc}"
-                )
-            )
-        )
-
-    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,
-        prefetch_count=prefetch_count,
-    )
-
-    worker_v1.MessageBusWorker(app, config=config).start_sync(
-        handler_names=handler_names,
-    )
-
-
 @cli.command()
 @click.argument(
     "app_path",
@@ -285,21 +191,25 @@ def worker(
     "--broker-url",
     type=str,
     envvar="BROKER_URL",
+    required=True,
+    help="The URL for the message broker",
 )
 @click.option(
     "--backend-url",
     type=str,
     envvar="BACKEND_URL",
+    required=True,
+    help="The URL for the message broker backend",
 )
 @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(
+def worker(
     app_path: str, broker_url: str, backend_url: str, handlers: str | None
 ) -> None:
-
+    """Start a message bus worker that processes asynchronous messages from a message queue."""
     app = find_microservice_by_module_path(app_path)
 
     # Parse handler names if provided
@@ -307,7 +217,7 @@ def worker_v2(
     if handlers:
         handler_names = {name.strip() for name in handlers.split(",") if name.strip()}
 
-    worker_v2_mod.MessageBusWorker(
+    worker_mod.MessageBusWorker(
         app=app,
         broker_url=broker_url,
         backend_url=backend_url,
@@ -354,38 +264,6 @@ def server(app_path: str, host: str, port: int) -> None:
     uvicorn.run(asgi_app, host=host, port=port)
 
 
-@cli.command()
-@click.argument(
-    "app_path",
-    type=str,
-)
-@click.option(
-    "--interval",
-    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)
-
-    # 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()
 @click.argument(
     "app_path",
@@ -408,35 +286,33 @@ def scheduler(
     required=True,
 )
 @click.option(
-    "--schedulers",
+    "--actions",
     type=str,
-    help="Comma-separated list of scheduler names to run (only run schedulers with these names)",
+    help="Comma-separated list of action names to run (only run actions with these names)",
 )
-def scheduler_v2(
+def beat(
     interval: int,
     broker_url: str,
     backend_url: str,
     app_path: str,
-    schedulers: str | None = None,
+    actions: 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()
-        }
+    if actions:
+        scheduler_names = {name.strip() for name in actions.split(",") if name.strip()}
 
-    scheduler = SchedulerV2(
+    beat_worker = BeatWorker(
         app=app,
         interval=interval,
         backend_url=backend_url,
         broker_url=broker_url,
-        scheduler_names=scheduler_names,
+        scheduled_action_names=scheduler_names,
     )
-    scheduler.run()
+    beat_worker.run()
 
 
 def generate_interfaces(
@@ -663,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",
@@ -766,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.11a10/src/jararaca/scheduler/scheduler_v2.py → jararaca-0.3.11a12/src/jararaca/scheduler/beat_worker.py

@@ -4,10 +4,9 @@ import logging
 import signal
 import time
 from abc import ABC, abstractmethod
-from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from types import FrameType
-from typing import Any, AsyncGenerator
+from typing import Any
 from urllib.parse import parse_qs
 
 import aio_pika
@@ -36,7 +35,7 @@ from jararaca.utils.rabbitmq_utils import RabbitmqUtils
 logger = logging.getLogger(__name__)
 
 
-def extract_scheduled_actions(
+def _extract_scheduled_actions(
     app: Microservice, container: Container, scheduler_names: set[str] | None = None
 ) -> list[ScheduledActionData]:
     scheduled_actions: list[ScheduledActionData] = []
@@ -64,7 +63,7 @@ def extract_scheduled_actions(
 # region Message Broker Dispatcher
 
 
-class MessageBrokerDispatcher(ABC):
+class _MessageBrokerDispatcher(ABC):
 
     @abstractmethod
     async def dispatch_scheduled_action(
@@ -100,7 +99,7 @@ class MessageBrokerDispatcher(ABC):
         pass
 
 
-class RabbitMQBrokerDispatcher(MessageBrokerDispatcher):
+class _RabbitMQBrokerDispatcher(_MessageBrokerDispatcher):
 
     def __init__(self, url: str) -> None:
         self.url = url
@@ -196,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,
                 )
@@ -206,13 +205,13 @@ class RabbitMQBrokerDispatcher(MessageBrokerDispatcher):
         await self.conn_pool.close()
 
 
-def get_message_broker_dispatcher_from_url(url: str) -> MessageBrokerDispatcher:
+def _get_message_broker_dispatcher_from_url(url: str) -> _MessageBrokerDispatcher:
     """
     Factory function to create a message broker instance from a URL.
     Currently, only RabbitMQ is supported.
     """
     if url.startswith("amqp://") or url.startswith("amqps://"):
-        return RabbitMQBrokerDispatcher(url=url)
+        return _RabbitMQBrokerDispatcher(url=url)
     else:
         raise ValueError(f"Unsupported message broker URL: {url}")
 
@@ -220,7 +219,7 @@ def get_message_broker_dispatcher_from_url(url: str) -> MessageBrokerDispatcher:
 # endregion
 
 
-class SchedulerV2:
+class BeatWorker:
 
     def __init__(
         self,
@@ -228,11 +227,11 @@ class SchedulerV2:
         interval: int,
         broker_url: str,
         backend_url: str,
-        scheduler_names: set[str] | None = None,
+        scheduled_action_names: set[str] | None = None,
     ) -> None:
         self.app = app
 
-        self.broker: MessageBrokerDispatcher = get_message_broker_dispatcher_from_url(
+        self.broker: _MessageBrokerDispatcher = _get_message_broker_dispatcher_from_url(
             broker_url
         )
         self.backend: MessageBrokerBackend = get_message_broker_backend_from_url(
@@ -240,7 +239,7 @@ class SchedulerV2:
         )
 
         self.interval = interval
-        self.scheduler_names = scheduler_names
+        self.scheduler_names = scheduled_action_names
         self.container = Container(self.app)
         self.uow_provider = UnitOfWorkContextProvider(app, self.container)
 
@@ -266,7 +265,7 @@ class SchedulerV2:
         """
         async with self.lifecycle():
 
-            scheduled_actions = extract_scheduled_actions(
+            scheduled_actions = _extract_scheduled_actions(
                 self.app, self.container, self.scheduler_names
             )
 
@@ -341,14 +340,3 @@ class SchedulerV2:
 
         await self.backend.dispose()
         await self.broker.dispose()
-
-
-@asynccontextmanager
-async def none_context() -> AsyncGenerator[None, None]:
-    yield
-
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-)

{jararaca-0.3.11a10 → 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,19 +273,24 @@ 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.
         """
         return await channel.declare_queue(
             name=queue_name,
             durable=True,
             passive=passive,
+            arguments={
+                "x-max-length": 1,
+            },
         )
 
     @classmethod