diff --git a/packages/core/src/aisdk.ts b/packages/core/src/aisdk.ts index ffe9425d9f8..4904eedd38b 100644 --- a/packages/core/src/aisdk.ts +++ b/packages/core/src/aisdk.ts @@ -47,19 +47,19 @@ type UserContent = Extract["content"] type AssistantContent = Extract["content"] type ToolResultContent = Extract -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 + readonly options: Record sdk?: SDK } export interface LanguageEvent { readonly model: RuntimeInfo readonly sdk: SDK - readonly options: Record + readonly options: Record 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 = { + const options: Record = { 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[0], init?: BunFetchRequestInit) => Promise +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 }>() @@ -423,7 +425,7 @@ function modelFromLanguage(info: RuntimeInfo, language: LanguageModelV3) { } function gatewayProviderOptions(modelID: ID, settings: Readonly>) { - 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 } diff --git a/packages/core/test/aisdk.test.ts b/packages/core/test/aisdk.test.ts index c422716a820..dab9790a044 100644 --- a/packages/core/test/aisdk.test.ts +++ b/packages/core/test/aisdk.test.ts @@ -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 }) } })