mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-19 17:01:34 +00:00
* refactor(sessions): migrate runtime storage to sqlite * test(sessions): fix sqlite CI regressions * test(sessions): align remaining sqlite fixtures * fix(codex): require sqlite trajectory recorder * test(sessions): align orphan recovery sqlite fixture * test(sessions): align sqlite rebase fixtures * fix(sessions): finish current-main integration of the sqlite flip Resolve the whole-store SDK removal across its owner boundary: drop the loadSessionStore re-export and the registry whole-store wrappers, wire hasTrackedActiveSessionRun into gateway chat, complete the preserveLockedHarnessIds cleanup contract, flip the codex thread-history import to storePath targets, and port remaining main-side tests from file-store helpers to session accessor reads. * chore: drop committed pebbles log, revert plugin-inspector bump, refresh generated docs Remove the 1.8k-line .pebbles/events.jsonl work log from the branch, restore the plugin-inspector advisory lane to main's pinned 0.3.10 so the supply-chain bump gets its own review, and regenerate docs_map, the plugin SDK API baseline, and the export-surface ratchet for the merged tree. * feat(sessions): keep archived transcripts by default with zstd cold storage Codex-style retention: deleting or resetting a session archives its transcript as a zstd-compressed JSONL artifact (plain when the runtime lacks node:zlib zstd) and keeps it until the disk budget evicts oldest first. resetArchiveRetention now governs both deleted and reset archives and defaults to keep; maxDiskBytes defaults to 2gb so retention stays bounded, with archives evicted before live sessions. The cron reaper follows the same knob instead of deleting archives on its own timer. * fix(state): converge agent DB migration lineages and bound database growth Merge coherence: run both structure-gated legacy memory-schema repairs (flip-lineage drop, main-lineage identity rebuild) before the flip migration so pre-flip v1/v2 and pre-merge flip v1/v4 databases all converge, and hoist foreign_keys=OFF outside the schema transaction where the pragma was silently ignored and the v1 sessions rebuild cascade-deleted session_entries. Growth guards: fresh agent DBs enable auto_vacuum=INCREMENTAL, WAL maintenance releases freed pages in bounded passes (never a blocking full VACUUM), and doctor reports state/agent DB bloat from freelist stats. * fix(codex): resolve the store path for thread-history import via the SDK The supervision catalog passed the legacy sessionFile locator to the storePath-targeted transcript mirror; resolve the agent store path with the session-store SDK helper instead of a runtime-object seam so test fakes and headless callers need no extra surface. Drop the obsolete missing-session-id preprocessing case: sessions rows are NOT NULL on session_id and upsert repairs id-less patches at write time. * fix(sessions): fail safe on malformed disk-budget config and doctor stat errors A malformed explicit maxDiskBytes disables the budget instead of falling back to the destructive 2gb default the user never chose, and the doctor bloat check skips databases whose paths stat-fail instead of aborting doctor. * fix(sessions): complete sqlite conflict translations * test(sqlite): align hardening checks with maintenance * test(sessions): inspect compressed transcript archives * fix(tests): await session seeds and drop unused helpers flagged by CI lint The five unawaited writeSessionStoreSeed calls raced their SQLite seeds against the assertions, failing compact shards; the bloat probe drops a useless initializer and the merged tests drop now-unused helpers. * test(sessions): type legacy proof events directly * test(sessions): align hardening contracts * perf(sessions): read usage transcript sizes from SQL aggregates Usage/cost scans walked every session and materialized every transcript event just to re-stringify it for a byte estimate — the #86718 stall class reborn on the DB. readTranscriptStatsSync sums stored JSON bytes in SQLite without loading a single row. * fix(sessions): re-root foreign-root transcript paths onto the current sessions dir Restored backups, moved OPENCLAW_STATE_DIR, and rehearsal copies carry absolute sessionFile paths from the old root; the containment fallback kept those foreign paths, so migration read (and would archive) files in the original root and reported local copies missing. Re-root the canonical agents/<id>/sessions suffix onto the current dir when the file exists there; genuine cross-root layouts still fall through unchanged. * test(agents): seed harness admission through sqlite * fix(sqlite): close agent db on pragma setup failure * fix(doctor): compact and retrofit incremental auto-vacuum after session import The migration is the sanctioned offline window: post-import compact reclaims import churn and applies auto_vacuum=INCREMENTAL to databases created before the fresh-DB pragma existed, so runtime maintenance can release pages in bounded passes on every install. --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
670 lines
22 KiB
TypeScript
670 lines
22 KiB
TypeScript
// Ollama tests cover provider discovery plugin behavior.
|
|
import { mkdtempSync } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";
|
|
import { clearLiveCatalogCacheForTests } from "openclaw/plugin-sdk/provider-catalog-shared";
|
|
import type { ModelDefinitionConfig } from "openclaw/plugin-sdk/provider-onboard";
|
|
import { withFetchPreconnect } from "openclaw/plugin-sdk/test-env";
|
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
import { ollamaProviderDiscovery } from "./provider-discovery.js";
|
|
|
|
const OLLAMA_LOCAL_AUTH_MARKER = "ollama-local";
|
|
|
|
afterEach(() => {
|
|
clearLiveCatalogCacheForTests();
|
|
vi.unstubAllEnvs();
|
|
vi.unstubAllGlobals();
|
|
});
|
|
|
|
describe("Ollama provider", () => {
|
|
const createAgentDir = () => mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
|
|
|
const enableDiscoveryEnv = () => {
|
|
vi.stubEnv("VITEST", "");
|
|
vi.stubEnv("NODE_ENV", "development");
|
|
};
|
|
|
|
const fetchCallUrls = (fetchMock: ReturnType<typeof vi.fn>): string[] =>
|
|
fetchMock.mock.calls.map(([input]) => String(input));
|
|
|
|
const countFetchCallUrls = (fetchMock: ReturnType<typeof vi.fn>, suffix: string): number =>
|
|
fetchCallUrls(fetchMock).reduce((count, url) => count + (url.endsWith(suffix) ? 1 : 0), 0);
|
|
|
|
const stubOllamaFetch = (fetchMock: ReturnType<typeof vi.fn>) => {
|
|
vi.stubGlobal("fetch", withFetchPreconnect(fetchMock));
|
|
};
|
|
|
|
const countWarnCallsIncluding = (warnSpy: ReturnType<typeof vi.spyOn>, text: string): number => {
|
|
let count = 0;
|
|
for (const [message] of warnSpy.mock.calls) {
|
|
if (String(message).includes(text)) {
|
|
count++;
|
|
}
|
|
}
|
|
return count;
|
|
};
|
|
|
|
const expectDiscoveryCallCounts = (
|
|
fetchMock: ReturnType<typeof vi.fn>,
|
|
params: { tags: number; show: number },
|
|
) => {
|
|
expect(countFetchCallUrls(fetchMock, "/api/tags")).toBe(params.tags);
|
|
expect(countFetchCallUrls(fetchMock, "/api/show")).toBe(params.show);
|
|
};
|
|
|
|
async function withOllamaApiKey<T>(run: () => Promise<T>): Promise<T> {
|
|
process.env.OLLAMA_API_KEY = "test-key"; // pragma: allowlist secret
|
|
try {
|
|
return await run();
|
|
} finally {
|
|
delete process.env.OLLAMA_API_KEY;
|
|
}
|
|
}
|
|
|
|
async function runOllamaCatalog(params: {
|
|
config?: OpenClawConfig;
|
|
env?: NodeJS.ProcessEnv;
|
|
resolveProviderApiKey?: () => { apiKey: string | undefined; discoveryApiKey?: string };
|
|
}) {
|
|
const env: NodeJS.ProcessEnv = {
|
|
...process.env,
|
|
VITEST: "1",
|
|
NODE_ENV: "test",
|
|
...params.env,
|
|
};
|
|
const result = await ollamaProviderDiscovery.catalog.run({
|
|
config: params.config ?? {},
|
|
agentDir: createAgentDir(),
|
|
env,
|
|
resolveProviderApiKey:
|
|
params.resolveProviderApiKey ??
|
|
(() => ({
|
|
apiKey: env.OLLAMA_API_KEY?.trim() ? env.OLLAMA_API_KEY : undefined,
|
|
})),
|
|
resolveProviderAuth: () => ({
|
|
apiKey: env.OLLAMA_API_KEY?.trim() ? env.OLLAMA_API_KEY : undefined,
|
|
mode: env.OLLAMA_API_KEY?.trim() ? "api_key" : "none",
|
|
source: env.OLLAMA_API_KEY?.trim() ? "env" : "none",
|
|
}),
|
|
});
|
|
return result && "provider" in result ? result.provider : undefined;
|
|
}
|
|
|
|
async function withoutAmbientOllamaEnv<T>(run: () => Promise<T>): Promise<T> {
|
|
const previous = process.env.OLLAMA_API_KEY;
|
|
delete process.env.OLLAMA_API_KEY;
|
|
try {
|
|
return await run();
|
|
} finally {
|
|
if (previous === undefined) {
|
|
delete process.env.OLLAMA_API_KEY;
|
|
} else {
|
|
process.env.OLLAMA_API_KEY = previous;
|
|
}
|
|
}
|
|
}
|
|
|
|
const createTagModel = (name: string) => ({ name, modified_at: "", size: 1, digest: "" });
|
|
|
|
const jsonResponse = (body: unknown, status = 200) =>
|
|
new Response(JSON.stringify(body), {
|
|
status,
|
|
headers: { "content-type": "application/json" },
|
|
});
|
|
|
|
const tagsResponse = (names: string[]) =>
|
|
jsonResponse({ models: names.map((name) => createTagModel(name)) });
|
|
|
|
const notFoundJsonResponse = () => jsonResponse({}, 404);
|
|
|
|
const stubTagsFetch = (names: string[] = []) => {
|
|
const fetchMock = vi.fn(async (input: unknown) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return tagsResponse(names);
|
|
}
|
|
return notFoundJsonResponse();
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
return fetchMock;
|
|
};
|
|
|
|
it("should not include ollama when no API key is configured", async () => {
|
|
const provider = await runOllamaCatalog({
|
|
env: { OLLAMA_API_KEY: undefined },
|
|
});
|
|
|
|
expect(provider).toBeUndefined();
|
|
});
|
|
|
|
it("should use native ollama api type", async () => {
|
|
const fetchMock = stubTagsFetch();
|
|
|
|
await withOllamaApiKey(async () => {
|
|
const provider = await runOllamaCatalog({});
|
|
|
|
if (!provider) {
|
|
throw new Error("expected injected Ollama provider");
|
|
}
|
|
expect(provider.apiKey).toBe(OLLAMA_LOCAL_AUTH_MARKER);
|
|
expect(provider.api).toBe("ollama");
|
|
expect(provider.baseUrl).toBe("http://127.0.0.1:11434");
|
|
expectDiscoveryCallCounts(fetchMock, { tags: 1, show: 0 });
|
|
});
|
|
});
|
|
|
|
it("should preserve explicit ollama baseUrl and api on implicit provider injection", async () => {
|
|
const fetchMock = stubTagsFetch();
|
|
|
|
await withOllamaApiKey(async () => {
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://192.168.20.14:11434/v1",
|
|
api: "openai-completions",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { OLLAMA_API_KEY: "test-key" },
|
|
});
|
|
|
|
expect(countFetchCallUrls(fetchMock, "/api/tags")).toBe(1);
|
|
|
|
expect(provider?.baseUrl).toBe("http://192.168.20.14:11434/v1");
|
|
expect(provider?.api).toBe("openai-completions");
|
|
});
|
|
});
|
|
|
|
it("should normalize explicit native ollama baseUrl on implicit provider injection", async () => {
|
|
const fetchMock = stubTagsFetch();
|
|
|
|
await withOllamaApiKey(async () => {
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://192.168.20.14:11434/v1",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { OLLAMA_API_KEY: "test-key" },
|
|
});
|
|
|
|
expect(countFetchCallUrls(fetchMock, "/api/tags")).toBe(1);
|
|
expect(provider?.baseUrl).toBe("http://192.168.20.14:11434");
|
|
expect(provider?.api).toBe("ollama");
|
|
});
|
|
});
|
|
|
|
it("discovers per-model context windows from /api/show", async () => {
|
|
enableDiscoveryEnv();
|
|
const fetchMock = vi.fn(async (input: unknown, init?: RequestInit) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return tagsResponse(["qwen3:32b", "llama3.3:70b"]);
|
|
}
|
|
if (url.endsWith("/api/show")) {
|
|
const rawBody = init?.body;
|
|
const bodyText = typeof rawBody === "string" ? rawBody : "{}";
|
|
const parsed = JSON.parse(bodyText) as { name?: string };
|
|
if (parsed.name === "qwen3:32b") {
|
|
return jsonResponse({ model_info: { "qwen3.context_length": 131072 } });
|
|
}
|
|
if (parsed.name === "llama3.3:70b") {
|
|
return jsonResponse({ model_info: { "llama.context_length": 65536 } });
|
|
}
|
|
}
|
|
return notFoundJsonResponse();
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
env: { OLLAMA_API_KEY: "test-key", VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
const models = provider?.models ?? [];
|
|
const qwen = models.find((model) => model.id === "qwen3:32b");
|
|
const llama = models.find((model) => model.id === "llama3.3:70b");
|
|
expect(qwen?.contextWindow).toBe(131072);
|
|
expect(llama?.contextWindow).toBe(65536);
|
|
expectDiscoveryCallCounts(fetchMock, { tags: 1, show: 2 });
|
|
});
|
|
|
|
it("auto-registers ollama provider when models are discovered locally", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
enableDiscoveryEnv();
|
|
const fetchMock = vi.fn(async (input: unknown) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return tagsResponse(["deepseek-r1:latest", "llama3.3:latest"]);
|
|
}
|
|
if (url.endsWith("/api/show")) {
|
|
return jsonResponse({ model_info: {} });
|
|
}
|
|
return notFoundJsonResponse();
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
env: { OLLAMA_API_KEY: OLLAMA_LOCAL_AUTH_MARKER, VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(provider?.apiKey).toBe(OLLAMA_LOCAL_AUTH_MARKER);
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.baseUrl).toBe("http://127.0.0.1:11434");
|
|
expect(provider?.models).toHaveLength(2);
|
|
expect(provider?.models?.[0]?.id).toBe("deepseek-r1:latest");
|
|
expect(provider?.models?.[0]?.reasoning).toBe(true);
|
|
expect(provider?.models?.[1]?.reasoning).toBe(false);
|
|
expectDiscoveryCallCounts(fetchMock, { tags: 1, show: 2 });
|
|
});
|
|
});
|
|
|
|
it("does not warn when Ollama is unreachable and not explicitly configured", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
enableDiscoveryEnv();
|
|
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
const fetchMock = vi
|
|
.fn()
|
|
.mockRejectedValue(new Error("connect ECONNREFUSED 127.0.0.1:11434"));
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(provider).toBeUndefined();
|
|
expect(
|
|
warnSpy.mock.calls.filter(([message]) => String(message).includes("Ollama")),
|
|
).toHaveLength(0);
|
|
warnSpy.mockRestore();
|
|
});
|
|
});
|
|
|
|
it("warns when Ollama is unreachable and explicitly configured", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
enableDiscoveryEnv();
|
|
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
const fetchMock = vi
|
|
.fn()
|
|
.mockRejectedValue(new Error("connect ECONNREFUSED 127.0.0.1:11434"));
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://127.0.0.1:11435/v1",
|
|
api: "openai-completions",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(countWarnCallsIncluding(warnSpy, "Ollama")).toBeGreaterThan(0);
|
|
warnSpy.mockRestore();
|
|
});
|
|
});
|
|
|
|
it("falls back to default context window when /api/show fails", async () => {
|
|
enableDiscoveryEnv();
|
|
const fetchMock = vi.fn(async (input: unknown) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return tagsResponse(["qwen3:32b"]);
|
|
}
|
|
if (url.endsWith("/api/show")) {
|
|
return jsonResponse({}, 500);
|
|
}
|
|
return notFoundJsonResponse();
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
env: { OLLAMA_API_KEY: "test-key", VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
const model = provider?.models?.find((entry) => entry.id === "qwen3:32b");
|
|
expect(model?.contextWindow).toBe(128000);
|
|
expectDiscoveryCallCounts(fetchMock, { tags: 1, show: 1 });
|
|
});
|
|
|
|
it("caps /api/show requests when /api/tags returns a very large model list", async () => {
|
|
enableDiscoveryEnv();
|
|
const manyModels = Array.from({ length: 250 }, (_, idx) => ({
|
|
name: `model-${idx}`,
|
|
modified_at: "",
|
|
size: 1,
|
|
digest: "",
|
|
}));
|
|
const fetchMock = vi.fn(async (input: unknown) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return jsonResponse({ models: manyModels });
|
|
}
|
|
return jsonResponse({ model_info: { "llama.context_length": 65536 } });
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
env: { OLLAMA_API_KEY: "test-key", VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
const models = provider?.models ?? [];
|
|
// 1 call for /api/tags + 200 capped /api/show calls.
|
|
expectDiscoveryCallCounts(fetchMock, { tags: 1, show: 200 });
|
|
expect(models).toHaveLength(200);
|
|
});
|
|
|
|
it("should have correct model structure without streaming override", () => {
|
|
const mockOllamaModel = {
|
|
id: "llama3.3:latest",
|
|
name: "llama3.3:latest",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 128000,
|
|
maxTokens: 8192,
|
|
};
|
|
|
|
// Native Ollama provider does not need streaming: false workaround
|
|
expect(mockOllamaModel).not.toHaveProperty("params");
|
|
});
|
|
|
|
it("should skip discovery fetch when explicit models are configured", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
const explicitModels: ModelDefinitionConfig[] = [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"] as Array<"text" | "image">,
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
];
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://remote-ollama:11434/v1",
|
|
models: explicitModels,
|
|
apiKey: "config-ollama-key", // pragma: allowlist secret
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
const ollamaCalls = fetchMock.mock.calls.filter(([input]) => {
|
|
const url = String(input);
|
|
return url.endsWith("/api/tags") || url.endsWith("/api/show");
|
|
});
|
|
expect(ollamaCalls).toHaveLength(0);
|
|
expect(provider?.models).toEqual(explicitModels);
|
|
expect(provider?.baseUrl).toBe("http://remote-ollama:11434");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBe("config-ollama-key");
|
|
});
|
|
});
|
|
|
|
it("should use synthetic local auth for configured remote providers without apiKey", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://remote-ollama:11434/v1",
|
|
models: [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
expect(provider?.baseUrl).toBe("http://remote-ollama:11434");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBe(OLLAMA_LOCAL_AUTH_MARKER);
|
|
expect(provider?.models).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
it("should not use synthetic local auth for configured cloud providers without apiKey", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "https://ollama.com/v1",
|
|
models: [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
expect(provider?.baseUrl).toBe("https://ollama.com");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBeUndefined();
|
|
expect(provider?.models).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
it("uses resolved discovery api key when configured cloud apiKey is an env marker", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "https://ollama.com/v1",
|
|
models: [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
],
|
|
apiKey: "OLLAMA_API_KEY",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { OLLAMA_API_KEY: "real-secret", VITEST: "", NODE_ENV: "development" },
|
|
resolveProviderApiKey: () => ({
|
|
apiKey: "OLLAMA_API_KEY",
|
|
discoveryApiKey: "real-secret",
|
|
}),
|
|
});
|
|
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
expect(provider?.baseUrl).toBe("https://ollama.com");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBe("real-secret");
|
|
expect(provider?.models).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
it("uses resolved discovery api key for configured cloud providers without apiKey", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "https://ollama.com/v1",
|
|
models: [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { OLLAMA_API_KEY: "real-secret", VITEST: "", NODE_ENV: "development" },
|
|
resolveProviderApiKey: () => ({
|
|
apiKey: "OLLAMA_API_KEY",
|
|
discoveryApiKey: "real-secret",
|
|
}),
|
|
});
|
|
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
expect(provider?.baseUrl).toBe("https://ollama.com");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBe("real-secret");
|
|
expect(provider?.models).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
it("keeps synthetic local auth when a local provider also has a discovery key", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn();
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://127.0.0.1:11434/v1",
|
|
models: [
|
|
{
|
|
id: "gpt-oss:20b",
|
|
name: "GPT-OSS 20B",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 81920,
|
|
},
|
|
],
|
|
apiKey: "OLLAMA_API_KEY",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { OLLAMA_API_KEY: "real-secret", VITEST: "", NODE_ENV: "development" },
|
|
resolveProviderApiKey: () => ({
|
|
apiKey: "OLLAMA_API_KEY",
|
|
discoveryApiKey: "real-secret",
|
|
}),
|
|
});
|
|
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
expect(provider?.baseUrl).toBe("http://127.0.0.1:11434");
|
|
expect(provider?.api).toBe("ollama");
|
|
expect(provider?.apiKey).toBe(OLLAMA_LOCAL_AUTH_MARKER);
|
|
expect(provider?.models).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
it("should preserve explicit apiKey from configured remote providers", async () => {
|
|
await withoutAmbientOllamaEnv(async () => {
|
|
const fetchMock = vi.fn(async (input: unknown) => {
|
|
const url = String(input);
|
|
if (url.endsWith("/api/tags")) {
|
|
return tagsResponse([]);
|
|
}
|
|
return notFoundJsonResponse();
|
|
});
|
|
stubOllamaFetch(fetchMock);
|
|
|
|
const provider = await runOllamaCatalog({
|
|
config: {
|
|
models: {
|
|
providers: {
|
|
ollama: {
|
|
baseUrl: "http://remote-ollama:11434/v1",
|
|
api: "openai-completions",
|
|
models: [
|
|
{
|
|
id: "configured-remote-model",
|
|
name: "Configured Remote Model",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 8192,
|
|
maxTokens: 8192,
|
|
},
|
|
],
|
|
apiKey: "config-ollama-key", // pragma: allowlist secret
|
|
},
|
|
},
|
|
},
|
|
},
|
|
env: { VITEST: "", NODE_ENV: "development" },
|
|
});
|
|
|
|
expect(provider?.apiKey).toBe("config-ollama-key");
|
|
expect(provider?.baseUrl).toBe("http://remote-ollama:11434/v1");
|
|
expect(provider?.api).toBe("openai-completions");
|
|
expect(fetchMock).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|