synth-ai 0.2.6.dev6__py3-none-any.whl → 0.2.8__py3-none-any.whl

synth_ai/cli/demo.py

@@ -35,64 +35,73 @@ def _forward_to_new(args: list[str]) -> None:
 
 def register(cli):
     @cli.group("demo", invoke_without_command=True)
+    @click.option("--force", is_flag=True, help="Overwrite existing files in CWD when initializing demo")
     @click.option("--list", "list_only", is_flag=True, help="List available legacy demos and exit")
     @click.option("-f", "filter_term", default="", help="Filter legacy demos by substring")
     @click.pass_context
-    def demo(ctx: click.Context, list_only: bool, filter_term: str):
+    def demo(ctx: click.Context, force: bool, list_only: bool, filter_term: str):
         """Demo helpers.
 
-        - Legacy mode (no subcommand): find and run examples/*/run_demo.sh
+        - Default (no subcommand): initialize RL demo files into ./synth_demo/ (alias of rl_demo init)
+        - Legacy mode: with --list, find and run examples/*/run_demo.sh
         - New RL demo subcommands: deploy, configure, run
         """
         if ctx.invoked_subcommand is not None:
             return
-        # Legacy behavior: interactive examples runner
-        repo_root = Path(os.getcwd())
-        examples_dir = repo_root / "examples"
-        demos = _find_demo_scripts(examples_dir)
-        if filter_term:
-            demos = [p for p in demos if filter_term.lower() in str(p).lower()]
-
-        if not demos:
-            click.echo("No run_demo.sh scripts found under examples/.")
-            return
 
+        # If explicitly asked to list legacy demos, show interactive picker
         if list_only:
+            repo_root = Path(os.getcwd())
+            examples_dir = repo_root / "examples"
+            demos = _find_demo_scripts(examples_dir)
+            if filter_term:
+                demos = [p for p in demos if filter_term.lower() in str(p).lower()]
+
+            if not demos:
+                click.echo("No run_demo.sh scripts found under examples/.")
+                return
+
             click.echo("Available demos:")
-            for p in demos:
-                click.echo(f" - {p.relative_to(repo_root)}")
-            return
+            for idx, p in enumerate(demos, start=1):
+                click.echo(f" {idx}. {p.relative_to(repo_root)}")
+            click.echo("")
+
+            def _validate_choice(val: str) -> int:
+                try:
+                    i = int(val)
+                except Exception as err:
+                    raise click.BadParameter("Enter a number from the list") from err
+                if i < 1 or i > len(demos):
+                    raise click.BadParameter(f"Choose a number between 1 and {len(demos)}")
+                return i
+
+            choice = click.prompt("Select a demo to run", value_proc=_validate_choice)
+            script = demos[choice - 1]
 
-        click.echo("Available demos:")
-        for idx, p in enumerate(demos, start=1):
-            click.echo(f" {idx}. {p.relative_to(repo_root)}")
-        click.echo("")
+            click.echo("")
+            click.echo(f"🚀 Running {script.relative_to(repo_root)}\n")
 
-        def _validate_choice(val: str) -> int:
             try:
-                i = int(val)
-            except Exception as err:
-                raise click.BadParameter("Enter a number from the list") from err
-            if i < 1 or i > len(demos):
-                raise click.BadParameter(f"Choose a number between 1 and {len(demos)}")
-            return i
-
-        choice = click.prompt("Select a demo to run", value_proc=_validate_choice)
-        script = demos[choice - 1]
-
-        click.echo("")
-        click.echo(f"🚀 Running {script.relative_to(repo_root)}\n")
-
-        try:
-            subprocess.run(["bash", str(script)], check=True)
-        except subprocess.CalledProcessError as e:
-            click.echo(f"❌ Demo exited with non-zero status: {e.returncode}")
-        except KeyboardInterrupt:
-            click.echo("\n🛑 Demo interrupted by user")
+                subprocess.run(["bash", str(script)], check=True)
+            except subprocess.CalledProcessError as e:
+                click.echo(f"❌ Demo exited with non-zero status: {e.returncode}")
+            except KeyboardInterrupt:
+                click.echo("\n🛑 Demo interrupted by user")
+            return
+
+        # Default: forward to RL demo init behavior, optionally with --force
+        args: list[str] = ["rl_demo.init"]
+        if force:
+            args.append("--force")
+        _forward_to_new(args)
 
     # (prepare command removed; configure now prepares baseline TOML)
 
