diff --git a/client/app.css b/client/app.css index 044e3a5..024539f 100644 --- a/client/app.css +++ b/client/app.css @@ -1,21 +1,99 @@ @import "@mariozechner/pi-web-ui/app.css"; +@font-face { + font-family: "B612"; + src: url("./fonts/B612-Regular.ttf") format("truetype"); + font-style: normal; + font-weight: 400; + font-display: swap; +} + +@font-face { + font-family: "B612"; + src: url("./fonts/B612-Bold.ttf") format("truetype"); + font-style: normal; + font-weight: 700; + font-display: swap; +} + :root { + --app-font-family: "B612", sans-serif; + --app-font-size: 14px; + --app-line-height: 1.45; + --app-font-weight-normal: 400; + --app-font-weight-strong: 700; + --app-radius: 8px; + --app-space-1: 4px; + --app-space-2: 8px; + --app-space-3: 12px; + --app-space-4: 16px; --accent-foreground: oklch(45% 0.18 155); --sidebar-width: 300px; + font-family: var(--app-font-family); + font-size: var(--app-font-size); + line-height: var(--app-line-height); } .dark { --accent-foreground: oklch(72% 0.19 155); } -html, body { +html, +body { margin: 0; padding: 0; height: 100%; overflow: hidden; } +body, +button, +input, +select, +textarea, +message-editor, +message-list, +streaming-message-container, +theme-toggle { + font-family: var(--app-font-family) !important; + font-size: var(--app-font-size) !important; + line-height: var(--app-line-height) !important; +} + +button, +input, +select, +textarea { + font: inherit; +} + +/* Keep the whole UI at one text size even where Tailwind utilities or + component defaults request smaller/larger UI text. */ +.text-xs, +.text-sm, +.text-\[10px\], +.session-item-title, +.session-item-preview, +.session-item-meta, +.model-button, +.model-filter, +.model-option, +.status-pill, +.tool-count, +.empty-state, +.error-banner, +.sidebar-title, +.sidebar-empty { + font-size: var(--app-font-size) !important; + line-height: var(--app-line-height) !important; +} + +.font-semibold, +.sidebar-title, +.session-item-title { + font-weight: var(--app-font-weight-strong) !important; +} + #app { height: 100%; display: flex; @@ -61,6 +139,41 @@ html, body { transform: translateX(0); } +.sidebar-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: var(--app-space-3) var(--app-space-4); + border-bottom: 1px solid var(--border); + flex-shrink: 0; +} + +.sidebar-title { + color: var(--foreground); +} + +.icon-button { + padding: 6px; + border-radius: var(--app-radius); + border: none; + background: transparent; + cursor: pointer; + color: var(--foreground); + display: flex; +} + +.icon-button:hover { + background: var(--accent); +} + +.sidebar-empty { + display: flex; + align-items: center; + justify-content: center; + padding: 48px 0; + color: var(--muted-foreground); +} + /* Session items */ .session-item { @@ -86,19 +199,14 @@ html, body { } .session-item-title { - font-size: 13px; - font-weight: 500; color: var(--foreground); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - line-height: 1.3; } .session-item-preview { - font-size: 12px; color: var(--muted-foreground); - line-height: 1.4; margin-top: 3px; display: -webkit-box; -webkit-line-clamp: 2; @@ -107,7 +215,6 @@ html, body { } .session-item-meta { - font-size: 11px; color: var(--muted-foreground); margin-top: 4px; display: flex; @@ -116,6 +223,10 @@ html, body { opacity: 0.7; } +.model-option-current { + background: color-mix(in oklab, var(--accent) 50%, transparent); +} + @media (max-width: 767px) { .main-content { width: 100% !important; diff --git a/client/fonts/B612-Bold.ttf b/client/fonts/B612-Bold.ttf new file mode 100644 index 0000000..c301468 Binary files /dev/null and b/client/fonts/B612-Bold.ttf differ diff --git a/client/fonts/B612-Regular.ttf b/client/fonts/B612-Regular.ttf new file mode 100644 index 0000000..c4f49ff Binary files /dev/null and b/client/fonts/B612-Regular.ttf differ diff --git a/client/fonts/OFL.txt b/client/fonts/OFL.txt new file mode 100644 index 0000000..9d0aff0 --- /dev/null +++ b/client/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2012 The B612 Project Authors (https://github.com/polarsys/b612) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/client/main.ts b/client/main.ts index ee1a9ef..045c8c0 100644 --- a/client/main.ts +++ b/client/main.ts @@ -338,36 +338,35 @@ function sessionTitle(s: SessionListItem): string { return `Session ${s.id.slice(0, 8)}`; } +function modelLabel(model: ModelInfo): string { + return `${model.provider}/${model.id}`; +} + +function modelMatchesFilter(model: ModelInfo, filter: string): boolean { + const needle = filter.trim().toLowerCase(); + if (!needle) return true; + return [model.provider, model.id, model.name, modelLabel(model)] + .some((value) => value.toLowerCase().includes(needle)); +} + function renderSidebar() { return html`
-
- Sessions +
+ Sessions
- - + +
${sessionsLoading ? html` -
+
Loading sessions...
` : sessionList.length === 0 ? html` -
+
No sessions yet
` : sessionList.map((s) => html` @@ -422,7 +421,7 @@ function renderApp() { - + ${connected ? "Connected" : "Disconnected"} @@ -432,17 +431,15 @@ function renderApp() {
${showModelDropdown ? (() => { - const sorted = [...availableModels].sort((a, b) => a.id.localeCompare(b.id)); - const filtered = modelFilter - ? sorted.filter((m) => m.id.toLowerCase().includes(modelFilter.toLowerCase())) - : sorted; + const sorted = [...availableModels].sort((a, b) => modelLabel(a).localeCompare(modelLabel(b))); + const filtered = sorted.filter((m) => modelMatchesFilter(m, modelFilter)); return html`
{ modelFilter = (e.target as HTMLInputElement).value; renderApp(); requestAnimationFrame(() => document.getElementById("model-filter")?.focus()); }} @keydown=${(e: KeyboardEvent) => { if (e.key === "Escape") { showModelDropdown = false; renderApp(); }}} @@ -463,14 +460,14 @@ function renderApp() { ${filtered.map( (m) => html` ` )} - ${filtered.length === 0 ? html`
No matches
` : ""} + ${filtered.length === 0 ? html`
No matches
` : ""}
`; })() : ""} diff --git a/docs/local-evaluation.md b/docs/local-evaluation.md index e9a0c7b..5ea9ee8 100644 --- a/docs/local-evaluation.md +++ b/docs/local-evaluation.md @@ -18,6 +18,25 @@ Health check: curl -I http://127.0.0.1:3001/ ``` +Model selector smoke check: + +```bash +node --input-type=module - <<'JS' +import WebSocket from 'ws'; +const ws = new WebSocket('ws://127.0.0.1:3001/api/ws'); +ws.on('open', () => ws.send(JSON.stringify({ type: 'getModels' }))); +ws.on('message', (data) => { + const msg = JSON.parse(data.toString()); + if (msg.type === 'models') { + console.log(msg.models.length, `${msg.current?.provider}/${msg.current?.id}`); + ws.close(); + } +}); +JS +``` + +The app vendors B612 regular/bold under `client/fonts/` and applies it globally through `client/app.css` variables. + ## Repository remotes - `origin`: `ssh://git@git.openfu.com:11622/udo/pi-webui.git` diff --git a/server/index.ts b/server/index.ts index 48b873d..368ea12 100644 --- a/server/index.ts +++ b/server/index.ts @@ -25,7 +25,8 @@ import type { const __dirname = path.dirname(fileURLToPath(import.meta.url)); const PORT = parseInt(process.env.PORT || "3001"); const HOST = process.env.HOST || "127.0.0.1"; -const LITELLM_URL = process.env.LITELLM_URL || "http://192.168.50.240:4000"; +const LITELLM_URL = process.env.LITELLM_URL || ""; +const LITELLM_TIMEOUT_MS = parseInt(process.env.LITELLM_TIMEOUT_MS || "1500"); let litellmKey = process.env.LITELLM_KEY || ""; const app = express(); @@ -47,6 +48,7 @@ let authStorage: AuthStorage; let modelRegistry: ModelRegistry; let sessionUnsubscribe: (() => void) | undefined; const clients = new Set(); +const syntheticModels = new Map>(); function modelToInfo(model: Model): ModelInfo { return { @@ -126,44 +128,120 @@ function send(ws: WebSocket, msg: ServerMessage) { } async function fetchLiteLLMModels(): Promise { + if (!LITELLM_URL) return []; + + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), LITELLM_TIMEOUT_MS); try { const headers: Record = { "Content-Type": "application/json" }; if (litellmKey) { headers["Authorization"] = `Bearer ${litellmKey}`; } - const res = await fetch(`${LITELLM_URL}/v1/models`, { headers }); + const res = await fetch(`${LITELLM_URL}/v1/models`, { headers, signal: controller.signal }); if (!res.ok) { console.error(`LiteLLM /v1/models returned ${res.status}`); return []; } const json = await res.json() as { data?: Array<{ id: string; owned_by?: string }> }; return (json.data || []).map((m) => ({ - provider: "ollama", + provider: "litellm", id: m.id.trim(), name: m.id.trim(), })); } catch (err) { console.error("Failed to fetch LiteLLM models:", err); return []; + } finally { + clearTimeout(timeout); } } +function modelKey(provider: string, modelId: string): string { + return `${provider}/${modelId}`; +} + +function parseModelReference(reference: string | undefined): { provider: string; modelId: string } | undefined { + const trimmed = reference?.trim(); + if (!trimmed) return undefined; + const thinkingSuffixes = [":off", ":minimal", ":low", ":medium", ":high"]; + const suffix = thinkingSuffixes.find((value) => trimmed.endsWith(value)); + const withoutThinking = suffix ? trimmed.slice(0, -suffix.length) : trimmed; + const slash = withoutThinking.indexOf("/"); + if (slash <= 0 || slash === withoutThinking.length - 1) return undefined; + return { + provider: withoutThinking.slice(0, slash), + modelId: withoutThinking.slice(slash + 1), + }; +} + +function buildSyntheticModel(provider: string, modelId: string): Model | undefined { + const key = modelKey(provider, modelId); + const existing = syntheticModels.get(key); + if (existing) return existing; + + const providerModels = modelRegistry.getAll().filter((m) => m.provider === provider); + const base = providerModels.find((m) => modelRegistry.hasConfiguredAuth(m)) || providerModels[0]; + if (!base) return undefined; + + const model: Model = { + ...base, + id: modelId, + name: modelId, + }; + syntheticModels.set(key, model); + return model; +} + +function findConfiguredOrSyntheticModel(provider: string, modelId: string): Model | undefined { + const model = modelRegistry.find(provider, modelId) || syntheticModels.get(modelKey(provider, modelId)); + if (model && modelRegistry.hasConfiguredAuth(model)) return model; + const synthetic = buildSyntheticModel(provider, modelId); + return synthetic && modelRegistry.hasConfiguredAuth(synthetic) ? synthetic : undefined; +} + +function addModelInfo(merged: ModelInfo[], seen: Set, model: Model) { + const key = modelKey(model.provider, model.id); + if (seen.has(key)) return; + seen.add(key); + merged.push(modelToInfo(model)); +} + async function getRegistryModels(): Promise { + const settings = readAgentSettings(); const available = await modelRegistry.getAvailable(); const configured = available.filter((m) => modelRegistry.hasConfiguredAuth(m)); const source = configured.length > 0 ? configured : available; - return source.map(modelToInfo); + const merged: ModelInfo[] = []; + const seen = new Set(); + + for (const reference of [ + process.env.PI_WEBUI_MODEL, + process.env.PI_MODEL, + settings.defaultProvider && settings.defaultModel ? `${settings.defaultProvider}/${settings.defaultModel}` : undefined, + ...(Array.isArray(settings.enabledModels) ? settings.enabledModels : []), + ]) { + if (typeof reference !== "string") continue; + const parsed = parseModelReference(reference); + if (!parsed) continue; + const model = findConfiguredOrSyntheticModel(parsed.provider, parsed.modelId); + if (model) addModelInfo(merged, seen, model); + } + + for (const model of source) { + addModelInfo(merged, seen, model); + } + + return merged; } async function getModels(): Promise { - const litellmModels = await fetchLiteLLMModels(); const registryModels = await getRegistryModels(); + const litellmModels = await fetchLiteLLMModels(); - // Merge: registry models first, then any LiteLLM models not already in registry - const seen = new Set(registryModels.map((m) => `${m.provider}/${m.id}`)); + const seen = new Set(registryModels.map((m) => modelKey(m.provider, m.id))); const merged = [...registryModels]; for (const m of litellmModels) { - const key = `${m.provider}/${m.id}`; + const key = modelKey(m.provider, m.id); if (!seen.has(key)) { merged.push(m); seen.add(key); @@ -173,20 +251,12 @@ async function getModels(): Promise { } function findModel(provider: string, modelId: string): Model | undefined { - return modelRegistry.find(provider, modelId); + return findConfiguredOrSyntheticModel(provider, modelId); } function getModelFromReference(reference: string | undefined): Model | undefined { - const trimmed = reference?.trim(); - if (!trimmed) return undefined; - - const slash = trimmed.indexOf("/"); - if (slash <= 0 || slash === trimmed.length - 1) return undefined; - - const provider = trimmed.slice(0, slash); - const modelId = trimmed.slice(slash + 1); - const model = modelRegistry.find(provider, modelId); - return model && modelRegistry.hasConfiguredAuth(model) ? model : undefined; + const parsed = parseModelReference(reference); + return parsed ? findConfiguredOrSyntheticModel(parsed.provider, parsed.modelId) : undefined; } function readAgentSettings(): any { @@ -208,8 +278,8 @@ async function resolveInitialWebUiModel(): Promise | undefined> { const defaultProvider = typeof settings.defaultProvider === "string" ? settings.defaultProvider : undefined; const defaultModel = typeof settings.defaultModel === "string" ? settings.defaultModel : undefined; if (defaultProvider && defaultModel) { - const configuredDefault = modelRegistry.find(defaultProvider, defaultModel); - if (configuredDefault && modelRegistry.hasConfiguredAuth(configuredDefault)) { + const configuredDefault = findConfiguredOrSyntheticModel(defaultProvider, defaultModel); + if (configuredDefault) { return configuredDefault; } console.warn(`Configured Pi default model is not available in this SDK: ${defaultProvider}/${defaultModel}`);