synth-ai 0.2.9.dev5__py3-none-any.whl → 0.2.9.dev6__py3-none-any.whl

synth_ai/cli/rl_demo.py

@@ -20,6 +20,7 @@ import click
 
 def _forward(args: list[str]) -> None:
     import sys
+
     try:
         from synth_ai.demos.core import cli as demo_cli  # type: ignore
     except Exception as e:  # pragma: no cover
@@ -36,7 +37,9 @@ def register(cli):
         """RL Demo commands (separate from legacy demo)."""
 
     # Help pyright understand dynamic Click group attributes
-    from typing import Any, cast as _cast
+    from typing import Any
+    from typing import cast as _cast
+
     _rlg = _cast(Any, rl_demo)
 
     @_rlg.command("setup")
@@ -47,9 +50,19 @@ def register(cli):
 
     @_rlg.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(
+        "--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)")
+    @click.option(
+        "--script",
+        type=click.Path(),
+        default=None,
+        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:
@@ -64,7 +77,7 @@ def register(cli):
 
     @_rlg.command("configure")
     def rl_configure():
-        _forward(["rl_demo.configure"]) 
+        _forward(["rl_demo.configure"])
 
     @_rlg.command("init")
     @click.option("--template", type=str, default=None, help="Template id to instantiate")
@@ -81,13 +94,22 @@ def register(cli):
         _forward(args)
 
     @_rlg.command("run")
-    @click.option("--config", type=click.Path(), default=None, help="Path to TOML config (skip prompt)")
+    @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 rl_run(config: str | None, batch_size: int | None, group_size: int | None, model: str | None, timeout: int, dry_run: bool):
+    def rl_run(
+        config: str | None,
+        batch_size: int | None,
+        group_size: int | None,
+        model: str | None,
+        timeout: int,
+        dry_run: bool,
+    ):
         args = ["rl_demo.run"]
         if config:
             args.extend(["--config", config])
@@ -106,19 +128,29 @@ def register(cli):
     # Dotted aliases (top-level): legacy check → setup
     @cli.command("rl_demo.check")
     def rl_check_alias():
-        _forward(["rl_demo.setup"]) 
+        _forward(["rl_demo.setup"])
 
     @cli.command("rl_demo.setup")
     def rl_setup_alias():
-        _forward(["rl_demo.setup"]) 
+        _forward(["rl_demo.setup"])
 
     # (prepare alias removed)
 
     @cli.command("rl_demo.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(
+        "--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)")
+    @click.option(
+        "--script",
+        type=click.Path(),
+        default=None,
+        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:
@@ -133,7 +165,7 @@ def register(cli):
 
     @cli.command("rl_demo.configure")
     def rl_configure_alias():
-        _forward(["rl_demo.configure"]) 
+        _forward(["rl_demo.configure"])
 
     @cli.command("rl_demo.init")
     @click.option("--template", type=str, default=None, help="Template id to instantiate")
@@ -150,13 +182,22 @@ def register(cli):
         _forward(args)
 
     @cli.command("rl_demo.run")
-    @click.option("--config", type=click.Path(), default=None, help="Path to TOML config (skip prompt)")
+    @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 rl_run_alias(config: str | None, batch_size: int | None, group_size: int | None, model: str | None, timeout: int, dry_run: bool):
+    def rl_run_alias(
+        config: str | None,
+        batch_size: int | None,
+        group_size: int | None,
+        model: str | None,
+        timeout: int,
+        dry_run: bool,
+    ):
         args = ["rl_demo.run"]
         if config:
             args.extend(["--config", config])
@@ -175,9 +216,19 @@ def register(cli):
     # Top-level convenience alias: `synth-ai deploy`
     @cli.command("demo-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(
+        "--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)")
+    @click.option(
+        "--script",
+        type=click.Path(),
+        default=None,
+        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:
@@ -191,13 +242,22 @@ def register(cli):
         _forward(args)
 
     @cli.command("run")
-    @click.option("--config", type=click.Path(), default=None, help="Path to TOML config (skip prompt)")
+    @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):
+    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])

