synth-ai 0.2.12__py3-none-any.whl → 0.2.13.dev2__py3-none-any.whl

synth_ai/cli/rl_demo.py

@@ -15,20 +15,31 @@ For convenience, dotted aliases are also exposed:
 
 from __future__ import annotations
 
+import importlib
+from typing import Any, cast
+
 import click
+from click.exceptions import Exit
+
+demo_commands = cast(Any, importlib.import_module("synth_ai.demos.core.cli"))
 
 
-def _forward(args: list[str]) -> None:
-    import sys
+def _run_demo_command(func, *args, **kwargs) -> None:
+    """Invoke a demo command and exit via Click on non-zero status codes."""
 
     try:
-        from synth_ai.demos.core import cli as demo_cli  # type: ignore
-    except Exception as e:  # pragma: no cover
-        click.echo(f"Failed to import RL demo CLI: {e}")
-        sys.exit(1)
-    rc = int(demo_cli.main(args) or 0)
-    if rc != 0:
-        sys.exit(rc)
+        result = func(*args, **kwargs)
+    except SystemExit as exc:  # pragma: no cover - defensive
+        raise Exit(exc.code or 1) from exc
+
+    if result is None:
+        return
+    try:
+        code = int(result)
+    except (TypeError, ValueError):
+        return
+    if code != 0:
+        raise Exit(code)
 
 
 def register(cli):
@@ -37,14 +48,11 @@ def register(cli):
         """RL Demo commands (separate from legacy demo)."""
 
     # Help pyright understand dynamic Click group attributes
-    from typing import Any
-    from typing import cast as _cast
-
-    _rlg = _cast(Any, rl_demo)
+    _rlg = cast(Any, rl_demo)
 
     @_rlg.command("setup")
     def rl_setup():
-        _forward(["rl_demo.setup"])  # primary setup command
+        _run_demo_command(demo_commands.setup)
 
     # (prepare command removed; consolidated into configure)
 
@@ -64,34 +72,29 @@ def register(cli):
         help="Path to deploy_task_app.sh (optional legacy)",
     )
     def rl_deploy(local: bool, app: str | None, name: str, script: str | None):
-        args: list[str] = ["rl_demo.deploy"]
-        if local:
-            args.append("--local")
-        if app:
-            args.extend(["--app", app])
-        if name:
-            args.extend(["--name", name])
-        if script:
-            args.extend(["--script", script])
-        _forward(args)
+        _run_demo_command(
+            demo_commands.deploy,
+            local=local,
+            app=app,
+            name=name,
+            script=script,
+        )
 
     @_rlg.command("configure")
     def rl_configure():
-        _forward(["rl_demo.configure"])
+        _run_demo_command(demo_commands.run)
 
     @_rlg.command("init")
     @click.option("--template", type=str, default=None, help="Template id to instantiate")
     @click.option("--dest", type=click.Path(), default=None, help="Destination directory for files")
     @click.option("--force", is_flag=True, help="Overwrite existing files in destination")
     def rl_init(template: str | None, dest: str | None, force: bool):
-        args = ["rl_demo.init"]
-        if template:
-            args.extend(["--template", template])
-        if dest:
-            args.extend(["--dest", dest])
-        if force:
-            args.append("--force")
-        _forward(args)
+        _run_demo_command(
+            demo_commands.init,
+            template=template,
+            dest=dest,
+            force=force,
+        )
 
     @_rlg.command("run")
     @click.option(
@@ -110,29 +113,24 @@ def register(cli):
         timeout: int,
         dry_run: bool,
     ):
-        args = ["rl_demo.run"]
-        if config:
-            args.extend(["--config", config])
-        if batch_size is not None:
-            args.extend(["--batch-size", str(batch_size)])
-        if group_size is not None:
-            args.extend(["--group-size", str(group_size)])
-        if model:
-            args.extend(["--model", model])
-        if timeout is not None:
-            args.extend(["--timeout", str(timeout)])
-        if dry_run:
-            args.append("--dry-run")
-        _forward(args)
+        _run_demo_command(
+            demo_commands.run,
+            config=config,
+            batch_size=batch_size,
+            group_size=group_size,
+            model=model,
+            timeout=timeout,
+            dry_run=dry_run,
+        )
 
     # Dotted aliases (top-level): legacy check → setup
     @cli.command("rl_demo.check")
     def rl_check_alias():
