Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(llm): use a configured API version path as entered (closes #11323)
Elian Doran3d10396af3ac
diff --git a/packages/trilium-core/src/services/llm/providers/local.spec.ts b/packages/trilium-core/src/services/llm/providers/local.spec.tsindex 059de724bf..46f0226a92 100644--- a/packages/trilium-core/src/services/llm/providers/local.spec.ts+++ b/packages/trilium-core/src/services/llm/providers/local.spec.ts@@ -108,6 +108,16 @@ describe("LocalProvider", () => {expect(createOpenAiMock).toHaveBeenLastCalledWith({ apiKey: "local", baseURL: "https://proxy.example.com/llm/v1", fetch: llmFetch });});+ it("uses a path-carrying URL as entered, appending /v1 only to a bare host", () => {+ // Zhipu serves its OpenAI-compatible API under /v4, so /v1 must not be appended.+ new LocalProvider("openai-compatible", "", "https://open.bigmodel.cn/api/paas/v4");+ expect(createOpenAiMock).toHaveBeenLastCalledWith({ apiKey: "local", baseURL: "https://open.bigmodel.cn/api/paas/v4", fetch: llmFetch });++ // A path naming no version is used as entered too — appending /v1 would invent a route.+ new LocalProvider("openai-compatible", "", "https://gateway.example.com/openai");+ expect(createOpenAiMock).toHaveBeenLastCalledWith({ apiKey: "local", baseURL: "https://gateway.example.com/openai", fetch: llmFetch });+ });+it("forwards a supplied API key to the SDK", () => {new LocalProvider("openai-compatible", "sk-proxy", "http://box:8080/v1");expect(createOpenAiMock).toHaveBeenLastCalledWith({ apiKey: "sk-proxy", baseURL: "http://box:8080/v1", fetch: llmFetch });@@ -189,6 +199,20 @@ describe("LocalProvider", () => {expect(provider.getModelPricing("gpt-4.1")).toBeUndefined();});+ it("lists models from an explicit non-v1 API version", async () => {+ fetchMock.mockImplementation(routes({ "/api/paas/v4/models": openAiModels(["glm-4.5"]) }));++ const provider = new LocalProvider("openai-compatible", "", "https://open.bigmodel.cn/api/paas/v4");++ await expect(provider.listModels()).resolves.toEqual([expect.objectContaining({ id: "glm-4.5" })]);+ // Only `/v1` is dropped from the probe root, so a `/v4` endpoint keeps its full path.+ expect(fetchMock.mock.calls.map(([url]) => url)).toEqual([+ "https://open.bigmodel.cn/api/paas/v4/api/tags",+ "https://open.bigmodel.cn/api/paas/v4/api/v0/models",+ "https://open.bigmodel.cn/api/paas/v4/models"+ ]);+ });+it("prices an endpoint identified as a local runtime as free", async () => {fetchMock.mockImplementation(routes({ "/api/tags": ollamaTags([{ name: "m1" }]) }));const provider = new LocalProvider("openai-compatible", "", "http://box:11434");diff --git a/packages/trilium-core/src/services/llm/providers/local.ts b/packages/trilium-core/src/services/llm/providers/local.tsindex e6eaf7e299..1c4fbaf598 100644--- a/packages/trilium-core/src/services/llm/providers/local.ts+++ b/packages/trilium-core/src/services/llm/providers/local.ts@@ -3,12 +3,13 @@* Studio and generic "OpenAI-compatible" provider cards.** Every local runtime worth supporting (llama.cpp, vLLM, SGLang, LocalAI, Jan,- * KoboldCpp, llamafile, LiteLLM, …) exposes the OpenAI-compatible `/v1`- * surface, so that is the chat path in all cases. Two of them additionally- * serve a *native* model listing carrying metadata `/v1/models` omits — Ollama's- * `/api/tags` (parameter size, quantization) and LM Studio's `/api/v0/models`- * (quantization, context length) — so listing probes those first and falls back- * to `/v1/models` for everything else.+ * KoboldCpp, llamafile, LiteLLM, …) exposes the OpenAI-compatible surface, so+ * that is the chat path in all cases — under `/v1`, or under whichever version+ * the configured URL names. Two of them additionally serve a *native* model+ * listing carrying metadata the OpenAI one omits — Ollama's `/api/tags`+ * (parameter size, quantization) and LM Studio's `/api/v0/models` (quantization,+ * context length) — so listing probes those first and falls back to the+ * OpenAI-compatible `/models` for everything else.** The named cards exist only to prefill a URL and a setup hint in the UI; all* three dispatch here, and the card id arrives as {@link LocalProviderKind}.@@ -49,6 +50,17 @@ const TITLE_MODEL_MAX_PARAMS_B = 4;/** Id shapes that suggest a small model, used when no parameter count is reported. */const SMALL_MODEL_NAME = /small|mini|tiny|phi|gemma.*2b/i;+/**+ * The two roots a card resolves to: the OpenAI-compatible paths hang off+ * `apiBaseURL`, the native listings off `root` beside it.+ */+interface Endpoint {+ /** What the native listing paths hang off. */+ root: string;+ /** What the OpenAI-compatible paths hang off. */+ apiBaseURL: string;+}+/** A listed model, plus the parameter count when the endpoint reports one. */interface LocalModel extends RemoteModel {/** Parameter count in billions. */@@ -64,8 +76,10 @@ export class LocalProvider extends BaseProvider {private readonly kind: LocalProviderKind;private openai: OpenAISDKProvider;- /** Canonical endpoint root, without a trailing `/v1`. */+ /** Endpoint root the native listings hang off, without a trailing `/v1`. */private root: string;+ /** OpenAI-compatible API base: the configured URL, or a bare host plus `/v1`. */+ private apiBaseURL: string;/*** Whether the models are known to come from a local runtime, and are* therefore free to run. The named cards are local by definition; the@@ -79,11 +93,13 @@ export class LocalProvider extends BaseProvider {this.kind = kind;this.name = kind;this.isLocalRuntime = kind !== "openai-compatible";- this.root = resolveRoot(kind, this.baseURL);+ const endpoint = resolveEndpoint(kind, this.baseURL);+ this.root = endpoint.root;+ this.apiBaseURL = endpoint.apiBaseURL;this.openai = createOpenAI({apiKey: apiKey || PLACEHOLDER_API_KEY,- baseURL: `${this.root}/v1`,+ baseURL: this.apiBaseURL,fetch: llmFetch});}@@ -168,12 +184,12 @@ export class LocalProvider extends BaseProvider {return null;}- /** The universal fallback: the OpenAI-compatible `/v1/models` listing. */+ /** The universal fallback: the OpenAI-compatible `/models` listing. */private async listOpenAiCompatibleModels(): Promise<LocalModel[]> {- const url = `${this.root}/v1/models`;+ const url = `${this.apiBaseURL}/models`;const payload = await this.probeJson(url);if (payload === undefined) {- throw new Error(`No model listing endpoint found at ${this.root} — is this an OpenAI-compatible server?`);+ throw new Error(`No model listing endpoint found at ${this.apiBaseURL} — is this an OpenAI-compatible server?`);}const data = (payload as { data?: unknown }).data;if (!Array.isArray(data)) {@@ -259,38 +275,47 @@ export class LocalProvider extends BaseProvider {}/**- * Canonical endpoint root for a card: the configured URL (validated), or the- * card's own default, with any trailing `/v1` removed so both spellings a user- * might enter — `http://localhost:1234` and `http://localhost:1234/v1` — resolve- * to the same instance. The `/v1` is re-appended for the SDK and the- * OpenAI-compatible listing; the native listings hang off the root.+ * Endpoints for a card: the configured URL (validated), or the card's own+ * default, split by {@link endpointFromUrl}.*/-function resolveRoot(kind: LocalProviderKind, baseURL: string | undefined): string {+function resolveEndpoint(kind: LocalProviderKind, baseURL: string | undefined): Endpoint {const fallback = DEFAULT_BASE_URLS[kind];if (!baseURL) {if (!fallback) {throw new Error("A base URL is required for an OpenAI-compatible provider.");}- return stripApiVersion(fallback);+ return endpointFromUrl(fallback);}try {const parsed = new URL(baseURL);if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {throw new Error(`unsupported protocol ${parsed.protocol}`);}- return stripApiVersion(baseURL);+ return endpointFromUrl(baseURL);} catch (e) {if (!fallback) {throw new Error(`Invalid base URL "${baseURL}": ${e instanceof Error ? e.message : String(e)}`);}getLog().error(`${kind}: invalid base URL "${baseURL}" (${e}), falling back to ${fallback}`);- return stripApiVersion(fallback);+ return endpointFromUrl(fallback);}}-/** Trailing slashes are already gone (the base class normalizes them). */-function stripApiVersion(url: string): string {- return url.endsWith("/v1") ? url.slice(0, -"/v1".length) : url;+/**+ * Split a URL into the roots of {@link Endpoint}. A URL carrying a path is the+ * API base as entered, so an endpoint under a version of its own — Zhipu's+ * `/api/paas/v4` — reaches that version rather than a `/v1` below it; a bare+ * host names no API and takes the conventional `/v1`.+ *+ * Only `/v1` is dropped from `root`: it is the exact suffix of the two runtimes+ * that serve the native listings, which sit beside it. Trailing slashes are+ * already gone (the base class normalizes them).+ */+function endpointFromUrl(url: string): Endpoint {+ return {+ root: url.endsWith("/v1") ? url.slice(0, -"/v1".length) : url,+ apiBaseURL: new URL(url).pathname === "/" ? `${url}/v1` : url+ };}/**