Skip to content

Commit 67b44e0

Browse files
committed
fix(provider): discover models from openai-compatible endpoints
Custom openai-compatible providers showed stale model lists because nothing fetched /models from the configured baseURL: the list came from static config entries and the models.dev catalog keyed by provider ID, so changing options.baseURL only changed the request target. Discover GET {baseURL}/models at provider state build for config providers with npm @ai-sdk/openai-compatible. Server-served models replace the stored list (keeping config-declared entries the server still serves); discovery failures keep the configured list. Honors options.baseURL/api precedence, ${VAR} env interpolation, stored auth keys, and skips embedding/rerank entries.
1 parent bfed6f0 commit 67b44e0

3 files changed

Lines changed: 234 additions & 3 deletions

File tree

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
export * as ProviderDiscover from "./discover"
2+
3+
// Maps an OpenAI-compatible /models response to the provider Model shape.
4+
// Used to keep custom config providers in sync with the models their
5+
// endpoint actually serves instead of a static or catalog-stale list.
6+
7+
const DISCOVERY_TIMEOUT_MS = 5_000
8+
9+
type RawModel = {
10+
id?: unknown
11+
object?: unknown
12+
created?: unknown
13+
owned_by?: unknown
14+
context_length?: unknown
15+
max_model_len?: unknown
16+
}
17+
18+
function asString(value: unknown): string | undefined {
19+
return typeof value === "string" ? value : undefined
20+
}
21+
22+
function asNumber(value: unknown): number | undefined {
23+
if (typeof value === "number" && Number.isFinite(value)) return value
24+
if (typeof value === "string") {
25+
const parsed = Number(value)
26+
if (Number.isFinite(parsed)) return parsed
27+
}
28+
return undefined
29+
}
30+
31+
export type Discovered = {
32+
id: string
33+
name?: string
34+
created?: number
35+
context?: number
36+
output?: number
37+
}
38+
39+
export function parseModels(data: unknown): Discovered[] {
40+
if (!Array.isArray(data)) return []
41+
const out: Discovered[] = []
42+
for (const item of data) {
43+
if (!item || typeof item !== "object") continue
44+
const record = item as RawModel
45+
const id = asString(record.id)
46+
if (!id) continue
47+
// Skip non-chat entries like embeddings/rerank when identifiable
48+
if (/(embed|rerank|whisper|tts|moderation)/i.test(id)) continue
49+
out.push({
50+
id,
51+
name: asString((record as Record<string, unknown>).name),
52+
created: asNumber(record.created),
53+
context: asNumber(record.context_length) ?? asNumber(record.max_model_len),
54+
})
55+
}
56+
return out
57+
}
58+
59+
export async function discover(
60+
baseURL: string,
61+
apiKey: string | undefined,
62+
): Promise<Discovered[]> {
63+
const url = `${baseURL.replace(/\/+$/, "")}/models`
64+
const headers: Record<string, string> = {}
65+
if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`
66+
const res = await fetch(url, {
67+
headers,
68+
signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS),
69+
})
70+
if (!res.ok) throw new Error(`model discovery failed: ${res.status}`)
71+
const json: unknown = await res.json()
72+
const data =
73+
json && typeof json === "object" && Array.isArray((json as Record<string, unknown>).data)
74+
? ((json as Record<string, unknown>).data as unknown)
75+
: Array.isArray(json)
76+
? json
77+
: undefined
78+
if (!data) throw new Error("model discovery returned unexpected shape")
79+
return parseModels(data)
80+
}

‎packages/opencode/src/provider/provider.ts‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { FSUtil } from "@opencode-ai/core/fs-util"
2626
import { isRecord } from "@/util/record"
2727
import { optional } from "@opencode-ai/core/schema"
2828
import { ProviderTransform } from "./transform"
29+
import { ProviderDiscover } from "./discover"
2930
import { ProviderV2 } from "@opencode-ai/core/provider"
3031
import { ModelV2 } from "@opencode-ai/core/model"
3132
import { ModelStatus } from "./model-status"
@@ -1579,6 +1580,74 @@ const layer = Layer.effect(
15791580
database[providerID] = parsed
15801581
}
15811582

1583+
// Discover models for openai-compatible config providers so the list
1584+
// reflects what the endpoint actually serves. Stale catalog/config
1585+
// entries for endpoints the server no longer serves are dropped;
1586+
// on discovery failure the configured list is kept.
1587+
const discoveryEnvs = yield* env.all()
1588+
for (const [providerID, provider] of configProviders) {
1589+
if (provider.npm !== "@ai-sdk/openai-compatible") continue
1590+
if (modelsDev[providerID]?.api === provider.options?.baseURL) continue
1591+
const id = ProviderV2.ID.make(providerID)
1592+
if (!isProviderAllowed(id)) continue
1593+
const rawURL = iife(() => {
1594+
if (typeof provider.options?.baseURL === "string" && provider.options.baseURL !== "")
1595+
return provider.options.baseURL
1596+
if (typeof provider.api === "string" && provider.api !== "") return provider.api
1597+
return undefined
1598+
})
1599+
if (!rawURL) continue
1600+
const baseURL = rawURL.replace(/\$\{([^}]+)\}/g, (item, key) => discoveryEnvs[String(key)] ?? item)
1601+
if (!/^https?:\/\//.test(baseURL)) continue
1602+
const target = database[id]
1603+
if (!target) continue
1604+
const storedAuth = yield* auth.get(id).pipe(Effect.orDie)
1605+
yield* Effect.promise(async () => {
1606+
try {
1607+
const key =
1608+
typeof provider.options?.apiKey === "string"
1609+
? provider.options.apiKey
1610+
: (storedAuth?.type === "api" ? storedAuth.key : undefined)
1611+
const found = await ProviderDiscover.discover(baseURL, key)
1612+
if (!found.length) return
1613+
const next: Record<string, Model> = {}
1614+
for (const item of found) {
1615+
const template = target.models[item.id]
1616+
next[item.id] = template ?? {
1617+
id: ModelV2.ID.make(item.id),
1618+
providerID: id,
1619+
name: item.name ?? item.id,
1620+
family: "",
1621+
api: {
1622+
id: item.id,
1623+
url: baseURL,
1624+
npm: "@ai-sdk/openai-compatible",
1625+
},
1626+
status: "active",
1627+
headers: {},
1628+
options: {},
1629+
cost: { input: 0, output: 0, cache: { read: 0, write: 0 } },
1630+
limit: { context: item.context ?? 0, input: undefined, output: item.output ?? 0 },
1631+
capabilities: {
1632+
temperature: false,
1633+
reasoning: false,
1634+
attachment: false,
1635+
toolcall: true,
1636+
input: { text: true, audio: false, image: false, video: false, pdf: false },
1637+
output: { text: true, audio: false, image: false, video: false, pdf: false },
1638+
interleaved: false,
1639+
},
1640+
release_date: item.created ? new Date(item.created * 1000).toISOString().slice(0, 10) : "",
1641+
variants: {},
1642+
}
1643+
}
1644+
target.models = next
1645+
} catch {
1646+
// Endpoint unreachable or unsupported; keep configured models.
1647+
}
1648+
})
1649+
}
1650+
15821651
// load env
15831652
const envs = yield* env.all()
15841653
for (const [id, provider] of Object.entries(database)) {

‎packages/opencode/test/provider/provider.test.ts‎

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { afterEach, expect, test } from "bun:test"
1+
import { afterAll, afterEach, beforeAll, expect, test } from "bun:test"
22
import { mkdir, unlink } from "fs/promises"
33
import path from "path"
44
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
@@ -873,7 +873,7 @@ it.instance(
873873
const providers = yield* list
874874
expect(providers[ProviderV2.ID.make("local-llm")]).toBeDefined()
875875
expect(providers[ProviderV2.ID.make("local-llm")].models["llama-3"].api.npm).toBe("@ai-sdk/openai-compatible")
876-
expect(providers[ProviderV2.ID.make("local-llm")].options.baseURL).toBe("http://localhost:11434/v1")
876+
expect(providers[ProviderV2.ID.make("local-llm")].options.baseURL).toBe("http://127.0.0.1:9/v1")
877877
}),
878878
{
879879
config: {
@@ -883,7 +883,7 @@ it.instance(
883883
npm: "@ai-sdk/openai-compatible",
884884
env: [],
885885
models: { "llama-3": { name: "Llama 3", tool_call: true, limit: { context: 8192, output: 2048 } } },
886-
options: { apiKey: "not-needed", baseURL: "http://localhost:11434/v1" },
886+
options: { apiKey: "not-needed", baseURL: "http://127.0.0.1:9/v1" },
887887
},
888888
},
889889
},
@@ -2085,6 +2085,88 @@ it.effect("opencode loader keeps paid models when config apiKey is present", ()
20852085
}).pipe(provideMultiInstance),
20862086
)
20872087

2088+
const discoveryModelsServer = {
2089+
server: null as ReturnType<typeof Bun.serve> | null,
2090+
url: "",
2091+
start() {
2092+
if (this.server) return
2093+
this.server = Bun.serve({
2094+
port: 0,
2095+
async fetch(req) {
2096+
const url = new URL(req.url)
2097+
if (url.pathname === "/v1/models") {
2098+
return Response.json({
2099+
object: "list",
2100+
data: [
2101+
{ id: "server-model-a", object: "model", created: 1700000000, owned_by: "test" },
2102+
{ id: "server-model-b", object: "model" },
2103+
{ id: "text-embedding-x", object: "model" },
2104+
],
2105+
})
2106+
}
2107+
return new Response("not found", { status: 404 })
2108+
},
2109+
})
2110+
this.url = `${this.server.url.origin}/v1`
2111+
},
2112+
}
2113+
2114+
beforeAll(() => discoveryModelsServer.start())
2115+
afterAll(() => discoveryModelsServer.server?.stop(true))
2116+
2117+
it.instance(
2118+
"openai-compatible provider discovers models from baseURL",
2119+
Effect.gen(function* () {
2120+
const providers = yield* list
2121+
const provider = providers[ProviderV2.ID.make("discovery-provider")]
2122+
expect(provider).toBeDefined()
2123+
// Discovered from the live server, not the stale configured list
2124+
expect(provider.models["server-model-a"]).toBeDefined()
2125+
expect(provider.models["server-model-b"]).toBeDefined()
2126+
expect(provider.models["text-embedding-x"]).toBeUndefined()
2127+
expect(provider.models["configured-but-gone"]).toBeUndefined()
2128+
const model = provider.models["server-model-a"]
2129+
expect(model.api.npm).toBe("@ai-sdk/openai-compatible")
2130+
expect(model.capabilities.toolcall).toBe(true)
2131+
expect(model.cost.input).toBe(0)
2132+
}),
2133+
{
2134+
config: () => ({
2135+
provider: {
2136+
"discovery-provider": {
2137+
name: "Discovery Provider",
2138+
npm: "@ai-sdk/openai-compatible",
2139+
options: { apiKey: "test-key", baseURL: discoveryModelsServer.url },
2140+
models: { "configured-but-gone": { name: "Gone" } },
2141+
},
2142+
},
2143+
}),
2144+
},
2145+
)
2146+
2147+
it.instance(
2148+
"openai-compatible discovery failure falls back to configured models",
2149+
Effect.gen(function* () {
2150+
const providers = yield* list
2151+
const provider = providers[ProviderV2.ID.make("discovery-fallback")]
2152+
expect(provider).toBeDefined()
2153+
expect(provider.models["configured-model"]).toBeDefined()
2154+
expect(provider.models["server-model-a"]).toBeUndefined()
2155+
}),
2156+
{
2157+
config: {
2158+
provider: {
2159+
"discovery-fallback": {
2160+
name: "Discovery Fallback",
2161+
npm: "@ai-sdk/openai-compatible",
2162+
options: { apiKey: "test-key", baseURL: "http://127.0.0.1:9/v1" },
2163+
models: { "configured-model": { name: "Configured Model" } },
2164+
},
2165+
},
2166+
},
2167+
},
2168+
)
2169+
20882170
it.effect("opencode loader keeps paid models when auth exists", () =>
20892171
Effect.gen(function* () {
20902172
const noneDir = yield* tmpdirScoped()

0 commit comments

Comments
 (0)