vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-30 17:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(providers): share template model cloning

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-17 04:20:13 +00:00
parent dd85ff4da7
commit ed06d21013
4 changed files with 90 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/google/provider-models.ts
View File

@@ -1,39 +1,14 @@
import { cloneFirstTemplateModel } from "../../src/plugins/provider-model-helpers.js";
import type {
ProviderResolveDynamicModelContext,
ProviderRuntimeModel,
} from "openclaw/plugin-sdk/core";
import { normalizeModelCompat } from "openclaw/plugin-sdk/provider-models";
const GEMINI_3_1_PRO_PREFIX = "gemini-3.1-pro";
const GEMINI_3_1_FLASH_PREFIX = "gemini-3.1-flash";
const GEMINI_3_1_PRO_TEMPLATE_IDS = ["gemini-3-pro-preview"] as const;
const GEMINI_3_1_FLASH_TEMPLATE_IDS = ["gemini-3-flash-preview"] as const;
function cloneFirstTemplateModel(params: {
providerId: string;
modelId: string;
templateIds: readonly string[];
ctx: ProviderResolveDynamicModelContext;
}): ProviderRuntimeModel | undefined {
const trimmedModelId = params.modelId.trim();
for (const templateId of [...new Set(params.templateIds)].filter(Boolean)) {
const template = params.ctx.modelRegistry.find(
params.providerId,
templateId,
) as ProviderRuntimeModel | null;
if (!template) {
continue;
}
return normalizeModelCompat({
...template,
id: trimmedModelId,
name: trimmedModelId,
reasoning: true,
} as ProviderRuntimeModel);
}
return undefined;
}
export function resolveGoogle31ForwardCompatModel(params: {
providerId: string;
ctx: ProviderResolveDynamicModelContext;
@@ -55,6 +30,7 @@ export function resolveGoogle31ForwardCompatModel(params: {
modelId: trimmed,
templateIds,
ctx: params.ctx,
patch: { reasoning: true },
});
}

50
extensions/openai/shared.ts
View File

@@ -1,8 +1,5 @@
import type {
ProviderResolveDynamicModelContext,
ProviderRuntimeModel,
} from "openclaw/plugin-sdk/core";
import { normalizeModelCompat } from "openclaw/plugin-sdk/provider-models";
import { findCatalogTemplate } from "../../src/plugins/provider-catalog.js";
import { cloneFirstTemplateModel } from "../../src/plugins/provider-model-helpers.js";
export const OPENAI_API_BASE_URL = "https://api.openai.com/v1";
@@ -22,44 +19,5 @@ export function isOpenAIApiBaseUrl(baseUrl?: string): boolean {
return /^https?:\/\/api\.openai\.com(?:\/v1)?\/?$/i.test(trimmed);
}
export function cloneFirstTemplateModel(params: {
providerId: string;
modelId: string;
templateIds: readonly string[];
ctx: ProviderResolveDynamicModelContext;
patch?: Partial<ProviderRuntimeModel>;
}): ProviderRuntimeModel | undefined {
const trimmedModelId = params.modelId.trim();
for (const templateId of [...new Set(params.templateIds)].filter(Boolean)) {
const template = params.ctx.modelRegistry.find(
params.providerId,
templateId,
) as ProviderRuntimeModel | null;
if (!template) {
continue;
}
return normalizeModelCompat({
...template,
id: trimmedModelId,
name: trimmedModelId,
...params.patch,
} as ProviderRuntimeModel);
}
return undefined;
}
export function findCatalogTemplate(params: {
entries: ReadonlyArray<{ provider: string; id: string }>;
providerId: string;
templateIds: readonly string[];
}) {
return params.templateIds
.map((templateId) =>
params.entries.find(
(entry) =>
entry.provider.toLowerCase() === params.providerId.toLowerCase() &&
entry.id.toLowerCase() === templateId.toLowerCase(),
),
)
.find((entry) => entry !== undefined);
}
export { cloneFirstTemplateModel };
export { findCatalogTemplate };

56
src/plugins/provider-model-helpers.test.ts Normal file
View File

@@ -0,0 +1,56 @@
import type { ModelRegistry } from "@mariozechner/pi-coding-agent";
import { describe, expect, it } from "vitest";
import { cloneFirstTemplateModel } from "./provider-model-helpers.js";
import type { ProviderResolveDynamicModelContext, ProviderRuntimeModel } from "./types.js";
function createContext(models: ProviderRuntimeModel[]): ProviderResolveDynamicModelContext {
return {
provider: "test-provider",
modelId: "next-model",
modelRegistry: {
find(providerId: string, modelId: string) {
return (
models.find((model) => model.provider === providerId && model.id === modelId) ?? null
);
},
} as ModelRegistry,
};
}
describe("cloneFirstTemplateModel", () => {
it("clones the first matching template and applies patches", () => {
const model = cloneFirstTemplateModel({
providerId: "test-provider",
modelId: " next-model ",
templateIds: ["missing", "template-a", "template-b"],
ctx: createContext([
{
id: "template-a",
name: "Template A",
provider: "test-provider",
api: "openai-completions",
} as ProviderRuntimeModel,
]),
patch: { reasoning: true },
});
expect(model).toMatchObject({
id: "next-model",
name: "next-model",
provider: "test-provider",
api: "openai-completions",
reasoning: true,
});
});
it("returns undefined when no template exists", () => {
const model = cloneFirstTemplateModel({
providerId: "test-provider",
modelId: "next-model",
templateIds: ["missing"],
ctx: createContext([]),
});
expect(model).toBeUndefined();
});
});

28
src/plugins/provider-model-helpers.ts Normal file
View File

@@ -0,0 +1,28 @@
import { normalizeModelCompat } from "../agents/model-compat.js";
import type { ProviderResolveDynamicModelContext, ProviderRuntimeModel } from "./types.js";
export function cloneFirstTemplateModel(params: {
providerId: string;
modelId: string;
templateIds: readonly string[];
ctx: ProviderResolveDynamicModelContext;
patch?: Partial<ProviderRuntimeModel>;
}): ProviderRuntimeModel | undefined {
const trimmedModelId = params.modelId.trim();
for (const templateId of [...new Set(params.templateIds)].filter(Boolean)) {
const template = params.ctx.modelRegistry.find(
params.providerId,
templateId,
) as ProviderRuntimeModel | null;
if (!template) {
continue;
}
return normalizeModelCompat({
...template,
id: trimmedModelId,
name: trimmedModelId,
...params.patch,
} as ProviderRuntimeModel);
}
return undefined;
}