ai 4.0.0-canary.4 → 4.0.0-canary.6

package/dist/index.mjs

@@ -1499,19 +1499,18 @@ function calculateLanguageModelUsage(usage) {
 }
 
 // core/util/prepare-response-headers.ts
-function prepareResponseHeaders(init, {
+function prepareResponseHeaders(headers, {
   contentType,
   dataStreamVersion
 }) {
-  var _a11;
-  const headers = new Headers((_a11 = init == null ? void 0 : init.headers) != null ? _a11 : {});
-  if (!headers.has("Content-Type")) {
-    headers.set("Content-Type", contentType);
+  const responseHeaders = new Headers(headers != null ? headers : {});
+  if (!responseHeaders.has("Content-Type")) {
+    responseHeaders.set("Content-Type", contentType);
   }
   if (dataStreamVersion !== void 0) {
-    headers.set("X-Vercel-AI-Data-Stream", dataStreamVersion);
+    responseHeaders.set("X-Vercel-AI-Data-Stream", dataStreamVersion);
   }
-  return headers;
+  return responseHeaders;
 }
 
 // core/generate-object/inject-json-instruction.ts
@@ -2085,9 +2084,6 @@ async function generateObject({
                       "ai.response.timestamp": responseData.timestamp.toISOString(),
                       "ai.usage.promptTokens": result2.usage.promptTokens,
                       "ai.usage.completionTokens": result2.usage.completionTokens,
-                      // deprecated:
-                      "ai.finishReason": result2.finishReason,
-                      "ai.result.object": { output: () => result2.text },
                       // standardized gen-ai llm span attributes:
                       "gen_ai.response.finish_reasons": [result2.finishReason],
                       "gen_ai.response.id": responseData.id,
@@ -2192,9 +2188,6 @@ async function generateObject({
                       "ai.response.timestamp": responseData.timestamp.toISOString(),
                       "ai.usage.promptTokens": result2.usage.promptTokens,
                       "ai.usage.completionTokens": result2.usage.completionTokens,
-                      // deprecated:
-                      "ai.finishReason": result2.finishReason,
-                      "ai.result.object": { output: () => objectText },
                       // standardized gen-ai llm span attributes:
                       "gen_ai.response.finish_reasons": [result2.finishReason],
                       "gen_ai.response.id": responseData.id,
@@ -2248,12 +2241,7 @@ async function generateObject({
               output: () => JSON.stringify(validationResult.value)
             },
             "ai.usage.promptTokens": usage.promptTokens,
-            "ai.usage.completionTokens": usage.completionTokens,
-            // deprecated:
-            "ai.finishReason": finishReason,
-            "ai.result.object": {
-              output: () => JSON.stringify(validationResult.value)
-            }
+            "ai.usage.completionTokens": usage.completionTokens
           }
         })
       );
@@ -2282,16 +2270,13 @@ var DefaultGenerateObjectResult = class {
     this.experimental_providerMetadata = options.providerMetadata;
     this.response = options.response;
     this.request = options.request;
-    this.rawResponse = {
-      headers: options.response.headers
-    };
     this.logprobs = options.logprobs;
   }
   toJsonResponse(init) {
     var _a11;
     return new Response(JSON.stringify(this.object), {
       status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
-      headers: prepareResponseHeaders(init, {
+      headers: prepareResponseHeaders(init == null ? void 0 : init.headers, {
         contentType: "application/json; charset=utf-8"
       })
     });
@@ -2365,23 +2350,23 @@ function now() {
 }
 
 // core/util/prepare-outgoing-http-headers.ts
-function prepareOutgoingHttpHeaders(init, {
+function prepareOutgoingHttpHeaders(headers, {
   contentType,
   dataStreamVersion
 }) {
-  const headers = {};
-  if ((init == null ? void 0 : init.headers) != null) {
-    for (const [key, value] of Object.entries(init.headers)) {
-      headers[key] = value;
+  const outgoingHeaders = {};
+  if (headers != null) {
+    for (const [key, value] of Object.entries(headers)) {
+      outgoingHeaders[key] = value;
     }
   }
-  if (headers["Content-Type"] == null) {
-    headers["Content-Type"] = contentType;
+  if (outgoingHeaders["Content-Type"] == null) {
+    outgoingHeaders["Content-Type"] = contentType;
   }
   if (dataStreamVersion !== void 0) {
-    headers["X-Vercel-AI-Data-Stream"] = dataStreamVersion;
+    outgoingHeaders["X-Vercel-AI-Data-Stream"] = dataStreamVersion;
   }
-  return headers;
+  return outgoingHeaders;
 }
 
 // core/util/write-to-server-response.ts
@@ -2662,7 +2647,6 @@ var DefaultStreamObjectResult = class {
     generateId: generateId3
   }) {
     this.warnings = warnings;
-    this.rawResponse = rawResponse;
     this.outputStrategy = outputStrategy;
     this.request = Promise.resolve(request);
     this.objectPromise = new DelayedPromise();
@@ -2795,9 +2779,6 @@ var DefaultStreamObjectResult = class {
                   "ai.response.timestamp": response.timestamp.toISOString(),
                   "ai.usage.promptTokens": finalUsage.promptTokens,
                   "ai.usage.completionTokens": finalUsage.completionTokens,
-                  // deprecated
-                  "ai.finishReason": finishReason,
-                  "ai.result.object": { output: () => JSON.stringify(object) },
                   // standardized gen-ai llm span attributes:
                   "gen_ai.response.finish_reasons": [finishReason],
                   "gen_ai.response.id": response.id,
@@ -2816,9 +2797,7 @@ var DefaultStreamObjectResult = class {
                   "ai.usage.completionTokens": finalUsage.completionTokens,
                   "ai.response.object": {
                     output: () => JSON.stringify(object)
-                  },
-                  // deprecated
-                  "ai.result.object": { output: () => JSON.stringify(object) }
+                  }
                 }
               })
             );
@@ -2826,7 +2805,6 @@ var DefaultStreamObjectResult = class {
               usage: finalUsage,
               object,
               error,
-              rawResponse,
               response: {
                 ...response,
                 headers: rawResponse == null ? void 0 : rawResponse.headers
@@ -2903,7 +2881,7 @@ var DefaultStreamObjectResult = class {
       response,
       status: init == null ? void 0 : init.status,
       statusText: init == null ? void 0 : init.statusText,
-      headers: prepareOutgoingHttpHeaders(init, {
+      headers: prepareOutgoingHttpHeaders(init == null ? void 0 : init.headers, {
         contentType: "text/plain; charset=utf-8"
       }),
       stream: this.textStream.pipeThrough(new TextEncoderStream())
@@ -2913,7 +2891,7 @@ var DefaultStreamObjectResult = class {
     var _a11;
     return new Response(this.textStream.pipeThrough(new TextEncoderStream()), {
       status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
-      headers: prepareResponseHeaders(init, {
+      headers: prepareResponseHeaders(init == null ? void 0 : init.headers, {
         contentType: "text/plain; charset=utf-8"
       })
     });
@@ -3290,14 +3268,6 @@ async function generateText({
                     "ai.response.timestamp": responseData.timestamp.toISOString(),
                     "ai.usage.promptTokens": result.usage.promptTokens,
                     "ai.usage.completionTokens": result.usage.completionTokens,
-                    // deprecated:
-                    "ai.finishReason": result.finishReason,
-                    "ai.result.text": {
-                      output: () => result.text
-                    },
-                    "ai.result.toolCalls": {
-                      output: () => JSON.stringify(result.toolCalls)
-                    },
                     // standardized gen-ai llm span attributes:
                     "gen_ai.response.finish_reasons": [result.finishReason],
                     "gen_ai.response.id": responseData.id,
@@ -3400,15 +3370,7 @@ async function generateText({
               output: () => JSON.stringify(currentModelResponse.toolCalls)
             },
             "ai.usage.promptTokens": currentModelResponse.usage.promptTokens,
-            "ai.usage.completionTokens": currentModelResponse.usage.completionTokens,
-            // deprecated:
-            "ai.finishReason": currentModelResponse.finishReason,
-            "ai.result.text": {
-              output: () => currentModelResponse.text
-            },
-            "ai.result.toolCalls": {
-              output: () => JSON.stringify(currentModelResponse.toolCalls)
-            }
+            "ai.usage.completionTokens": currentModelResponse.usage.completionTokens
           }
         })
       );
@@ -3506,9 +3468,6 @@ var DefaultGenerateTextResult = class {
     this.responseMessages = options.responseMessages;
     this.steps = options.steps;
     this.experimental_providerMetadata = options.providerMetadata;
-    this.rawResponse = {
-      headers: options.response.headers
-    };
     this.logprobs = options.logprobs;
   }
 };
@@ -4165,14 +4124,10 @@ var DefaultStreamTextResult = class {
                 const msToFirstChunk = now2() - startTimestamp;
                 stepFirstChunk = false;
                 doStreamSpan2.addEvent("ai.stream.firstChunk", {
-                  "ai.response.msToFirstChunk": msToFirstChunk,
-                  // deprecated:
-                  "ai.stream.msToFirstChunk": msToFirstChunk
+                  "ai.response.msToFirstChunk": msToFirstChunk
                 });
                 doStreamSpan2.setAttributes({
-                  "ai.response.msToFirstChunk": msToFirstChunk,
-                  // deprecated:
-                  "ai.stream.msToFirstChunk": msToFirstChunk
+                  "ai.response.msToFirstChunk": msToFirstChunk
                 });
               }
               if (chunk.type === "text-delta" && chunk.textDelta.length === 0) {
@@ -4297,12 +4252,6 @@ var DefaultStreamTextResult = class {
                       "ai.response.timestamp": stepResponse.timestamp.toISOString(),
                       "ai.usage.promptTokens": stepUsage.promptTokens,
                       "ai.usage.completionTokens": stepUsage.completionTokens,
-                      // deprecated
-                      "ai.finishReason": stepFinishReason,
-                      "ai.result.text": { output: () => stepText },
-                      "ai.result.toolCalls": {
-                        output: () => stepToolCallsJson
-                      },
                       // standardized gen-ai llm span attributes:
                       "gen_ai.response.finish_reasons": [stepFinishReason],
                       "gen_ai.response.id": stepResponse.id,
@@ -4357,7 +4306,6 @@ var DefaultStreamTextResult = class {
                 warnings: self.warnings,
                 logprobs: stepLogProbs,
                 request: stepRequest,
-                rawResponse: self.rawResponse,
                 response: {
                   ...stepResponse,
                   headers: (_a11 = self.rawResponse) == null ? void 0 : _a11.headers,
@@ -4418,13 +4366,7 @@ var DefaultStreamTextResult = class {
                         output: () => stepToolCallsJson
                       },
                       "ai.usage.promptTokens": combinedUsage.promptTokens,
-                      "ai.usage.completionTokens": combinedUsage.completionTokens,
-                      // deprecated
-                      "ai.finishReason": stepFinishReason,
-                      "ai.result.text": { output: () => fullStepText },
-                      "ai.result.toolCalls": {
-                        output: () => stepToolCallsJson
-                      }
+                      "ai.usage.completionTokens": combinedUsage.completionTokens
                     }
                   })
                 );
@@ -4454,7 +4396,6 @@ var DefaultStreamTextResult = class {
                   // The type exposed to the users will be correctly inferred.
                   toolResults: stepToolResults,
                   request: stepRequest,
-                  rawResponse,
                   response: {
                     ...stepResponse,
                     headers: rawResponse == null ? void 0 : rawResponse.headers,
@@ -4617,20 +4558,19 @@ var DefaultStreamTextResult = class {
     });
     return this.fullStream.pipeThrough(callbackTransformer).pipeThrough(streamPartsTransformer).pipeThrough(new TextEncoderStream());
   }
-  pipeDataStreamToResponse(response, options) {
-    const init = options == null ? void 0 : "init" in options ? options.init : {
-      headers: "headers" in options ? options.headers : void 0,
-      status: "status" in options ? options.status : void 0,
-      statusText: "statusText" in options ? options.statusText : void 0
-    };
-    const data = options == null ? void 0 : "data" in options ? options.data : void 0;
-    const getErrorMessage3 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
-    const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
+  pipeDataStreamToResponse(response, {
+    status,
+    statusText,
+    headers,
+    data,
+    getErrorMessage: getErrorMessage3,
+    sendUsage
+  } = {}) {
     writeToServerResponse({
       response,
-      status: init == null ? void 0 : init.status,
-      statusText: init == null ? void 0 : init.statusText,
-      headers: prepareOutgoingHttpHeaders(init, {
+      status,
+      statusText,
+      headers: prepareOutgoingHttpHeaders(headers, {
         contentType: "text/plain; charset=utf-8",
         dataStreamVersion: "v1"
       }),
@@ -4642,7 +4582,7 @@ var DefaultStreamTextResult = class {
       response,
       status: init == null ? void 0 : init.status,
       statusText: init == null ? void 0 : init.statusText,
-      headers: prepareOutgoingHttpHeaders(init, {
+      headers: prepareOutgoingHttpHeaders(init == null ? void 0 : init.headers, {
         contentType: "text/plain; charset=utf-8"
       }),
       stream: this.textStream.pipeThrough(new TextEncoderStream())
@@ -4655,22 +4595,20 @@ var DefaultStreamTextResult = class {
     });
     return (options == null ? void 0 : options.data) ? mergeStreams(options == null ? void 0 : options.data.stream, stream) : stream;
   }
-  toDataStreamResponse(options) {
-    var _a11;
-    const init = options == null ? void 0 : "init" in options ? options.init : {
-      headers: "headers" in options ? options.headers : void 0,
-      status: "status" in options ? options.status : void 0,
-      statusText: "statusText" in options ? options.statusText : void 0
-    };
-    const data = options == null ? void 0 : "data" in options ? options.data : void 0;
-    const getErrorMessage3 = options == null ? void 0 : "getErrorMessage" in options ? options.getErrorMessage : void 0;
-    const sendUsage = options == null ? void 0 : "sendUsage" in options ? options.sendUsage : void 0;
+  toDataStreamResponse({
+    headers,
+    status,
+    statusText,
+    data,
+    getErrorMessage: getErrorMessage3,
+    sendUsage
+  } = {}) {
     return new Response(
       this.toDataStream({ data, getErrorMessage: getErrorMessage3, sendUsage }),
       {
-        status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
-        statusText: init == null ? void 0 : init.statusText,
-        headers: prepareResponseHeaders(init, {
+        status,
+        statusText,
+        headers: prepareResponseHeaders(headers, {
           contentType: "text/plain; charset=utf-8",
           dataStreamVersion: "v1"
         })
@@ -4681,7 +4619,7 @@ var DefaultStreamTextResult = class {
     var _a11;
     return new Response(this.textStream.pipeThrough(new TextEncoderStream()), {
       status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
-      headers: prepareResponseHeaders(init, {
+      headers: prepareResponseHeaders(init == null ? void 0 : init.headers, {
         contentType: "text/plain; charset=utf-8"
       })
     });
@@ -5121,7 +5059,7 @@ function toDataStreamResponse(stream, options) {
   return new Response(responseStream, {
     status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
     statusText: init == null ? void 0 : init.statusText,
-    headers: prepareResponseHeaders(init, {
+    headers: prepareResponseHeaders(init == null ? void 0 : init.headers, {
       contentType: "text/plain; charset=utf-8",
       dataStreamVersion: "v1"
     })
@@ -5165,7 +5103,7 @@ function toDataStreamResponse2(stream, options = {}) {
   return new Response(responseStream, {
     status: (_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200,
     statusText: init == null ? void 0 : init.statusText,
-    headers: prepareResponseHeaders(init, {
+    headers: prepareResponseHeaders(init == null ? void 0 : init.headers, {
       contentType: "text/plain; charset=utf-8",
       dataStreamVersion: "v1"
     })
@@ -5182,48 +5120,6 @@ function trimStartOfStream() {
     return text;
   };
 }
-
-// streams/stream-to-response.ts
-function streamToResponse(res, response, init, data) {
-  var _a11;
-  response.writeHead((_a11 = init == null ? void 0 : init.status) != null ? _a11 : 200, {
-    "Content-Type": "text/plain; charset=utf-8",
-    ...init == null ? void 0 : init.headers
-  });
-  let processedStream = res;
-  if (data) {
-    processedStream = mergeStreams(data.stream, res);
-  }
-  const reader = processedStream.getReader();
-  function read() {
-    reader.read().then(({ done, value }) => {
-      if (done) {
-        response.end();
-        return;
-      }
-      response.write(value);
-      read();
-    });
-  }
-  read();
-}
-
-// streams/streaming-text-response.ts
-var StreamingTextResponse = class extends Response {
-  constructor(res, init, data) {
-    let processedStream = res;
-    if (data) {
-      processedStream = mergeStreams(data.stream, res);
-    }
-    super(processedStream, {
-      ...init,
-      status: 200,
-      headers: prepareResponseHeaders(init, {
-        contentType: "text/plain; charset=utf-8"
-      })
-    });
-  }
-};
 export {
   AISDKError10 as AISDKError,
   APICallError2 as APICallError,
@@ -5248,7 +5144,6 @@ export {
   NoSuchToolError,
   RetryError,
   StreamData,
-  StreamingTextResponse,
   TypeValidationError2 as TypeValidationError,
   UnsupportedFunctionalityError2 as UnsupportedFunctionalityError,
   convertToCoreMessages,
@@ -5272,7 +5167,6 @@ export {
   readDataStream,
   streamObject,
   streamText,
-  streamToResponse,
   tool
 };
 //# sourceMappingURL=index.mjs.map