@ai-sdk/openai 3.0.123 → 3.0.125

package/dist/index.mjs

@@ -80,6 +80,98 @@ function getGptVersion(modelId) {
   };
 }
 
+// src/normalize-openai-json-schema.ts
+function normalizeOpenAIJsonSchema(schema) {
+  const normalizedSchema = normalizeSchema(schema, true);
+  const reference = getSingletonReference(normalizedSchema);
+  if (reference == null) {
+    return normalizedSchema;
+  }
+  const { allOf: _allOf, ...schemaWithoutAllOf } = normalizedSchema;
+  const referencedSchema = getLocalReferenceSchema(reference, normalizedSchema);
+  return typeof referencedSchema !== "object" || referencedSchema == null ? normalizedSchema : { ...referencedSchema, ...schemaWithoutAllOf };
+  function normalizeSchema(schema2, isRoot = false) {
+    if (typeof schema2 !== "object" || schema2 == null) {
+      return schema2;
+    }
+    const normalizedSchema2 = { ...schema2 };
+    if (normalizedSchema2.properties != null) {
+      normalizedSchema2.properties = normalizeSchemaRecord(
+        normalizedSchema2.properties
+      );
+    }
+    if (normalizedSchema2.patternProperties != null) {
+      normalizedSchema2.patternProperties = normalizeSchemaRecord(
+        normalizedSchema2.patternProperties
+      );
+    }
+    if (normalizedSchema2.definitions != null) {
+      normalizedSchema2.definitions = normalizeSchemaRecord(
+        normalizedSchema2.definitions
+      );
+    }
+    if (normalizedSchema2.$defs != null) {
+      normalizedSchema2.$defs = normalizeSchemaRecord(normalizedSchema2.$defs);
+    }
+    if (normalizedSchema2.items != null) {
+      normalizedSchema2.items = Array.isArray(normalizedSchema2.items) ? normalizedSchema2.items.map((item) => normalizeSchema(item)) : normalizeSchema(normalizedSchema2.items);
+    }
+    if (normalizedSchema2.allOf != null) {
+      normalizedSchema2.allOf = normalizedSchema2.allOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (normalizedSchema2.anyOf != null) {
+      normalizedSchema2.anyOf = normalizedSchema2.anyOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (normalizedSchema2.oneOf != null) {
+      normalizedSchema2.oneOf = normalizedSchema2.oneOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (typeof normalizedSchema2.additionalProperties === "object" && normalizedSchema2.additionalProperties != null) {
+      normalizedSchema2.additionalProperties = normalizeSchema(
+        normalizedSchema2.additionalProperties
+      );
+    }
+    const reference2 = getSingletonReference(normalizedSchema2);
+    if (reference2 == null || isRoot) {
+      return normalizedSchema2;
+    }
+    const { allOf: _allOf2, ...schemaWithoutAllOf2 } = normalizedSchema2;
+    return { ...schemaWithoutAllOf2, $ref: reference2 };
+  }
+  function normalizeSchemaRecord(record) {
+    return Object.fromEntries(
+      Object.entries(record).map(([key, value]) => [
+        key,
+        normalizeSchema(value)
+      ])
+    );
+  }
+  function getSingletonReference(schema2) {
+    var _a2;
+    if (((_a2 = schema2.allOf) == null ? void 0 : _a2.length) !== 1) {
+      return void 0;
+    }
+    const [allOfSchema] = schema2.allOf;
+    return typeof allOfSchema === "object" && allOfSchema != null && Object.keys(allOfSchema).length === 1 && typeof allOfSchema.$ref === "string" ? allOfSchema.$ref : void 0;
+  }
+  function getLocalReferenceSchema(reference2, schema2) {
+    var _a2, _b;
+    const match = /^#\/(definitions|\$defs)\/(.+)$/.exec(reference2);
+    if (match == null) {
+      return void 0;
+    }
+    const [, keyword, encodedName] = match;
+    const name = encodedName.replace(/~1/g, "/").replace(/~0/g, "~");
+    const definition = keyword === "definitions" ? (_a2 = schema2.definitions) == null ? void 0 : _a2[name] : (_b = schema2.$defs) == null ? void 0 : _b[name];
+    return definition;
+  }
+}
+
 // src/openai-stream-error.ts
 import { APICallError } from "@ai-sdk/provider";
 function createOpenAIProviderStreamError(frame) {
@@ -984,7 +1076,7 @@ var OpenAIChatLanguageModel = class {
       response_format: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? responseFormat.schema != null ? {
         type: "json_schema",
         json_schema: {
-          schema: responseFormat.schema,
+          schema: normalizeOpenAIJsonSchema(responseFormat.schema),
           strict: strictJsonSchema,
           name: (_e = responseFormat.name) != null ? _e : "response",
           description: responseFormat.description
@@ -3077,6 +3169,7 @@ import {
   isNonNullable,
   parseJSON,
   parseProviderOptions as parseProviderOptions5,
+  safeValidateTypes,
   validateTypes
 } from "@ai-sdk/provider-utils";
 import { z as z22 } from "zod/v4";
@@ -3466,6 +3559,57 @@ async function expandParallelToolCall({
 function serializeToolCallArguments2(input) {
   return JSON.stringify(input === void 0 ? {} : input);
 }
+async function convertWebSearchToolResultOutput({
+  output,
+  id
+}) {
+  if (output.type !== "json") {
+    return void 0;
+  }
+  const validation = await safeValidateTypes({
+    value: output.value,
+    schema: webSearchOutputSchema
+  });
+  if (!validation.success || validation.value.action == null) {
+    return void 0;
+  }
+  const { action, sources } = validation.value;
+  switch (action.type) {
+    case "search":
+      return {
+        type: "web_search_call",
+        id,
+        status: "completed",
+        action: {
+          type: "search",
+          ...action.query != null && { query: action.query },
+          ...action.queries != null && { queries: action.queries },
+          ...sources != null && { sources }
+        }
+      };
+    case "openPage":
+      return {
+        type: "web_search_call",
+        id,
+        status: "completed",
+        action: {
+          type: "open_page",
+          url: action.url
+        }
+      };
+    case "findInPage":
+      return {
+        type: "web_search_call",
+        id,
+        status: "completed",
+        action: {
+          type: "find_in_page",
+          url: action.url,
+          pattern: action.pattern
+        }
+      };
+  }
+}
 async function convertFunctionToolResultOutput({
   output,
   promptCacheBreakpoint,
@@ -3672,7 +3816,7 @@ async function convertToOpenAIResponsesInput({
   toolSearchToolName,
   customProviderToolNames
 }) {
-  var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D;
+  var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G;
   let input = [];
   const warnings = [];
   const processedApprovalIds = /* @__PURE__ */ new Set();
@@ -4018,8 +4162,23 @@ async function convertToOpenAIResponsesInput({
               const resolvedResultToolName = toolNameMapping.toProviderToolName(
                 part.toolName
               );
+              if (resolvedResultToolName === "web_search" || resolvedResultToolName === "web_search_preview") {
+                const itemId = (_u = (_t = (_s = part.providerOptions) == null ? void 0 : _s[providerOptionsName]) == null ? void 0 : _t.itemId) != null ? _u : part.toolCallId;
+                if (store) {
+                  input.push({ type: "item_reference", id: itemId });
+                  break;
+                }
+                const webSearchCall = await convertWebSearchToolResultOutput({
+                  output: part.output,
+                  id: itemId
+                });
+                if (webSearchCall != null) {
+                  input.push(webSearchCall);
+                  break;
+                }
+              }
               if (part.toolName === toolSearchToolName) {
-                const itemId = (_x = (_w = (_t = (_s = part.providerOptions) == null ? void 0 : _s[providerOptionsName]) == null ? void 0 : _t.itemId) != null ? _w : (_v = (_u = part.providerMetadata) == null ? void 0 : _u[providerOptionsName]) == null ? void 0 : _v.itemId) != null ? _x : part.toolCallId;
+                const itemId = (_A = (_z = (_w = (_v = part.providerOptions) == null ? void 0 : _v[providerOptionsName]) == null ? void 0 : _w.itemId) != null ? _z : (_y = (_x = part.providerMetadata) == null ? void 0 : _x[providerOptionsName]) == null ? void 0 : _y.itemId) != null ? _A : part.toolCallId;
                 if (store) {
                   input.push({ type: "item_reference", id: itemId });
                 } else if (part.output.type === "json") {
@@ -4060,7 +4219,7 @@ async function convertToOpenAIResponsesInput({
                 break;
               }
               if (store) {
-                const itemId = (_A = (_z = (_y = part.providerOptions) == null ? void 0 : _y[providerOptionsName]) == null ? void 0 : _z.itemId) != null ? _A : part.toolCallId;
+                const itemId = (_D = (_C = (_B = part.providerOptions) == null ? void 0 : _B[providerOptionsName]) == null ? void 0 : _C.itemId) != null ? _D : part.toolCallId;
                 input.push({ type: "item_reference", id: itemId });
               } else {
                 warnings.push({
@@ -4227,7 +4386,7 @@ ${text}`,
           }
           const output = part.output;
           if (output.type === "execution-denied") {
-            const approvalId = (_C = (_B = output.providerOptions) == null ? void 0 : _B.openai) == null ? void 0 : _C.approvalId;
+            const approvalId = (_F = (_E = output.providerOptions) == null ? void 0 : _E.openai) == null ? void 0 : _F.approvalId;
             if (approvalId) {
               continue;
             }
@@ -4314,7 +4473,7 @@ ${text}`,
                 break;
               case "execution-denied":
                 outputValue = convertScalarOutput(
-                  (_D = output.reason) != null ? _D : "Tool call execution denied."
+                  (_G = output.reason) != null ? _G : "Tool call execution denied."
                 );
                 break;
               case "json":
@@ -4513,7 +4672,7 @@ var openaiResponsesNestedErrorChunkSchema = z23.object({
   sequence_number: z23.number(),
   error: z23.object({
     type: z23.string(),
-    code: z23.string(),
+    code: z23.string().nullish(),
     message: z23.string(),
     param: z23.string().nullish()
   })
@@ -6108,7 +6267,7 @@ var OpenAIResponsesLanguageModel = class {
               strict: strictJsonSchema,
               name: (_h = responseFormat.name) != null ? _h : "response",
               description: responseFormat.description,
-              schema: responseFormat.schema
+              schema: normalizeOpenAIJsonSchema(responseFormat.schema)
             } : { type: "json_object" }
           },
           ...(openaiOptions == null ? void 0 : openaiOptions.textVerbosity) && {
@@ -8266,7 +8425,7 @@ var OpenAITranscriptionModel = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.123" : "0.0.0-test";
+var VERSION = true ? "3.0.125" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {