synth-ai 0.2.9.dev11__py3-none-any.whl → 0.4.1__py3-none-any.whl

synth_ai/sdk/api/train/env_resolver.py

@@ -0,0 +1,418 @@
+from __future__ import annotations
+
+import importlib
+import os
+from collections.abc import Callable, Iterable, MutableMapping
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, cast
+
+import click
+
+from synth_ai.cli.lib.env import resolve_env_var
+from synth_ai.core.telemetry import log_info
+
+from . import task_app
+from .utils import REPO_ROOT, mask_value, read_env_file, write_env_value
+
+
+def _load_saved_env_path() -> Path | None:
+    try:
+        module = cast(
+            Any, importlib.import_module("synth_ai.cli.demo_apps.demo_task_apps.core")
+        )
+        loader = cast(Callable[[], str | None], module.load_env_file_path)
+        saved_path = loader()
+        if saved_path:
+            return Path(saved_path)
+    except Exception:
+        return None
+    return None
+
+
+@dataclass(slots=True)
+class KeySpec:
+    name: str
+    description: str
+    secret: bool = True
+    allow_modal_secret: bool = False
+    allow_modal_app: bool = False
+    modal_secret_pattern: str | None = None
+    optional: bool = False
+
+
+class EnvResolver:
+    def __init__(self, initial_candidates: list[Path]) -> None:
+        if not initial_candidates:
+            raise click.ClickException("No .env candidates discovered")
+        self._candidates = initial_candidates
+        self._current = initial_candidates[0]
+        self._cache: MutableMapping[Path, dict[str, str]] = {}
+
+    @property
+    def current_path(self) -> Path:
+        return self._current
+
+    def select_new_env(self) -> None:
+        path = prompt_for_env(self._candidates, current=self._current)
+        self._current = path
+        if path not in self._candidates:
+            self._candidates.append(path)
+
+    def get_value(self, key: str) -> str | None:
+        cache = self._cache.get(self._current)
+        if cache is None:
+            cache = read_env_file(self._current)
+            self._cache[self._current] = cache
+        return cache.get(key)
+
+    def set_value(self, key: str, value: str) -> None:
+        cache = self._cache.setdefault(self._current, {})
+        cache[key] = value
+        write_env_value(self._current, key, value)
+
+
+def _collect_default_candidates(config_path: Path | None) -> list[Path]:
+    candidates: list[Path] = []
+    cwd = Path.cwd()
+
+    # Prioritize CWD env files
+    cwd_env = cwd / ".env"
+    if cwd_env.exists():
+        candidates.append(cwd_env.resolve())
+
+    # Search for additional .env files in CWD subdirectories
+    for sub in cwd.glob("**/.env"):
+        try:
+            resolved = sub.resolve()
+        except Exception:
+            continue
+        if resolved in candidates:
+            continue
+        # avoid nested venv caches
+        if any(part in {".venv", "node_modules", "__pycache__"} for part in resolved.parts):
+            continue
+        if len(candidates) >= 20:
+            break
+        candidates.append(resolved)
+
+    # Then config path env file
+    if config_path:
+        cfg_env = config_path.parent / ".env"
+        if cfg_env.exists():
+            candidates.append(cfg_env.resolve())
+
+    # Then repo env files
+    repo_env = REPO_ROOT / ".env"
+    if repo_env.exists():
+        candidates.append(repo_env.resolve())
+    examples_env = REPO_ROOT / "examples" / ".env"
+    if examples_env.exists():
+        candidates.append(examples_env.resolve())
+
+    # Search shallow depth for additional .env files in examples
+    for sub in (REPO_ROOT / "examples").glob("**/.env"):
+        try:
+            resolved = sub.resolve()
+        except Exception:
+            continue
+        if resolved in candidates:
+            continue
+        # avoid nested venv caches
+        if any(part in {".venv", "node_modules", "__pycache__"} for part in resolved.parts):
+            continue
+        if len(candidates) >= 20:
+            break
+        candidates.append(resolved)
+
+    deduped: list[Path] = []
+    for path in candidates:
+        if path not in deduped:
+            deduped.append(path)
+    return deduped
+
+
+def prompt_for_env(candidates: list[Path], *, current: Path | None = None) -> Path:
+    options = list(dict.fromkeys(candidates))  # preserve order, dedupe
+    click.echo("Select an .env file:")
+    for idx, path in enumerate(options, start=1):
+        marker = " (current)" if current and path == current else ""
+        click.echo(f"  {idx}) {path}{marker}")
+    click.echo("  m) Enter path manually")
+    click.echo("  0) Abort")
+
+    choice = click.prompt("Choice", default=None)
+    if choice is None:
+        raise click.ClickException("Selection required")
+    choice = choice.strip().lower()
+    if choice == "0":
+        raise click.ClickException("Aborted by user")
+    if choice in {"m", "manual"}:
+        manual = click.prompt("Enter path to .env", type=str).strip()
+        path = Path(manual).expanduser().resolve()
+        if not path.exists():
+            raise click.ClickException(f"Env file not found: {path}")
+        return path
+    try:
+        idx = int(choice)
+    except ValueError as exc:
+        raise click.ClickException("Invalid selection") from exc
+    if idx < 1 or idx > len(options):
+        raise click.ClickException("Invalid selection")
+    return options[idx - 1]
+
+
+def resolve_env(
+    *,
+    config_path: Path | None,
+    explicit_env_paths: Iterable[str],
+    required_keys: list[KeySpec],
+    toml_env_file_path: str | None = None,
+) -> tuple[Path, dict[str, str]]:
+    """Resolve environment file and values.
+
+    Priority order:
+    1. Explicit CLI --env-file paths
+    2. TOML config env_file_path
+    3. Saved path from previous session
+    4. Default candidates (CWD .env, config dir .env, repo .env)
+
+    Never prompts interactively - fails with informative error if credentials missing.
+    """
+    ctx: dict[str, Any] = {
+        "config_path": str(config_path) if config_path else None,
+        "has_explicit_env_paths": bool(list(explicit_env_paths)),
+        "required_key_count": len(required_keys),
+    }
+    log_info("resolve_env invoked", ctx=ctx)
+    provided = [Path(p).expanduser().resolve() for p in explicit_env_paths]
+    if provided:
+        for path in provided:
+            if not path.exists():
+                raise click.ClickException(f"Env file not found: {path}")
+        resolver = EnvResolver(provided)
+    elif toml_env_file_path:
+        # Use env file path from TOML config
+        # Resolve relative to config file's directory if path is relative
+        env_path_str = str(toml_env_file_path).strip()
+        if config_path:
+            # If relative path, resolve relative to config file's directory
+            if not Path(env_path_str).is_absolute():
+                config_dir = config_path.parent.resolve()
+                env_path = (config_dir / env_path_str).resolve()
+            else:
+                env_path = Path(env_path_str).expanduser().resolve()
+        else:
+            # Fallback: resolve relative to current working directory
+            env_path = Path(env_path_str).expanduser().resolve()
+        
+        if not env_path.exists():
+            raise click.ClickException(
+                f"Env file specified in TOML config not found: {env_path}\n"
+                f"  Config: {config_path}\n"
+                f"  TOML env_file_path: {toml_env_file_path}\n"
+                f"  Resolved to: {env_path}"
+            )
+        resolver = EnvResolver([env_path])
+    else:
+        saved_path = _load_saved_env_path()
+        if saved_path and saved_path.exists():
+            resolver = EnvResolver([saved_path])
+        else:
+            # Use default candidates without prompting
+            candidates = _collect_default_candidates(config_path)
+            if not candidates:
+                # No .env files found - check if we can use environment variables
+                missing_keys = [
+                    spec.name
+                    for spec in required_keys
+                    if not spec.optional and not os.environ.get(spec.name)
+                ]
+                if missing_keys:
+                    raise click.ClickException(
+                        f"❌ Missing required credentials: {', '.join(missing_keys)}\n\n"
+                        f"  Options:\n"
+                        f"  1. Set environment variables: {', '.join(missing_keys)}\n"
+                        f"  2. Create a .env file with these keys\n"
+                        f"  3. Use --env-file to specify a .env file path\n"
+                        f"  4. Add env_file_path to your TOML config: [prompt_learning]\n"
+                        f"     env_file_path = \"/path/to/.env\"\n\n"
+                        f"  Searched for .env files in:\n"
+                        f"    - {Path.cwd() / '.env'}\n"
+                        f"    - {config_path.parent / '.env' if config_path else 'N/A'}\n"
+                        f"    - {REPO_ROOT / '.env'}"
+                    )
+                # Use a dummy resolver since we'll use environment variables
+                resolver = EnvResolver([Path.cwd() / ".env"])
+            else:
+                # Use first candidate without prompting
+                resolver = EnvResolver(candidates)
+
+    # Preload selected .env keys into process env so downstream lookups succeed
+    try:
+        current_env_map = read_env_file(resolver.current_path)
+        for k in (
+            "SYNTH_API_KEY",
+            "ENVIRONMENT_API_KEY",
+            "dev_environment_api_key",
+            "DEV_ENVIRONMENT_API_KEY",
+            "TASK_APP_URL",
+            "TASK_APP_BASE_URL",
+        ):
+            v = current_env_map.get(k)
+            if v and not os.environ.get(k):
+                os.environ[k] = v
+    except Exception:
+        pass
+
+    resolved: dict[str, str] = {}
+    for spec in required_keys:
+        value = _resolve_key(resolver, spec)
+        if value:
+            resolved[spec.name] = value
+    return resolver.current_path, resolved
+
+
+def _resolve_key(resolver: EnvResolver, spec: KeySpec) -> str:
+    """Resolve a key value without interactive prompts.
+    
+    Priority:
+    1. Environment variable
+    2. Value from .env file
+    3. Secrets helper (resolve_env_var)
+    
+    Fails hard if not found (no interactive prompts).
+    """
+    # Priority: existing environment variable
+    env_val = os.environ.get(spec.name) or resolver.get_value(spec.name)
+    # Allow common aliases in .env to satisfy required keys without extra prompts
+    if not env_val and spec.name == "ENVIRONMENT_API_KEY":
+        for alias in ("dev_environment_api_key", "DEV_ENVIRONMENT_API_KEY"):
+            alt = resolver.get_value(alias)
+            if alt:
+                env_val = alt
+                os.environ[spec.name] = alt
+                click.echo(f"Found {spec.name} via {alias}: {mask_value(alt)}")
+                break
+    if not env_val and spec.name == "TASK_APP_URL":
+        for alias in ("TASK_APP_BASE_URL",):
+            alt = resolver.get_value(alias)
+            if alt:
+                env_val = alt
+                os.environ[spec.name] = alt
+                click.echo(f"Found {spec.name} via {alias}: {mask_value(alt)}")
+                break
+    if env_val:
+        click.echo(f"Found {spec.name} in current sources: {mask_value(env_val)}")
+        # Automatically use and persist the value (no prompt)
+        _maybe_persist(resolver, spec, env_val)
+        os.environ[spec.name] = env_val
+        return env_val
+
+    # Try secrets helper
+    resolve_env_var(spec.name)
+    resolved_value = os.environ.get(spec.name)
+    if resolved_value:
+        click.echo(f"Found {spec.name} via secrets helper: {mask_value(resolved_value)}")
+        _maybe_persist(resolver, spec, resolved_value)
+        os.environ[spec.name] = resolved_value
+        return resolved_value
+
+    # Not found - fail hard with informative message
+    if spec.optional:
+        return ""
+    
+    # Build helpful error message
+    env_file_hint = ""
+    if resolver.current_path.exists():
+        env_file_hint = f"\n  Checked .env file: {resolver.current_path}"
+    
+    raise click.ClickException(
+        f"❌ Missing required credential: {spec.name}\n\n"
+        f"  Description: {spec.description}\n"
+        f"  Options:\n"
+        f"  1. Set environment variable: export {spec.name}=<value>\n"
+        f"  2. Add to .env file: {spec.name}=<value>\n"
+        f"  3. Use --env-file to specify a .env file path\n"
+        f"  4. Add env_file_path to your TOML config: [prompt_learning]\n"
+        f"     env_file_path = \"/path/to/.env\"{env_file_hint}"
+    )
+
+
+def _maybe_persist(resolver: EnvResolver, spec: KeySpec, value: str) -> None:
+    # Automatically save (no prompt)
+    # Skip auto-persisting TASK_APP_URL to prevent overwriting CLI overrides
+    if spec.name == "TASK_APP_URL":
+        click.echo(f"Skipping auto-persist for {spec.name} (use CLI flags to override)")
+        return
+    resolver.set_value(spec.name, value)
+    click.echo(f"Saved {spec.name} to {resolver.current_path}")
+
+
+def _prompt_yes_no(message: str, *, default: bool) -> bool:
+    """Prompt the user for a yes/no answer, accepting numeric variants."""
+
+    default_token = "y" if default else "n"
+    suffix = "[Y/n]" if default else "[y/N]"
+    while True:
+        response = click.prompt(f"{message} {suffix}", default=default_token, show_default=False)
+        normalized = str(response).strip().lower()
+        if normalized in {"", "y", "yes", "1", "true", "t"}:
+            return True
+        if normalized in {"n", "no", "0", "false", "f"}:
+            return False
+        click.echo("Invalid input; enter 'y' or 'n'.")
+
+
+def _fetch_modal_secret(resolver: EnvResolver, spec: KeySpec) -> str | None:
+    try:
+        names = task_app.list_modal_secrets(spec.modal_secret_pattern)
+    except click.ClickException as exc:
+        click.echo(str(exc))
+        return None
+    if not names:
+        click.echo("No Modal secrets matched")
+        return None
+    click.echo(task_app.format_modal_secrets(names))
+    idx = click.prompt("Select secret (0 to cancel)", type=int)
+    if idx == 0:
+        return None
+    if idx < 1 or idx > len(names):
+        click.echo("Invalid selection")
+        return None
+    name = names[idx - 1]
+    value = task_app.get_modal_secret_value(name)
+    _maybe_persist(resolver, spec, value)
+    os.environ[spec.name] = value
+    return value
+
+
+def _fetch_modal_app(spec: KeySpec) -> str | None:
+    try:
+        apps = task_app.list_modal_apps("task-app")
+    except click.ClickException as exc:
+        click.echo(str(exc))
+        return None
+    if not apps:
+        click.echo("No Modal apps matched")
+        return None
+    click.echo(task_app.format_modal_apps(apps))
+    idx = click.prompt("Select app (0 to cancel)", type=int)
+    if idx == 0:
+        return None
+    if idx < 1 or idx > len(apps):
+        click.echo("Invalid selection")
+        return None
+    url = apps[idx - 1].url
+    os.environ[spec.name] = url
+    return url
+
+
+def _raise_abort(spec: KeySpec) -> None:
+    raise click.ClickException(f"Missing required value for {spec.name}")
+
+
+__all__ = [
+    "KeySpec",
+    "resolve_env",
+]

