synth-ai 0.2.8.dev8__py3-none-any.whl → 0.2.8.dev9__py3-none-any.whl

synth_ai/demos/core/cli.py

@@ -16,9 +16,6 @@ from synth_ai.handshake import run_handshake, HandshakeError
 from synth_ai.demos.demo_task_apps.core import DemoEnv, DEFAULT_TASK_APP_SECRET_NAME
 
 
-TASK_APP_MODAL_SECRET = DEFAULT_TASK_APP_SECRET_NAME
-
-
 def _key_preview(value: str, label: str) -> str:
     """Return a short descriptor for a secret without leaking the full value."""
     try:
@@ -115,7 +112,6 @@ def cmd_setup(_args: argparse.Namespace) -> int:
             dotenv_values = {
                 "TASK_APP_BASE_URL": new_url,
                 "TASK_APP_NAME": env.task_app_name,
-                "TASK_APP_SECRET_NAME": TASK_APP_MODAL_SECRET,
             }
             demo_core.persist_dotenv_values(dotenv_values)
             os.environ["TASK_APP_BASE_URL"] = new_url
@@ -237,67 +233,6 @@ def _popen_stream_capture(cmd: list[str], cwd: str | None = None, env: dict | No
     return int(proc.returncode or 0), "\n".join(buf_lines)
 
 
-def _mask_secret_args(args: list[str]) -> list[str]:
-    masked: list[str] = []
-    sensitive_prefixes = (
-        "ENVIRONMENT_API_KEY=",
-        "OPENAI_API_KEY=",
-        "SYNTH_API_KEY=",
-    )
-    for a in args:
-        if "=" in a and any(a.startswith(prefix) for prefix in sensitive_prefixes):
-            try:
-                key, value = a.split("=", 1)
-                tail = value[-5:] if len(value) >= 5 else value
-                masked.append(f"{key}=***{tail}")
-            except Exception:
-                masked.append("<masked>")
-        else:
-            masked.append(a)
-    return masked
-
-
-def _ensure_modal_secret(
-    secret_name: str,
-    *,
-    values: dict[str, str],
-    label: str = "deploy",
-    replace: bool = False,
-) -> bool:
-    prefix = f"[{label}]"
-    if not secret_name.strip():
-        raise RuntimeError("Secret name is required")
-
-    if not values:
-        raise RuntimeError("No values provided to create Modal secret")
-
-    create_args = [f"{k}={v}" for k, v in values.items()]
-    create_cmd = ["uv", "run", "modal", "secret", "create", secret_name, *create_args]
-
-    if replace:
-        print(f"{prefix} Removing Modal secret '{secret_name}' (if present)…")
-        delete_commands = [
-            ["bash", "-lc", f"printf 'y\\n' | uv run modal secret delete {secret_name}"],
-            ["bash", "-lc", f"printf 'y\\n' | modal secret delete {secret_name}"],
-        ]
-        delete_code = None
-        for delete_cmd in delete_commands:
-            print(f"{prefix} Command:", " ".join(delete_cmd))
-            delete_code = _popen_stream(delete_cmd)
-            if delete_code in (0, 1):
-                break
-        if delete_code not in (0, 1):
-            print(f"{prefix} Warning: delete command exited with {delete_code}; continuing to recreate")
-
-    print(f"\n{prefix} Creating Modal secret '{secret_name}'…")
-    print(f"{prefix} Command:", " ".join(_mask_secret_args(create_cmd)))
-    code = _popen_stream(create_cmd)
-    if code != 0:
-        raise RuntimeError("Failed to provision Modal secret (see logs above)")
-
-    return True
-
-
 def _fmt_float(value: float) -> str:
     return f"{value:.10g}"
 
@@ -666,22 +601,19 @@ def _ensure_task_app_ready(env: DemoEnv, synth_key: str, *, label: str) -> DemoE
         app_name = fallback
         demo_core.persist_task_url(task_url, name=app_name)
 
-    secret_name = TASK_APP_MODAL_SECRET
     demo_core.persist_task_url(task_url, name=app_name)
     demo_core.persist_dotenv_values({
         "TASK_APP_BASE_URL": task_url,
         "TASK_APP_NAME": app_name,
-        "TASK_APP_SECRET_NAME": secret_name,
+        "TASK_APP_SECRET_NAME": DEFAULT_TASK_APP_SECRET_NAME,
     })
 
-    openai_key = (os.environ.get("OPENAI_API_KEY") or local_env.get("OPENAI_API_KEY") or "").strip()
-    secret_values: dict[str, str] = {"ENVIRONMENT_API_KEY": env_key}
-    if openai_key:
-        secret_values["OPENAI_API_KEY"] = openai_key
     if synth_key:
-        secret_values["SYNTH_API_KEY"] = synth_key
+        os.environ["SYNTH_API_KEY"] = synth_key
 
-    _ensure_modal_secret(secret_name, values=secret_values, label=label, replace=True)
+    openai_key = (os.environ.get("OPENAI_API_KEY") or local_env.get("OPENAI_API_KEY") or "").strip()
+    if openai_key:
+        os.environ["OPENAI_API_KEY"] = openai_key
 
     rollout_url = task_url.rstrip("/") + "/health/rollout"
     print(f"[{label}] Verifying rollout health:")
@@ -712,8 +644,6 @@ def _ensure_task_app_ready(env: DemoEnv, synth_key: str, *, label: str) -> DemoE
         print(f"[{label}] Warning: rollout health check failed ({rc}). Response: {body}")
         try:
             print(f"[{label}] Sent header X-API-Key → {_key_preview(env_key, 'X-API-Key')}")
-            if secret_name:
-                print(f"[{label}] Modal secret name={secret_name}")
         except Exception:
             pass
     else:
@@ -721,16 +651,18 @@ def _ensure_task_app_ready(env: DemoEnv, synth_key: str, *, label: str) -> DemoE
 
     os.environ["TASK_APP_BASE_URL"] = task_url
     os.environ["ENVIRONMENT_API_KEY"] = env_key
+    os.environ["TASK_APP_SECRET_NAME"] = DEFAULT_TASK_APP_SECRET_NAME
     updated_env = demo_core.load_env()
     updated_env.env_api_key = env_key
     updated_env.task_app_base_url = task_url
     updated_env.task_app_name = app_name
-    updated_env.task_app_secret_name = secret_name
+    updated_env.task_app_secret_name = DEFAULT_TASK_APP_SECRET_NAME
     return updated_env
 
 
 def cmd_deploy(args: argparse.Namespace) -> int:
     env = demo_core.load_env()
+    os.environ["TASK_APP_SECRET_NAME"] = DEFAULT_TASK_APP_SECRET_NAME
     cwd_env_path = os.path.join(os.getcwd(), ".env")
     local_env = demo_core.load_dotenv_file(cwd_env_path)
     url = ""
@@ -808,7 +740,6 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                     print("Aborted by user.")
                     return 1
 
-                secret_name = TASK_APP_MODAL_SECRET
                 existing_env_key = (env.env_api_key or "").strip()
                 env_key: str | None = existing_env_key or None
                 if existing_env_key:
@@ -831,6 +762,8 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                     env.env_api_key = env_key
                     local_env["ENVIRONMENT_API_KEY"] = env_key
                     print("[deploy] Minted new ENVIRONMENT_API_KEY")
+                elif env_key:
+                    os.environ["ENVIRONMENT_API_KEY"] = env_key
                 
                 # Optionally upload the new key to the backend using sealed box helper
                 backend_base = (env.dev_backend_url or "").rstrip("/")
@@ -861,13 +794,14 @@ def cmd_deploy(args: argparse.Namespace) -> int:
 
                 synth_key = (env.synth_api_key or os.environ.get("SYNTH_API_KEY") or local_env.get("SYNTH_API_KEY") or "").strip()
                 if not synth_key:
-                    synth_key = input("Enter SYNTH_API_KEY for Modal secret (required): ").strip()
+                    synth_key = input("Enter SYNTH_API_KEY for deployment (required): ").strip()
                     if not synth_key:
-                        print("SYNTH_API_KEY is required to create the Modal secret.")
+                        print("SYNTH_API_KEY is required for deployment.")
                         return 1
                     demo_core.persist_api_key(synth_key)
                     demo_core.persist_dotenv_values({"SYNTH_API_KEY": synth_key})
                     env.synth_api_key = synth_key
+                os.environ["SYNTH_API_KEY"] = synth_key
 
                 openai_key = (os.environ.get("OPENAI_API_KEY") or local_env.get("OPENAI_API_KEY") or "").strip()
                 if not openai_key:
@@ -875,25 +809,11 @@ def cmd_deploy(args: argparse.Namespace) -> int:
                         "Enter your OpenAI API key, found at https://platform.openai.com/api-keys\n> "
                     ).strip()
                     if not openai_key:
