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
51 changes: 46 additions & 5 deletions apps/server/src/provider/CodexChatGptModels.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,40 @@ it.effect(
models:
request.headers.authorization === "Bearer account-a"
? [
{ slug: "second", display_name: "Second from OpenAI", visibility: "list" },
{ slug: "hidden", display_name: "Hidden", visibility: "hidden" },
{ slug: "first", display_name: "First from OpenAI", visibility: "list" },
{
slug: "second",
display_name: "Second from OpenAI",
visibility: "list",
default_reasoning_level: "low",
supported_reasoning_levels: [
{ effort: "low", description: "Fast" },
{ effort: "high", description: "Deep" },
],
},
{
slug: "hidden",
display_name: "Hidden",
visibility: "hidden",
default_reasoning_level: null,
supported_reasoning_levels: null,
},
{
slug: "first",
display_name: "First from OpenAI",
visibility: "list",
default_reasoning_level: "high",
supported_reasoning_levels: [{ effort: "high", description: "Deep" }],
},
]
: [{ slug: "account-b-only", display_name: "B", visibility: "list" }],
: [
{
slug: "account-b-only",
display_name: "B",
visibility: "list",
default_reasoning_level: null,
supported_reasoning_levels: null,
},
],
}),
),
);
Expand All @@ -49,14 +78,26 @@ it.effect(
],
);
assert.deepEqual(a[1]!.capabilities, native[0]!.capabilities);
assert.isNull(a[0]!.capabilities);
assert.deepEqual(a[0]!.capabilities?.optionDescriptors, [
{
id: "reasoningEffort",
label: "Reasoning",
type: "select",
options: [
{ id: "low", label: "Low", isDefault: true },
{ id: "high", label: "High" },
],
currentValue: "low",
},
]);
const b = yield* chatGptModels("account-b", native).pipe(
Effect.provideService(HttpClient.HttpClient, http),
);
assert.deepEqual(
b.map((model) => model.slug),
["account-b-only"],
);
assert.isNull(b[0]!.capabilities);
assert.deepEqual(requests, ["Bearer account-a", "Bearer account-b"]);
}),
);
Expand Down
50 changes: 39 additions & 11 deletions apps/server/src/provider/CodexChatGptModels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { ServerProviderModel } from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Schema from "effect/Schema";
import { HttpClient, HttpClientRequest } from "effect/http";
import { mapCodexModelCapabilities } from "./CodexProvider.ts";

export class ChatGptCatalogError extends Schema.TaggedError<ChatGptCatalogError>()(
"ChatGptCatalogError",
Expand All @@ -14,6 +15,17 @@ const Catalog = Schema.Struct({
slug: Schema.NonEmptyString,
display_name: Schema.NonEmptyString,
visibility: Schema.String,
default_reasoning_level: Schema.optionalKey(Schema.NullOr(Schema.NonEmptyString)),
supported_reasoning_levels: Schema.optionalKey(
Schema.NullOr(
Schema.Array(
Schema.Struct({
effort: Schema.NonEmptyString,
description: Schema.optionalKey(Schema.NullOr(Schema.String)),
}),
),
),
),
}),
),
});
Expand All @@ -32,15 +44,31 @@ export const chatGptModels = Effect.fn("chatGptModels")(function* (
const catalog = yield* response.json.pipe(Effect.flatMap(Schema.decodeUnknownEffect(Catalog)));
return catalog.models
.filter((model) => model.visibility === "list")
.map(
(model) =>
({
...nativeModels.find((native) => native.slug === model.slug),
capabilities:
nativeModels.find((native) => native.slug === model.slug)?.capabilities ?? null,
slug: model.slug,
name: model.display_name,
isCustom: false,
}) satisfies ServerProviderModel,
);
.map((model): ServerProviderModel => {
const native = nativeModels.find((candidate) => candidate.slug === model.slug);
// A pinned Codex CLI can predate a model the account already has; the catalog still lists its efforts.
const catalogCapabilities =
model.default_reasoning_level && model.supported_reasoning_levels
? mapCodexModelCapabilities({
id: model.slug,
model: model.slug,
displayName: model.display_name,
description: "",
hidden: false,
isDefault: false,
defaultReasoningEffort: model.default_reasoning_level,
supportedReasoningEfforts: model.supported_reasoning_levels.map((level) => ({
reasoningEffort: level.effort,
description: level.description ?? "",
})),
})
: null;
return {
...native,
capabilities: native?.capabilities ?? catalogCapabilities,
slug: model.slug,
name: model.display_name,
isCustom: false,
};
});
}, Effect.timeout("15 seconds"));
Loading