-        _forward(["rl_demo.setup"])
+        _run_demo_command(demo_commands.setup)
 
     @cli.command("rl_demo.setup")
     def rl_setup_alias():
-        _forward(["rl_demo.setup"])
+        _run_demo_command(demo_commands.setup)
 
     # (prepare alias removed)
 
@@ -152,34 +150,29 @@ def register(cli):
         help="Path to deploy_task_app.sh (optional legacy)",
     )
     def rl_deploy_alias(local: bool, app: str | None, name: str, script: str | None):
-        args: list[str] = ["rl_demo.deploy"]
-        if local:
-            args.append("--local")
-        if app:
-            args.extend(["--app", app])
-        if name:
-            args.extend(["--name", name])
-        if script:
-            args.extend(["--script", script])
-        _forward(args)
+        _run_demo_command(
+            demo_commands.deploy,
+            local=local,
+            app=app,
+            name=name,
+            script=script,
+        )
 
     @cli.command("rl_demo.configure")
     def rl_configure_alias():
-        _forward(["rl_demo.configure"])
+        _run_demo_command(demo_commands.run)
 
     @cli.command("rl_demo.init")
     @click.option("--template", type=str, default=None, help="Template id to instantiate")
     @click.option("--dest", type=click.Path(), default=None, help="Destination directory for files")
     @click.option("--force", is_flag=True, help="Overwrite existing files in destination")
     def rl_init_alias(template: str | None, dest: str | None, force: bool):
-        args = ["rl_demo.init"]
-        if template:
-            args.extend(["--template", template])
-        if dest:
-            args.extend(["--dest", dest])
-        if force:
-            args.append("--force")
-        _forward(args)
+        _run_demo_command(
+            demo_commands.init,
+            template=template,
+            dest=dest,
+            force=force,
+        )
 
     @cli.command("rl_demo.run")
     @click.option(
@@ -198,20 +191,15 @@ def register(cli):
         timeout: int,
         dry_run: bool,
     ):
-        args = ["rl_demo.run"]
-        if config:
-            args.extend(["--config", config])
-        if batch_size is not None:
-            args.extend(["--batch-size", str(batch_size)])
-        if group_size is not None:
-            args.extend(["--group-size", str(group_size)])
-        if model:
-            args.extend(["--model", model])
-        if timeout is not None:
-            args.extend(["--timeout", str(timeout)])
-        if dry_run:
-            args.append("--dry-run")
-        _forward(args)
+        _run_demo_command(
+            demo_commands.run,
+            config=config,
+            batch_size=batch_size,
+            group_size=group_size,
+            model=model,
+            timeout=timeout,
+            dry_run=dry_run,
+        )
 
     # Top-level convenience alias: `synth-ai deploy`
     @cli.command("demo-deploy")
@@ -230,16 +218,13 @@ def register(cli):
         help="Path to deploy_task_app.sh (optional legacy)",
     )
     def deploy_demo(local: bool, app: str | None, name: str, script: str | None):
-        args: list[str] = ["rl_demo.deploy"]
-        if local:
-            args.append("--local")
-        if app:
-            args.extend(["--app", app])
-        if name:
-            args.extend(["--name", name])
-        if script:
-            args.extend(["--script", script])
-        _forward(args)
+        _run_demo_command(
+            demo_commands.deploy,
+            local=local,
+            app=app,
+            name=name,
+            script=script,
+        )
 
     @cli.command("run")
     @click.option(
@@ -258,17 +243,12 @@ def register(cli):
         timeout: int,
         dry_run: bool,
     ):