-    @demo.command("deploy")
+    # Help pyright understand dynamic Click group attributes
+    from typing import Any, cast as _cast
+    _dg = _cast(Any, demo)
+
+    @_dg.command("deploy")
     @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")
@@ -109,11 +118,15 @@ def register(cli):
             args.extend(["--script", script])
         _forward_to_new(args)
 
-    @demo.command("configure")
+    @_dg.command("configure")
     def demo_configure():
         _forward_to_new(["rl_demo.configure"]) 
 
-    @demo.command("run")
+    @_dg.command("setup")
+    def demo_setup():
+        _forward_to_new(["rl_demo.setup"]) 
+
+    @_dg.command("run")
     @click.option("--batch-size", type=int, default=None)
     @click.option("--group-size", type=int, default=None)
     @click.option("--model", type=str, default=None)

synth_ai/cli/rl_demo.py

@@ -7,6 +7,7 @@ Usage examples:
   uvx synth-ai rl_demo deploy --app /path/to/math_task_app.py --name synth-math-demo
   uvx synth-ai rl_demo configure
   uvx synth-ai rl_demo run --batch-size 4 --group-size 16 --model Qwen/Qwen3-0.6B
+  uvx synth-ai run --config demo_config.toml
 
 For convenience, dotted aliases are also exposed:
   uvx synth-ai rl_demo.check
@@ -38,9 +39,9 @@ def register(cli):
     from typing import Any, cast as _cast
     _rlg = _cast(Any, rl_demo)
 
-    @_rlg.command("check")
-    def rl_check():
-        _forward(["rl_demo.check"])  # reuse same implementation
+    @_rlg.command("setup")
+    def rl_setup():
+        _forward(["rl_demo.setup"])  # primary setup command
 
     # (prepare command removed; consolidated into configure)
 
@@ -96,10 +97,14 @@ def register(cli):
             args.append("--dry-run")
         _forward(args)
 
-    # Dotted aliases (top-level) for convenience: rl_demo.check etc.
+    # Dotted aliases (top-level): legacy check → setup
     @cli.command("rl_demo.check")
     def rl_check_alias():
-        _forward(["rl_demo.check"]) 
+        _forward(["rl_demo.setup"]) 
+
+    @cli.command("rl_demo.setup")
+    def rl_setup_alias():
+        _forward(["rl_demo.setup"]) 
 
     # (prepare alias removed)
 
@@ -154,3 +159,44 @@ def register(cli):
         if dry_run:
             args.append("--dry-run")
         _forward(args)
+
+    # Top-level convenience alias: `synth-ai deploy`
+    @cli.command("deploy")
+    @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_top(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)
+
+    @cli.command("run")
+    @click.option("--config", type=click.Path(), default=None, help="Path to TOML config (skip prompt)")
+    @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)
+    @click.option("--dry-run", is_flag=True, help="Print request body and exit")
+    def run_top(config: str | None, batch_size: int | None, group_size: int | None, model: str | None, 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)

synth_ai/cli/root.py

@@ -117,6 +117,12 @@ def configure():
     _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("--batch-size", type=int, default=None)
 @click.option("--group-size", type=int, default=None)
@@ -136,6 +142,12 @@ def run(batch_size: int | None, group_size: int | None, model: str | None, timeo
     _forward_to_demo(args)
 
 
+@cli.command()
+def setup():
+    """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")