Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions apps/mobile/src/lib/modelOptions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,28 @@ describe("mobile model options", () => {
expect(isModelSelectionUnavailable(config, disabled, null)).toBe(true);
expect(isModelSelectionUnavailable(config, removed, null)).toBe(true);
expect(resolveSelectableModelSelection(null, disabled, null)).toBe(disabled);
const cooling = {
...config,
providers: config.providers.map((provider) => ({
...provider,
models: [
{
slug: usable.model,
name: "GPT-5.6-Sol",
isUnavailable: true,
isCustom: false,
capabilities: null,
},
],
})),
};
expect(isModelSelectionUnavailable(cooling, usable, null)).toBe(true);
expect(resolveSelectableModelSelection(cooling, usable, null)).toBe(usable);
expect(buildModelOptions(cooling, usable, undefined, null)[0]).toMatchObject({
selection: usable,
label: "GPT-5.6-Sol",
isUnavailable: true,
});
});

describe("Antigravity selections", () => {
Expand Down
29 changes: 23 additions & 6 deletions apps/mobile/src/lib/modelOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import {
buildExplicitProviderOptionSelectionsFromDescriptors,
getProviderOptionDescriptors,
} from "@t3tools/shared/model";
import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
import {
resolveModelShortName,
unavailableModelReason,
} from "@t3tools/client-runtime/provider-clients";
import { resolveProvidersForCwd } from "@t3tools/client-runtime/providerSkills";

export type ModelOption = {
Expand Down Expand Up @@ -223,13 +226,25 @@ export function isModelSelectionUnavailable(
config: T3ServerConfig | null | undefined,
selection: ModelSelection | null | undefined,
projectId: ProjectId | null,
): boolean {
const provider = config?.providers.find(
(candidate) => candidate.instanceId === selection?.instanceId,
);
return (
isProviderSelectionUnavailable(config, selection, provider, projectId) ||
(selection != null && unavailableModelReason(provider, selection.model) !== null)
);
}

function isProviderSelectionUnavailable(
config: T3ServerConfig | null | undefined,
selection: ModelSelection | null | undefined,
provider: T3ServerConfig["providers"][number] | undefined,
projectId: ProjectId | null,
): boolean {
if (!config || !selection) {
return false;
}
const provider = config.providers.find(
(candidate) => candidate.instanceId === selection.instanceId,
);
if (isDisabledForProject(config, provider, selection.instanceId, projectId)) {
return true;
}
Expand Down Expand Up @@ -263,6 +278,8 @@ export function describeUnavailableModelSelection(
(candidate) => candidate.instanceId === selection.instanceId,
);
const driver = selectionDriver(config, selection.instanceId);
const modelReason = unavailableModelReason(provider, selection.model);
if (modelReason) return { title: "Model unavailable", detail: modelReason };
if (isDriverDisallowed(config, driver)) {
const label = providerDisplayLabel({
driver: driver ?? selection.instanceId,
Expand Down Expand Up @@ -310,7 +327,7 @@ export function resolveSelectableModelSelection(
isProviderEnabledForProject(config, provider, projectId) &&
provider.installed &&
provider.auth.status !== "unauthenticated" &&
!isModelSelectionUnavailable(config, selection, projectId)
!isProviderSelectionUnavailable(config, selection, provider, projectId)
? selection
: null;
}
Expand Down Expand Up @@ -455,7 +472,7 @@ export function buildModelOptions(
...(provider.iconUrl ? { providerIconUrl: provider.iconUrl } : {}),
isHidden: !model.isCustom && hiddenModels.has(model.slug),
canHide: !model.isCustom,
...(providerUnavailable ? { isUnavailable: true } : {}),
...(providerUnavailable || model.isUnavailable ? { isUnavailable: true } : {}),
isDefault: model.isDefault === true,
isLegacy: model.isLegacy === true,
...(updateRequired ? { providerUpdateRequired: updateRequired } : {}),
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/src/state/thread-task-permissions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ beforeEach(() => {
state.thread.groupDiscussionOpen = false;
state.projection = null;
state.serverConfig = {
providers: [{ instanceId: "codex", driver: "codex", enabled: true }],
providers: [{ instanceId: "codex", driver: "codex", enabled: true, models: [] }],
environment: { capabilities: {} },
} as unknown as ServerConfig;
state.pendingRequests = {
Expand Down Expand Up @@ -482,7 +482,7 @@ describe("mobile task permissions", () => {
vi.clearAllMocks();
state.serverConfig = {
...state.serverConfig,
providers: [{ instanceId: "codex", driver: "codex", enabled: false }],
providers: [{ instanceId: "codex", driver: "codex", enabled: false, models: [] }],
} as unknown as ServerConfig;
state.draft = { ...state.draft, attachments: [] };
expect(await useThreadComposerState({ startSideChat }).onSendMessage()).toBeNull();
Expand Down
61 changes: 55 additions & 6 deletions apps/server/src/inference/InferenceProxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,34 @@ it.effect(
expect(activeCodexConfig).toMatchObject({
customModels: expect.arrayContaining(["gpt-local-new"]),
});
const astra = "gpt-local-new";
catalog = initialCatalog;
poolCooldowns = [
{
scope: "model",
model_key: astra,
retry_at: DateTime.formatIso(
DateTime.makeUnsafe((yield* Clock.currentTimeMillis) + 320_000),
),
},
];
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex"));
expect(activeCodexConfig).toMatchObject({
customModels: expect.arrayContaining([astra]),
});
expect(yield* proxy.routeHealth(configured.config, local.key, "codex")).toMatchObject({
unavailableModels: [astra],
});
expect(yield* proxy.routeCandidates(local.key, hostId, "codex", astra)).toEqual([]);
poolCooldowns = undefined;
catalog = [...initialCatalog, { id: astra, owned_by: "openai" }];
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex"));
expect(yield* proxy.routeCandidates(local.key, hostId, "codex", astra)).toHaveLength(1);
catalog = initialCatalog;
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex"));
expect(activeCodexConfig).toMatchObject({
customModels: expect.not.arrayContaining([astra]),
});
const piId = ProviderInstanceId.make("pi");
yield* proxy.connect({
...connect,
Expand Down Expand Up @@ -1453,7 +1481,7 @@ it.effect(
).toHaveLength(2);
peerId = hostId;
yield* proxy.connect({ ...connect, grant: issued });
expect(yield* proxy.hasFallback(issued.key, hostId, "codex")).toBe(true);
expect(yield* proxy.hasRoutePool(issued.key, hostId, "codex")).toBe(true);
expect(yield* fs.readFileString(config.settingsPath)).not.toContain(issued.key);
const setCodexConfigEnabled = (enabled: boolean) =>
settings.reviseProviderInstance(ProviderInstanceId.make("codex"), (instance) => {
Expand All @@ -1469,7 +1497,7 @@ it.effect(
});
});
yield* setCodexConfigEnabled(false);
expect(yield* proxy.hasFallback(issued.key, hostId, "codex")).toBe(false);
expect(yield* proxy.hasRoutePool(issued.key, hostId, "codex")).toBe(false);
expect(yield* proxy.routeCandidates(issued.key, hostId, "codex")).toBeNull();
expect(yield* proxy.authorize(issued.key, hostId, "codex")).toBeNull();
expect((yield* proxy.status).routes.map((route) => route.instanceId)).not.toContain(
Expand All @@ -1482,7 +1510,7 @@ it.effect(
[inferenceProject]: { providerInstances: { [codexId]: { enabled: true } } },
},
});
expect(yield* proxy.hasFallback(issued.key, hostId, "codex")).toBe(true);
expect(yield* proxy.hasRoutePool(issued.key, hostId, "codex")).toBe(true);
expect(yield* proxy.routeCandidates(issued.key, hostId, "codex")).toHaveLength(1);
expect(yield* proxy.authorize(issued.key, hostId, "codex")).not.toBeNull();
expect((yield* proxy.status).routes.map((route) => route.instanceId)).toContain(
Expand Down Expand Up @@ -1512,13 +1540,13 @@ it.effect(
const resumed = (yield* settings.getSettings).providerInstances[codexId]!;
expect(resumed.enabled).toBe(false);
expect(resumed.config).toMatchObject({ inferenceEnabled: true });
expect(yield* proxy.hasFallback(issued.key, hostId, "codex")).toBe(true);
expect(yield* proxy.hasRoutePool(issued.key, hostId, "codex")).toBe(true);
yield* settings.updateSettings({
projectSettingsOverrides: { [inferenceProject]: null },
});
yield* setCodexConfigEnabled(true);
yield* proxy.connect({ ...connect, grant: issued });
expect(yield* proxy.hasFallback(issued.key, hostId, "codex")).toBe(true);
expect(yield* proxy.hasRoutePool(issued.key, hostId, "codex")).toBe(true);
expect(
(yield* settings.getSettings).providerInstances[ProviderInstanceId.make("codex")]
?.config,
Expand All @@ -1540,6 +1568,9 @@ it.effect(
(candidate) => candidate.hostId,
),
).toEqual([EnvironmentId.make("other-host")]);
const fallbackHealth = yield* proxy.health(issued.key, hostId, "codex");
expect(fallbackHealth?.models).toContain("codex-auto-review");
expect(fallbackHealth?.unavailableModels ?? []).not.toContain("codex-auto-review");
yield* proxy.recordRouteOutcome({
driver: "codex",
hostId,
Expand Down Expand Up @@ -1632,7 +1663,25 @@ it.effect(
).toHaveLength(2);
const reissued = { ...issued, key: "reissued-primary-key" };
yield* proxy.connect({ ...connect, grant: reissued });
expect(yield* proxy.hasFallback(reissued.key, hostId, "codex")).toBe(false);
expect(yield* proxy.hasRoutePool(reissued.key, hostId, "codex")).toBe(true);
expect(
yield* proxy.routeCandidates(reissued.key, hostId, "codex", "codex-auto-review"),
).toHaveLength(1);
yield* proxy.recordRouteOutcome({
driver: "codex",
hostId,
model: "codex-auto-review",
status: 503,
retryAfter: "320",
});
yield* TestClock.adjust("319 seconds");
expect(
yield* proxy.routeCandidates(reissued.key, hostId, "codex", "codex-auto-review"),
).toEqual([]);
yield* TestClock.adjust("1 second");
expect(
yield* proxy.routeCandidates(reissued.key, hostId, "codex", "codex-auto-review"),
).toHaveLength(1);
expect(yield* proxy.authorize(issued.key, hostId, "codex")).toBeNull();
peerId = EnvironmentId.make("other-host");
yield* proxy.connect({
Expand Down
Loading
Loading