ai 3.1.0-canary.2 → 3.1.0-canary.3

package/core/dist/index.js

@@ -33,7 +33,6 @@ __export(core_exports, {
   GenerateObjectResult: () => GenerateObjectResult,
   GenerateTextResult: () => GenerateTextResult,
   StreamObjectResult: () => StreamObjectResult,
-  StreamTextHttpResponse: () => StreamTextHttpResponse,
   StreamTextResult: () => StreamTextResult,
   convertDataContentToBase64String: () => convertDataContentToBase64String,
   convertDataContentToUint8Array: () => convertDataContentToUint8Array,
@@ -125,6 +124,30 @@ var NoTextGeneratedError = class extends Error {
   }
 };
 
+// ai-model-specification/errors/retry-error.ts
+var RetryError = class extends Error {
+  constructor({
+    message,
+    reason,
+    errors
+  }) {
+    super(message);
+    this.name = "RetryError";
+    this.reason = reason;
+    this.errors = errors;
+    this.lastError = errors[errors.length - 1];
+  }
+  toJSON() {
+    return {
+      name: this.name,
+      message: this.message,
+      reason: this.reason,
+      lastError: this.lastError,
+      errors: this.errors
+    };
+  }
+};
+
 // ai-model-specification/errors/type-validation-error.ts
 var TypeValidationError = class extends Error {
   constructor({ value, cause }) {
@@ -214,6 +237,15 @@ function convertUint8ArrayToBase64(array) {
   return globalThis.btoa(latin1string);
 }
 
+// core/generate-text/token-usage.ts
+function calculateTokenUsage(usage) {
+  return {
+    promptTokens: usage.promptTokens,
+    completionTokens: usage.completionTokens,
+    totalTokens: usage.promptTokens + usage.completionTokens
+  };
+}
+
 // core/prompt/data-content.ts
 function convertDataContentToBase64String(content) {
   if (typeof content === "string") {
@@ -283,7 +315,7 @@ function convertToLanguageModelPrompt({
                     case "image": {
                       return {
                         type: "image",
-                        image: convertDataContentToUint8Array(part.image),
+                        image: part.image instanceof URL ? part.image : convertDataContentToUint8Array(part.image),
                         mimeType: part.mimeType
                       };
                     }
@@ -419,6 +451,66 @@ function validateCallSettings(settings) {
   return settings;
 }
 
+// core/util/delay.ts
+async function delay(delayInMs) {
+  return new Promise((resolve) => setTimeout(resolve, delayInMs));
+}
+
+// core/util/retry-with-exponential-backoff.ts
+var retryWithExponentialBackoff = ({
+  maxRetries = 2,
+  initialDelayInMs = 2e3,
+  backoffFactor = 2
+} = {}) => async (f) => _retryWithExponentialBackoff(f, {
+  maxRetries,
+  delayInMs: initialDelayInMs,
+  backoffFactor
+});
+async function _retryWithExponentialBackoff(f, {
+  maxRetries,
+  delayInMs,
+  backoffFactor
+}, errors = []) {
+  try {
+    return await f();
+  } catch (error) {
+    if (maxRetries === 0) {
+      throw error;
+    }
+    const errorMessage = getErrorMessage(error);
+    const newErrors = [...errors, error];
+    const tryNumber = newErrors.length;
+    if (tryNumber > maxRetries) {
+      throw new RetryError({
+        message: `Failed after ${tryNumber} tries. Last error: ${errorMessage}`,
+        reason: "maxRetriesExceeded",
+        errors: newErrors
+      });
+    }
+    if (error instanceof Error) {
+      if (error.name === "AbortError") {
+        throw error;
+      }
+      if (
+        // deal with bundling duplication by using names
+        error.name === "ApiCallError" && error.isRetryable === true && tryNumber <= maxRetries
+      ) {
+        await delay(delayInMs);
+        return _retryWithExponentialBackoff(
+          f,
+          { maxRetries, delayInMs: backoffFactor * delayInMs, backoffFactor },
+          newErrors
+        );
+      }
+    }
+    throw new RetryError({
+      message: `Failed after ${tryNumber} tries with non-retryable error: '${errorMessage}'`,
+      reason: "errorNotRetryable",
+      errors: newErrors
+    });
+  }
+}
+
 // core/generate-object/inject-json-schema-into-system.ts
 var DEFAULT_SCHEMA_PREFIX = "JSON schema:";
 var DEFAULT_SCHEMA_SUFFIX = "You MUST answer with a JSON object that matches the JSON schema above.";
@@ -446,69 +538,89 @@ async function generateObject({
   system,
   prompt,
   messages,
+  maxRetries,
+  abortSignal,
   ...settings
 }) {
   var _a, _b;
+  const retry = retryWithExponentialBackoff({ maxRetries });
   const jsonSchema = (0, import_zod_to_json_schema.default)(schema);
   if (mode === "auto" || mode == null) {
     mode = model.defaultObjectGenerationMode;
   }
   let result;
+  let finishReason;
+  let usage;
   switch (mode) {
     case "json": {
-      const generateResult = await model.doGenerate({
-        mode: { type: "object-json" },
-        ...validateCallSettings(settings),
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
+      const generateResult = await retry(
+        () => model.doGenerate({
+          mode: { type: "object-json" },
+          ...validateCallSettings(settings),
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({
+            system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+            prompt,
+            messages
+          }),
+          abortSignal
         })
-      });
+      );
       if (generateResult.text === void 0) {
         throw new NoTextGeneratedError();
       }
       result = generateResult.text;
+      finishReason = generateResult.finishReason;
+      usage = generateResult.usage;
       break;
     }
     case "grammar": {
-      const generateResult = await model.doGenerate({
-        mode: { type: "object-grammar", schema: jsonSchema },
-        ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
+      const generateResult = await retry(
+        () => model.doGenerate({
+          mode: { type: "object-grammar", schema: jsonSchema },
+          ...settings,
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({
+            system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+            prompt,
+            messages
+          }),
+          abortSignal
         })
-      });
+      );
       if (generateResult.text === void 0) {
         throw new NoTextGeneratedError();
       }
       result = generateResult.text;
+      finishReason = generateResult.finishReason;
+      usage = generateResult.usage;
       break;
     }
     case "tool": {
-      const generateResult = await model.doGenerate({
-        mode: {
-          type: "object-tool",
-          tool: {
-            type: "function",
-            name: "json",
-            description: "Respond with a JSON object.",
-            parameters: jsonSchema
-          }
-        },
-        ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({ system, prompt, messages })
-      });
+      const generateResult = await retry(
+        () => model.doGenerate({
+          mode: {
+            type: "object-tool",
+            tool: {
+              type: "function",
+              name: "json",
+              description: "Respond with a JSON object.",
+              parameters: jsonSchema
+            }
+          },
+          ...settings,
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({ system, prompt, messages }),
+          abortSignal
+        })
+      );
       const functionArgs = (_b = (_a = generateResult.toolCalls) == null ? void 0 : _a[0]) == null ? void 0 : _b.args;
       if (functionArgs === void 0) {
         throw new NoTextGeneratedError();
       }
       result = functionArgs;
+      finishReason = generateResult.finishReason;
+      usage = generateResult.usage;
       break;
     }
     case void 0: {
@@ -524,12 +636,16 @@ async function generateObject({
     throw parseResult.error;
   }
   return new GenerateObjectResult({
-    object: parseResult.value
+    object: parseResult.value,
+    finishReason,
+    usage: calculateTokenUsage(usage)
   });
 }
 var GenerateObjectResult = class {
   constructor(options) {
     this.object = options.object;
+    this.finishReason = options.finishReason;
+    this.usage = options.usage;
   }
 };
 
@@ -916,8 +1032,11 @@ async function streamObject({
   system,
   prompt,
   messages,
+  maxRetries,
+  abortSignal,
   ...settings
 }) {
+  const retry = retryWithExponentialBackoff({ maxRetries });
   const jsonSchema = (0, import_zod_to_json_schema2.default)(schema);
   let modelStream;
   if (mode === "auto" || mode == null) {
@@ -925,16 +1044,19 @@ async function streamObject({
   }
   switch (mode) {
     case "json": {
-      const { stream, warnings } = await model.doStream({
-        mode: { type: "object-json" },
-        ...validateCallSettings(settings),
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
+      const { stream, warnings } = await retry(
+        () => model.doStream({
+          mode: { type: "object-json" },
+          ...validateCallSettings(settings),
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({
+            system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+            prompt,
+            messages
+          }),
+          abortSignal
         })
-      });
+      );
       modelStream = stream.pipeThrough(
         new TransformStream({
           transform(chunk, controller) {
@@ -952,16 +1074,19 @@ async function streamObject({
       break;
     }
     case "grammar": {
-      const { stream, warnings } = await model.doStream({
-        mode: { type: "object-grammar", schema: jsonSchema },
-        ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
+      const { stream, warnings } = await retry(
+        () => model.doStream({
+          mode: { type: "object-grammar", schema: jsonSchema },
+          ...settings,
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({
+            system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+            prompt,
+            messages
+          }),
+          abortSignal
         })
-      });
+      );
       modelStream = stream.pipeThrough(
         new TransformStream({
           transform(chunk, controller) {
@@ -979,20 +1104,23 @@ async function streamObject({
       break;
     }
     case "tool": {
-      const { stream, warnings } = await model.doStream({
-        mode: {
-          type: "object-tool",
-          tool: {
-            type: "function",
-            name: "json",
-            description: "Respond with a JSON object.",
-            parameters: jsonSchema
-          }
-        },
-        ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({ system, prompt, messages })
-      });
+      const { stream, warnings } = await retry(
+        () => model.doStream({
+          mode: {
+            type: "object-tool",
+            tool: {
+              type: "function",
+              name: "json",
+              description: "Respond with a JSON object.",
+              parameters: jsonSchema
+            }
+          },
+          ...settings,
+          inputFormat: getInputFormat({ prompt, messages }),
+          prompt: convertToLanguageModelPrompt({ system, prompt, messages }),
+          abortSignal
+        })
+      );
       modelStream = stream.pipeThrough(
         new TransformStream({
           transform(chunk, controller) {
@@ -1091,27 +1219,33 @@ async function generateText({
   system,
   prompt,
   messages,
+  maxRetries,
+  abortSignal,
   ...settings
 }) {
   var _a, _b;
-  const modelResponse = await model.doGenerate({
-    mode: {
-      type: "regular",
-      tools: tools == null ? void 0 : Object.entries(tools).map(([name, tool2]) => ({
-        type: "function",
-        name,
-        description: tool2.description,
-        parameters: (0, import_zod_to_json_schema3.default)(tool2.parameters)
-      }))
-    },
-    ...validateCallSettings(settings),
-    inputFormat: getInputFormat({ prompt, messages }),
-    prompt: convertToLanguageModelPrompt({
-      system,
-      prompt,
-      messages
+  const retry = retryWithExponentialBackoff({ maxRetries });
+  const modelResponse = await retry(
+    () => model.doGenerate({
+      mode: {
+        type: "regular",
+        tools: tools == null ? void 0 : Object.entries(tools).map(([name, tool2]) => ({
+          type: "function",
+          name,
+          description: tool2.description,
+          parameters: (0, import_zod_to_json_schema3.default)(tool2.parameters)
+        }))
+      },
+      ...validateCallSettings(settings),
+      inputFormat: getInputFormat({ prompt, messages }),
+      prompt: convertToLanguageModelPrompt({
+        system,
+        prompt,
+        messages
+      }),
+      abortSignal
     })
-  });
+  );
   const toolCalls = [];
   for (const modelToolCall of (_a = modelResponse.toolCalls) != null ? _a : []) {
     toolCalls.push(parseToolCall({ toolCall: modelToolCall, tools }));
@@ -1123,7 +1257,9 @@ async function generateText({
     // they can check the length of the string:
     text: (_b = modelResponse.text) != null ? _b : "",
     toolCalls,
-    toolResults
+    toolResults,
+    finishReason: modelResponse.finishReason,
+    usage: calculateTokenUsage(modelResponse.usage)
   });
 }
 async function executeTools({
@@ -1154,6 +1290,8 @@ var GenerateTextResult = class {
     this.text = options.text;
     this.toolCalls = options.toolCalls;
     this.toolResults = options.toolResults;
+    this.finishReason = options.finishReason;
+    this.usage = options.usage;
   }
 };
 
@@ -1279,238 +1417,6 @@ function runToolsTransformation({
   });
 }
 
-// shared/stream-parts.ts
-var textStreamPart = {
-  code: "0",
-  name: "text",
-  parse: (value) => {
-    if (typeof value !== "string") {
-      throw new Error('"text" parts expect a string value.');
-    }
-    return { type: "text", value };
-  }
-};
-var functionCallStreamPart = {
-  code: "1",
-  name: "function_call",
-  parse: (value) => {
-    if (value == null || typeof value !== "object" || !("function_call" in value) || typeof value.function_call !== "object" || value.function_call == null || !("name" in value.function_call) || !("arguments" in value.function_call) || typeof value.function_call.name !== "string" || typeof value.function_call.arguments !== "string") {
-      throw new Error(
-        '"function_call" parts expect an object with a "function_call" property.'
-      );
-    }
-    return {
-      type: "function_call",
-      value
-    };
-  }
-};
-var dataStreamPart = {
-  code: "2",
-  name: "data",
-  parse: (value) => {
-    if (!Array.isArray(value)) {
-      throw new Error('"data" parts expect an array value.');
-    }
-    return { type: "data", value };
-  }
-};
-var errorStreamPart = {
-  code: "3",
-  name: "error",
-  parse: (value) => {
-    if (typeof value !== "string") {
-      throw new Error('"error" parts expect a string value.');
-    }
-    return { type: "error", value };
-  }
-};
-var assistantMessageStreamPart = {
-  code: "4",
-  name: "assistant_message",
-  parse: (value) => {
-    if (value == null || typeof value !== "object" || !("id" in value) || !("role" in value) || !("content" in value) || typeof value.id !== "string" || typeof value.role !== "string" || value.role !== "assistant" || !Array.isArray(value.content) || !value.content.every(
-      (item) => item != null && typeof item === "object" && "type" in item && item.type === "text" && "text" in item && item.text != null && typeof item.text === "object" && "value" in item.text && typeof item.text.value === "string"
-    )) {
-      throw new Error(
-        '"assistant_message" parts expect an object with an "id", "role", and "content" property.'
-      );
-    }
-    return {
-      type: "assistant_message",
-      value
-    };
-  }
-};
-var assistantControlDataStreamPart = {
-  code: "5",
-  name: "assistant_control_data",
-  parse: (value) => {
-    if (value == null || typeof value !== "object" || !("threadId" in value) || !("messageId" in value) || typeof value.threadId !== "string" || typeof value.messageId !== "string") {
-      throw new Error(
-        '"assistant_control_data" parts expect an object with a "threadId" and "messageId" property.'
-      );
-    }
-    return {
-      type: "assistant_control_data",
-      value: {
-        threadId: value.threadId,
-        messageId: value.messageId
-      }
-    };
-  }
-};
-var dataMessageStreamPart = {
-  code: "6",
-  name: "data_message",
-  parse: (value) => {
-    if (value == null || typeof value !== "object" || !("role" in value) || !("data" in value) || typeof value.role !== "string" || value.role !== "data") {
-      throw new Error(
-        '"data_message" parts expect an object with a "role" and "data" property.'
-      );
-    }
-    return {
-      type: "data_message",
-      value
-    };
-  }
-};
-var toolCallStreamPart = {
-  code: "7",
-  name: "tool_calls",
-  parse: (value) => {
-    if (value == null || typeof value !== "object" || !("tool_calls" in value) || typeof value.tool_calls !== "object" || value.tool_calls == null || !Array.isArray(value.tool_calls) || value.tool_calls.some((tc) => {
-      tc == null || typeof tc !== "object" || !("id" in tc) || typeof tc.id !== "string" || !("type" in tc) || typeof tc.type !== "string" || !("function" in tc) || tc.function == null || typeof tc.function !== "object" || !("arguments" in tc.function) || typeof tc.function.name !== "string" || typeof tc.function.arguments !== "string";
-    })) {
-      throw new Error(
-        '"tool_calls" parts expect an object with a ToolCallPayload.'
-      );
-    }
-    return {
-      type: "tool_calls",
-      value
-    };
-  }
-};
-var messageAnnotationsStreamPart = {
-  code: "8",
-  name: "message_annotations",
-  parse: (value) => {
-    if (!Array.isArray(value)) {
-      throw new Error('"message_annotations" parts expect an array value.');
-    }
-    return { type: "message_annotations", value };
-  }
-};
-var streamParts = [
-  textStreamPart,
-  functionCallStreamPart,
-  dataStreamPart,
-  errorStreamPart,
-  assistantMessageStreamPart,
-  assistantControlDataStreamPart,
-  dataMessageStreamPart,
-  toolCallStreamPart,
-  messageAnnotationsStreamPart
-];
-var streamPartsByCode = {
-  [textStreamPart.code]: textStreamPart,
-  [functionCallStreamPart.code]: functionCallStreamPart,
-  [dataStreamPart.code]: dataStreamPart,
-  [errorStreamPart.code]: errorStreamPart,
-  [assistantMessageStreamPart.code]: assistantMessageStreamPart,
-  [assistantControlDataStreamPart.code]: assistantControlDataStreamPart,
-  [dataMessageStreamPart.code]: dataMessageStreamPart,
-  [toolCallStreamPart.code]: toolCallStreamPart,
-  [messageAnnotationsStreamPart.code]: messageAnnotationsStreamPart
-};
-var StreamStringPrefixes = {
-  [textStreamPart.name]: textStreamPart.code,
-  [functionCallStreamPart.name]: functionCallStreamPart.code,
-  [dataStreamPart.name]: dataStreamPart.code,
-  [errorStreamPart.name]: errorStreamPart.code,
-  [assistantMessageStreamPart.name]: assistantMessageStreamPart.code,
-  [assistantControlDataStreamPart.name]: assistantControlDataStreamPart.code,
-  [dataMessageStreamPart.name]: dataMessageStreamPart.code,
-  [toolCallStreamPart.name]: toolCallStreamPart.code,
-  [messageAnnotationsStreamPart.name]: messageAnnotationsStreamPart.code
-};
-var validCodes = streamParts.map((part) => part.code);
-function formatStreamPart(type, value) {
-  const streamPart = streamParts.find((part) => part.name === type);
-  if (!streamPart) {
-    throw new Error(`Invalid stream part type: ${type}`);
-  }
-  return `${streamPart.code}:${JSON.stringify(value)}
-`;
-}
-
-// shared/utils.ts
-var import_non_secure = require("nanoid/non-secure");
-var nanoid2 = (0, import_non_secure.customAlphabet)(
-  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  7
-);
-var COMPLEX_HEADER = "X-Experimental-Stream-Data";
-
-// core/generate-text/stream-text-http-response.ts
-var StreamTextHttpResponse = class extends Response {
-  constructor(messageStream) {
-    super(
-      messageStream.pipeThrough(
-        new TransformStream({
-          transform(chunk, controller) {
-            var _a;
-            switch (chunk.type) {
-              case "error": {
-                break;
-              }
-              case "text-delta": {
-                controller.enqueue(formatStreamPart("text", chunk.textDelta));
-                break;
-              }
-              case "tool-call": {
-                controller.enqueue(
-                  formatStreamPart("tool_calls", {
-                    tool_calls: [
-                      {
-                        type: "function",
-                        id: (_a = chunk.toolCallId) != null ? _a : "",
-                        // TODO client need to support null id
-                        function: {
-                          name: chunk.toolName,
-                          arguments: JSON.stringify(chunk.args)
-                        }
-                      }
-                    ]
-                  })
-                );
-                break;
-              }
-              case "tool-result": {
-                break;
-              }
-              default: {
-                const exhaustiveCheck = chunk;
-                throw new Error(
-                  `Unhandled stream part type: ${exhaustiveCheck}`
-                );
-              }
-            }
-          }
-        })
-      ),
-      {
-        status: 200,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8",
-          [COMPLEX_HEADER]: "true"
-        }
-      }
-    );
-  }
-};
-
 // core/generate-text/stream-text.ts
 async function streamText({
   model,
@@ -1518,26 +1424,32 @@ async function streamText({
   system,
   prompt,
   messages,
+  maxRetries,
+  abortSignal,
   ...settings
 }) {
-  const { stream, warnings } = await model.doStream({
-    mode: {
-      type: "regular",
-      tools: tools == null ? void 0 : Object.entries(tools).map(([name, tool2]) => ({
-        type: "function",
-        name,
-        description: tool2.description,
-        parameters: (0, import_zod_to_json_schema4.default)(tool2.parameters)
-      }))
-    },
-    ...validateCallSettings(settings),
-    inputFormat: getInputFormat({ prompt, messages }),
-    prompt: convertToLanguageModelPrompt({
-      system,
-      prompt,
-      messages
+  const retry = retryWithExponentialBackoff({ maxRetries });
+  const { stream, warnings } = await retry(
+    () => model.doStream({
+      mode: {
+        type: "regular",
+        tools: tools == null ? void 0 : Object.entries(tools).map(([name, tool2]) => ({
+          type: "function",
+          name,
+          description: tool2.description,
+          parameters: (0, import_zod_to_json_schema4.default)(tool2.parameters)
+        }))
+      },
+      ...validateCallSettings(settings),
+      inputFormat: getInputFormat({ prompt, messages }),
+      prompt: convertToLanguageModelPrompt({
+        system,
+        prompt,
+        messages
+      }),
+      abortSignal
     })
-  });
+  );
   const toolStream = runToolsTransformation({
     tools,
     generatorStream: stream
@@ -1593,9 +1505,6 @@ var StreamTextResult = class {
       }
     };
   }
-  toResponse() {
-    return new StreamTextHttpResponse(this.rootStream);
-  }
 };
 
 // core/tool/tool.ts
@@ -1607,7 +1516,6 @@ function tool(tool2) {
   GenerateObjectResult,
   GenerateTextResult,
   StreamObjectResult,
-  StreamTextHttpResponse,
   StreamTextResult,
   convertDataContentToBase64String,
   convertDataContentToUint8Array,