-                        print("OPENAI_API_KEY is required to create the Modal secret.")
+                        print("OPENAI_API_KEY is required for deployment.")
                         return 1
                     demo_core.persist_dotenv_values({"OPENAI_API_KEY": openai_key})
                     local_env["OPENAI_API_KEY"] = openai_key
-
-                values = {
-                    "SYNTH_API_KEY": synth_key,
-                    "OPENAI_API_KEY": openai_key,
-                }
-                if env_key:
-                    values["ENVIRONMENT_API_KEY"] = env_key
-
-                try:
-                    created = _ensure_modal_secret(secret_name, values=values, label="deploy", replace=True)
-                except RuntimeError as secret_err:
-                    print(f"Failed to prepare Modal secret '{secret_name}': {secret_err}")
-                    return 2
-                if created:
-                    print(f"[deploy] Modal secret '{secret_name}' provisioned.")
+                os.environ["OPENAI_API_KEY"] = openai_key
 
                 deploy_cmd = ["uv", "run", "python", "-m", "modal", "deploy", "--name", name_in, app_path]
                 print("\nStreaming Modal build/deploy logs (this can take several minutes on first run)…\n")
@@ -943,7 +863,7 @@ def cmd_deploy(args: argparse.Namespace) -> int:
         dotenv_values = {"TASK_APP_BASE_URL": url}
         if app_name:
             dotenv_values["TASK_APP_NAME"] = app_name
