refactor(ai-sdk): decode JSON body record in one pass and tighten option types (#57891)

This commit is contained in:
Aiden Cline
2026-10-21 15:46:05 -05:00
committed by GitHub
Unverified
parent 6dfc681835
commit a7a508b898
2 changed files with 13 additions and 9 deletions
+10 -8
View File
@@ -47,19 +47,19 @@ type UserContent = Extract<LanguageModelV3Message, { role: "user" }>["content"]
type AssistantContent = Extract<LanguageModelV3Message, { role: "assistant" }>["content"]
type ToolResultContent = Extract<AssistantContent[number], { type: "tool-result" }>
const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
const decodeJsonRecord = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Record(Schema.String, Schema.Json)))
export interface SDKEvent {
readonly model: RuntimeInfo
readonly package: string
readonly options: Record<string, any>
readonly options: Record<string, unknown>
sdk?: SDK
}
export interface LanguageEvent {
readonly model: RuntimeInfo
readonly sdk: SDK
readonly options: Record<string, any>
readonly options: Record<string, unknown>
language?: LanguageModelV3
}
@@ -122,7 +122,7 @@ function wrapSSE(res: Response, ms: number, ctl: AbortController) {
function prepareOptions(model: RuntimeInfo, pkg: string) {
const projected = mapBodyToProviderOptions(model, pkg)
const options: Record<string, any> = {
const options: Record<string, unknown> = {
name: model.canonical ?? model.providerID,
...(model.settings ?? {}),
headers: model.headers,
@@ -155,13 +155,13 @@ function prepareOptions(model: RuntimeInfo, pkg: string) {
)
if (typeof opts.body === "string" && model.body !== undefined) {
const decoded = Option.getOrUndefined(decodeJson(opts.body))
if (Schema.is(Schema.Record(Schema.String, Schema.Json))(decoded)) {
const decoded = Option.getOrUndefined(decodeJsonRecord(opts.body))
if (decoded) {
opts.body = JSON.stringify(Provider.mergeOverlay(decoded, model.body))
}
}
const send: Fetch = typeof customFetch === "function" ? customFetch : fetch
const send: Fetch = isFetch(customFetch) ? customFetch : fetch
const middleware = httpMiddleware.getStore()
const res = await (
middleware
@@ -177,6 +177,8 @@ function prepareOptions(model: RuntimeInfo, pkg: string) {
type Fetch = (input: Parameters<typeof fetch>[0], init?: BunFetchRequestInit) => Promise<Response>
const isFetch = (value: unknown): value is Fetch => typeof value === "function"
// HTTP hook middleware is scoped to one model request, but the SDK's fetch is baked into the
// cached language model, so the active middleware rides along in async context instead.
const httpMiddleware = new AsyncLocalStorage<{ http: HttpMiddleware; context: Context.Context<never> }>()
@@ -423,7 +425,7 @@ function modelFromLanguage(info: RuntimeInfo, language: LanguageModelV3) {
}
function gatewayProviderOptions(modelID: ID, settings: Readonly<Record<string, JSONValue>>) {
const gateway = isRecord(settings.gateway) ? Object.fromEntries(Object.entries(settings.gateway)) : undefined
const gateway = isRecord(settings.gateway) ? { ...settings.gateway } : undefined
const model = Object.fromEntries(Object.entries(settings).filter(([key]) => key !== "gateway"))
if (Object.keys(model).length === 0) return gateway === undefined ? undefined : { gateway }
+3 -1
View File
@@ -204,7 +204,9 @@ it.effect("uses only the provider timeout signal when the request signal is null
let wrappedFetch: typeof fetch | undefined
let requestSignal: AbortSignal | null | undefined
yield* aisdk.hook.sdk((event) => {
wrappedFetch = event.options.fetch
if (typeof event.options.fetch === "function") {
wrappedFetch = event.options.fetch as typeof fetch
}
event.sdk = { languageModel: () => ({ provider: event.model.providerID }) }
})