mirror of
https://github.com/moltbot/moltbot.git
synced 2026-04-26 07:57:40 +00:00
* fix(models): apply Gemini model-id normalization to google-vertex provider The existing normalizeGoogleModelId() (which maps e.g. gemini-3.1-flash-lite to gemini-3.1-flash-lite-preview) was only applied when the provider was "google". Users configuring google-vertex/gemini-3.1-flash-lite would get a "missing" model because the -preview suffix was never appended. Extend the normalization to google-vertex in both model-selection (parseModelRef path) and normalizeProviders (config normalization path). Ref: https://github.com/openclaw/openclaw/issues/36838 Ref: https://github.com/openclaw/openclaw/pull/36918#issuecomment-4032732959 * fix(models): normalize google-vertex flash-lite * fix(models): place unreleased changelog entry last * fix(models): place unreleased changelog entry before releases
130 lines
4.1 KiB
TypeScript
130 lines
4.1 KiB
TypeScript
import { mkdtempSync } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
normalizeAntigravityModelId,
|
|
normalizeGoogleModelId,
|
|
normalizeProviders,
|
|
type ProviderConfig,
|
|
} from "./models-config.providers.js";
|
|
|
|
function buildModel(id: string): NonNullable<ProviderConfig["models"]>[number] {
|
|
return {
|
|
id,
|
|
name: id,
|
|
reasoning: true,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 1,
|
|
maxTokens: 1,
|
|
};
|
|
}
|
|
|
|
function buildProvider(modelIds: string[]): ProviderConfig {
|
|
return {
|
|
baseUrl: "https://example.invalid/v1",
|
|
api: "openai-completions",
|
|
apiKey: "EXAMPLE_KEY", // pragma: allowlist secret
|
|
models: modelIds.map((id) => buildModel(id)),
|
|
};
|
|
}
|
|
|
|
describe("normalizeAntigravityModelId", () => {
|
|
it.each(["gemini-3-pro", "gemini-3.1-pro", "gemini-3-1-pro"])(
|
|
"adds default -low suffix to bare pro id: %s",
|
|
(id) => {
|
|
expect(normalizeAntigravityModelId(id)).toBe(`${id}-low`);
|
|
},
|
|
);
|
|
|
|
it.each([
|
|
"gemini-3-pro-low",
|
|
"gemini-3-pro-high",
|
|
"gemini-3.1-flash",
|
|
"claude-opus-4-6-thinking",
|
|
])("keeps already-tiered and non-pro ids unchanged: %s", (id) => {
|
|
expect(normalizeAntigravityModelId(id)).toBe(id);
|
|
});
|
|
});
|
|
|
|
describe("normalizeGoogleModelId", () => {
|
|
it("maps the deprecated 3.1 flash alias to the real preview model", () => {
|
|
expect(normalizeGoogleModelId("gemini-3.1-flash")).toBe("gemini-3-flash-preview");
|
|
expect(normalizeGoogleModelId("gemini-3.1-flash-preview")).toBe("gemini-3-flash-preview");
|
|
});
|
|
|
|
it("adds the preview suffix for gemini 3.1 flash-lite", () => {
|
|
expect(normalizeGoogleModelId("gemini-3.1-flash-lite")).toBe("gemini-3.1-flash-lite-preview");
|
|
});
|
|
});
|
|
|
|
describe("google-antigravity provider normalization", () => {
|
|
it("normalizes bare gemini pro IDs only for google-antigravity providers", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
|
const providers = {
|
|
"google-antigravity": buildProvider([
|
|
"gemini-3-pro",
|
|
"gemini-3.1-pro",
|
|
"gemini-3-1-pro",
|
|
"gemini-3-pro-high",
|
|
"claude-opus-4-6-thinking",
|
|
]),
|
|
openai: buildProvider(["gpt-5"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).not.toBe(providers);
|
|
expect(normalized?.["google-antigravity"]?.models.map((model) => model.id)).toEqual([
|
|
"gemini-3-pro-low",
|
|
"gemini-3.1-pro-low",
|
|
"gemini-3-1-pro-low",
|
|
"gemini-3-pro-high",
|
|
"claude-opus-4-6-thinking",
|
|
]);
|
|
expect(normalized?.openai).toBe(providers.openai);
|
|
});
|
|
|
|
it("returns original providers object when no antigravity IDs need normalization", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
|
const providers = {
|
|
"google-antigravity": buildProvider(["gemini-3-pro-low", "claude-opus-4-6-thinking"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).toBe(providers);
|
|
});
|
|
});
|
|
|
|
describe("google-vertex provider normalization", () => {
|
|
it("normalizes gemini flash-lite IDs for google-vertex providers", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
|
const providers = {
|
|
"google-vertex": buildProvider(["gemini-3.1-flash-lite", "gemini-3-flash-preview"]),
|
|
openai: buildProvider(["gpt-5"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).not.toBe(providers);
|
|
expect(normalized?.["google-vertex"]?.models.map((model) => model.id)).toEqual([
|
|
"gemini-3.1-flash-lite-preview",
|
|
"gemini-3-flash-preview",
|
|
]);
|
|
expect(normalized?.openai).toBe(providers.openai);
|
|
});
|
|
|
|
it("returns original providers object when no google-vertex IDs need normalization", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-"));
|
|
const providers = {
|
|
"google-vertex": buildProvider(["gemini-3.1-flash-lite-preview", "gemini-3-flash-preview"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).toBe(providers);
|
|
});
|
|
});
|