synth_ai/cli/root.py

@@ -5,17 +5,23 @@ Canonical CLI entrypoint for Synth AI (moved from synth_ai/cli.py).
 
 from __future__ import annotations
 
+import contextlib
 import logging
 import os
 import shutil
 import signal
+import socket
 import subprocess
 import sys
+import tempfile
 import time
 
 import click
+
 try:
-    from importlib.metadata import PackageNotFoundError, version as _pkg_version
+    from importlib.metadata import PackageNotFoundError
+    from importlib.metadata import version as _pkg_version
+
     try:
         __pkg_version__ = _pkg_version("synth-ai")
     except PackageNotFoundError:
@@ -30,6 +36,9 @@ except Exception:
         __pkg_version__ = "unknown"
 
 
+SQLD_VERSION = "v0.26.2"
+
+
 def find_sqld_binary() -> str | None:
     sqld_path = shutil.which("sqld")
     if sqld_path:
@@ -39,6 +48,7 @@ def find_sqld_binary() -> str | None:
         "/usr/bin/sqld",
         os.path.expanduser("~/.local/bin/sqld"),
         os.path.expanduser("~/bin/sqld"),
+        os.path.expanduser("~/.turso/bin/sqld"),
     ]
     for path in common_paths:
         if os.path.exists(path) and os.access(path, os.X_OK):
@@ -47,40 +57,100 @@ def find_sqld_binary() -> str | None:
 
 
 def install_sqld() -> str:
-    click.echo("🔧 sqld not found. Installing...")
-    script = """#!/bin/bash
-set -e
-SQLD_VERSION="v0.26.2"
-OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-ARCH=$(uname -m)
-case "$ARCH" in
-  x86_64) ARCH="x86_64" ;;
-  aarch64|arm64) ARCH="aarch64" ;;
-  *) echo "Unsupported architecture: $ARCH"; exit 1 ;;
-esac
-URL="https://github.com/tursodatabase/libsql/releases/download/libsql-server-${SQLD_VERSION}/sqld-${OS}-${ARCH}.tar.xz"
-TMP_DIR=$(mktemp -d)
-cd "$TMP_DIR"
-curl -L -o sqld.tar.xz "$URL"
-tar -xf sqld.tar.xz
-mkdir -p ~/.local/bin
-mv sqld ~/.local/bin/
-chmod +x ~/.local/bin/sqld
-cd -
-rm -rf "$TMP_DIR"
-"""
-    path = "/tmp/install_sqld.sh"
-    with open(path, "w") as f:
-        f.write(script)
-    subprocess.run(["bash", path], check=True)
-    os.unlink(path)
-    local_bin = os.path.expanduser("~/.local/bin")
-    if local_bin not in os.environ.get("PATH", ""):
-        os.environ["PATH"] = f"{local_bin}:{os.environ.get('PATH', '')}"
-    return os.path.expanduser("~/.local/bin/sqld")
-
-
-@click.group(help=f"Synth AI v{__pkg_version__} - Software for aiding the best and multiplying the will.")
+    """Install sqld via the Turso CLI, installing the CLI via Homebrew if needed."""
+
+    click.echo("🔧 sqld not found. Attempting automatic install...")
+
+    turso_cli_path = shutil.which("turso")
+    brew_path = shutil.which("brew")
+
+    if not turso_cli_path:
+        if not brew_path:
+            raise click.ClickException(
+                "Automatic install requires either Homebrew or an existing Turso CLI.\n"
+                "Install manually using one of:\n"
+                "  • brew install tursodatabase/tap/turso\n"
+                "  • curl -sSfL https://get.tur.so/install.sh | bash\n"
+                "Then run 'turso dev' once and re-run this command."
+            )
+
+        click.echo("🧰 Installing Turso CLI via Homebrew (tursodatabase/tap/turso)…")
+        try:
+            subprocess.run(
+                [brew_path, "install", "tursodatabase/tap/turso"],
+                check=True,
+            )
+        except subprocess.CalledProcessError as exc:
+            raise click.ClickException(
+                "Homebrew install failed. Please resolve brew errors and retry."
+            ) from exc
+
+        turso_cli_path = shutil.which("turso")
+        if not turso_cli_path:
+            raise click.ClickException(
+                "Homebrew reported success but the 'turso' binary is not on PATH."
+            )
+
+    click.echo("📥 Downloading sqld via 'turso dev' (this may take a few seconds)…")
+
+    with tempfile.NamedTemporaryFile(prefix="synth_sqld_", suffix=".db", delete=False) as temp_db:
+        temp_db_path = temp_db.name
+
+    env = os.environ.copy()
+    env.setdefault("TURSO_NONINTERACTIVE", "1")
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.bind(("127.0.0.1", 0))
+        port = sock.getsockname()[1]
+
+    cmd = [
+        turso_cli_path,
+        "dev",
+        f"--db-file={temp_db_path}",
+        f"--port={port}",
+    ]
+    proc: subprocess.Popen[str] | None = None
+    stdout_data = ""
+    stderr_data = ""
+    try:
+        proc = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            env=env,
+        )
+        try:
+            stdout_data, stderr_data = proc.communicate(timeout=10)
+        except subprocess.TimeoutExpired:
+            proc.terminate()
+            try:
+                stdout_data, stderr_data = proc.communicate(timeout=5)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+                stdout_data, stderr_data = proc.communicate()
+    finally:
+        if proc and proc.returncode not in (0, None) and (stdout_data or stderr_data):
+            logging.getLogger(__name__).debug(
+                "turso dev stdout: %s\nstderr: %s", stdout_data, stderr_data
+            )
+        with contextlib.suppress(OSError):
+            os.unlink(temp_db_path)
+
+    sqld_path = find_sqld_binary()
+    if sqld_path:
+        click.echo(f"✅ sqld available at {sqld_path}")
+        return sqld_path
+
+    raise click.ClickException(
+        "sqld download did not succeed. Run 'turso dev' manually once, "
+        "ensure it downloads sqld, and try again."
+    )
+
+
+@click.group(
+    help=f"Synth AI v{__pkg_version__} - Software for aiding the best and multiplying the will."
+)
 @click.version_option(version=__pkg_version__, prog_name="synth-ai")
 def cli():
     """Top-level command group for Synth AI."""
