ai 5.0.0-canary.13 → 5.0.0-canary.14

package/dist/index.js

@@ -2215,8 +2215,8 @@ async function embedMany({
     }),
     tracer,
     fn: async (span) => {
-      const maxEmbeddingsPerCall = model.maxEmbeddingsPerCall;
-      if (maxEmbeddingsPerCall == null) {
+      const maxEmbeddingsPerCall = await model.maxEmbeddingsPerCall;
+      if (maxEmbeddingsPerCall == null || maxEmbeddingsPerCall === Infinity) {
         const { embeddings: embeddings2, usage, response } = await retry(() => {
           return recordSpan({
             name: "ai.embedMany.doEmbed",
@@ -3705,7 +3705,6 @@ async function standardizePrompt({
       });
     }
     return {
-      type: "prompt",
       system: prompt.system,
       messages: [
         {
@@ -3744,7 +3743,6 @@ async function standardizePrompt({
       });
     }
     return {
-      type: "messages",
       messages,
       system: prompt.system
     };
@@ -4140,29 +4138,31 @@ function validateObjectGenerationInput({
 
 // core/generate-object/generate-object.ts
 var originalGenerateId = (0, import_provider_utils13.createIdGenerator)({ prefix: "aiobj", size: 24 });
-async function generateObject({
-  model,
-  enum: enumValues,
-  // rename bc enum is reserved by typescript
-  schema: inputSchema,
-  schemaName,
-  schemaDescription,
-  output = "object",
-  system,
-  prompt,
-  messages,
-  maxRetries: maxRetriesArg,
-  abortSignal,
-  headers,
-  experimental_repairText: repairText,
-  experimental_telemetry: telemetry,
-  providerOptions,
-  _internal: {
-    generateId: generateId3 = originalGenerateId,
-    currentDate = () => /* @__PURE__ */ new Date()
-  } = {},
-  ...settings
-}) {
+async function generateObject(options) {
+  const {
+    model,
+    output = "object",
+    system,
+    prompt,
+    messages,
+    maxRetries: maxRetriesArg,
+    abortSignal,
+    headers,
+    experimental_repairText: repairText,
+    experimental_telemetry: telemetry,
+    providerOptions,
+    _internal: {
+      generateId: generateId3 = originalGenerateId,
+      currentDate = () => /* @__PURE__ */ new Date()
+    } = {},
+    ...settings
+  } = options;
+  const enumValues = "enum" in options ? options.enum : void 0;
+  const {
+    schema: inputSchema,
+    schemaDescription,
+    schemaName
+  } = "schema" in options ? options : {};
   validateObjectGenerationInput({
     output,
     schema: inputSchema,
@@ -4233,9 +4233,6 @@ async function generateObject({
                 telemetry
               }),
               ...baseTelemetryAttributes,
-              "ai.prompt.format": {
-                input: () => standardizedPrompt.type
-              },
               "ai.prompt.messages": {
                 input: () => JSON.stringify(promptMessages)
               },
@@ -4261,7 +4258,6 @@ async function generateObject({
                 description: schemaDescription
               },
               ...prepareCallSettings(settings),
-              inputFormat: standardizedPrompt.type,
               prompt: promptMessages,
               providerOptions,
               abortSignal,
@@ -4557,29 +4553,32 @@ function now() {
 
 // core/generate-object/stream-object.ts
 var originalGenerateId2 = (0, import_provider_utils14.createIdGenerator)({ prefix: "aiobj", size: 24 });
-function streamObject({
-  model,
-  schema: inputSchema,
-  schemaName,
-  schemaDescription,
-  output = "object",
-  system,
-  prompt,
-  messages,
-  maxRetries,
-  abortSignal,
-  headers,
-  experimental_telemetry: telemetry,
-  providerOptions,
-  onError,
-  onFinish,
-  _internal: {
-    generateId: generateId3 = originalGenerateId2,
-    currentDate = () => /* @__PURE__ */ new Date(),
-    now: now2 = now
-  } = {},
-  ...settings
-}) {
+function streamObject(options) {
+  const {
+    model,
+    output = "object",
+    system,
+    prompt,
+    messages,
+    maxRetries,
+    abortSignal,
+    headers,
+    experimental_telemetry: telemetry,
+    providerOptions,
+    onError,
+    onFinish,
+    _internal: {
+      generateId: generateId3 = originalGenerateId2,
+      currentDate = () => /* @__PURE__ */ new Date(),
+      now: now2 = now
+    } = {},
+    ...settings
+  } = options;
+  const {
+    schema: inputSchema,
+    schemaDescription,
+    schemaName
+  } = "schema" in options ? options : {};
   validateObjectGenerationInput({
     output,
     schema: inputSchema,
@@ -4692,7 +4691,6 @@ var DefaultStreamObjectResult = class {
             description: schemaDescription
           },
           ...prepareCallSettings(settings),
-          inputFormat: standardizedPrompt.type,
           prompt: await convertToLanguageModelPrompt({
             prompt: standardizedPrompt,
             supportedUrls: await model.getSupportedUrls()
@@ -4730,9 +4728,6 @@ var DefaultStreamObjectResult = class {
                   telemetry
                 }),
                 ...baseTelemetryAttributes,
-                "ai.prompt.format": {
-                  input: () => callOptions.inputFormat
-                },
                 "ai.prompt.messages": {
                   input: () => JSON.stringify(callOptions.prompt)
                 },
@@ -5408,6 +5403,7 @@ async function generateText({
   experimental_telemetry: telemetry,
   providerOptions,
   experimental_activeTools: activeTools,
+  experimental_prepareStep: prepareStep,
   experimental_repairToolCall: repairToolCall,
   _internal: {
     generateId: generateId3 = originalGenerateId3,
@@ -5446,6 +5442,9 @@ async function generateText({
           telemetry
         }),
         ...baseTelemetryAttributes,
+        // model:
+        "ai.model.provider": model.provider,
+        "ai.model.id": model.modelId,
         // specific settings that only make sense on the outer level:
         "ai.prompt": {
           input: () => JSON.stringify({ system, prompt, messages })
@@ -5455,10 +5454,8 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a17, _b, _c;
-      const toolsAndToolChoice = {
-        ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
-      };
+      var _a17, _b, _c, _d, _e, _f;
+      const callSettings2 = prepareCallSettings(settings);
       let currentModelResponse;
       let currentToolCalls = [];
       let currentToolResults = [];
@@ -5475,19 +5472,29 @@ async function generateText({
       };
       let stepType = "initial";
       do {
-        const promptFormat = stepCount === 0 ? initialPrompt.type : "messages";
         const stepInputMessages = [
           ...initialPrompt.messages,
           ...responseMessages
         ];
+        const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
+          model,
+          steps,
+          maxSteps,
+          stepNumber: stepCount
+        }));
         const promptMessages = await convertToLanguageModelPrompt({
           prompt: {
-            type: promptFormat,
             system: initialPrompt.system,
             messages: stepInputMessages
           },
           supportedUrls: await model.getSupportedUrls()
         });
+        const stepModel = (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a17 : model;
+        const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
+          tools,
+          toolChoice: (_b = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b : toolChoice,
+          activeTools: (_c = prepareStepResult == null ? void 0 : prepareStepResult.experimental_activeTools) != null ? _c : activeTools
+        });
         currentModelResponse = await retry(
           () => {
             var _a18;
@@ -5501,23 +5508,23 @@ async function generateText({
                     telemetry
                   }),
                   ...baseTelemetryAttributes,
-                  "ai.prompt.format": { input: () => promptFormat },
+                  // model:
+                  "ai.model.provider": stepModel.provider,
+                  "ai.model.id": stepModel.modelId,
+                  // prompt:
                   "ai.prompt.messages": {
                     input: () => JSON.stringify(promptMessages)
                   },
                   "ai.prompt.tools": {
                     // convert the language model level tools:
-                    input: () => {
-                      var _a19;
-                      return (_a19 = toolsAndToolChoice.tools) == null ? void 0 : _a19.map((tool2) => JSON.stringify(tool2));
-                    }
+                    input: () => stepTools == null ? void 0 : stepTools.map((tool2) => JSON.stringify(tool2))
                   },
                   "ai.prompt.toolChoice": {
-                    input: () => toolsAndToolChoice.toolChoice != null ? JSON.stringify(toolsAndToolChoice.toolChoice) : void 0
+                    input: () => stepToolChoice != null ? JSON.stringify(stepToolChoice) : void 0
                   },
                   // standardized gen-ai llm span attributes:
-                  "gen_ai.system": model.provider,
-                  "gen_ai.request.model": model.modelId,
+                  "gen_ai.system": stepModel.provider,
+                  "gen_ai.request.model": stepModel.modelId,
                   "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
                   "gen_ai.request.max_tokens": settings.maxOutputTokens,
                   "gen_ai.request.presence_penalty": settings.presencePenalty,
@@ -5529,11 +5536,11 @@ async function generateText({
               }),
               tracer,
               fn: async (span2) => {
-                var _a19, _b2, _c2, _d, _e, _f, _g, _h;
-                const result = await model.doGenerate({
-                  ...callSettings,
-                  ...toolsAndToolChoice,
-                  inputFormat: promptFormat,
+                var _a19, _b2, _c2, _d2, _e2, _f2, _g, _h;
+                const result = await stepModel.doGenerate({
+                  ...callSettings2,
+                  tools: stepTools,
+                  toolChoice: stepToolChoice,
                   responseFormat: output == null ? void 0 : output.responseFormat,
                   prompt: promptMessages,
                   providerOptions,
@@ -5542,8 +5549,8 @@ async function generateText({
                 });
                 const responseData = {
                   id: (_b2 = (_a19 = result.response) == null ? void 0 : _a19.id) != null ? _b2 : generateId3(),
-                  timestamp: (_d = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d : currentDate(),
-                  modelId: (_f = (_e = result.response) == null ? void 0 : _e.modelId) != null ? _f : model.modelId,
+                  timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
+                  modelId: (_f2 = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f2 : stepModel.modelId,
                   headers: (_g = result.response) == null ? void 0 : _g.headers,
                   body: (_h = result.response) == null ? void 0 : _h.body
                 };
@@ -5619,7 +5626,7 @@ async function generateText({
             nextStepType = "tool-result";
           }
         }
-        const originalText = (_a17 = extractContentText(currentModelResponse.content)) != null ? _a17 : "";
+        const originalText = (_d = extractContentText(currentModelResponse.content)) != null ? _d : "";
         const stepTextLeadingWhitespaceTrimmed = stepType === "continue" && // only for continue steps
         text2.trimEnd() !== text2 ? originalText.trimStart() : originalText;
         const stepText = nextStepType === "continue" ? removeTextAfterLastWhitespace(stepTextLeadingWhitespaceTrimmed) : stepTextLeadingWhitespaceTrimmed;
@@ -5672,7 +5679,7 @@ async function generateText({
           finishReason: currentModelResponse.finishReason,
           usage: currentUsage,
           warnings: currentModelResponse.warnings,
-          request: (_b = currentModelResponse.request) != null ? _b : {},
+          request: (_e = currentModelResponse.request) != null ? _e : {},
           response: {
             ...currentModelResponse.response,
             // deep clone msgs to avoid mutating past messages in multi-step:
@@ -5725,7 +5732,7 @@ async function generateText({
         finishReason: currentModelResponse.finishReason,
         usage,
         warnings: currentModelResponse.warnings,
-        request: (_c = currentModelResponse.request) != null ? _c : {},
+        request: (_f = currentModelResponse.request) != null ? _f : {},
         response: {
           ...currentModelResponse.response,
           messages: responseMessages
@@ -6795,14 +6802,12 @@ var DefaultStreamTextResult = class {
             prompt: { system, prompt, messages },
             tools
           });
-          const promptFormat = responseMessages.length === 0 ? initialPrompt.type : "messages";
           const stepInputMessages = [
             ...initialPrompt.messages,
             ...responseMessages
           ];
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
-              type: promptFormat,
               system: initialPrompt.system,
               messages: stepInputMessages
             },
@@ -6826,9 +6831,6 @@ var DefaultStreamTextResult = class {
                     telemetry
                   }),
                   ...baseTelemetryAttributes,
-                  "ai.prompt.format": {
-                    input: () => promptFormat
-                  },
                   "ai.prompt.messages": {
                     input: () => JSON.stringify(promptMessages)
                   },
@@ -6866,7 +6868,6 @@ var DefaultStreamTextResult = class {
                   result: await model.doStream({
                     ...callSettings,
                     ...toolsAndToolChoice,
-                    inputFormat: promptFormat,
                     responseFormat: output == null ? void 0 : output.responseFormat,
                     prompt: promptMessages,
                     providerOptions,