ai 3.0.15 → 3.0.17

package/dist/index.d.mts

@@ -536,7 +536,9 @@ Generate a structured, typed object for a given prompt and schema using a langua
 This function does not stream the output. If you want to stream the output, use `experimental_streamObject` instead.
 
 @param model - The language model to use.
+
 @param schema - The schema of the object that the model should generate.
+@param mode - The mode to use for object generation. Not all models support all modes. Defaults to 'auto'.
 
 @param system - A system message that will be part of the prompt.
 @param prompt - A simple text prompt. You can either use `prompt` or `messages` but not both.
@@ -634,7 +636,9 @@ Generate a structured, typed object for a given prompt and schema using a langua
 This function streams the output. If you do not want to stream the output, use `experimental_generateObject` instead.
 
 @param model - The language model to use.
+
 @param schema - The schema of the object that the model should generate.
+@param mode - The mode to use for object generation. Not all models support all modes. Defaults to 'auto'.
 
 @param system - A system message that will be part of the prompt.
 @param prompt - A simple text prompt. You can either use `prompt` or `messages` but not both.

package/dist/index.d.ts

@@ -536,7 +536,9 @@ Generate a structured, typed object for a given prompt and schema using a langua
 This function does not stream the output. If you want to stream the output, use `experimental_streamObject` instead.
 
 @param model - The language model to use.
+
 @param schema - The schema of the object that the model should generate.
+@param mode - The mode to use for object generation. Not all models support all modes. Defaults to 'auto'.
 
 @param system - A system message that will be part of the prompt.
 @param prompt - A simple text prompt. You can either use `prompt` or `messages` but not both.
@@ -634,7 +636,9 @@ Generate a structured, typed object for a given prompt and schema using a langua
 This function streams the output. If you do not want to stream the output, use `experimental_generateObject` instead.
 
 @param model - The language model to use.
+
 @param schema - The schema of the object that the model should generate.
+@param mode - The mode to use for object generation. Not all models support all modes. Defaults to 'auto'.
 
 @param system - A system message that will be part of the prompt.
 @param prompt - A simple text prompt. You can either use `prompt` or `messages` but not both.

package/dist/index.js

@@ -170,6 +170,26 @@ var InvalidDataContentError = class extends Error {
   }
 };
 