synth_ai/sdk/api/train/graph_validators.py

@@ -0,0 +1,216 @@
+"""TOML schema + validation for ADAS/Graphs jobs.
+
+Graphs jobs (aka ADAS jobs) are JSON-dataset-first, but for convenience we also
+support a small TOML wrapper that points at an GraphGenTaskSet JSON file plus a few
+optimization knobs.
+
+Example `graph.toml`:
+
+```toml
+[graph]
+dataset = "my_tasks.json"          # required (path to GraphGenTaskSet JSON)
+policy_model = "gpt-4o-mini"       # optional
+rollout_budget = 200              # optional
+proposer_effort = "medium"        # optional: low|medium|high
+auto_start = true                 # optional
+
+[graph.metadata]
+session_id = "sess_123"
+parent_job_id = "adas_parent"
+population_size = 4
+num_generations = 5
+```
+"""
+
+from __future__ import annotations
+
+import tomllib
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Dict, List, Optional, cast, Literal
+
+from .graphgen_models import GraphGenJobConfig, GraphGenTaskSet, load_graphgen_taskset
+from .graphgen_validators import GraphGenValidationError, validate_graphgen_job_config
+
+
+@dataclass(slots=True)
+class GraphTomlResult:
+    """Normalized graph job config loaded from TOML."""
+
+    dataset_path: Path
+    dataset: GraphGenTaskSet
+    config: GraphGenJobConfig
+    auto_start: bool
+    metadata: Dict[str, Any]
+    initial_prompt: Optional[str] = None
+
+
+class GraphTomlValidationError(Exception):
+    """Raised when a graph TOML config is invalid."""
+
+    def __init__(self, message: str, errors: List[Dict[str, Any]]) -> None:
+        self.message = message
+        self.errors = errors
+        super().__init__(message)
+
+
+def validate_graph_job_section(
+    section: Dict[str, Any],
+    *,
+    base_dir: Optional[Path] = None,
+) -> GraphTomlResult:
+    """Validate a `[graph]` TOML section and return normalized config."""
+    errors: List[Dict[str, Any]] = []
+
+    if not isinstance(section, dict):
+        raise GraphTomlValidationError(
+            "Graph config must be a TOML table",
+            [{"field": "graph", "error": "graph section must be a table"}],
+        )
+
+    dataset_ref = section.get("dataset_path") or section.get("dataset")
+    if not dataset_ref or not isinstance(dataset_ref, str):
+        errors.append(
+            {
+                "field": "graph.dataset",
+                "error": "dataset (path) is required",
+                "suggestion": "Set graph.dataset = \"my_tasks.json\"",
+            }
+        )
+        dataset_path = None
+        dataset = None
+    else:
+        dataset_path = Path(dataset_ref).expanduser()
+        if base_dir and not dataset_path.is_absolute():
+            dataset_path = (base_dir / dataset_path).resolve()
+        try:
+            dataset = load_graphgen_taskset(dataset_path)
+        except FileNotFoundError:
+            errors.append(
+                {
+                    "field": "graph.dataset",
+                    "error": f"Dataset file not found: {dataset_path}",
+                }
+            )
+            dataset = None
+        except ValueError as e:
+            errors.append(
+                {
+                    "field": "graph.dataset",
+                    "error": f"Invalid GraphGenTaskSet JSON: {e}",
+                }
+            )
+            dataset = None
+
+    policy_model = section.get("policy_model") or section.get("model")
+    rollout_budget = section.get("rollout_budget") or section.get("budget")
+    proposer_effort = section.get("proposer_effort") or section.get("effort")
+
+    try:
+        config = GraphGenJobConfig(
+            policy_model=str(policy_model) if policy_model is not None else "gpt-4o-mini",
+            policy_provider=section.get("policy_provider"),
+            rollout_budget=int(rollout_budget) if rollout_budget is not None else 100,
+            proposer_effort=cast(Literal["low", "medium", "high"], str(proposer_effort)) if proposer_effort is not None else "medium",
+            judge_model=section.get("judge_model"),
+            judge_provider=section.get("judge_provider"),
+            population_size=section.get("population_size", 4),
+            num_generations=section.get("num_generations"),
+        )
+    except Exception as e:
+        errors.append({"field": "graph", "error": f"Invalid graph config fields: {e}"})
+        config = GraphGenJobConfig()
+
+    auto_start = bool(section.get("auto_start", True))
+    metadata = cast(Dict[str, Any], section.get("metadata") if isinstance(section.get("metadata"), dict) else {})
+    initial_prompt = section.get("initial_prompt")
+
+    if dataset is not None:
+        try:
+            validate_graphgen_job_config(config, dataset)
+        except GraphGenValidationError as e:
+            errors.extend(e.errors)
+
+    if errors:
+        raise GraphTomlValidationError("Graph TOML validation failed", errors)
+
+    assert dataset_path is not None and dataset is not None
+    return GraphTomlResult(
+        dataset_path=dataset_path,
+        dataset=dataset,
+        config=config,
+        auto_start=auto_start,
+        metadata=metadata,
+        initial_prompt=str(initial_prompt) if initial_prompt is not None else None,
+    )
+
+
+def load_graph_job_toml(path: str | Path) -> GraphTomlResult:
+    """Load and validate a graph job TOML file."""
+    path = Path(path).expanduser().resolve()
+    with open(path, "rb") as f:
+        cfg = tomllib.load(f)
+
+    section = cfg.get("graph") or cfg.get("adas") or {}
+    return validate_graph_job_section(section, base_dir=path.parent)
+
+
+def validate_graph_job_payload(payload: Dict[str, Any]) -> None:
+    """Validate a graph/ADAS job payload (matching backend create request).
+
+    Expected keys:
+      - dataset: GraphGenTaskSet dict
+      - policy_model, rollout_budget, proposer_effort
+      - optional judge_model/judge_provider
+      - optional metadata (population_size/num_generations)
+    """
+    errors: List[Dict[str, Any]] = []
+
+    dataset_raw = payload.get("dataset")
+    dataset: Optional[GraphGenTaskSet]
+    if isinstance(dataset_raw, GraphGenTaskSet):
+        dataset = dataset_raw
+    elif isinstance(dataset_raw, dict):
+        try:
+            dataset = GraphGenTaskSet.model_validate(dataset_raw)
+        except Exception as e:
+            errors.append({"field": "dataset", "error": f"Invalid GraphGenTaskSet: {e}"})
+            dataset = None
+    else:
+        errors.append({"field": "dataset", "error": "dataset must be a dict"})
+        dataset = None
+
+    metadata = cast(Dict[str, Any], payload.get("metadata") if isinstance(payload.get("metadata"), dict) else {})
+
+    try:
+        config = GraphGenJobConfig(
+            policy_model=str(payload.get("policy_model") or "gpt-4o-mini"),
+            policy_provider=payload.get("policy_provider"),
+            rollout_budget=int(payload.get("rollout_budget") or 100),
+            proposer_effort=cast(Literal["low", "medium", "high"], str(payload.get("proposer_effort") or "medium")),
+            judge_model=payload.get("judge_model"),
+            judge_provider=payload.get("judge_provider"),
+            population_size=metadata.get("population_size", 4),
+            num_generations=metadata.get("num_generations"),
+        )
+    except Exception as e:
+        errors.append({"field": "config", "error": f"Invalid config fields: {e}"})
+        config = GraphGenJobConfig()
+
+    if dataset is not None:
+        try:
+            validate_graphgen_job_config(config, dataset)
+        except GraphGenValidationError as e:
+            errors.extend(e.errors)
+
+    if errors:
+        raise GraphTomlValidationError("Graph job validation failed", errors)
+
+
+__all__ = [
+    "GraphTomlResult",
+    "GraphTomlValidationError",
+    "validate_graph_job_section",
+    "validate_graph_job_payload",
+    "load_graph_job_toml",
+]