'
- for slot in reg.PRIORITY_KEYS[:3]: # primary + backup_1 + backup_2
- current = role_cfg.get(slot) or ""
+ role_rows += (
+ f'
'
+ f'
{role.title()}'
+ f'
'
+ )
+ for slot in reg.PRIORITY_KEYS[:3]:
slot_label = slot.replace("_", " ").title()
- sel_html = f'
'
- # Pre-select current value via JS (simpler than string-building selected attrs)
- role_rows += f'
{slot_label}{sel_html}
'
+ sel = (
+ f'
'
+ )
+ role_rows += f'
{slot_label}{sel}
'
role_rows += '
'
- # JS data for pre-selecting current role values
- import json as _json
role_data_js = _json.dumps({
role: {slot: (roles.get(role, {}).get(slot) or "") for slot in reg.PRIORITY_KEYS[:3]}
for role in app_settings.get_defined_roles()
})
+ # ── Catalog data + Google accounts for JS ─────────────────────────────────
+ google_accounts_js = _json.dumps(reg.get_google_accounts(username))
+ google_catalog_js = _json.dumps(reg.get_catalog("google"))
+ anthropic_catalog_js = _json.dumps(reg.get_catalog("anthropic"))
+ has_hosts = "true" if hosts else "false"
+
html = (_STATIC / "local_llm.html").read_text()
- html = html.replace("{{ username }}", username)
- html = html.replace("{{ host_rows }}", host_rows)
- html = html.replace("{{ model_rows }}", model_rows)
- html = html.replace("{{ host_options }}", host_options)
- html = html.replace("{{ add_model_hidden }}", add_model_hidden)
- html = html.replace("{{ role_rows }}", role_rows)
- html = html.replace("{{ role_data_js }}", role_data_js)
+ replacements = {
+ "{{ username }}": username,
+ "{{ google_account_rows }}": google_account_rows,
+ "{{ host_rows }}": host_rows,
+ "{{ model_rows }}": model_rows,
+ "{{ host_options }}": host_options,
+ "{{ role_rows }}": role_rows,
+ "{{ role_data_js }}": role_data_js,
+ "{{ google_accounts_js }}": google_accounts_js,
+ "{{ google_catalog_js }}": google_catalog_js,
+ "{{ anthropic_catalog_js }}": anthropic_catalog_js,
+ "{{ has_hosts }}": has_hosts,
+ }
+ for key, val in replacements.items():
+ html = html.replace(key, val)
if success:
html = html.replace("", f'
{success}
')
if error:
@@ -199,14 +243,44 @@ def _render(username: str, success: str = "", error: str = "") -> str:
# ── Routes ────────────────────────────────────────────────────────────────────
-@router.get("/settings/local", include_in_schema=False)
-async def models_page(request: Request):
+@router.get("/settings/models", include_in_schema=False)
+async def models_page_canonical(request: Request):
username = _get_user(request)
if not username:
return RedirectResponse("/login", status_code=302)
return HTMLResponse(_render(username))
+@router.get("/settings/local", include_in_schema=False)
+async def models_page_legacy(request: Request):
+ return RedirectResponse("/settings/models", status_code=301)
+
+
+@router.post("/settings/local/google-account", include_in_schema=False)
+async def save_google_account(
+ request: Request,
+ account_id: str = Form(""),
+ label: str = Form(""),
+ api_key: str = Form(""),
+):
+ username = _get_user(request)
+ if not username:
+ return RedirectResponse("/login", status_code=302)
+ if not api_key.strip() and not account_id.strip():
+ return HTMLResponse(_render(username, error="API key is required."))
+ reg.save_google_account(username, account_id or None, label, api_key)
+ return HTMLResponse(_render(username, success="Google account saved."))
+
+
+@router.post("/settings/local/google-account/{account_id}/remove", include_in_schema=False)
+async def remove_google_account(request: Request, account_id: str):
+ username = _get_user(request)
+ if not username:
+ return RedirectResponse("/login", status_code=302)
+ reg.remove_google_account(username, account_id)
+ return HTMLResponse(_render(username, success="Google account removed."))
+
+
@router.post("/settings/local/host", include_in_schema=False)
async def save_host(
request: Request,
@@ -222,7 +296,6 @@ async def save_host(
if not api_url.strip():
return HTMLResponse(_render(username, error="API URL is required."))
reg.save_host(username, host_id or None, label, api_url, api_key, host_type)
- logger.info("model registry host saved: %s (%s)", username, host_type)
return HTMLResponse(_render(username, success="Host saved."))
@@ -237,22 +310,50 @@ async def remove_host(request: Request, host_id: str):
@router.post("/settings/local/models/add", include_in_schema=False)
async def add_model(
- request: Request,
- host_id: str = Form(...),
- label: str = Form(""),
- model_name: str = Form(...),
- context_k: int = Form(0),
- tags: str = Form(""),
+ request: Request,
+ provider: str = Form("local"),
+ label: str = Form(""),
+ context_k: int = Form(0),
+ tags: str = Form(""),
+ # local-only fields
+ host_id: str = Form(""),
+ model_name: str = Form(""),
+ # cloud-only fields
+ cloud_model_name: str = Form(""),
+ account_id: str = Form(""),
+ credential_id: str = Form("cli"),
):
username = _get_user(request)
if not username:
return RedirectResponse("/login", status_code=302)
- if not model_name.strip():
- return HTMLResponse(_render(username, error="Model name is required."))
+
tag_list = [t.strip() for t in tags.split(",") if t.strip()]
- reg.save_model(username, None, host_id, label, model_name, context_k, tag_list)
- logger.info("model added to registry: %s / %s", username, model_name)
- return HTMLResponse(_render(username, success=f'Model "{label or model_name}" added.'))
+
+ if provider == "local":
+ if not model_name.strip():
+ return HTMLResponse(_render(username, error="Model name is required."))
+ if not host_id.strip():
+ return HTMLResponse(_render(username, error="Select a host."))
+ reg.save_model(username, None, host_id, label, model_name, context_k, tag_list)
+ display = label or model_name
+
+ elif provider in ("google", "anthropic"):
+ if not cloud_model_name.strip():
+ return HTMLResponse(_render(username, error="Select a model from the catalog."))
+ if provider == "google" and not account_id.strip():
+ return HTMLResponse(_render(username, error="Select a Google account."))
+ reg.save_cloud_model(
+ username, None, provider, cloud_model_name, label,
+ account_id=account_id or None,
+ credential_id=credential_id or None,
+ context_k=context_k, tags=tag_list,
+ )
+ display = label or cloud_model_name
+ else:
+ return HTMLResponse(_render(username, error=f"Unknown provider: {provider}"))
+
+ logger.info("model added: %s / %s (%s)", username, display, provider)
+ return HTMLResponse(_render(username, success=f'Model "{display}" added.'))
@router.post("/settings/local/models/{model_id}/remove", include_in_schema=False)
@@ -287,7 +388,7 @@ async def set_role(request: Request) -> JSONResponse:
ok = reg.set_role(username, role, slot, model_id)
if not ok:
- return JSONResponse({"error": f"Invalid slot or model_id not found"}, status_code=400)
+ return JSONResponse({"error": "Invalid slot or model_id not found"}, status_code=400)
logger.info("role set: %s %s.%s = %s", username, role, slot, model_id)
return JSONResponse({"ok": True})
@@ -295,31 +396,24 @@ async def set_role(request: Request) -> JSONResponse:
@router.get("/api/local-llm/fetch-models")
async def fetch_models(request: Request, host_id: str = "") -> JSONResponse:
- """Proxy to the host's /api/models endpoint. host_id selects which host."""
+ """Proxy to the host's models endpoint. host_id selects which host."""
username = _get_user(request)
if not username:
return JSONResponse({"error": "Not authenticated"}, status_code=401)
registry = reg.get_registry(username)
- hosts = registry.get("hosts", [])
+ hosts = registry.get("hosts", [])
- if host_id:
- host = next((h for h in hosts if h["id"] == host_id), None)
- else:
- host = hosts[0] if hosts else None
+ host = next((h for h in hosts if h["id"] == host_id), None) if host_id else (hosts[0] if hosts else None)
- # Fall back to .env
if host:
- api_url = host.get("api_url", "")
- api_key = host.get("api_key", "")
+ api_url, api_key, host_type = host.get("api_url",""), host.get("api_key",""), host.get("host_type","openwebui")
else:
- api_url = app_settings.local_api_url
- api_key = app_settings.local_api_key
+ api_url, api_key, host_type = app_settings.local_api_url, app_settings.local_api_key, "openwebui"
if not api_url:
return JSONResponse({"error": "No host configured."}, status_code=400)
- host_type = host.get("host_type", "openwebui") if host else "openwebui"
models_path = "/models" if host_type == "openai" else "/api/models"
url = api_url.rstrip("/") + models_path
headers = {"Authorization": f"Bearer {api_key}"} if api_key else {}
@@ -329,11 +423,10 @@ async def fetch_models(request: Request, host_id: str = "") -> JSONResponse:
resp = await client.get(url, headers=headers)
resp.raise_for_status()
data = resp.json()
- models = [
- {"id": m["id"], "name": m.get("name") or m["id"]}
- for m in data.get("data", [])
- ]
- models.sort(key=lambda m: m["name"].lower())
+ models = sorted(
+ [{"id": m["id"], "name": m.get("name") or m["id"]} for m in data.get("data", [])],
+ key=lambda m: m["name"].lower(),
+ )
return JSONResponse({"models": models})
except httpx.HTTPStatusError as e:
return JSONResponse({"error": f"Host returned {e.response.status_code}"}, status_code=502)
diff --git a/cortex/static/local_llm.html b/cortex/static/local_llm.html
index a37ab36..6b131fe 100644
--- a/cortex/static/local_llm.html
+++ b/cortex/static/local_llm.html
@@ -9,30 +9,21 @@
@@ -206,53 +220,104 @@
← Chat
Help
Settings
-
Models
+
Models
Sign out
-
-
+
-
+
-
Hosts
-
OpenAI-compatible API servers (Open WebUI, Ollama, LM Studio, etc.)
+
Cloud Providers
+
+
+
+
+ Claude models are accessed through the Claude CLI using your existing OAuth login.
+ Run claude auth login to authenticate.
+
+
+
+
+
+ {{ google_account_rows }}
+
+ + Add Google account
+
+
+
+
+
+
+
+
Local Hosts
+
OpenAI-compatible API servers (Open WebUI, Ollama, LM Studio, OpenRouter, etc.)
{{ host_rows }}
-
- + Add host
-