synth-ai 0.2.8.dev5__py3-none-any.whl → 0.2.8.dev7__py3-none-any.whl

synth_ai/demos/core/cli.py

@@ -763,7 +763,10 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                     raise FileNotFoundError(f"App file not found: {app_path}")
                 # Surface the app path before asking for the name
                 print(f"Using task app: {app_path}")
-                suggested_name = args.name or f"synth-{os.path.splitext(os.path.basename(app_path))[0]}"
+                existing_name = (args.name or env.task_app_name or "").strip()
+                if not existing_name:
+                    existing_name = f"synth-{os.path.splitext(os.path.basename(app_path))[0]}"
+                suggested_name = existing_name
                 name_in = input(f"Modal app name [{suggested_name}]: ").strip() or suggested_name
                 app_name = name_in
                 print("\nAbout to deploy with:")
@@ -774,7 +777,11 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                     print("Aborted by user.")
                     return 1
 
-                secret_name = (env.task_app_secret_name or "").strip() or f"{name_in}-secret"
+                prev_secret = (env.task_app_secret_name or "").strip()
+                default_secret = f"{name_in}-secret"
+                secret_name = default_secret if not prev_secret else prev_secret
+                if prev_secret and prev_secret != default_secret:
+                    secret_name = default_secret
                 existing_env_key = (env.env_api_key or "").strip()
                 env_key: str | None = existing_env_key or None
                 if existing_env_key:
@@ -799,24 +806,24 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                     print("[deploy] Minted new ENVIRONMENT_API_KEY")
                 
                 # Optionally upload the new key to the backend using sealed box helper
-                backend_base = env.dev_backend_url or ""
+                backend_base = (env.dev_backend_url or "").rstrip("/")
                 synth_key = (env.synth_api_key or os.environ.get("SYNTH_API_KEY") or local_env.get("SYNTH_API_KEY") or "").strip()
                 if backend_base and synth_key:
-                        backend_base = backend_base.rstrip("/")
-                        if not backend_base.endswith("/api"):
-                            backend_base = f"{backend_base}/api"
+                        # Pass a base WITHOUT trailing /api to setup_environment_api_key,
+                        # since it appends /api/v1/... internally.
+                        non_api_base = backend_base[:-4] if backend_base.endswith("/api") else backend_base
                         try:
                             choice = input(
-                                f"Upload ENVIRONMENT_API_KEY to backend {backend_base}? [Y/n]: "
+                                f"Upload ENVIRONMENT_API_KEY to backend {non_api_base}? [Y/n]: "
                             ).strip().lower() or "y"
                         except Exception:
                             choice = "y"
                         if choice.startswith("y"):
                             try:
-                                print(f"[deploy] Uploading ENVIRONMENT_API_KEY to {backend_base} …")
+                                print(f"[deploy] Uploading ENVIRONMENT_API_KEY to {non_api_base} …")
                                 from synth_ai.rl.env_keys import setup_environment_api_key
 
-                                setup_environment_api_key(backend_base.rstrip("/"), synth_key, token=env_key)
+                                setup_environment_api_key(non_api_base, synth_key, token=env_key)
                                 print("[deploy] Backend sealed-box upload complete.")
                             except Exception as upload_err:
                                 print(f"[deploy] Failed to upload ENVIRONMENT_API_KEY: {upload_err}")
@@ -917,7 +924,7 @@ def cmd_deploy(args: argparse.Namespace) -> int:
             print(f"  export TASK_APP_NAME={app_name}")
             print(f"  export TASK_APP_SECRET_NAME={app_name}-secret")
         print(f"Persisted to {dotenv_path}")
-        print("Next: uvx synth-ai run")
+        print("\nNext step:\n$ uvx synth-ai run")
         return 0
     except Exception as e:
         print(f"Deploy error: {e}")
@@ -1070,11 +1077,7 @@ fi
         if os.path.exists(dst_cfg):
             print(f"  - {dst_cfg} (seeded)")
         print("")
-        print("Next steps:")
-        print("  1) cd synth_demo && put your ENVIRONMENT_API_KEY in ./.env")
-        print("  2) Deploy to Modal:")
-        print("     uvx bash ./deploy_task_app.sh")
-        print("  3) From project root, run: uvx synth-ai run")
+        print("\nNext step:\n$ uvx synth-ai setup")
         return 0
     except Exception as e:
         print(f"Init error: {e}")