-            dotenv_values["TASK_APP_SECRET_NAME"] = TASK_APP_MODAL_SECRET
+        dotenv_values["TASK_APP_SECRET_NAME"] = DEFAULT_TASK_APP_SECRET_NAME
         dotenv_path = demo_core.persist_dotenv_values(dotenv_values)
         print(f"TASK_APP_BASE_URL={url}")
         if app_name:
@@ -952,7 +872,6 @@ def cmd_deploy(args: argparse.Namespace) -> int:
         print(f"  export TASK_APP_BASE_URL={url}")
         if app_name:
             print(f"  export TASK_APP_NAME={app_name}")
-            print(f"  export TASK_APP_SECRET_NAME={TASK_APP_MODAL_SECRET}")
         print(f"Persisted to {dotenv_path}")
         print("\nNext step:\n$ uvx synth-ai run")
         return 0
@@ -1228,7 +1147,7 @@ def cmd_run(args: argparse.Namespace) -> int:
                 print(f"  {_key_preview(sk, 'SYNTH_API_KEY')}")
             if ek:
                 print(f"  {_key_preview(ek, 'ENVIRONMENT_API_KEY')}")
-            print("Also ensure your Modal secret contains ENVIRONMENT_API_KEY and matches the task app.")
+            print("Ensure the ENVIRONMENT_API_KEY you deployed with matches the task app and remains exported.")
         return code
 
     # Fallback: legacy jobs API flow
@@ -1305,7 +1224,7 @@ def cmd_run(args: argparse.Namespace) -> int:
                 print("Hint: HTTP 401 Unauthorized from backend. Verify SYNTH_API_KEY for:", base_url)
                 if sk:
                     print(f"  {_key_preview(sk, 'SYNTH_API_KEY')}")
-                print("Also ensure your Modal secret contains a valid ENVIRONMENT_API_KEY.")
+                print("Ensure the ENVIRONMENT_API_KEY and OPENAI_API_KEY used for deployment remain valid.")
         except Exception:
             pass
         return 2

synth_ai/demos/demo_task_apps/core.py

@@ -4,7 +4,6 @@ import json
 import os
 import subprocess
 import sys
-import time
 from dataclasses import dataclass
 from typing import Any, Dict, Optional, Tuple
 
@@ -13,6 +12,9 @@ import urllib.request
 from synth_ai.config.base_url import PROD_BASE_URL_DEFAULT
 
 
+DEFAULT_TASK_APP_SECRET_NAME = "hendrycks-math-task-app-secret"
+
+
 @dataclass
 class DemoEnv:
     dev_backend_url: str = ""
