diff --git a/packages/ai/src/providers/baseten.ts b/packages/ai/src/providers/baseten.ts index 8e55738399d..4aa6db6a10d 100644 --- a/packages/ai/src/providers/baseten.ts +++ b/packages/ai/src/providers/baseten.ts @@ -8,6 +8,7 @@ import { DecisionRoute } from "../route/decision.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID, type ProviderOptions } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("baseten") const baseURL = "https://inference.baseten.co/v1" @@ -84,20 +85,10 @@ export const provider = configure() export const decision = provider.decision export const model: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const decisionModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).decision(modelID, input.providerOptions) } -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export * as Baseten from "./baseten.js" diff --git a/packages/ai/src/providers/cerebras.ts b/packages/ai/src/providers/cerebras.ts index b06fca4be6a..234a3dfa02b 100644 --- a/packages/ai/src/providers/cerebras.ts +++ b/packages/ai/src/providers/cerebras.ts @@ -5,6 +5,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("cerebras") const baseURL = "https://api.cerebras.ai/v1" @@ -56,14 +57,5 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) diff --git a/packages/ai/src/providers/cohere.ts b/packages/ai/src/providers/cohere.ts index dceddf9a562..f14cb35fab6 100644 --- a/packages/ai/src/providers/cohere.ts +++ b/packages/ai/src/providers/cohere.ts @@ -5,6 +5,7 @@ import { Endpoint } from "../route/endpoint.js" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import { ProviderID, type ModelID, type OpenString } from "../schema/index.js" import type { ProviderPackage } from "../provider-package.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("cohere") const COMPATIBILITY_BASE_URL = "https://api.cohere.ai/compatibility/v1" @@ -51,15 +52,6 @@ export const configure = (input: Config = {}) => { } export const provider = configure() export const chat = provider.chat -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as Cohere from "./cohere.js" diff --git a/packages/ai/src/providers/cohere/chat.ts b/packages/ai/src/providers/cohere/chat.ts index aaaf950cce2..60f9fe3000d 100644 --- a/packages/ai/src/providers/cohere/chat.ts +++ b/packages/ai/src/providers/cohere/chat.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { Cohere } from "../cohere.js" +import { toConfig } from "../settings.js" export type Settings = Cohere.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - Cohere.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).chat(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + Cohere.configure(toConfig(settings)).chat(modelID) diff --git a/packages/ai/src/providers/deepinfra.ts b/packages/ai/src/providers/deepinfra.ts index 66100205b72..038e7aa21a7 100644 --- a/packages/ai/src/providers/deepinfra.ts +++ b/packages/ai/src/providers/deepinfra.ts @@ -5,6 +5,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("deepinfra") const baseURL = "https://api.deepinfra.com/v1/openai" @@ -59,14 +60,5 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) diff --git a/packages/ai/src/providers/deepseek.ts b/packages/ai/src/providers/deepseek.ts index f482ae1aec4..87cdfe78da9 100644 --- a/packages/ai/src/providers/deepseek.ts +++ b/packages/ai/src/providers/deepseek.ts @@ -5,6 +5,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("deepseek") const baseURL = "https://api.deepseek.com/v1" @@ -52,16 +53,7 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as DeepSeek from "./deepseek.js" diff --git a/packages/ai/src/providers/fireworks.ts b/packages/ai/src/providers/fireworks.ts index d121a4c0e42..6339df5fb52 100644 --- a/packages/ai/src/providers/fireworks.ts +++ b/packages/ai/src/providers/fireworks.ts @@ -5,6 +5,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("fireworks") const baseURL = "https://api.fireworks.ai/inference/v1" @@ -49,16 +50,7 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as Fireworks from "./fireworks.js" diff --git a/packages/ai/src/providers/google.ts b/packages/ai/src/providers/google.ts index 7cf6667400c..330c690a1bf 100644 --- a/packages/ai/src/providers/google.ts +++ b/packages/ai/src/providers/google.ts @@ -10,6 +10,7 @@ import { GoogleImages } from "../protocols/google-images.js" import { GoogleSpeech } from "../protocols/google-speech.js" import { GoogleTranscription } from "../protocols/google-transcription.js" import { GoogleVideo } from "../protocols/google-video.js" +import { toConfig } from "./settings.js" export type { GoogleImageOptions } from "../protocols/google-images.js" export type { GoogleSpeechOptions } from "../protocols/google-speech.js" @@ -69,22 +70,12 @@ export const configure = (input: Config = {}) => { export const provider = configure() export const model: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).image(modelID, input.providerOptions) } -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export const image = provider.image export const gemini = provider.gemini export const interactions = provider.interactions diff --git a/packages/ai/src/providers/google/interactions.ts b/packages/ai/src/providers/google/interactions.ts index 693ee8d7f13..81c0f396508 100644 --- a/packages/ai/src/providers/google/interactions.ts +++ b/packages/ai/src/providers/google/interactions.ts @@ -1,6 +1,7 @@ import { configure } from "../google.js" import type { ProviderPackage } from "../../provider-package.js" import type { GoogleInteractions } from "../../protocols/google-interactions.js" +import { toConfig } from "../settings.js" export type Settings = ProviderPackage.Settings & GoogleInteractions.ProviderOptionsInput & { @@ -8,14 +9,5 @@ export type Settings = ProviderPackage.Settings & readonly baseURL?: string } -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).interactions(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).interactions(modelID) diff --git a/packages/ai/src/providers/groq.ts b/packages/ai/src/providers/groq.ts index d6c11f4e537..69be93f51a2 100644 --- a/packages/ai/src/providers/groq.ts +++ b/packages/ai/src/providers/groq.ts @@ -8,6 +8,7 @@ import { Endpoint } from "../route/endpoint.js" import { Protocol } from "../route/protocol.js" import { ProviderID, type ModelID, type LLMRequest } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("groq") const baseURL = "https://api.groq.com/openai/v1" @@ -96,16 +97,7 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as Groq from "./groq.js" diff --git a/packages/ai/src/providers/meta.ts b/packages/ai/src/providers/meta.ts index eb302d59b12..bb9ed426917 100644 --- a/packages/ai/src/providers/meta.ts +++ b/packages/ai/src/providers/meta.ts @@ -10,6 +10,7 @@ import { Endpoint } from "../route/endpoint.js" import { MediaRoute } from "../route/media.js" import { ProviderID, ToolDefinition, type ModelID, type OpenString } from "../schema/index.js" import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("meta") const baseURL = "https://api.meta.ai/v1" @@ -151,24 +152,14 @@ export const messages = provider.messages export const image = provider.image export const model: ProviderPackage.Model = (modelID, settings) => - fromSettings(settings).responses(modelID) + configure(toConfig(settings)).responses(modelID) export const chatModel: ProviderPackage.Model = (modelID, settings) => - fromSettings(settings).chat(modelID) + configure(toConfig(settings)).chat(modelID) export const messagesModel: ProviderPackage.Model = (modelID, settings) => - fromSettings(settings).messages(modelID) + configure(toConfig(settings)).messages(modelID) -export const imageModel = (modelID: string, settings?: Settings) => fromSettings(settings).image(modelID) - -function fromSettings({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }) -} +export const imageModel = (modelID: string, settings?: Settings) => configure(toConfig(settings)).image(modelID) export * as Meta from "./meta.js" diff --git a/packages/ai/src/providers/minimax.ts b/packages/ai/src/providers/minimax.ts index d16230a5950..d745a61f66f 100644 --- a/packages/ai/src/providers/minimax.ts +++ b/packages/ai/src/providers/minimax.ts @@ -12,6 +12,7 @@ import { Framing } from "../route/framing.js" import { MediaRoute } from "../route/media.js" import { Protocol } from "../route/protocol.js" import { ProviderID, type LLMRequest, type ModelID, type ProviderOptions } from "../schema/index.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("minimax") @@ -137,9 +138,9 @@ export const configure = (input: Config = {}) => { export const provider = configure() export const model: ProviderPackage.Model, MessagesOptionsInput> = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig>(settings) return configure(input).image(modelID, input.providerOptions) } @@ -148,14 +149,4 @@ export const chat = provider.chat export const responses = provider.responses export const image = provider.image -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings<{}> = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export * as MiniMax from "./minimax.js" diff --git a/packages/ai/src/providers/minimax/chat.ts b/packages/ai/src/providers/minimax/chat.ts index 2dea92192a4..51ff4dedeb6 100644 --- a/packages/ai/src/providers/minimax/chat.ts +++ b/packages/ai/src/providers/minimax/chat.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { MiniMax } from "../minimax.js" +import { toConfig } from "../settings.js" export type Settings = MiniMax.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - MiniMax.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).chat(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + MiniMax.configure(toConfig(settings)).chat(modelID) diff --git a/packages/ai/src/providers/minimax/responses.ts b/packages/ai/src/providers/minimax/responses.ts index d64975d0f63..00a6a6755d4 100644 --- a/packages/ai/src/providers/minimax/responses.ts +++ b/packages/ai/src/providers/minimax/responses.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { MiniMax } from "../minimax.js" +import { toConfig } from "../settings.js" export type Settings = MiniMax.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - MiniMax.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).responses(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + MiniMax.configure(toConfig(settings)).responses(modelID) diff --git a/packages/ai/src/providers/mistral.ts b/packages/ai/src/providers/mistral.ts index 92c43d0d778..7924ecf6331 100644 --- a/packages/ai/src/providers/mistral.ts +++ b/packages/ai/src/providers/mistral.ts @@ -3,6 +3,7 @@ import { MistralChat } from "../protocols/mistral-chat.js" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import type { RouteDefaultsInput } from "../route/client.js" import { ProviderID, type ModelID } from "../schema/index.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("mistral") @@ -39,16 +40,7 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as Mistral from "./mistral.js" diff --git a/packages/ai/src/providers/moonshot.ts b/packages/ai/src/providers/moonshot.ts index ebc9fc3819b..d8529cfa537 100644 --- a/packages/ai/src/providers/moonshot.ts +++ b/packages/ai/src/providers/moonshot.ts @@ -10,6 +10,7 @@ import { Endpoint } from "../route/endpoint.js" import { Framing } from "../route/framing.js" import { Protocol } from "../route/protocol.js" import { ProviderID, type LLMRequest, type ModelID } from "../schema/index.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("moonshotai") @@ -133,16 +134,7 @@ export const chat = provider.chat export const messages = provider.messages export const responses = provider.responses -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as Moonshot from "./moonshot.js" diff --git a/packages/ai/src/providers/moonshot/messages.ts b/packages/ai/src/providers/moonshot/messages.ts index 3976fd9fcef..b6b86623f38 100644 --- a/packages/ai/src/providers/moonshot/messages.ts +++ b/packages/ai/src/providers/moonshot/messages.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { Moonshot } from "../moonshot.js" +import { toConfig } from "../settings.js" export type Settings = Moonshot.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - Moonshot.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).messages(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + Moonshot.configure(toConfig(settings)).messages(modelID) diff --git a/packages/ai/src/providers/moonshot/responses.ts b/packages/ai/src/providers/moonshot/responses.ts index 546c17b5413..50cbab9f8a8 100644 --- a/packages/ai/src/providers/moonshot/responses.ts +++ b/packages/ai/src/providers/moonshot/responses.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { Moonshot } from "../moonshot.js" +import { toConfig } from "../settings.js" export type Settings = Moonshot.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - Moonshot.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).responses(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + Moonshot.configure(toConfig(settings)).responses(modelID) diff --git a/packages/ai/src/providers/openai-compatible-responses.ts b/packages/ai/src/providers/openai-compatible-responses.ts index 0b4c1b19a61..652e0f1e595 100644 --- a/packages/ai/src/providers/openai-compatible-responses.ts +++ b/packages/ai/src/providers/openai-compatible-responses.ts @@ -4,6 +4,7 @@ import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import type { RouteDefaultsInput } from "../route/client.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js" +import { toConfig } from "./settings.js" export type { OpenResponsesOptionsInput, OpenResponsesProviderOptionsInput } from "./open-responses-options.js" @@ -48,13 +49,5 @@ export const provider = { export const model: ProviderPackage.Model = ( modelID, - { apiKey, baseURL, body, headers, provider, ...providerOptions }, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - provider, - providerOptions, - }).model(modelID) + { provider, ...settings }, +) => configure({ ...toConfig(settings), provider }).model(modelID) diff --git a/packages/ai/src/providers/openai-compatible.ts b/packages/ai/src/providers/openai-compatible.ts index df859e04c8d..d3203c0500b 100644 --- a/packages/ai/src/providers/openai-compatible.ts +++ b/packages/ai/src/providers/openai-compatible.ts @@ -6,6 +6,7 @@ import type { RouteDefaultsInput } from "../route/client.js" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import type { ProviderPackage } from "../provider-package.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("openai-compatible") @@ -67,15 +68,8 @@ export const imageModel = (modelID: string, settings: Settings) => { return configure(input).image(modelID, input.providerOptions) } -function config({ apiKey, baseURL, body, headers, provider, ...providerOptions }: Settings) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - provider, - providerOptions, - } +function config({ provider, ...settings }: Settings) { + return { ...toConfig(settings), provider } } export * as OpenAICompatible from "./openai-compatible.js" diff --git a/packages/ai/src/providers/opencode.ts b/packages/ai/src/providers/opencode.ts index c75d6e4694b..b15b88488a0 100644 --- a/packages/ai/src/providers/opencode.ts +++ b/packages/ai/src/providers/opencode.ts @@ -2,6 +2,7 @@ import { HttpOptions, ProviderID, type ModelID, type ProviderOptions } from "../ import type { ProviderPackage } from "../provider-package.js" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import { SystemOne } from "../protocols/system-one.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("opencode") const baseURL = "https://opencode.ai/inference/systemone/v1" @@ -32,10 +33,9 @@ export const configure = (input: Config = {}) => { export const provider = configure() export const decision = provider.decision -export const decisionModel = (modelID: string, { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) => - configure({ apiKey, baseURL, headers, http: body === undefined ? undefined : { body } }).decision( - modelID, - providerOptions, - ) +export const decisionModel = (modelID: string, settings?: Settings) => { + const input = toConfig(settings) + return configure(input).decision(modelID, input.providerOptions) +} export * as OpenCode from "./opencode.js" diff --git a/packages/ai/src/providers/openrouter.ts b/packages/ai/src/providers/openrouter.ts index f7be5b4d128..d2a0bd49946 100644 --- a/packages/ai/src/providers/openrouter.ts +++ b/packages/ai/src/providers/openrouter.ts @@ -14,6 +14,7 @@ import { OpenResponses } from "../protocols/open-responses.js" import { cacheControl } from "../protocols/utils/cache.js" import { isRecord, JsonObject, lenient, ProviderShared } from "../protocols/shared.js" import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("openrouter") const baseURL = "https://openrouter.ai/api/v1" @@ -292,28 +293,18 @@ export const image = provider.image export const chat = provider.chat export const responses = provider.responses export const model: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const responsesModel: ProviderPackage.Model< Settings, OpenRouterResponsesProviderOptionsInput -> = (modelID, settings) => configure(config(settings)).responses(modelID) +> = (modelID, settings) => configure(toConfig(settings)).responses(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).image(modelID, input.providerOptions) } export const decisionModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).decision(modelID, input.providerOptions) } -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export * as OpenRouter from "./openrouter.js" diff --git a/packages/ai/src/providers/settings.ts b/packages/ai/src/providers/settings.ts new file mode 100644 index 00000000000..73a8186a89d --- /dev/null +++ b/packages/ai/src/providers/settings.ts @@ -0,0 +1,27 @@ +import type { ProviderPackage } from "../provider-package.js" + +type Connection = "apiKey" | "baseURL" | "body" | "headers" + +/** + * Splits flat provider settings into connection config, treating every other key as a provider option. + * The overload keeps each provider's option keys; a generic rest would type them as `Omit`, which collapses + * to the `Settings` index signature. + */ +export function toConfig( + settings?: Settings, +): { + apiKey: Settings["apiKey"] + baseURL: Settings["baseURL"] + headers: Settings["headers"] + http: { body: NonNullable } | undefined + providerOptions: { [Key in keyof Settings as Key extends Connection ? never : Key]: Settings[Key] } +} +export function toConfig({ apiKey, baseURL, body, headers, ...providerOptions }: ProviderPackage.Settings = {}) { + return { + apiKey, + baseURL, + headers, + http: body === undefined ? undefined : { body }, + providerOptions, + } +} diff --git a/packages/ai/src/providers/togetherai.ts b/packages/ai/src/providers/togetherai.ts index 1b7c37b0fdd..565a704cbda 100644 --- a/packages/ai/src/providers/togetherai.ts +++ b/packages/ai/src/providers/togetherai.ts @@ -5,6 +5,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { ProviderID, type ModelID } from "../schema/index.js" import type { OpenAIProviderOptionsInput } from "./openai-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("togetherai") const baseURL = "https://api.together.xyz/v1" @@ -52,14 +53,5 @@ export const configure = (input: Config = {}) => { export const provider = configure() -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) diff --git a/packages/ai/src/providers/typesafe-ai.ts b/packages/ai/src/providers/typesafe-ai.ts index 8f87560ce6b..104881c63ea 100644 --- a/packages/ai/src/providers/typesafe-ai.ts +++ b/packages/ai/src/providers/typesafe-ai.ts @@ -2,6 +2,7 @@ import { HttpOptions, ProviderID, type ModelID, type ProviderOptions } from "../ import type { ProviderPackage } from "../provider-package.js" import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js" import { SystemOne } from "../protocols/system-one.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("typesafe-ai") const baseURL = "https://api.typesafe.ai/v1" @@ -32,10 +33,9 @@ export const configure = (input: Config = {}) => { export const provider = configure() export const decision = provider.decision -export const decisionModel = (modelID: string, { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) => - configure({ apiKey, baseURL, headers, http: body === undefined ? undefined : { body } }).decision( - modelID, - providerOptions, - ) +export const decisionModel = (modelID: string, settings?: Settings) => { + const input = toConfig(settings) + return configure(input).decision(modelID, input.providerOptions) +} export * as TypeSafeAI from "./typesafe-ai.js" diff --git a/packages/ai/src/providers/vercel-ai-gateway.ts b/packages/ai/src/providers/vercel-ai-gateway.ts index 49fd75328b4..5f35c00e749 100644 --- a/packages/ai/src/providers/vercel-ai-gateway.ts +++ b/packages/ai/src/providers/vercel-ai-gateway.ts @@ -23,6 +23,7 @@ import { type ProviderOptions, } from "../schema/index.js" import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("vercel-ai-gateway") const baseURL = "https://ai-gateway.vercel.sh/v1" @@ -269,30 +270,20 @@ export const chat = provider.chat export const image = provider.image export const model: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const messagesModel: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).messages(modelID) + configure(toConfig(settings)).messages(modelID) export const responsesModel: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).responses(modelID) + configure(toConfig(settings)).responses(modelID) export const chatModel: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).chat(modelID) + configure(toConfig(settings)).chat(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).image(modelID, input.providerOptions) } export const decisionModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).decision(modelID, input.providerOptions) } -function config({ apiKey, baseURL, headers, body, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export * as VercelAIGateway from "./vercel-ai-gateway.js" diff --git a/packages/ai/src/providers/xai.ts b/packages/ai/src/providers/xai.ts index 4782a97158d..accba2ae901 100644 --- a/packages/ai/src/providers/xai.ts +++ b/packages/ai/src/providers/xai.ts @@ -10,6 +10,7 @@ import { XAIImages } from "../protocols/xai-images.js" import { XAIVideo } from "../protocols/xai-video.js" import type { OpenAIOptionsInput } from "./openai-options.js" import type { ProviderPackage } from "../provider-package.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("xai") const baseURL = "https://api.x.ai/v1" @@ -108,21 +109,11 @@ export const provider = configure() export const model: ProviderPackage.Model = ( modelID, settings, -) => configure(config(settings)).model(modelID) +) => configure(toConfig(settings)).model(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).image(modelID, input.providerOptions) } - -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} export const responses = provider.responses export const chat = provider.chat export const image = provider.image diff --git a/packages/ai/src/providers/zai-coding-plan.ts b/packages/ai/src/providers/zai-coding-plan.ts index 1a22dd22a6e..40449f6237e 100644 --- a/packages/ai/src/providers/zai-coding-plan.ts +++ b/packages/ai/src/providers/zai-coding-plan.ts @@ -9,6 +9,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { Framing } from "../route/framing.js" import { ProviderID, type ModelID } from "../schema/index.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("zai-coding-plan") @@ -80,16 +81,7 @@ export const chat = provider.chat export const messages = provider.messages export const responses = provider.responses -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).model(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + configure(toConfig(settings)).model(modelID) export * as ZAICodingPlan from "./zai-coding-plan.js" diff --git a/packages/ai/src/providers/zai-coding-plan/messages.ts b/packages/ai/src/providers/zai-coding-plan/messages.ts index 932d1086fd5..eeb8a9c2320 100644 --- a/packages/ai/src/providers/zai-coding-plan/messages.ts +++ b/packages/ai/src/providers/zai-coding-plan/messages.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { ZAICodingPlan } from "../zai-coding-plan.js" +import { toConfig } from "../settings.js" export type Settings = ZAICodingPlan.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - ZAICodingPlan.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).messages(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + ZAICodingPlan.configure(toConfig(settings)).messages(modelID) diff --git a/packages/ai/src/providers/zai-coding-plan/responses.ts b/packages/ai/src/providers/zai-coding-plan/responses.ts index 41d380f58d2..9d8e4e34714 100644 --- a/packages/ai/src/providers/zai-coding-plan/responses.ts +++ b/packages/ai/src/providers/zai-coding-plan/responses.ts @@ -1,16 +1,8 @@ import type { ProviderPackage } from "../../provider-package.js" import { ZAICodingPlan } from "../zai-coding-plan.js" +import { toConfig } from "../settings.js" export type Settings = ZAICodingPlan.Settings -export const model: ProviderPackage.Model = ( - modelID, - { apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}, -) => - ZAICodingPlan.configure({ - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - }).responses(modelID) +export const model: ProviderPackage.Model = (modelID, settings) => + ZAICodingPlan.configure(toConfig(settings)).responses(modelID) diff --git a/packages/ai/src/providers/zai.ts b/packages/ai/src/providers/zai.ts index 4132bf2a5d7..81f012ca31b 100644 --- a/packages/ai/src/providers/zai.ts +++ b/packages/ai/src/providers/zai.ts @@ -7,6 +7,7 @@ import { Route, type RouteDefaultsInput } from "../route/client.js" import { Endpoint } from "../route/endpoint.js" import { MediaRoute } from "../route/media.js" import { ProviderID, type ModelID, type ProviderOptions } from "../schema/index.js" +import { toConfig } from "./settings.js" export const id = ProviderID.make("zai") @@ -67,20 +68,10 @@ export const image = provider.image export const chat = provider.chat export const model: ProviderPackage.Model = (modelID, settings) => - configure(config(settings)).model(modelID) + configure(toConfig(settings)).model(modelID) export const imageModel = (modelID: string, settings?: Settings) => { - const input = config(settings) + const input = toConfig(settings) return configure(input).image(modelID, input.providerOptions) } -function config({ apiKey, baseURL, body, headers, ...providerOptions }: Settings = {}) { - return { - apiKey, - baseURL, - headers, - http: body === undefined ? undefined : { body }, - providerOptions, - } -} - export * as ZAI from "./zai.js"