@@ -1363,7 +1366,7 @@ def main(argv: list[str] | None = None) -> int:
     def _deploy_opts(parser):
         parser.add_argument("--local", action="store_true", help="Run local FastAPI instead of Modal deploy")
         parser.add_argument("--app", type=str, default=None, help="Path to Modal app.py for uv run modal deploy")
-        parser.add_argument("--name", type=str, default="synth-math-demo", help="Modal app name")
+        parser.add_argument("--name", type=str, default=None, help="Modal app name")
         parser.add_argument("--script", type=str, default=None, help="Path to deploy_task_app.sh (optional legacy)")
         parser.set_defaults(func=cmd_deploy)
 

synth_ai/demos/demo_task_apps/math/modal_task_app.py

@@ -43,7 +43,15 @@ if _SYNTH_HOSTED is not None:
 # No extra local dirs required; app is self-contained
 
 app = App("hendrycks-math-task-app")
-_SECRET_NAME = "synth-math-demo-secret"
+_SECRET_NAME = (
+    os.getenv("TASK_APP_SECRET_NAME")
+    or os.getenv("MATH_TASK_APP_SECRET")
+    or os.getenv("TASK_APP_NAME", "").strip()
+)
+if not _SECRET_NAME:
+    _SECRET_NAME = "synth-math-demo-secret"
+elif not _SECRET_NAME.endswith("-secret"):
+    _SECRET_NAME = f"{_SECRET_NAME}-secret"
 
 
 @app.function(
@@ -411,5 +419,3 @@ def fastapi_app():
         }
 
     return api
-
-

synth_ai/handshake.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
-
-import json
 import os
 import time
 import webbrowser
 from typing import Any, Dict, Tuple
+from urllib.parse import urljoin, urlsplit, urlunsplit
 
 import requests
 
@@ -13,18 +12,58 @@ class HandshakeError(Exception):
     pass
 
 
+_TRUTHY = {"1", "true", "yes", "on"}
+
+
 def _origin() -> str:
-    # Prefer explicit env; fallback to localhost dashboard
-    return (os.getenv("SYNTH_CANONICAL_ORIGIN", "") or "http://localhost:3000").rstrip("/")
+    """Resolve the dashboard origin for the browser handshake.
+
+    Priority order:
+      1. Explicit ``SYNTH_CANONICAL_ORIGIN`` override.
+      2. Development flag ``SYNTH_CANONICAL_DEV`` (case-insensitive truthy) → localhost.
+      3. Production dashboard at ``https://www.usesynth.ai/dashboard``.
+    """
+
+    override = (os.getenv("SYNTH_CANONICAL_ORIGIN") or "").strip()
+    if override:
+        return override.rstrip("/")
+
+    dev_flag = (os.getenv("SYNTH_CANONICAL_DEV") or "").strip().lower()
+    if dev_flag in _TRUTHY:
+        print("USING DEV ORIGIN")
+        return "http://localhost:3000"
+
+    return "https://www.usesynth.ai/dashboard"
+
+
+def _split_origin(origin: str) -> tuple[str, str]:
+    parsed = urlsplit(origin)
+    bare = urlunsplit((parsed.scheme, parsed.netloc, "", "", ""))
+    path = parsed.path.rstrip("/")
+    return bare, path
+
+
+def _ensure_verification_uri(data: Dict[str, Any], base_with_path: str) -> None:
+    uri = data.get("verification_uri")
+    if not isinstance(uri, str) or not uri:
+        return
+    if uri.startswith("http://") or uri.startswith("https://"):
+        return
+    data["verification_uri"] = urljoin(base_with_path.rstrip("/") + "/", uri.lstrip("/"))
 
 
 def start_handshake_session(origin: str | None = None) -> Tuple[str, str, int, int]:
     base = (origin or _origin()).rstrip("/")
-    url = f"{base}/api/sdk/handshake/init"
+    api_origin, _ = _split_origin(base)
+    url = urljoin(api_origin.rstrip("/") + "/", "api/sdk/handshake/init")
     r = requests.post(url, timeout=10)
     if r.status_code != 200:
         raise HandshakeError(f"init failed: {r.status_code} {r.text}")
