roboomp
8191cf41d3
Required CLI model registries to expose getAvailable() and used that authenticated set whenever callers omit availableModels. Deferred SDK and bench/dry-balance resolution now lets configured roles beat unauthenticated catalog id collisions. Updated resolver test registries and made the #6508 regression omit the explicit availableModels option, covering the deferred-caller path from the review. Fixes #6508
64 lines
2.2 KiB
TypeScript
64 lines
2.2 KiB
TypeScript
import { describe, expect, test } from "bun:test";
|
|
import type { Model } from "@oh-my-pi/pi-ai";
|
|
import { buildModel } from "@oh-my-pi/pi-catalog/build";
|
|
import {
|
|
resolveCliModel,
|
|
resolveModelFromSettings,
|
|
resolveModelRoleValue,
|
|
} from "@oh-my-pi/pi-coding-agent/config/model-resolver";
|
|
import { Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
|
|
|
|
function model(provider: string, id: string): Model<"anthropic-messages"> {
|
|
return buildModel({
|
|
provider,
|
|
id,
|
|
name: `${provider}/${id}`,
|
|
api: "anthropic-messages",
|
|
baseUrl: `https://${provider}.example.com`,
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 1, output: 1, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 200000,
|
|
maxTokens: 8192,
|
|
});
|
|
}
|
|
|
|
describe("issue #980 provider-qualified model resolution", () => {
|
|
test("prefers the explicit anthropic provider when the exact pair exists", () => {
|
|
const availableModels = [model("amazon-bedrock", "claude-3-7-sonnet"), model("anthropic", "claude-3-7-sonnet")];
|
|
const settings = Settings.isolated({
|
|
modelRoles: { default: "anthropic/claude-3-7-sonnet" },
|
|
});
|
|
|
|
const resolved = resolveModelFromSettings({ settings, availableModels });
|
|
expect(resolved?.provider).toBe("anthropic");
|
|
expect(resolved?.id).toBe("claude-3-7-sonnet");
|
|
});
|
|
|
|
test("does not silently fall back to bedrock when a provider-qualified role misses", () => {
|
|
const availableModels = [model("amazon-bedrock", "claude-3-7-sonnet"), model("anthropic", "claude-sonnet-4-5")];
|
|
const settings = Settings.isolated({
|
|
modelRoles: { default: "anthropic/claude-3-7-sonnet" },
|
|
});
|
|
|
|
const roleValue = settings.getModelRole("default");
|
|
const roleResolved = resolveModelRoleValue(roleValue, availableModels, { settings });
|
|
expect(roleResolved.model).toBeUndefined();
|
|
|
|
const settingsResolved = resolveModelFromSettings({ settings, availableModels });
|
|
expect(settingsResolved).toBeUndefined();
|
|
|
|
const cliResolved = resolveCliModel({
|
|
cliModel: "anthropic/claude-3-7-sonnet",
|
|
modelRegistry: {
|
|
getAll: () => availableModels,
|
|
getAvailable: () => availableModels,
|
|
},
|
|
});
|
|
expect(cliResolved.model).toBeUndefined();
|
|
expect(cliResolved.error).toBe(
|
|
'Model "anthropic/claude-3-7-sonnet" not found. Run "omp models" to see available models.',
|
|
);
|
|
});
|
|
});
|