+// spec/errors/invalid-prompt-error.ts
+var InvalidPromptError = class extends Error {
+  constructor({ prompt: prompt2, message }) {
+    super(`Invalid prompt: ${message}`);
+    this.name = "AI_InvalidPromptError";
+    this.prompt = prompt2;
+  }
+  static isInvalidPromptError(error) {
+    return error instanceof Error && error.name === "AI_InvalidPromptError" && prompt != null;
+  }
+  toJSON() {
+    return {
+      name: this.name,
+      message: this.message,
+      stack: this.stack,
+      prompt: this.prompt
+    };
+  }
+};
+
 // spec/util/get-error-message.ts
 function getErrorMessage(error) {
   if (error == null) {
@@ -431,89 +451,101 @@ function convertDataContentToUint8Array(content) {
 }
 
 // core/prompt/convert-to-language-model-prompt.ts
-function convertToLanguageModelPrompt({
-  system,
-  prompt,
-  messages
-}) {
-  if (prompt == null && messages == null) {
-    throw new Error("prompt or messages must be defined");
-  }
-  if (prompt != null && messages != null) {
-    throw new Error("prompt and messages cannot be defined at the same time");
-  }
+function convertToLanguageModelPrompt(prompt2) {
   const languageModelMessages = [];
-  if (system != null) {
-    languageModelMessages.push({ role: "system", content: system });
-  }
-  if (typeof prompt === "string") {
-    languageModelMessages.push({
-      role: "user",
-      content: [{ type: "text", text: prompt }]
-    });
-  } else {
-    messages = messages;
-    languageModelMessages.push(
-      ...messages.map((message) => {
-        switch (message.role) {
-          case "user": {
-            if (typeof message.content === "string") {
+  if (prompt2.system != null) {
+    languageModelMessages.push({ role: "system", content: prompt2.system });
+  }
+  switch (prompt2.type) {
+    case "prompt": {
+      languageModelMessages.push({
+        role: "user",
+        content: [{ type: "text", text: prompt2.prompt }]
+      });
+      break;
+    }
+    case "messages": {
+      languageModelMessages.push(
+        ...prompt2.messages.map((message) => {
+          switch (message.role) {
+            case "user": {
+              if (typeof message.content === "string") {
+                return {
+                  role: "user",
+                  content: [{ type: "text", text: message.content }]
+                };
+              }
               return {
                 role: "user",
-                content: [{ type: "text", text: message.content }]
-              };
-            }
-            return {
-              role: "user",
-              content: message.content.map(
-                (part) => {
-                  switch (part.type) {
-                    case "text": {
-                      return part;
-                    }
-                    case "image": {
-                      return {
-                        type: "image",
-                        image: part.image instanceof URL ? part.image : convertDataContentToUint8Array(part.image),
-                        mimeType: part.mimeType
-                      };
+                content: message.content.map(
+                  (part) => {
+                    switch (part.type) {
+                      case "text": {
+                        return part;
+                      }
+                      case "image": {
+                        return {
+                          type: "image",
+                          image: part.image instanceof URL ? part.image : convertDataContentToUint8Array(part.image),
+                          mimeType: part.mimeType
+                        };
+                      }
                     }
                   }
-                }
-              )
-            };
-          }
-          case "assistant": {
-            if (typeof message.content === "string") {
-              return {
-                role: "assistant",
-                content: [{ type: "text", text: message.content }]
+                )
               };
             }
-            return { role: "assistant", content: message.content };
-          }
-          case "tool": {
-            return message;
+            case "assistant": {
+              if (typeof message.content === "string") {
+                return {
+                  role: "assistant",
+                  content: [{ type: "text", text: message.content }]
+                };
+              }
+              return { role: "assistant", content: message.content };
+            }
+            case "tool": {
+              return message;
+            }
           }
-        }
-      })
-    );
+        })
+      );
+      break;
+    }
+    default: {
+      const _exhaustiveCheck = prompt2;
+      throw new Error(`Unsupported prompt type: ${_exhaustiveCheck}`);
+    }
   }
   return languageModelMessages;
 }
 
-// core/prompt/get-input-format.ts
-function getInputFormat({
-  prompt,
-  messages
-}) {
-  if (prompt == null && messages == null) {
-    throw new Error("prompt or messages must be defined");
+// core/prompt/get-validated-prompt.ts
+function getValidatedPrompt(prompt2) {
+  if (prompt2.prompt == null && prompt2.messages == null) {
+    throw new InvalidPromptError({
+      prompt: prompt2,
+      message: "prompt or messages must be defined"
+    });
   }
-  if (prompt != null && messages != null) {
-    throw new Error("prompt and messages cannot be defined at the same time");
+  if (prompt2.prompt != null && prompt2.messages != null) {
+    throw new InvalidPromptError({
+      prompt: prompt2,
+      message: "prompt and messages cannot be defined at the same time"
+    });
   }
-  return prompt != null ? "prompt" : "messages";
+  return prompt2.prompt != null ? {
+    type: "prompt",
+    prompt: prompt2.prompt,
+    messages: void 0,
+    system: prompt2.system
+  } : {
+    type: "messages",
+    prompt: void 0,
+    messages: prompt2.messages,
+    // only possible case bc of checks above
+    system: prompt2.system
+  };
 }
 
 // core/prompt/prepare-call-settings.ts
@@ -725,7 +757,7 @@ async function experimental_generateObject({
   schema,
   mode,
   system,
-  prompt,
+  prompt: prompt2,
   messages,
   maxRetries,
   abortSignal,
@@ -743,19 +775,20 @@ async function experimental_generateObject({
   let warnings;
   switch (mode) {
     case "json": {
-      const generateResult = await retry(
-        () => model.doGenerate({
+      const validatedPrompt = getValidatedPrompt({
+        system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+        prompt: prompt2,
+        messages
+      });
+      const generateResult = await retry(() => {
+        return model.doGenerate({
           mode: { type: "object-json" },
           ...prepareCallSettings(settings),
-          inputFormat: getInputFormat({ prompt, messages }),
-          prompt: convertToLanguageModelPrompt({
-            system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-            prompt,
-            messages
-          }),
+          inputFormat: validatedPrompt.type,
+          prompt: convertToLanguageModelPrompt(validatedPrompt),
           abortSignal
-        })
-      );
+        });
+      });
       if (generateResult.text === void 0) {
         throw new NoTextGeneratedError();
       }
@@ -766,16 +799,17 @@ async function experimental_generateObject({
       break;
     }
     case "grammar": {
+      const validatedPrompt = getValidatedPrompt({
+        system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+        prompt: prompt2,
+        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
-          }),
+          inputFormat: validatedPrompt.type,
+          prompt: convertToLanguageModelPrompt(validatedPrompt),
           abortSignal
         })
       );
@@ -789,6 +823,11 @@ async function experimental_generateObject({
       break;
     }
     case "tool": {
+      const validatedPrompt = getValidatedPrompt({
+        system,
+        prompt: prompt2,
+        messages
+      });
       const generateResult = await retry(
         () => model.doGenerate({
           mode: {
@@ -801,8 +840,8 @@ async function experimental_generateObject({
             }
           },
           ...settings,
-          inputFormat: getInputFormat({ prompt, messages }),
-          prompt: convertToLanguageModelPrompt({ system, prompt, messages }),
+          inputFormat: validatedPrompt.type,
+          prompt: convertToLanguageModelPrompt(validatedPrompt),
           abortSignal
         })
       );
@@ -1242,7 +1281,7 @@ async function experimental_streamObject({
   schema,
   mode,
   system,
-  prompt,
+  prompt: prompt2,
   messages,
   maxRetries,
   abortSignal,
@@ -1257,15 +1296,16 @@ async function experimental_streamObject({
   let transformer;
   switch (mode) {
     case "json": {
+      const validatedPrompt = getValidatedPrompt({
+        system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+        prompt: prompt2,
+        messages
+      });
       callOptions = {
         mode: { type: "object-json" },
         ...prepareCallSettings(settings),
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
-        }),
+        inputFormat: validatedPrompt.type,
+        prompt: convertToLanguageModelPrompt(validatedPrompt),
         abortSignal
       };
       transformer = {
@@ -1283,15 +1323,16 @@ async function experimental_streamObject({
       break;
     }
     case "grammar": {
+      const validatedPrompt = getValidatedPrompt({
+        system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
+        prompt: prompt2,
+        messages
+      });
       callOptions = {
         mode: { type: "object-grammar", schema: jsonSchema },
         ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({
-          system: injectJsonSchemaIntoSystem({ system, schema: jsonSchema }),
-          prompt,
-          messages
-        }),
+        inputFormat: validatedPrompt.type,
+        prompt: convertToLanguageModelPrompt(validatedPrompt),
         abortSignal
       };
       transformer = {
@@ -1309,6 +1350,11 @@ async function experimental_streamObject({
       break;
     }
     case "tool": {
+      const validatedPrompt = getValidatedPrompt({
+        system,
+        prompt: prompt2,
+        messages
+      });
       callOptions = {
         mode: {
           type: "object-tool",
@@ -1320,8 +1366,8 @@ async function experimental_streamObject({
           }
         },
         ...settings,
-        inputFormat: getInputFormat({ prompt, messages }),
-        prompt: convertToLanguageModelPrompt({ system, prompt, messages }),
+        inputFormat: validatedPrompt.type,
+        prompt: convertToLanguageModelPrompt(validatedPrompt),
         abortSignal
       };
       transformer = {
@@ -1428,7 +1474,7 @@ async function experimental_generateText({
   model,
   tools,
   system,
-  prompt,
+  prompt: prompt2,
   messages,
   maxRetries,
   abortSignal,
@@ -1436,8 +1482,9 @@ async function experimental_generateText({
 }) {
   var _a, _b;
   const retry = retryWithExponentialBackoff({ maxRetries });
-  const modelResponse = await retry(
-    () => model.doGenerate({
+  const validatedPrompt = getValidatedPrompt({ system, prompt: prompt2, messages });
+  const modelResponse = await retry(() => {
+    return model.doGenerate({
       mode: {
         type: "regular",
         tools: tools == null ? void 0 : Object.entries(tools).map(([name, tool2]) => ({
@@ -1448,15 +1495,11 @@ async function experimental_generateText({
         }))
       },
       ...prepareCallSettings(settings),
-      inputFormat: getInputFormat({ prompt, messages }),
-      prompt: convertToLanguageModelPrompt({
-        system,
-        prompt,
-        messages
-      }),
+      inputFormat: validatedPrompt.type,
+      prompt: convertToLanguageModelPrompt(validatedPrompt),
       abortSignal
-    })
-  );
+    });
+  });
   const toolCalls = [];
   for (const modelToolCall of (_a = modelResponse.toolCalls) != null ? _a : []) {
     toolCalls.push(parseToolCall({ toolCall: modelToolCall, tools }));
@@ -1665,13 +1708,14 @@ async function experimental_streamText({
   model,
   tools,
   system,
-  prompt,
+  prompt: prompt2,
   messages,
   maxRetries,
   abortSignal,
   ...settings
 }) {
   const retry = retryWithExponentialBackoff({ maxRetries });
+  const validatedPrompt = getValidatedPrompt({ system, prompt: prompt2, messages });
   const { stream, warnings } = await retry(
     () => model.doStream({
       mode: {
@@ -1684,12 +1728,8 @@ async function experimental_streamText({
         }))
       },
       ...prepareCallSettings(settings),
-      inputFormat: getInputFormat({ prompt, messages }),
-      prompt: convertToLanguageModelPrompt({
-        system,
-        prompt,
-        messages
-      }),
+      inputFormat: validatedPrompt.type,
+      prompt: convertToLanguageModelPrompt(validatedPrompt),
       abortSignal
     })
   );