-        args = ["run"]
-        if config:
-            args.extend(["--config", config])
-        if batch_size is not None:
-            args.extend(["--batch-size", str(batch_size)])
-        if group_size is not None:
-            args.extend(["--group-size", str(group_size)])
-        if model:
-            args.extend(["--model", model])
-        if timeout is not None:
-            args.extend(["--timeout", str(timeout)])
-        if dry_run:
-            args.append("--dry-run")
-        _forward(args)
+        _run_demo_command(
+            demo_commands.run,
+            config=config,
+            batch_size=batch_size,
+            group_size=group_size,
+            model=model,
+            timeout=timeout,
+            dry_run=dry_run,
+        )

synth_ai/cli/root.py

@@ -156,103 +156,6 @@ def cli():
     """Top-level command group for Synth AI."""
 
 
-# === Legacy demo command group (aliases new rl_demo implementation) ===
-@cli.group()
-def demo():
-    """Demo helpers (deploy, configure, run)."""
-
-
-def _forward_to_demo(args: list[str]) -> None:
-    # Lazy import to avoid loading demo deps unless needed
-    try:
-        from synth_ai.demos.core import cli as demo_cli  # type: ignore
-    except Exception as e:  # pragma: no cover
-        click.echo(f"Failed to import demo CLI: {e}")
-        sys.exit(1)
-    rc = int(demo_cli.main(args) or 0)  # type: ignore[attr-defined]
-    if rc != 0:
-        sys.exit(rc)
-
-
-# (prepare command removed; handled by configure)
-
-
-@demo.command()
-@click.option("--local", is_flag=True, help="Run local FastAPI instead of Modal deploy")
-@click.option(
-    "--app", type=click.Path(), default=None, help="Path to Modal app.py for uv run modal deploy"
-)
-@click.option("--name", type=str, default="synth-math-demo", help="Modal app name")
-@click.option(
-    "--script", type=click.Path(), default=None, help="Path to deploy_task_app.sh (optional legacy)"
-)
-def deploy(local: bool, app: str | None, name: str, script: str | None):
-    """Deploy the Math Task App (Modal by default)."""
-    args: list[str] = ["rl_demo.deploy"]
-    if local:
-        args.append("--local")
-    if app:
-        args.extend(["--app", app])
-    if name:
-        args.extend(["--name", name])
-    if script:
-        args.extend(["--script", script])
-    _forward_to_demo(args)
-
-
-@demo.command()
-def configure():
-    """Print resolved environment and config path."""
-    _forward_to_demo(["rl_demo.configure"])
-
-
-@demo.command()
-def setup():
-    """Perform SDK handshake and write keys to .env."""
-    _forward_to_demo(["rl_demo.setup"])
-
-
-@demo.command()
-@click.option("--template", type=str, default=None, help="Template id to instantiate")
-@click.option("--dest", type=str, default=None, help="Destination directory for files")
-@click.option("--force", is_flag=True, help="Overwrite existing files in destination")
-def init(template: str | None, dest: str | None, force: bool):
-    """Copy demo task app template into the current directory."""
-    args: list[str] = ["demo.init"]
-    if template:
-        args.extend(["--template", template])
-    if dest:
-        args.extend(["--dest", dest])
-    if force:
-        args.append("--force")
-    _forward_to_demo(args)
-
-
-@demo.command()
-@click.option("--batch-size", type=int, default=None)
-@click.option("--group-size", type=int, default=None)
-@click.option("--model", type=str, default=None)
-@click.option("--timeout", type=int, default=600)
-def run(batch_size: int | None, group_size: int | None, model: str | None, timeout: int):
-    """Kick off a short RL job using the prepared TOML."""
-    args = ["rl_demo.run"]
-    if batch_size is not None:
-        args.extend(["--batch-size", str(batch_size)])
-    if group_size is not None:
-        args.extend(["--group-size", str(group_size)])
-    if model:
-        args.extend(["--model", model])
-    if timeout:
-        args.extend(["--timeout", str(timeout)])
-    _forward_to_demo(args)
-
-
-@cli.command(name="setup")
-def setup_command():
-    """Perform SDK handshake and write keys to .env."""
-    _forward_to_demo(["rl_demo.setup"])
-
-
 @cli.command()
 @click.option("--db-file", default="traces/v3/synth_ai.db", help="Database file path")
 @click.option("--sqld-port", default=8080, type=int, help="Port for sqld HTTP interface")