mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-20 16:41:42 +00:00
* fix(ollama): repair retired cloud provider endpoint Route configured Ollama Cloud provider ids through plugin doctor compatibility migrations so doctor --fix can rewrite the retired ai.ollama.com endpoint before runtime reads persisted config. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test(doctor): align provider fixture with typed config Ensure the doctor registry provider-scoped migration test uses a fully typed provider fixture so the test type-check shard validates the intended behavior. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test(ollama): align doctor fixture with typed config Use fully typed provider and model fixtures in the Ollama doctor contract tests so the extension test type-check shard validates the migration behavior. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(ollama): preserve custom cloud provider base url Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix(ollama): avoid logging retired endpoint secrets --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Vincent Koc <25068+vincentkoc@users.noreply.github.com>
183 lines
5.5 KiB
TypeScript
183 lines
5.5 KiB
TypeScript
// Ollama tests cover doctor contract config compatibility.
|
|
import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";
|
|
import { describe, expect, it } from "vitest";
|
|
import { legacyConfigRules, normalizeCompatibilityConfig } from "./doctor-contract-api.js";
|
|
|
|
type ModelDefinition = NonNullable<
|
|
NonNullable<OpenClawConfig["models"]>["providers"]
|
|
>[string]["models"][number];
|
|
|
|
const cloudModel: ModelDefinition = {
|
|
id: "kimi-k2.5:cloud",
|
|
name: "Kimi K2.5 Cloud",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
},
|
|
contextWindow: 131072,
|
|
maxTokens: 8192,
|
|
};
|
|
|
|
function readOllamaCloudProvider(config: OpenClawConfig): Record<string, unknown> | undefined {
|
|
return config.models?.providers?.["ollama-cloud"] as Record<string, unknown> | undefined;
|
|
}
|
|
|
|
describe("ollama doctor contract", () => {
|
|
it("detects retired Ollama Cloud provider endpoints", () => {
|
|
expect(legacyConfigRules[0]?.match({ baseUrl: "https://ai.ollama.com" })).toBe(true);
|
|
expect(legacyConfigRules[0]?.match({ baseUrl: "https://ollama.com" })).toBe(false);
|
|
});
|
|
|
|
it("migrates retired Ollama Cloud provider baseUrl to the canonical endpoint", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
"ollama-cloud": {
|
|
baseUrl: "https://ai.ollama.com",
|
|
api: "ollama",
|
|
models: [cloudModel],
|
|
},
|
|
ollama: {
|
|
baseUrl: "http://127.0.0.1:11434",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
} as OpenClawConfig;
|
|
|
|
const result = normalizeCompatibilityConfig({ cfg: config });
|
|
|
|
expect(result.changes).toEqual([
|
|
"Updated models.providers.ollama-cloud.baseUrl from the retired Ollama Cloud endpoint to https://ollama.com.",
|
|
]);
|
|
expect(readOllamaCloudProvider(result.config)).toEqual({
|
|
baseUrl: "https://ollama.com",
|
|
api: "ollama",
|
|
models: [cloudModel],
|
|
});
|
|
expect(readOllamaCloudProvider(config)?.baseUrl).toBe("https://ai.ollama.com");
|
|
});
|
|
|
|
it("removes retired Ollama Cloud provider baseURL aliases when canonical baseUrl is present", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
"ollama-cloud": {
|
|
baseUrl: "https://ollama.com",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
} as OpenClawConfig;
|
|
|
|
const result = normalizeCompatibilityConfig({ cfg: config });
|
|
|
|
expect(result.changes).toEqual([
|
|
"Removed retired models.providers.ollama-cloud.baseURL while preserving models.providers.ollama-cloud.baseUrl.",
|
|
]);
|
|
expect(readOllamaCloudProvider(result.config)).toEqual({
|
|
baseUrl: "https://ollama.com",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
expect(readOllamaCloudProvider(config)).toEqual({
|
|
baseUrl: "https://ollama.com",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
});
|
|
|
|
it("migrates retired Ollama Cloud provider baseURL aliases when canonical baseUrl is blank", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
"ollama-cloud": {
|
|
baseUrl: " ",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
} as OpenClawConfig;
|
|
|
|
const result = normalizeCompatibilityConfig({ cfg: config });
|
|
|
|
expect(result.changes).toEqual([
|
|
"Updated models.providers.ollama-cloud.baseURL from the retired Ollama Cloud endpoint to https://ollama.com.",
|
|
]);
|
|
expect(readOllamaCloudProvider(result.config)).toEqual({
|
|
baseUrl: "https://ollama.com",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
expect(readOllamaCloudProvider(config)).toEqual({
|
|
baseUrl: " ",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
});
|
|
|
|
it("preserves custom canonical baseUrl when removing retired baseURL aliases", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
"ollama-cloud": {
|
|
baseUrl: "https://custom-ollama-cloud.example.test",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
} as OpenClawConfig;
|
|
|
|
const result = normalizeCompatibilityConfig({ cfg: config });
|
|
|
|
expect(result.changes).toEqual([
|
|
"Removed retired models.providers.ollama-cloud.baseURL while preserving models.providers.ollama-cloud.baseUrl.",
|
|
]);
|
|
expect(readOllamaCloudProvider(result.config)).toEqual({
|
|
baseUrl: "https://custom-ollama-cloud.example.test",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
expect(readOllamaCloudProvider(config)).toEqual({
|
|
baseUrl: "https://custom-ollama-cloud.example.test",
|
|
baseURL: "https://ai.ollama.com/",
|
|
api: "ollama",
|
|
models: [],
|
|
});
|
|
});
|
|
|
|
it("does not expose credentials or query parameters from the retired URL", () => {
|
|
const config = {
|
|
models: {
|
|
providers: {
|
|
"ollama-cloud": {
|
|
baseUrl: "https://user:password@ai.ollama.com/?token=secret",
|
|
api: "ollama",
|
|
models: [],
|
|
},
|
|
},
|
|
},
|
|
} as OpenClawConfig;
|
|
|
|
const result = normalizeCompatibilityConfig({ cfg: config });
|
|
|
|
expect(result.changes.join("\n")).not.toContain("user");
|
|
expect(result.changes.join("\n")).not.toContain("password");
|
|
expect(result.changes.join("\n")).not.toContain("secret");
|
|
expect(readOllamaCloudProvider(result.config)?.baseUrl).toBe("https://ollama.com");
|
|
});
|
|
});
|