-    data = r.json()
+    try:
+        data = r.json()
+    except ValueError as exc:  # pragma: no cover - network dependent
+        raise HandshakeError(f"init returned malformed JSON: {exc}") from exc
+    _ensure_verification_uri(data, base)
     return (
         str(data.get("device_code")),
         str(data.get("verification_uri")),
@@ -35,7 +74,8 @@ def start_handshake_session(origin: str | None = None) -> Tuple[str, str, int, i
 
 def poll_handshake_token(device_code: str, origin: str | None = None, *, timeout_s: int | None = None) -> Dict[str, Any]:
     base = (origin or _origin()).rstrip("/")
-    url = f"{base}/api/sdk/handshake/token"
+    api_origin, _ = _split_origin(base)
+    url = urljoin(api_origin.rstrip("/") + "/", "api/sdk/handshake/token")
     deadline = time.time() + (timeout_s or 600)
     while True:
         if time.time() > deadline:
@@ -46,7 +86,12 @@ def poll_handshake_token(device_code: str, origin: str | None = None, *, timeout
             time.sleep(2)
             continue
         if r.status_code == 200:
-            return r.json()
+            try:
+                data = r.json()
+            except ValueError as exc:  # pragma: no cover - network dependent
+                raise HandshakeError(f"token returned malformed JSON: {exc}") from exc
+            _ensure_verification_uri(data, base)
+            return data
         elif r.status_code in (404, 410):
             raise HandshakeError(f"handshake failed: {r.status_code}")
         # 428 authorization_pending or others → wait and retry
@@ -60,4 +105,3 @@ def run_handshake(origin: str | None = None) -> Dict[str, Any]:
     except Exception:
         pass
     return poll_handshake_token(device_code, origin, timeout_s=expires_in)
-

{synth_ai-0.2.8.dev5.dist-info → synth_ai-0.2.8.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synth-ai
-Version: 0.2.8.dev5
+Version: 0.2.8.dev7
 Summary: RL as a service SDK - Core AI functionality and tracing
 Author-email: Synth AI <josh@usesynth.ai>
 License-Expression: MIT
@@ -125,5 +125,6 @@ If your browser isn’t already signed in, sign in when prompted and the pairing
 
 Environment variables:
 
-- `SYNTH_CANONICAL_ORIGIN` (optional): override the dashboard base URL the SDK uses for the handshake (defaults to `http://localhost:3000`).
+- `SYNTH_CANONICAL_ORIGIN` (optional): override the dashboard base URL the SDK uses for the handshake (defaults to `https://www.usesynth.ai/dashboard`).
+- `SYNTH_CANONICAL_DEV` (optional): set to `1`, `true`, `yes`, or `on` to target the local dashboard at `http://localhost:3000`.
 - Keys are stored only in your project’s `.env` file, not exported to your shell.

{synth_ai-0.2.8.dev5.dist-info → synth_ai-0.2.8.dev7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 synth_ai/__init__.py,sha256=NixuXddy4lS2Wmj0F8eMt0HS_oYCTnq3iVVq5VYwWIc,1341
 synth_ai/__main__.py,sha256=Kh1xBKkTE5Vs2qNMtDuuOXerHUptMcOiF3YziOpC6DA,146
-synth_ai/handshake.py,sha256=AJR0GFFAkdAga8CXRLYbQl90-s0AQzTGxy5tQzPQb0E,1994
+synth_ai/handshake.py,sha256=uzoTOpkf9JQgsyKWrlx8gjfQmK3HpqFQAZY1gZDtiIo,3735
 synth_ai/http.py,sha256=lqjFXDmAP_xgfywK_rDSOVxuMy4rDH9S3Rtu9k1tLmk,1028
 synth_ai/http_client.py,sha256=_9J8rUGoItUMnJLGZw7r0uXiJeLWR939kByRkvtP1XM,4429
 synth_ai/install_sqld.sh,sha256=AMBhlfq661PxeTTc6D4K_Nei_qwMvA84ei4NhQzmUUk,928
@@ -21,7 +21,7 @@ synth_ai/config/base_url.py,sha256=c85LaABBrvsl8Fp8KH0LNtJJrpnUwlzA5Ywbuth8fHE,3
 synth_ai/core/experiment.py,sha256=hLkPtzUFA7iY3-QpeJ5K8YjvQeyfqnjab5P2CFaojys,236
 synth_ai/core/system.py,sha256=s-Z7np2ISYmYc1r9YN-y2yb3cgRlOalrh0iaqnxeo84,206
 synth_ai/demos/core/__init__.py,sha256=A2FjhY7KXGtyzdQXqeTPCkEhHfrH-eQg6bvP8HaYhZM,36
-synth_ai/demos/core/cli.py,sha256=LMw8ExI_1lUQrX0QFJzhegStwLkxqooTjD6r1Nr7fwY,55976
+synth_ai/demos/core/cli.py,sha256=lwkW1j638pOaLpmo6vPtDvEjsWdtLDCTwjbHoSHOdA8,56220
 synth_ai/demos/demo_task_apps/__init__.py,sha256=8aUGEGpWUw11GRb3wQXRAmQ99yjAt5qd5FCTDJpXWjI,44
 synth_ai/demos/demo_task_apps/core.py,sha256=ifKxxRKqC-y43MaqLHNuerXAlBHO8MI8ZBo2CzYcOoU,14563
 synth_ai/demos/demo_task_apps/math/__init__.py,sha256=WBzpZwSn7pRarBmhopQi34i9bEm05-71eM3siboOavY,43
@@ -30,7 +30,7 @@ synth_ai/demos/demo_task_apps/math/app.py,sha256=gNopoAhwM0vzdKuCa7AwQqSwiV2xagr
 synth_ai/demos/demo_task_apps/math/config.toml,sha256=Kxrzuyj7Az5mvzXaipPIyngKTDqphohf6uSWOHCF5cw,2105
 synth_ai/demos/demo_task_apps/math/deploy_modal.py,sha256=O4745sFuGEZTsygl-mz6ZOFJ7mog8CquXMgMyjFKr_c,2288
 synth_ai/demos/demo_task_apps/math/deploy_task_app.sh,sha256=qVffbAmsiCAxzFDzcxNVF4f7yyLWnmqPc1cNydHT5BQ,791
-synth_ai/demos/demo_task_apps/math/modal_task_app.py,sha256=OgTtoxlNc504ClAtLamsXL7nhmYptW0Djg4SeeeHcgs,18772
+synth_ai/demos/demo_task_apps/math/modal_task_app.py,sha256=PE6LtRmz-56nbMT0tCInSr5IRUIpq-jVOrhZMTmMna4,19026
 synth_ai/environments/__init__.py,sha256=BQW0Nc_BFQq_N-pcqTyJVjW56kSEXu7XZyaSer-U95Q,1032
 synth_ai/environments/environment/__init__.py,sha256=EBol9AKxPTIPXWcbH9Tja-l3yL-N2kB8e5atyf6F66c,31
 synth_ai/environments/environment/core.py,sha256=0jd0CZ88_s_qqA3d1lOgVsnv-ucw_1lJDAIUj1gTSt0,2201
@@ -412,9 +412,9 @@ synth_ai/v0/tracing_v1/events/manage.py,sha256=ZDXXP-ZwLH9LCsmw7Ru9o55d7bl_diPtJ
 synth_ai/v0/tracing_v1/events/scope.py,sha256=BuBkhSpVHUJt8iGT9HJZF82rbb88mQcd2vM2shg-w2I,2550
 synth_ai/v0/tracing_v1/events/store.py,sha256=0342lvAcalyJbVEIzQFaPuMQGgwiFm7M5rE6gr-G0E8,9041
 synth_ai/zyk/__init__.py,sha256=htVLnzTYQ5rxzYpzSYBm7_o6uNKZ3pB_PrqkBrgTRS4,771
-synth_ai-0.2.8.dev5.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
-synth_ai-0.2.8.dev5.dist-info/METADATA,sha256=obtSTg2SzuMQvnJvR918ouGdIx48zgW7QIzjEKQkdGA,5011
-synth_ai-0.2.8.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synth_ai-0.2.8.dev5.dist-info/entry_points.txt,sha256=Neq-3bT7TAijjgOIR77pKL-WYg6TWBDeO8pp_nL4vGY,91
-synth_ai-0.2.8.dev5.dist-info/top_level.txt,sha256=fBmtZyVHuKaGa29oHBaaUkrUIWTqSpoVMPiVdCDP3k8,9
-synth_ai-0.2.8.dev5.dist-info/RECORD,,
+synth_ai-0.2.8.dev7.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
+synth_ai-0.2.8.dev7.dist-info/METADATA,sha256=NhVDsnnUZ2UYfMURfhfdl_ukMaeyB3Zo3xtuvjQlnms,5152
+synth_ai-0.2.8.dev7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+synth_ai-0.2.8.dev7.dist-info/entry_points.txt,sha256=Neq-3bT7TAijjgOIR77pKL-WYg6TWBDeO8pp_nL4vGY,91
+synth_ai-0.2.8.dev7.dist-info/top_level.txt,sha256=fBmtZyVHuKaGa29oHBaaUkrUIWTqSpoVMPiVdCDP3k8,9
+synth_ai-0.2.8.dev7.dist-info/RECORD,,