@ai-sdk/openai 2.0.0-canary.6 → 2.0.0-canary.7

package/dist/internal/index.mjs

@@ -544,7 +544,7 @@ var OpenAIChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { args: body, warnings } = this.getArgs(options);
     const {
       responseHeaders,
@@ -582,10 +582,11 @@ var OpenAIChatLanguageModel = class {
       providerMetadata.openai.cachedPromptTokens = promptTokenDetails == null ? void 0 : promptTokenDetails.cached_tokens;
     }
     return {
-      text: (_c = choice.message.content) != null ? _c : void 0,
-      toolCalls: (_d = choice.message.tool_calls) == null ? void 0 : _d.map((toolCall) => {
+      text: choice.message.content != null ? { type: "text", text: choice.message.content } : void 0,
+      toolCalls: (_c = choice.message.tool_calls) == null ? void 0 : _c.map((toolCall) => {
         var _a2;
         return {
+          type: "tool-call",
           toolCallType: "function",
           toolCallId: (_a2 = toolCall.id) != null ? _a2 : generateId(),
           toolName: toolCall.function.name,
@@ -594,8 +595,8 @@ var OpenAIChatLanguageModel = class {
       }),
       finishReason: mapOpenAIFinishReason(choice.finish_reason),
       usage: {
-        inputTokens: (_f = (_e = response.usage) == null ? void 0 : _e.prompt_tokens) != null ? _f : void 0,
-        outputTokens: (_h = (_g = response.usage) == null ? void 0 : _g.completion_tokens) != null ? _h : void 0
+        inputTokens: (_e = (_d = response.usage) == null ? void 0 : _d.prompt_tokens) != null ? _e : void 0,
+        outputTokens: (_g = (_f = response.usage) == null ? void 0 : _f.completion_tokens) != null ? _g : void 0
       },
       request: { body },
       response: {
@@ -695,8 +696,8 @@ var OpenAIChatLanguageModel = class {
             const delta = choice.delta;
             if (delta.content != null) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: delta.content
+                type: "text",
+                text: delta.content
               });
             }
             const mappedLogprobs = mapOpenAIChatLogProbsOutput(
@@ -1133,7 +1134,7 @@ var OpenAICompletionLanguageModel = class {
     });
     const choice = response.choices[0];
     return {
-      text: choice.text,
+      text: { type: "text", text: choice.text },
       usage: {
         inputTokens: response.usage.prompt_tokens,
         outputTokens: response.usage.completion_tokens
@@ -1210,8 +1211,8 @@ var OpenAICompletionLanguageModel = class {
             }
             if ((choice == null ? void 0 : choice.text) != null) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: choice.text
+                type: "text",
+                text: choice.text
               });
             }
             const mappedLogprobs = mapOpenAICompletionLogProbs(
@@ -1295,7 +1296,7 @@ import {
 import { z as z5 } from "zod";
 var OpenAIEmbeddingModel = class {
   constructor(modelId, settings, config) {
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
@@ -1324,7 +1325,11 @@ var OpenAIEmbeddingModel = class {
         values
       });
     }
-    const { responseHeaders, value: response } = await postJsonToApi3({
+    const {
+      responseHeaders,
+      value: response,
+      rawValue
+    } = await postJsonToApi3({
       url: this.config.url({
         path: "/embeddings",
         modelId: this.modelId
@@ -1347,7 +1352,7 @@ var OpenAIEmbeddingModel = class {
     return {
       embeddings: response.data.map((item) => item.embedding),
       usage: response.usage ? { tokens: response.usage.prompt_tokens } : void 0,
-      rawResponse: { headers: responseHeaders }
+      response: { headers: responseHeaders, body: rawValue }
     };
   }
 };
@@ -1453,7 +1458,7 @@ import {
   postFormDataToApi
 } from "@ai-sdk/provider-utils";
 import { z as z7 } from "zod";
-var OpenAIProviderOptionsSchema = z7.object({
+var openAIProviderOptionsSchema = z7.object({
   include: z7.array(z7.string()).nullish(),
   language: z7.string().nullish(),
   prompt: z7.string().nullish(),
@@ -1538,7 +1543,7 @@ var OpenAITranscriptionModel = class {
     const openAIOptions = parseProviderOptions2({
       provider: "openai",
       providerOptions,
-      schema: OpenAIProviderOptionsSchema
+      schema: openAIProviderOptionsSchema
     });
     const formData = new FormData();
     const blob = audio instanceof Uint8Array ? new Blob([audio]) : new Blob([convertBase64ToUint8Array(audio)]);
@@ -2033,17 +2038,22 @@ var OpenAIResponsesLanguageModel = class {
     });
     const outputTextElements = response.output.filter((output) => output.type === "message").flatMap((output) => output.content).filter((content) => content.type === "output_text");
     const toolCalls = response.output.filter((output) => output.type === "function_call").map((output) => ({
+      type: "tool-call",
       toolCallType: "function",
       toolCallId: output.call_id,
       toolName: output.name,
       args: output.arguments
     }));
     return {
-      text: outputTextElements.map((content) => content.text).join("\n"),
+      text: {
+        type: "text",
+        text: outputTextElements.map((content) => content.text).join("\n")
+      },
       sources: outputTextElements.flatMap(
         (content) => content.annotations.map((annotation) => {
           var _a2, _b2, _c2;
           return {
+            type: "source",
             sourceType: "url",
             id: (_c2 = (_b2 = (_a2 = this.config).generateId) == null ? void 0 : _b2.call(_a2)) != null ? _c2 : generateId2(),
             url: annotation.url,
@@ -2154,8 +2164,8 @@ var OpenAIResponsesLanguageModel = class {
               });
             } else if (isTextDeltaChunk(value)) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: value.delta
+                type: "text",
+                text: value.delta
               });
             } else if (isResponseOutputItemDoneChunk(value) && value.item.type === "function_call") {
               ongoingToolCalls[value.output_index] = void 0;
@@ -2179,12 +2189,10 @@ var OpenAIResponsesLanguageModel = class {
             } else if (isResponseAnnotationAddedChunk(value)) {
               controller.enqueue({
                 type: "source",
-                source: {
-                  sourceType: "url",
-                  id: (_h = (_g = (_f = self.config).generateId) == null ? void 0 : _g.call(_f)) != null ? _h : generateId2(),
-                  url: value.annotation.url,
-                  title: value.annotation.title
-                }
+                sourceType: "url",
+                id: (_h = (_g = (_f = self.config).generateId) == null ? void 0 : _g.call(_f)) != null ? _h : generateId2(),
+                url: value.annotation.url,
+                title: value.annotation.title
               });
             }
           },