@@ -20,10 +22,7 @@ class DemoEnv:
     env_api_key: str = ""
     task_app_base_url: str = ""
     task_app_name: str = ""
-    task_app_secret_name: str = ""
-
-
-DEFAULT_TASK_APP_SECRET_NAME = "hendrycks-math-task-app-secret"
+    task_app_secret_name: str = DEFAULT_TASK_APP_SECRET_NAME
 
 def _mask(value: str, keep: int = 4) -> str:
     if not value:
@@ -287,7 +286,7 @@ def load_env() -> DemoEnv:
     )
 
     task_app_name = str(state.get("TASK_APP_NAME") or "")
-    task_app_secret_name = DEFAULT_TASK_APP_SECRET_NAME
+    task_app_secret_name = str(state.get("TASK_APP_SECRET_NAME") or DEFAULT_TASK_APP_SECRET_NAME)
 
     env.dev_backend_url = dev_url.rstrip("/")
     env.synth_api_key = synth_api_key
@@ -369,16 +368,17 @@ def persist_task_url(url: str, *, name: str | None = None) -> None:
         if data.get("TASK_APP_NAME") != name:
             data["TASK_APP_NAME"] = name
             changed.append("TASK_APP_NAME")
-        secret_name = DEFAULT_TASK_APP_SECRET_NAME
-        if data.get("TASK_APP_SECRET_NAME") != secret_name:
-            data["TASK_APP_SECRET_NAME"] = secret_name
-            if "TASK_APP_NAME" not in changed:
-                changed.append("TASK_APP_SECRET_NAME")
+        if data.get("TASK_APP_SECRET_NAME") != DEFAULT_TASK_APP_SECRET_NAME:
+            data["TASK_APP_SECRET_NAME"] = DEFAULT_TASK_APP_SECRET_NAME
+            changed.append("TASK_APP_SECRET_NAME")
+    elif data.get("TASK_APP_SECRET_NAME") != DEFAULT_TASK_APP_SECRET_NAME:
+        data["TASK_APP_SECRET_NAME"] = DEFAULT_TASK_APP_SECRET_NAME
+        changed.append("TASK_APP_SECRET_NAME")
     _write_state(data)
     if changed:
         print(f"Saved {', '.join(changed)} to {_state_path()}")
-        if "TASK_APP_NAME" in changed or "TASK_APP_SECRET_NAME" in changed:
-            print(f"TASK_APP_SECRET_NAME={data.get('TASK_APP_SECRET_NAME', '')}")
+        if "TASK_APP_SECRET_NAME" in changed:
+            print(f"TASK_APP_SECRET_NAME={DEFAULT_TASK_APP_SECRET_NAME}")
 
 
 def persist_api_key(key: str) -> None:

synth_ai/demos/demo_task_apps/math/modal_task_app.py

@@ -7,7 +7,11 @@ from pathlib import Path
 
 from modal import App, Image, Secret, asgi_app
 from functools import lru_cache
-from synth_ai.demos.demo_task_apps.core import DEFAULT_TASK_APP_SECRET_NAME
+
+try:  # Backward compatibility with older installed SDKs
+    from synth_ai.demos.demo_task_apps.core import DEFAULT_TASK_APP_SECRET_NAME
+except Exception:  # pragma: no cover - occurs on older deployments
+    DEFAULT_TASK_APP_SECRET_NAME = "hendrycks-math-task-app-secret"
 
 # Self-contained: no external problem bank installer required
 
@@ -43,15 +47,49 @@ if _SYNTH_HOSTED is not None:
 
 # No extra local dirs required; app is self-contained
 
+
+def _build_inline_secret() -> Secret:
+    required = ("ENVIRONMENT_API_KEY",)
+    optional = ("SYNTH_API_KEY", "OPENAI_API_KEY")
+    payload: dict[str, str] = {}
+    missing: list[str] = []
+
+    for key in required:
+        value = (os.environ.get(key) or "").strip()
+        if not value:
+            missing.append(key)
+        else:
+            payload[key] = value
+
+    for key in optional:
+        value = (os.environ.get(key) or "").strip()
+        if value:
+            payload[key] = value
+
+    if missing:
+        raise RuntimeError(
+            "Missing required environment values for inline secret: " + ", ".join(missing)
+        )
+
+    previews = ", ".join(f"{k}:len={len(v)}" for k, v in payload.items())
+    print(f"[startup] TASK_APP_SECRET_NAME={DEFAULT_TASK_APP_SECRET_NAME}")
+    print(f"[startup] inline secret prepared ({previews})")
+
+    return Secret.from_dict(payload)
+
+
+INLINE_SECRET = _build_inline_secret()
+
 app = App("hendrycks-math-task-app")
-hendryks_secret = DEFAULT_TASK_APP_SECRET_NAME
+
+
 @app.function(
     image=image,
     timeout=600,
     memory=16384,
     cpu=4,
     min_containers=1,
-    secrets=[Secret.from_name(hendryks_secret)],
+    secrets=[INLINE_SECRET],
 )
 @asgi_app()
 def fastapi_app():

{synth_ai-0.2.8.dev8.dist-info → synth_ai-0.2.8.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synth-ai
-Version: 0.2.8.dev8
+Version: 0.2.8.dev9
 Summary: RL as a service SDK - Core AI functionality and tracing
 Author-email: Synth AI <josh@usesynth.ai>
 License-Expression: MIT

{synth_ai-0.2.8.dev8.dist-info → synth_ai-0.2.8.dev9.dist-info}/RECORD

@@ -21,16 +21,16 @@ 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=kXvW6hqEbjLp5m8tnsqbLxBbEt-c5gVAzphg4mPf2ik,56914
+synth_ai/demos/core/cli.py,sha256=3yQSyygbK6Ix2UZCbVepVrSQF4LnI4E2TARLlyuhVF4,54009
 synth_ai/demos/demo_task_apps/__init__.py,sha256=8aUGEGpWUw11GRb3wQXRAmQ99yjAt5qd5FCTDJpXWjI,44
-synth_ai/demos/demo_task_apps/core.py,sha256=1JZBTW7J9lR_I4mSal7XlcK0QtVDQm-bA9WiNmPha4A,14624
+synth_ai/demos/demo_task_apps/core.py,sha256=Eu7gp0VtZ9tE1HPLG14-pkjC1cD_7brsdl2IRbdSBts,14764
 synth_ai/demos/demo_task_apps/math/__init__.py,sha256=WBzpZwSn7pRarBmhopQi34i9bEm05-71eM3siboOavY,43
 synth_ai/demos/demo_task_apps/math/_common.py,sha256=SgtVW1pne4pgwGS2gYYQWkmG9BvU2sQTYzlncmUJ0NM,533
 synth_ai/demos/demo_task_apps/math/app.py,sha256=gNopoAhwM0vzdKuCa7AwQqSwiV2xagrjMxMH9YIniv4,1160
 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=1hv0CYNmIV-6aiiUYw_myR1cM1_ApcMiCQ6NmavLP94,20244
+synth_ai/demos/demo_task_apps/math/modal_task_app.py,sha256=JKSlBxl5BetTx8211PomHvqPibj6bglx-iXFYYmO87s,21313
 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.dev8.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
-synth_ai-0.2.8.dev8.dist-info/METADATA,sha256=nHpXX9X8FZHz-rYwQul-fAM8ImsHge6OGUQEXJuUrc0,5152
-synth_ai-0.2.8.dev8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synth_ai-0.2.8.dev8.dist-info/entry_points.txt,sha256=Neq-3bT7TAijjgOIR77pKL-WYg6TWBDeO8pp_nL4vGY,91
-synth_ai-0.2.8.dev8.dist-info/top_level.txt,sha256=fBmtZyVHuKaGa29oHBaaUkrUIWTqSpoVMPiVdCDP3k8,9
-synth_ai-0.2.8.dev8.dist-info/RECORD,,
+synth_ai-0.2.8.dev9.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
+synth_ai-0.2.8.dev9.dist-info/METADATA,sha256=GhbfwG2ZggpD4GgfnWfSc4DoRG1OKktoRQL4XBKJ1gw,5152
+synth_ai-0.2.8.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+synth_ai-0.2.8.dev9.dist-info/entry_points.txt,sha256=Neq-3bT7TAijjgOIR77pKL-WYg6TWBDeO8pp_nL4vGY,91
+synth_ai-0.2.8.dev9.dist-info/top_level.txt,sha256=fBmtZyVHuKaGa29oHBaaUkrUIWTqSpoVMPiVdCDP3k8,9
+synth_ai-0.2.8.dev9.dist-info/RECORD,,