@@ -99,7 +169,7 @@ def _forward_to_demo(args: list[str]) -> None:
     except Exception as e:  # pragma: no cover
         click.echo(f"Failed to import demo CLI: {e}")
         sys.exit(1)
-    rc = int(getattr(demo_cli, "main")(args) or 0)  # type: ignore[attr-defined]
+    rc = int(demo_cli.main(args) or 0)  # type: ignore[attr-defined]
     if rc != 0:
         sys.exit(rc)
 
@@ -109,9 +179,13 @@ def _forward_to_demo(args: list[str]) -> None:
 
 @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(
+    "--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)")
+@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"]
@@ -205,7 +279,10 @@ def serve_deprecated(
     force: bool,
 ):
     logging.basicConfig(level=logging.INFO, format="%(message)s")
-    click.echo("⚠️  'synth-ai serve' now targets task apps; use 'synth-ai serve' for task apps or 'synth-ai serve-deprecated' for this legacy service.", err=True)
+    click.echo(
+        "⚠️  'synth-ai serve' now targets task apps; use 'synth-ai serve' for task apps or 'synth-ai serve-deprecated' for this legacy service.",
+        err=True,
+    )
     processes = []
 
     def signal_handler(sig, frame):

synth_ai/cli/status.py

@@ -14,9 +14,9 @@ from rich.table import Table
 
 
 async def _db_stats(db_url: str) -> dict:
-    from synth_ai.tracing_v3.turso.manager import AsyncSQLTraceManager
+    from synth_ai.tracing_v3.storage.factory import StorageConfig, create_storage
 
-    db = AsyncSQLTraceManager(db_url)
+    db = create_storage(StorageConfig(connection_string=db_url))
     await db.initialize()
     try:
         out: dict = {}