mirror of
https://github.com/moltbot/moltbot.git
synced 2026-04-27 08:28:14 +00:00
test: standardize hermetic provider env snapshots
This commit is contained in:
@@ -2,6 +2,7 @@ import { afterEach, beforeEach, vi } from "vitest";
|
|||||||
import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
|
import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
|
||||||
import type { OpenClawConfig } from "../config/config.js";
|
import type { OpenClawConfig } from "../config/config.js";
|
||||||
import type { MockFn } from "../test-utils/vitest-mock-fn.js";
|
import type { MockFn } from "../test-utils/vitest-mock-fn.js";
|
||||||
|
import { resolveImplicitProviders } from "./models-config.providers.js";
|
||||||
|
|
||||||
export async function withModelsTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
|
export async function withModelsTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
|
||||||
return withTempHomeBase(fn, { prefix: "openclaw-models-" });
|
return withTempHomeBase(fn, { prefix: "openclaw-models-" });
|
||||||
@@ -106,6 +107,8 @@ export const MODELS_CONFIG_IMPLICIT_ENV_VARS = [
|
|||||||
"TOGETHER_API_KEY",
|
"TOGETHER_API_KEY",
|
||||||
"VOLCANO_ENGINE_API_KEY",
|
"VOLCANO_ENGINE_API_KEY",
|
||||||
"BYTEPLUS_API_KEY",
|
"BYTEPLUS_API_KEY",
|
||||||
|
"KILOCODE_API_KEY",
|
||||||
|
"KIMI_API_KEY",
|
||||||
"KIMICODE_API_KEY",
|
"KIMICODE_API_KEY",
|
||||||
"GEMINI_API_KEY",
|
"GEMINI_API_KEY",
|
||||||
"VENICE_API_KEY",
|
"VENICE_API_KEY",
|
||||||
@@ -123,6 +126,29 @@ export const MODELS_CONFIG_IMPLICIT_ENV_VARS = [
|
|||||||
"AWS_SHARED_CREDENTIALS_FILE",
|
"AWS_SHARED_CREDENTIALS_FILE",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export function snapshotImplicitProviderEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
|
||||||
|
const source = env ?? process.env;
|
||||||
|
const snapshot: NodeJS.ProcessEnv = {};
|
||||||
|
|
||||||
|
for (const envVar of MODELS_CONFIG_IMPLICIT_ENV_VARS) {
|
||||||
|
const value = source[envVar];
|
||||||
|
if (value !== undefined) {
|
||||||
|
snapshot[envVar] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return snapshot;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function resolveImplicitProvidersForTest(
|
||||||
|
params: Parameters<typeof resolveImplicitProviders>[0],
|
||||||
|
) {
|
||||||
|
return await resolveImplicitProviders({
|
||||||
|
...params,
|
||||||
|
env: snapshotImplicitProviderEnv(params.env),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export const CUSTOM_PROXY_MODELS_CONFIG: OpenClawConfig = {
|
export const CUSTOM_PROXY_MODELS_CONFIG: OpenClawConfig = {
|
||||||
models: {
|
models: {
|
||||||
providers: {
|
providers: {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import {
|
|||||||
NON_ENV_SECRETREF_MARKER,
|
NON_ENV_SECRETREF_MARKER,
|
||||||
QWEN_OAUTH_MARKER,
|
QWEN_OAUTH_MARKER,
|
||||||
} from "./model-auth-markers.js";
|
} from "./model-auth-markers.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("models-config provider auth provenance", () => {
|
describe("models-config provider auth provenance", () => {
|
||||||
it("persists env keyRef and tokenRef auth profiles as env var markers", async () => {
|
it("persists env keyRef and tokenRef auth profiles as env var markers", async () => {
|
||||||
@@ -41,7 +41,7 @@ describe("models-config provider auth provenance", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir, env: {} });
|
const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
||||||
expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
||||||
expect(providers?.together?.apiKey).toBe("TOGETHER_API_KEY");
|
expect(providers?.together?.apiKey).toBe("TOGETHER_API_KEY");
|
||||||
@@ -78,7 +78,7 @@ describe("models-config provider auth provenance", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir, env: {} });
|
const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
expect(providers?.byteplus?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.byteplus?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
expect(providers?.["byteplus-plan"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.["byteplus-plan"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
expect(providers?.together?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.together?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
@@ -114,7 +114,7 @@ describe("models-config provider auth provenance", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir, env: {} });
|
const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
expect(providers?.["minimax-portal"]?.apiKey).toBe(MINIMAX_OAUTH_MARKER);
|
expect(providers?.["minimax-portal"]?.apiKey).toBe(MINIMAX_OAUTH_MARKER);
|
||||||
expect(providers?.["qwen-portal"]?.apiKey).toBe(QWEN_OAUTH_MARKER);
|
expect(providers?.["qwen-portal"]?.apiKey).toBe(QWEN_OAUTH_MARKER);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { join } from "node:path";
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { captureEnv } from "../test-utils/env.js";
|
import { captureEnv } from "../test-utils/env.js";
|
||||||
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("cloudflare-ai-gateway profile provenance", () => {
|
describe("cloudflare-ai-gateway profile provenance", () => {
|
||||||
it("prefers env keyRef marker over runtime plaintext for persistence", async () => {
|
it("prefers env keyRef marker over runtime plaintext for persistence", async () => {
|
||||||
@@ -37,7 +37,7 @@ describe("cloudflare-ai-gateway profile provenance", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe("CLOUDFLARE_AI_GATEWAY_API_KEY");
|
expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe("CLOUDFLARE_AI_GATEWAY_API_KEY");
|
||||||
} finally {
|
} finally {
|
||||||
envSnapshot.restore();
|
envSnapshot.restore();
|
||||||
@@ -70,7 +70,7 @@ describe("cloudflare-ai-gateway profile provenance", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("provider discovery auth marker guardrails", () => {
|
describe("provider discovery auth marker guardrails", () => {
|
||||||
let originalVitest: string | undefined;
|
let originalVitest: string | undefined;
|
||||||
@@ -63,7 +63,7 @@ describe("provider discovery auth marker guardrails", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir, env: {} });
|
const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
expect(providers?.vllm?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.vllm?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
const request = fetchMock.mock.calls[0]?.[1] as
|
const request = fetchMock.mock.calls[0]?.[1] as
|
||||||
| { headers?: Record<string, string> }
|
| { headers?: Record<string, string> }
|
||||||
@@ -96,7 +96,7 @@ describe("provider discovery auth marker guardrails", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir, env: {} });
|
const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
expect(providers?.huggingface?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.huggingface?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
const huggingfaceCalls = fetchMock.mock.calls.filter(([url]) =>
|
const huggingfaceCalls = fetchMock.mock.calls.filter(([url]) =>
|
||||||
String(url).includes("router.huggingface.co"),
|
String(url).includes("router.huggingface.co"),
|
||||||
@@ -132,7 +132,7 @@ describe("provider discovery auth marker guardrails", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
await resolveImplicitProviders({ agentDir, env: {} });
|
await resolveImplicitProvidersForTest({ agentDir, env: {} });
|
||||||
const vllmCall = fetchMock.mock.calls.find(([url]) => String(url).includes(":8000"));
|
const vllmCall = fetchMock.mock.calls.find(([url]) => String(url).includes(":8000"));
|
||||||
const request = vllmCall?.[1] as { headers?: Record<string, string> } | undefined;
|
const request = vllmCall?.[1] as { headers?: Record<string, string> } | undefined;
|
||||||
expect(request?.headers?.Authorization).toBe("Bearer ALLCAPS_SAMPLE");
|
expect(request?.headers?.Authorization).toBe("Bearer ALLCAPS_SAMPLE");
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { captureEnv } from "../test-utils/env.js";
|
import { captureEnv } from "../test-utils/env.js";
|
||||||
import { buildKilocodeProvider, resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
import { buildKilocodeProvider } from "./models-config.providers.js";
|
||||||
|
|
||||||
const KILOCODE_MODEL_IDS = ["kilo/auto"];
|
const KILOCODE_MODEL_IDS = ["kilo/auto"];
|
||||||
|
|
||||||
@@ -14,7 +15,7 @@ describe("Kilo Gateway implicit provider", () => {
|
|||||||
process.env.KILOCODE_API_KEY = "test-key"; // pragma: allowlist secret
|
process.env.KILOCODE_API_KEY = "test-key"; // pragma: allowlist secret
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.kilocode).toBeDefined();
|
expect(providers?.kilocode).toBeDefined();
|
||||||
expect(providers?.kilocode?.models?.length).toBeGreaterThan(0);
|
expect(providers?.kilocode?.models?.length).toBeGreaterThan(0);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -28,7 +29,7 @@ describe("Kilo Gateway implicit provider", () => {
|
|||||||
delete process.env.KILOCODE_API_KEY;
|
delete process.env.KILOCODE_API_KEY;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.kilocode).toBeUndefined();
|
expect(providers?.kilocode).toBeUndefined();
|
||||||
} finally {
|
} finally {
|
||||||
envSnapshot.restore();
|
envSnapshot.restore();
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { captureEnv } from "../test-utils/env.js";
|
import { captureEnv } from "../test-utils/env.js";
|
||||||
import { buildKimiCodingProvider, resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
import { buildKimiCodingProvider } from "./models-config.providers.js";
|
||||||
|
|
||||||
describe("kimi-coding implicit provider (#22409)", () => {
|
describe("kimi-coding implicit provider (#22409)", () => {
|
||||||
it("should include kimi-coding when KIMI_API_KEY is configured", async () => {
|
it("should include kimi-coding when KIMI_API_KEY is configured", async () => {
|
||||||
@@ -12,7 +13,7 @@ describe("kimi-coding implicit provider (#22409)", () => {
|
|||||||
process.env.KIMI_API_KEY = "test-key"; // pragma: allowlist secret
|
process.env.KIMI_API_KEY = "test-key"; // pragma: allowlist secret
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["kimi-coding"]).toBeDefined();
|
expect(providers?.["kimi-coding"]).toBeDefined();
|
||||||
expect(providers?.["kimi-coding"]?.api).toBe("anthropic-messages");
|
expect(providers?.["kimi-coding"]?.api).toBe("anthropic-messages");
|
||||||
expect(providers?.["kimi-coding"]?.baseUrl).toBe("https://api.kimi.com/coding/");
|
expect(providers?.["kimi-coding"]?.baseUrl).toBe("https://api.kimi.com/coding/");
|
||||||
@@ -36,7 +37,7 @@ describe("kimi-coding implicit provider (#22409)", () => {
|
|||||||
delete process.env.KIMI_API_KEY;
|
delete process.env.KIMI_API_KEY;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["kimi-coding"]).toBeUndefined();
|
expect(providers?.["kimi-coding"]).toBeUndefined();
|
||||||
} finally {
|
} finally {
|
||||||
envSnapshot.restore();
|
envSnapshot.restore();
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { writeFile } from "node:fs/promises";
|
|||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("minimax provider catalog", () => {
|
describe("minimax provider catalog", () => {
|
||||||
it("does not advertise the removed lightning model for api-key or oauth providers", async () => {
|
it("does not advertise the removed lightning model for api-key or oauth providers", async () => {
|
||||||
@@ -34,7 +34,7 @@ describe("minimax provider catalog", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.minimax?.models?.map((model) => model.id)).toEqual([
|
expect(providers?.minimax?.models?.map((model) => model.id)).toEqual([
|
||||||
"MiniMax-VL-01",
|
"MiniMax-VL-01",
|
||||||
"MiniMax-M2.5",
|
"MiniMax-M2.5",
|
||||||
|
|||||||
@@ -5,13 +5,14 @@ import { join } from "node:path";
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { withEnvAsync } from "../test-utils/env.js";
|
import { withEnvAsync } from "../test-utils/env.js";
|
||||||
import { resolveApiKeyForProvider } from "./model-auth.js";
|
import { resolveApiKeyForProvider } from "./model-auth.js";
|
||||||
import { buildNvidiaProvider, resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
import { buildNvidiaProvider } from "./models-config.providers.js";
|
||||||
|
|
||||||
describe("NVIDIA provider", () => {
|
describe("NVIDIA provider", () => {
|
||||||
it("should include nvidia when NVIDIA_API_KEY is configured", async () => {
|
it("should include nvidia when NVIDIA_API_KEY is configured", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await withEnvAsync({ NVIDIA_API_KEY: "test-key" }, async () => {
|
await withEnvAsync({ NVIDIA_API_KEY: "test-key" }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.nvidia).toBeDefined();
|
expect(providers?.nvidia).toBeDefined();
|
||||||
expect(providers?.nvidia?.models?.length).toBeGreaterThan(0);
|
expect(providers?.nvidia?.models?.length).toBeGreaterThan(0);
|
||||||
});
|
});
|
||||||
@@ -52,7 +53,7 @@ describe("MiniMax implicit provider (#15275)", () => {
|
|||||||
it("should use anthropic-messages API for API-key provider", async () => {
|
it("should use anthropic-messages API for API-key provider", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await withEnvAsync({ MINIMAX_API_KEY: "test-key" }, async () => {
|
await withEnvAsync({ MINIMAX_API_KEY: "test-key" }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.minimax).toBeDefined();
|
expect(providers?.minimax).toBeDefined();
|
||||||
expect(providers?.minimax?.api).toBe("anthropic-messages");
|
expect(providers?.minimax?.api).toBe("anthropic-messages");
|
||||||
expect(providers?.minimax?.authHeader).toBe(true);
|
expect(providers?.minimax?.authHeader).toBe(true);
|
||||||
@@ -83,14 +84,14 @@ describe("MiniMax implicit provider (#15275)", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["minimax-portal"]?.authHeader).toBe(true);
|
expect(providers?.["minimax-portal"]?.authHeader).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should include minimax portal provider when MINIMAX_OAUTH_TOKEN is configured", async () => {
|
it("should include minimax portal provider when MINIMAX_OAUTH_TOKEN is configured", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await withEnvAsync({ MINIMAX_OAUTH_TOKEN: "portal-token" }, async () => {
|
await withEnvAsync({ MINIMAX_OAUTH_TOKEN: "portal-token" }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["minimax-portal"]).toBeDefined();
|
expect(providers?.["minimax-portal"]).toBeDefined();
|
||||||
expect(providers?.["minimax-portal"]?.authHeader).toBe(true);
|
expect(providers?.["minimax-portal"]?.authHeader).toBe(true);
|
||||||
expect(providers?.["minimax-portal"]?.models?.some((m) => m.id === "MiniMax-VL-01")).toBe(
|
expect(providers?.["minimax-portal"]?.models?.some((m) => m.id === "MiniMax-VL-01")).toBe(
|
||||||
@@ -104,7 +105,7 @@ describe("vLLM provider", () => {
|
|||||||
it("should not include vllm when no API key is configured", async () => {
|
it("should not include vllm when no API key is configured", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await withEnvAsync({ VLLM_API_KEY: undefined }, async () => {
|
await withEnvAsync({ VLLM_API_KEY: undefined }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.vllm).toBeUndefined();
|
expect(providers?.vllm).toBeUndefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -112,7 +113,7 @@ describe("vLLM provider", () => {
|
|||||||
it("should include vllm when VLLM_API_KEY is set", async () => {
|
it("should include vllm when VLLM_API_KEY is set", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await withEnvAsync({ VLLM_API_KEY: "test-key" }, async () => {
|
await withEnvAsync({ VLLM_API_KEY: "test-key" }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
|
|
||||||
expect(providers?.vllm).toBeDefined();
|
expect(providers?.vllm).toBeDefined();
|
||||||
expect(providers?.vllm?.apiKey).toBe("VLLM_API_KEY");
|
expect(providers?.vllm?.apiKey).toBe("VLLM_API_KEY");
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { mkdtempSync } from "node:fs";
|
|||||||
import { tmpdir } from "node:os";
|
import { tmpdir } from "node:os";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("Ollama auto-discovery", () => {
|
describe("Ollama auto-discovery", () => {
|
||||||
let originalVitest: string | undefined;
|
let originalVitest: string | undefined;
|
||||||
@@ -55,7 +55,7 @@ describe("Ollama auto-discovery", () => {
|
|||||||
}) as unknown as typeof fetch;
|
}) as unknown as typeof fetch;
|
||||||
|
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
|
|
||||||
expect(providers?.ollama).toBeDefined();
|
expect(providers?.ollama).toBeDefined();
|
||||||
expect(providers?.ollama?.apiKey).toBe("ollama-local");
|
expect(providers?.ollama?.apiKey).toBe("ollama-local");
|
||||||
@@ -73,7 +73,7 @@ describe("Ollama auto-discovery", () => {
|
|||||||
mockOllamaUnreachable();
|
mockOllamaUnreachable();
|
||||||
|
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
|
|
||||||
expect(providers?.ollama).toBeUndefined();
|
expect(providers?.ollama).toBeUndefined();
|
||||||
const ollamaWarnings = warnSpy.mock.calls.filter(
|
const ollamaWarnings = warnSpy.mock.calls.filter(
|
||||||
@@ -89,7 +89,7 @@ describe("Ollama auto-discovery", () => {
|
|||||||
mockOllamaUnreachable();
|
mockOllamaUnreachable();
|
||||||
|
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
await resolveImplicitProviders({
|
await resolveImplicitProvidersForTest({
|
||||||
agentDir,
|
agentDir,
|
||||||
explicitProviders: {
|
explicitProviders: {
|
||||||
ollama: {
|
ollama: {
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
import type { ModelDefinitionConfig } from "../config/types.models.js";
|
import type { ModelDefinitionConfig } from "../config/types.models.js";
|
||||||
import { resolveImplicitProviders, resolveOllamaApiBase } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
import { resolveOllamaApiBase } from "./models-config.providers.js";
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.unstubAllEnvs();
|
vi.unstubAllEnvs();
|
||||||
@@ -60,7 +61,7 @@ describe("Ollama provider", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function resolveProvidersWithOllamaKey(agentDir: string) {
|
async function resolveProvidersWithOllamaKey(agentDir: string) {
|
||||||
return await withOllamaApiKey(async () => await resolveImplicitProviders({ agentDir }));
|
return await withOllamaApiKey(async () => await resolveImplicitProvidersForTest({ agentDir }));
|
||||||
}
|
}
|
||||||
|
|
||||||
const createTagModel = (name: string) => ({ name, modified_at: "", size: 1, digest: "" });
|
const createTagModel = (name: string) => ({ name, modified_at: "", size: 1, digest: "" });
|
||||||
@@ -78,7 +79,7 @@ describe("Ollama provider", () => {
|
|||||||
|
|
||||||
it("should not include ollama when no API key is configured", async () => {
|
it("should not include ollama when no API key is configured", async () => {
|
||||||
const agentDir = createAgentDir();
|
const agentDir = createAgentDir();
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
|
|
||||||
expect(providers?.ollama).toBeUndefined();
|
expect(providers?.ollama).toBeUndefined();
|
||||||
});
|
});
|
||||||
@@ -86,7 +87,7 @@ describe("Ollama provider", () => {
|
|||||||
it("should use native ollama api type", async () => {
|
it("should use native ollama api type", async () => {
|
||||||
const agentDir = createAgentDir();
|
const agentDir = createAgentDir();
|
||||||
await withOllamaApiKey(async () => {
|
await withOllamaApiKey(async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
|
|
||||||
expect(providers?.ollama).toBeDefined();
|
expect(providers?.ollama).toBeDefined();
|
||||||
expect(providers?.ollama?.apiKey).toBe("OLLAMA_API_KEY");
|
expect(providers?.ollama?.apiKey).toBe("OLLAMA_API_KEY");
|
||||||
@@ -98,7 +99,7 @@ describe("Ollama provider", () => {
|
|||||||
it("should preserve explicit ollama baseUrl on implicit provider injection", async () => {
|
it("should preserve explicit ollama baseUrl on implicit provider injection", async () => {
|
||||||
const agentDir = createAgentDir();
|
const agentDir = createAgentDir();
|
||||||
await withOllamaApiKey(async () => {
|
await withOllamaApiKey(async () => {
|
||||||
const providers = await resolveImplicitProviders({
|
const providers = await resolveImplicitProvidersForTest({
|
||||||
agentDir,
|
agentDir,
|
||||||
explicitProviders: {
|
explicitProviders: {
|
||||||
ollama: {
|
ollama: {
|
||||||
@@ -239,7 +240,7 @@ describe("Ollama provider", () => {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({
|
const providers = await resolveImplicitProvidersForTest({
|
||||||
agentDir,
|
agentDir,
|
||||||
explicitProviders: {
|
explicitProviders: {
|
||||||
ollama: {
|
ollama: {
|
||||||
@@ -264,7 +265,7 @@ describe("Ollama provider", () => {
|
|||||||
it("should preserve explicit apiKey when discovery path has no models and no env key", async () => {
|
it("should preserve explicit apiKey when discovery path has no models and no env key", async () => {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({
|
const providers = await resolveImplicitProvidersForTest({
|
||||||
agentDir,
|
agentDir,
|
||||||
explicitProviders: {
|
explicitProviders: {
|
||||||
ollama: {
|
ollama: {
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import { resolveOpenClawAgentDir } from "./agent-paths.js";
|
|||||||
import {
|
import {
|
||||||
installModelsConfigTestHooks,
|
installModelsConfigTestHooks,
|
||||||
MODELS_CONFIG_IMPLICIT_ENV_VARS,
|
MODELS_CONFIG_IMPLICIT_ENV_VARS,
|
||||||
|
resolveImplicitProvidersForTest,
|
||||||
unsetEnv,
|
unsetEnv,
|
||||||
withModelsTempHome,
|
withModelsTempHome,
|
||||||
withTempEnv,
|
withTempEnv,
|
||||||
} from "./models-config.e2e-harness.js";
|
} from "./models-config.e2e-harness.js";
|
||||||
import { ensureOpenClawModelsJson } from "./models-config.js";
|
import { ensureOpenClawModelsJson } from "./models-config.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
|
||||||
import { readGeneratedModelsJson } from "./models-config.test-utils.js";
|
import { readGeneratedModelsJson } from "./models-config.test-utils.js";
|
||||||
|
|
||||||
installModelsConfigTestHooks();
|
installModelsConfigTestHooks();
|
||||||
@@ -50,7 +50,7 @@ describe("openai-codex implicit provider", () => {
|
|||||||
const agentDir = resolveOpenClawAgentDir();
|
const agentDir = resolveOpenClawAgentDir();
|
||||||
await writeCodexOauthProfile(agentDir);
|
await writeCodexOauthProfile(agentDir);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["openai-codex"]).toMatchObject({
|
expect(providers?.["openai-codex"]).toMatchObject({
|
||||||
baseUrl: "https://chatgpt.com/backend-api",
|
baseUrl: "https://chatgpt.com/backend-api",
|
||||||
api: "openai-codex-responses",
|
api: "openai-codex-responses",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { withEnvAsync } from "../test-utils/env.js";
|
import { withEnvAsync } from "../test-utils/env.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
const qianfanApiKeyEnv = ["QIANFAN_API", "KEY"].join("_");
|
const qianfanApiKeyEnv = ["QIANFAN_API", "KEY"].join("_");
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ describe("Qianfan provider", () => {
|
|||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
const qianfanApiKey = "test-key"; // pragma: allowlist secret
|
const qianfanApiKey = "test-key"; // pragma: allowlist secret
|
||||||
await withEnvAsync({ [qianfanApiKeyEnv]: qianfanApiKey }, async () => {
|
await withEnvAsync({ [qianfanApiKeyEnv]: qianfanApiKey }, async () => {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.qianfan).toBeDefined();
|
expect(providers?.qianfan).toBeDefined();
|
||||||
expect(providers?.qianfan?.apiKey).toBe("QIANFAN_API_KEY");
|
expect(providers?.qianfan?.apiKey).toBe("QIANFAN_API_KEY");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { join } from "node:path";
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { captureEnv } from "../test-utils/env.js";
|
import { captureEnv } from "../test-utils/env.js";
|
||||||
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
import { VERCEL_AI_GATEWAY_BASE_URL } from "./vercel-ai-gateway.js";
|
import { VERCEL_AI_GATEWAY_BASE_URL } from "./vercel-ai-gateway.js";
|
||||||
|
|
||||||
describe("vercel-ai-gateway provider resolution", () => {
|
describe("vercel-ai-gateway provider resolution", () => {
|
||||||
@@ -14,7 +14,7 @@ describe("vercel-ai-gateway provider resolution", () => {
|
|||||||
process.env.AI_GATEWAY_API_KEY = "vercel-gateway-test-key"; // pragma: allowlist secret
|
process.env.AI_GATEWAY_API_KEY = "vercel-gateway-test-key"; // pragma: allowlist secret
|
||||||
try {
|
try {
|
||||||
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
const provider = providers?.["vercel-ai-gateway"];
|
const provider = providers?.["vercel-ai-gateway"];
|
||||||
expect(provider?.apiKey).toBe("AI_GATEWAY_API_KEY");
|
expect(provider?.apiKey).toBe("AI_GATEWAY_API_KEY");
|
||||||
expect(provider?.api).toBe("anthropic-messages");
|
expect(provider?.api).toBe("anthropic-messages");
|
||||||
@@ -52,7 +52,7 @@ describe("vercel-ai-gateway provider resolution", () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe("AI_GATEWAY_API_KEY");
|
expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe("AI_GATEWAY_API_KEY");
|
||||||
} finally {
|
} finally {
|
||||||
envSnapshot.restore();
|
envSnapshot.restore();
|
||||||
@@ -81,7 +81,7 @@ describe("vercel-ai-gateway provider resolution", () => {
|
|||||||
"utf8",
|
"utf8",
|
||||||
);
|
);
|
||||||
|
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { join } from "node:path";
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { captureEnv } from "../test-utils/env.js";
|
import { captureEnv } from "../test-utils/env.js";
|
||||||
import { upsertAuthProfile } from "./auth-profiles.js";
|
import { upsertAuthProfile } from "./auth-profiles.js";
|
||||||
import { resolveImplicitProviders } from "./models-config.providers.js";
|
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
|
||||||
|
|
||||||
describe("Volcengine and BytePlus providers", () => {
|
describe("Volcengine and BytePlus providers", () => {
|
||||||
it("includes volcengine and volcengine-plan when VOLCANO_ENGINE_API_KEY is configured", async () => {
|
it("includes volcengine and volcengine-plan when VOLCANO_ENGINE_API_KEY is configured", async () => {
|
||||||
@@ -13,7 +13,7 @@ describe("Volcengine and BytePlus providers", () => {
|
|||||||
process.env.VOLCANO_ENGINE_API_KEY = "test-key"; // pragma: allowlist secret
|
process.env.VOLCANO_ENGINE_API_KEY = "test-key"; // pragma: allowlist secret
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.volcengine).toBeDefined();
|
expect(providers?.volcengine).toBeDefined();
|
||||||
expect(providers?.["volcengine-plan"]).toBeDefined();
|
expect(providers?.["volcengine-plan"]).toBeDefined();
|
||||||
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
||||||
@@ -29,7 +29,7 @@ describe("Volcengine and BytePlus providers", () => {
|
|||||||
process.env.BYTEPLUS_API_KEY = "test-key"; // pragma: allowlist secret
|
process.env.BYTEPLUS_API_KEY = "test-key"; // pragma: allowlist secret
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.byteplus).toBeDefined();
|
expect(providers?.byteplus).toBeDefined();
|
||||||
expect(providers?.["byteplus-plan"]).toBeDefined();
|
expect(providers?.["byteplus-plan"]).toBeDefined();
|
||||||
expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY");
|
expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY");
|
||||||
@@ -65,7 +65,7 @@ describe("Volcengine and BytePlus providers", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const providers = await resolveImplicitProviders({ agentDir });
|
const providers = await resolveImplicitProvidersForTest({ agentDir });
|
||||||
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
||||||
expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY");
|
||||||
expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY");
|
expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY");
|
||||||
|
|||||||
Reference in New Issue
Block a user