jararaca 0.3.11a10__py3-none-any.whl → 0.3.11a12__py3-none-any.whl

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/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