From a56e4a9ff1948d4264d906ce672826dc02ff4ebe Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Thu, 11 Jun 2026 14:32:49 +0100 Subject: [PATCH] refac --- cptr/frontend/src/lib/apis/admin.ts | 24 ++ .../src/lib/components/Admin/Models.svelte | 227 ++++++++++++++++++ .../src/lib/components/AdminPanel.svelte | 7 +- cptr/frontend/src/lib/components/Icon.svelte | 4 + .../src/lib/components/chat/PlusMenu.svelte | 17 +- cptr/frontend/src/lib/i18n/locales/en.json | 16 +- cptr/routers/admin.py | 69 ++++++ cptr/routers/chat.py | 7 + cptr/utils/chat_task.py | 12 +- 9 files changed, 368 insertions(+), 15 deletions(-) create mode 100644 cptr/frontend/src/lib/components/Admin/Models.svelte diff --git a/cptr/frontend/src/lib/apis/admin.ts b/cptr/frontend/src/lib/apis/admin.ts index 86735f8..b12eb51 100644 --- a/cptr/frontend/src/lib/apis/admin.ts +++ b/cptr/frontend/src/lib/apis/admin.ts @@ -104,3 +104,27 @@ export const verifyConnection = (id: string) => fetchJSON<{ ok: boolean; message: string }>(`/api/admin/connections/${id}/verify`, { method: 'POST' }); + +// ── Model Config ──────────────────────────────────────────── + +export interface ModelConfigEntry { + is_active?: boolean; + params?: { request_params?: Record }; +} + +export interface ModelConfigResponse { + config: Record; + models: { id: string; name: string; provider: string; connection_id: string }[]; +} + +export const getModelConfig = async (): Promise => + fetchJSON('/api/admin/models/config'); + +export const updateModelConfig = ( + modelId: string, + update: { is_active?: boolean; params?: Record } +) => + fetchJSON(`/api/admin/models/${encodeURIComponent(modelId)}/config`, { + ...jsonBody(update), + method: 'PUT' + }); diff --git a/cptr/frontend/src/lib/components/Admin/Models.svelte b/cptr/frontend/src/lib/components/Admin/Models.svelte new file mode 100644 index 0000000..4f30297 --- /dev/null +++ b/cptr/frontend/src/lib/components/Admin/Models.svelte @@ -0,0 +1,227 @@ + + +{#snippet paramRows(rows: ParamRow[], onInput: () => void, onRemove: (i: number) => void, onAdd: () => void)} +
+ request params + {#each rows as row, i} +
+ + + +
+ {/each} + +
+{/snippet} + +
+

{$t('admin.models')}

+ + {#if loading} +
+ {:else} +
+ + + + {#if globalExpanded} + {@render paramRows( + globalRows, + () => (globalDirty = true), + (i) => { globalRows = globalRows.filter((_, idx) => idx !== i); globalDirty = true; }, + () => { globalRows = [...globalRows, { key: '', value: '' }]; globalDirty = true; } + )} + {/if} + + + {#each models as model} + + + {#if selectedId === model.id} + {@render paramRows( + model.rows, + () => (model.dirty = true), + (i) => { model.rows = model.rows.filter((_, idx) => idx !== i); model.dirty = true; }, + () => { model.rows = [...model.rows, { key: '', value: '' }]; model.dirty = true; } + )} + {/if} + {/each} + + {#if models.length === 0} +

{$t('models.noModels')}

+ {/if} +
+ +
+ +
+ {/if} +
+ + diff --git a/cptr/frontend/src/lib/components/AdminPanel.svelte b/cptr/frontend/src/lib/components/AdminPanel.svelte index a1c3249..7d953fa 100644 --- a/cptr/frontend/src/lib/components/AdminPanel.svelte +++ b/cptr/frontend/src/lib/components/AdminPanel.svelte @@ -3,6 +3,7 @@ import Modal from './Modal.svelte'; import Users from './Admin/Users.svelte'; import Connections from './Admin/Connections.svelte'; + import Models from './Admin/Models.svelte'; import AdminSettings from './Admin/Settings.svelte'; import { t } from '$lib/i18n'; @@ -12,7 +13,7 @@ let { onclose }: Props = $props(); - let activeTab = $state<'users' | 'connections' | 'settings'>('users'); + let activeTab = $state<'users' | 'connections' | 'models' | 'settings'>('users'); {$t('settings.back')} - {#each [{ id: 'users', label: $t('admin.users'), icon: 'user' }, { id: 'connections', label: $t('admin.connections'), icon: 'plug' }, { id: 'settings', label: $t('admin.settings'), icon: 'settings' }] as tab} + {#each [{ id: 'users', label: $t('admin.users'), icon: 'user' }, { id: 'connections', label: $t('admin.connections'), icon: 'plug' }, { id: 'models', label: $t('admin.models'), icon: 'cube' }, { id: 'settings', label: $t('admin.settings'), icon: 'settings' }] as tab} {/each} @@ -436,10 +434,7 @@ onclick={addParamRow} disabled={!canAddParam} > - - - - + Add parameter diff --git a/cptr/frontend/src/lib/i18n/locales/en.json b/cptr/frontend/src/lib/i18n/locales/en.json index 39910d0..69a0704 100644 --- a/cptr/frontend/src/lib/i18n/locales/en.json +++ b/cptr/frontend/src/lib/i18n/locales/en.json @@ -274,5 +274,19 @@ "admin.webCcBaseUrl": "Base URL", "admin.webCcKey": "API Key", "admin.webCcModel": "Model", - "admin.webCcHint": "Use any OpenAI-compatible endpoint (e.g. Perplexity Sonar, LiteLLM proxy)" + "admin.webCcHint": "Use any OpenAI-compatible endpoint (e.g. Perplexity Sonar, LiteLLM proxy)", + + "admin.models": "Models", + "models.defaults": "Defaults", + "models.noDefaults": "No global defaults", + "models.noParams": "No parameters", + "models.noModels": "No models available", + "models.addConnection": "Add a connection first.", + "models.failedToLoad": "Failed to load model config", + "models.failedToToggle": "Failed to toggle model", + "models.failedToSave": "Failed to save", + "models.savedDefaults": "Saved global defaults", + "models.savedParams": "Saved params for {{name}}", + "models.add": "+ Add", + "models.save": "Save" } diff --git a/cptr/routers/admin.py b/cptr/routers/admin.py index 9e2dd92..6a11aeb 100644 --- a/cptr/routers/admin.py +++ b/cptr/routers/admin.py @@ -353,3 +353,72 @@ class UpdateConnectionRequest(BaseModel): api_key: Optional[str] = None enabled: Optional[bool] = None models: Optional[list[str]] = None + + +# ── Model config ───────────────────────────────────────────── + +CONFIG_KEY_CHAT_MODELS = "chat.models" + + +@router.get("/models/config") +async def get_model_config(request: Request): + """Get per-model config and full model list (including inactive) for the admin Models tab.""" + require_admin(request) + config = await Config.get(CONFIG_KEY_CHAT_MODELS) or {} + + # Build full model list from all enabled connections (same as chat.py + # get_models but without filtering inactive models). + from cptr.routers.chat import _get_connections, _get_connection_models + + connections = [c for c in await _get_connections() if c.get("enabled", True)] + models = [] + for conn in connections: + model_ids = await _get_connection_models(conn, request.app.state) + prefix = (conn.get("prefix_id") or "").strip() + for model_id in model_ids or []: + prefixed_id = f"{prefix}/{model_id}" if prefix else model_id + models.append( + { + "id": prefixed_id, + "name": model_id, + "provider": conn.get("provider", ""), + "connection_id": conn["id"], + } + ) + + return {"config": config, "models": models} + + +class UpdateModelConfigRequest(BaseModel): + is_active: Optional[bool] = None + params: Optional[dict] = None + + +@router.put("/models/{model_id:path}/config") +async def update_model_config( + model_id: str, body: UpdateModelConfigRequest, request: Request +): + """Update config for a specific model (or '*' for global defaults).""" + require_admin(request) + all_config = await Config.get(CONFIG_KEY_CHAT_MODELS) or {} + + entry = all_config.get(model_id, {}) + + if body.is_active is not None: + entry["is_active"] = body.is_active + + if body.params is not None: + entry["params"] = body.params + + # Clean up empty entries + if not entry or (entry.keys() <= {"is_active"} and entry.get("is_active") is not False): + if not entry.get("params"): + all_config.pop(model_id, None) + else: + all_config[model_id] = entry + else: + all_config[model_id] = entry + + await Config.upsert({CONFIG_KEY_CHAT_MODELS: all_config}) + return {"ok": True} + diff --git a/cptr/routers/chat.py b/cptr/routers/chat.py index 57e7342..5167029 100644 --- a/cptr/routers/chat.py +++ b/cptr/routers/chat.py @@ -196,6 +196,13 @@ async def get_models(request: Request): ) default_model = await Config.get("chat.default_model") + + # Filter out inactive models + chat_models_config = await Config.get("chat.models") or {} + inactive = {k for k, v in chat_models_config.items() if v.get("is_active") is False} + if inactive: + models = [m for m in models if m["id"] not in inactive] + return {"models": models, "default": default_model} diff --git a/cptr/utils/chat_task.py b/cptr/utils/chat_task.py index 0068a3b..053fd4a 100644 --- a/cptr/utils/chat_task.py +++ b/cptr/utils/chat_task.py @@ -730,7 +730,17 @@ async def run_chat_task( new_messages_since: int = 0 # messages appended since last API call # Request params: arbitrary key-value pairs merged into the API request body - request_params = chat_params.get("request_params") or None + # Merge order: global ("*") → per-model → chat overrides (chat wins) + chat_request_params = chat_params.get("request_params") or {} + global_rp = {} + model_rp = {} + try: + chat_models_config = await Config.get("chat.models") or {} + global_rp = chat_models_config.get("*", {}).get("params", {}).get("request_params", {}) + model_rp = chat_models_config.get(model, {}).get("params", {}).get("request_params", {}) + except Exception: + pass + request_params = {**global_rp, **model_rp, **chat_request_params} or None for _iteration in range(CHAT_MAX_ITERATIONS): # ── Context compaction: summarize older messages if too large ──