ai 5.0.0-alpha.5 → 5.0.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/index.d.mts +18 -19
- package/dist/index.d.ts +18 -19
- package/dist/index.js +32 -19
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +38 -21
- package/dist/index.mjs.map +1 -1
- package/package.json +4 -3
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
# ai
|
2
2
|
|
3
|
+
## 5.0.0-alpha.6
|
4
|
+
|
5
|
+
### Patch Changes
|
6
|
+
|
7
|
+
- 0d2c085: feat (ai): support string model ids through gateway
|
8
|
+
- 48a7606: feat (ai): support changing the system prompt in prepareSteps
|
9
|
+
- Updated dependencies [0d2c085]
|
10
|
+
- Updated dependencies [6c2c708]
|
11
|
+
- @ai-sdk/provider@2.0.0-alpha.6
|
12
|
+
- @ai-sdk/gateway@1.0.0-alpha.6
|
13
|
+
- @ai-sdk/provider-utils@3.0.0-alpha.6
|
14
|
+
|
3
15
|
## 5.0.0-alpha.5
|
4
16
|
|
5
17
|
### Major Changes
|
package/dist/index.d.mts
CHANGED
@@ -2,6 +2,7 @@ import { ToolResultContent, Schema, ToolCall, ToolResult, IdGenerator, FetchFunc
|
|
2
2
|
export { IdGenerator, Schema, ToolCall, ToolResult, asSchema, createIdGenerator, generateId, jsonSchema } from '@ai-sdk/provider-utils';
|
3
3
|
import { AISDKError, SharedV2ProviderMetadata, SharedV2ProviderOptions, EmbeddingModelV2, EmbeddingModelV2Embedding, ImageModelV2, ImageModelV2CallWarning, ImageModelV2ProviderMetadata, JSONValue as JSONValue$1, LanguageModelV2, LanguageModelV2FinishReason, LanguageModelV2CallWarning, LanguageModelV2Source, SpeechModelV1, SpeechModelV1CallWarning, TranscriptionModelV1, TranscriptionModelV1CallWarning, LanguageModelV2Usage, JSONObject, LanguageModelV2ToolCall, JSONSchema7, LanguageModelV2CallOptions, JSONParseError, TypeValidationError, LanguageModelV2Middleware, ProviderV2, NoSuchModelError } from '@ai-sdk/provider';
|
4
4
|
export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, NoContentGeneratedError, NoSuchModelError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
|
5
|
+
import { GatewayModelId } from '@ai-sdk/gateway';
|
5
6
|
import { z } from 'zod';
|
6
7
|
import { ServerResponse } from 'node:http';
|
7
8
|
import { AttributeValue, Tracer } from '@opentelemetry/api';
|
@@ -382,7 +383,7 @@ type JSONValue = JSONValue$1;
|
|
382
383
|
/**
|
383
384
|
Language model that is used by the AI SDK Core functions.
|
384
385
|
*/
|
385
|
-
type LanguageModel = LanguageModelV2;
|
386
|
+
type LanguageModel = GatewayModelId | LanguageModelV2;
|
386
387
|
/**
|
387
388
|
Reason why a language model finished generating a response.
|
388
389
|
|
@@ -2708,14 +2709,12 @@ type PrepareStepFunction<TOOLS extends Record<string, Tool> = Record<string, Too
|
|
2708
2709
|
steps: Array<StepResult<NoInfer<TOOLS>>>;
|
2709
2710
|
stepNumber: number;
|
2710
2711
|
model: LanguageModel;
|
2711
|
-
}) => PromiseLike<
|
2712
|
-
|
2713
|
-
toolChoice?: ToolChoice<NoInfer<TOOLS>>;
|
2714
|
-
activeTools?: Array<keyof NoInfer<TOOLS>>;
|
2715
|
-
} | undefined> | {
|
2712
|
+
}) => PromiseLike<PrepareStepResult<TOOLS>> | PrepareStepResult<TOOLS>;
|
2713
|
+
type PrepareStepResult<TOOLS extends Record<string, Tool> = Record<string, Tool>> = {
|
2716
2714
|
model?: LanguageModel;
|
2717
2715
|
toolChoice?: ToolChoice<NoInfer<TOOLS>>;
|
2718
2716
|
activeTools?: Array<keyof NoInfer<TOOLS>>;
|
2717
|
+
system?: string;
|
2719
2718
|
} | undefined;
|
2720
2719
|
|
2721
2720
|
type StopCondition<TOOLS extends ToolSet> = (options: {
|
@@ -2776,7 +2775,7 @@ If set and supported by the model, calls will generate deterministic results.
|
|
2776
2775
|
@returns
|
2777
2776
|
A result object that contains the generated text, the results of the tool calls, and additional information.
|
2778
2777
|
*/
|
2779
|
-
declare function generateText<TOOLS extends ToolSet, OUTPUT = never, OUTPUT_PARTIAL = never>({ model, tools, toolChoice, system, prompt, messages, maxRetries: maxRetriesArg, abortSignal, headers, stopWhen, experimental_output: output, experimental_telemetry: telemetry, providerOptions, experimental_activeTools, activeTools, experimental_prepareStep, prepareStep, experimental_repairToolCall: repairToolCall, _internal: { generateId, currentDate, }, onStepFinish, ...settings }: CallSettings & Prompt & {
|
2778
|
+
declare function generateText<TOOLS extends ToolSet, OUTPUT = never, OUTPUT_PARTIAL = never>({ model: modelArg, tools, toolChoice, system, prompt, messages, maxRetries: maxRetriesArg, abortSignal, headers, stopWhen, experimental_output: output, experimental_telemetry: telemetry, providerOptions, experimental_activeTools, activeTools, experimental_prepareStep, prepareStep, experimental_repairToolCall: repairToolCall, _internal: { generateId, currentDate, }, onStepFinish, ...settings }: CallSettings & Prompt & {
|
2780
2779
|
/**
|
2781
2780
|
The language model to use.
|
2782
2781
|
*/
|
@@ -4162,15 +4161,15 @@ declare const wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, p
|
|
4162
4161
|
*
|
4163
4162
|
* @throws {NoSuchModelError} Throws when a requested model is not found and no fallback provider is available.
|
4164
4163
|
*/
|
4165
|
-
declare function customProvider<LANGUAGE_MODELS extends Record<string,
|
4164
|
+
declare function customProvider<LANGUAGE_MODELS extends Record<string, LanguageModelV2>, EMBEDDING_MODELS extends Record<string, EmbeddingModelV2<string>>, IMAGE_MODELS extends Record<string, ImageModelV2>>({ languageModels, textEmbeddingModels, imageModels, fallbackProvider, }: {
|
4166
4165
|
languageModels?: LANGUAGE_MODELS;
|
4167
4166
|
textEmbeddingModels?: EMBEDDING_MODELS;
|
4168
4167
|
imageModels?: IMAGE_MODELS;
|
4169
4168
|
fallbackProvider?: ProviderV2;
|
4170
|
-
}):
|
4171
|
-
languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>):
|
4172
|
-
textEmbeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>):
|
4173
|
-
imageModel(modelId: ExtractModelId<IMAGE_MODELS>):
|
4169
|
+
}): ProviderV2 & {
|
4170
|
+
languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>): LanguageModelV2;
|
4171
|
+
textEmbeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>): EmbeddingModelV2<string>;
|
4172
|
+
imageModel(modelId: ExtractModelId<IMAGE_MODELS>): ImageModelV2;
|
4174
4173
|
};
|
4175
4174
|
/**
|
4176
4175
|
* @deprecated Use `customProvider` instead.
|
@@ -4195,12 +4194,12 @@ declare class NoSuchProviderError extends NoSuchModelError {
|
|
4195
4194
|
|
4196
4195
|
type ExtractLiteralUnion<T> = T extends string ? string extends T ? never : T : never;
|
4197
4196
|
interface ProviderRegistryProvider<PROVIDERS extends Record<string, ProviderV2> = Record<string, ProviderV2>, SEPARATOR extends string = ':'> {
|
4198
|
-
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['languageModel']>>[0]>}` : never):
|
4199
|
-
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4200
|
-
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['textEmbeddingModel']>>[0]>}` : never):
|
4201
|
-
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4202
|
-
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['imageModel']>>[0]>}` : never):
|
4203
|
-
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4197
|
+
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['languageModel']>>[0]>}` : never): LanguageModelV2;
|
4198
|
+
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): LanguageModelV2;
|
4199
|
+
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['textEmbeddingModel']>>[0]>}` : never): EmbeddingModelV2<string>;
|
4200
|
+
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): EmbeddingModelV2<string>;
|
4201
|
+
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['imageModel']>>[0]>}` : never): ImageModelV2;
|
4202
|
+
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): ImageModelV2;
|
4204
4203
|
}
|
4205
4204
|
/**
|
4206
4205
|
* Creates a registry for the given providers.
|
@@ -5102,4 +5101,4 @@ interface DefaultChatStoreOptions<MESSAGE_METADATA = unknown, UI_DATA_PART_SCHEM
|
|
5102
5101
|
}
|
5103
5102
|
declare function defaultChatStoreOptions<MESSAGE_METADATA = unknown, UI_DATA_PART_SCHEMAS extends UIDataPartSchemas = UIDataPartSchemas>({ api, fetch, credentials, headers, body, prepareRequestBody, generateId, messageMetadataSchema, maxSteps, dataPartSchemas, chats, }: DefaultChatStoreOptions<MESSAGE_METADATA, UI_DATA_PART_SCHEMAS>): () => ChatStoreOptions<MESSAGE_METADATA, UI_DATA_PART_SCHEMAS>;
|
5104
5103
|
|
5105
|
-
export { ActiveResponse, AssistantContent, AssistantModelMessage, CallSettings, CallWarning, Chat, ChatRequestOptions, ChatStatus, ChatStore, ChatStoreEvent, ChatStoreFactory, ChatStoreOptions, ChatTransport, ChunkDetector, CompletionRequestOptions, CoreAssistantMessage, CoreMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, CreateUIMessage, DataContent, DataUIPart, DeepPartial, DefaultChatStoreOptions, DefaultChatTransport, DownloadError, EmbedManyResult, EmbedResult, Embedding, EmbeddingModel, EmbeddingModelUsage, GenerateImageResult as Experimental_GenerateImageResult, GeneratedFile as Experimental_GeneratedImage, SpeechResult as Experimental_SpeechResult, TranscriptionResult as Experimental_TranscriptionResult, FilePart, FileUIPart, FinishReason, GenerateObjectResult, GenerateTextOnStepFinishCallback, GenerateTextResult, GeneratedAudioFile, GeneratedFile, ImageModel, ImageGenerationWarning as ImageModelCallWarning, ImageModelProviderMetadata, ImageModelResponseMetadata, ImagePart, InferUIDataParts, InvalidArgumentError, InvalidDataContentError, InvalidMessageRoleError, InvalidStreamPartError, InvalidToolArgumentsError, JSONRPCError, JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, JSONValue, JsonToSseTransformStream, LanguageModel, LanguageModelRequestMetadata, LanguageModelResponseMetadata, LanguageModelUsage, MCPClientError, MCPTransport, MessageConversionError, ModelMessage, NoImageGeneratedError, NoObjectGeneratedError, NoOutputSpecifiedError, NoSuchProviderError, NoSuchToolError, ObjectStreamPart, OriginalUseChatOptions, output as Output, PrepareStepFunction, Prompt, Provider, ProviderMetadata, ProviderOptions, ProviderRegistryProvider, ReasoningUIPart, RepairTextFunction, RetryError, SerialJobExecutor, SourceUrlUIPart, SpeechModel, SpeechModelResponseMetadata, SpeechWarning, StepResult, StepStartUIPart, StopCondition, StreamObjectOnFinishCallback, StreamObjectResult, StreamTextOnChunkCallback, StreamTextOnErrorCallback, StreamTextOnFinishCallback, StreamTextOnStepFinishCallback, StreamTextResult, StreamTextTransform, SystemModelMessage, TelemetrySettings, TextPart, TextStreamChatTransport, TextStreamPart, TextUIPart, Tool, ToolCallPart, ToolCallRepairError, ToolCallRepairFunction, ToolCallUnion, ToolChoice, ToolContent, ToolExecutionError, ToolExecutionOptions, ToolInvocation, ToolInvocationUIPart, ToolModelMessage, ToolResultPart, ToolResultUnion, ToolSet, TranscriptionModel, TranscriptionModelResponseMetadata, TranscriptionWarning, UIDataPartSchemas, UIDataTypes, UIMessage, UIMessagePart, UIMessageStreamOptions, UIMessageStreamPart, UIMessageStreamWriter, UseChatOptions, UseCompletionOptions, UserContent, UserModelMessage, appendClientMessage, assistantModelMessageSchema, callChatApi, callCompletionApi, convertFileListToFileUIParts, convertToCoreMessages, convertToModelMessages, coreAssistantMessageSchema, coreMessageSchema, coreSystemMessageSchema, coreToolMessageSchema, coreUserMessageSchema, cosineSimilarity, createProviderRegistry, createTextStreamResponse, createUIMessageStream, createUIMessageStreamResponse, customProvider, defaultChatStoreOptions, defaultSettingsMiddleware, embed, embedMany, createMCPClient as experimental_createMCPClient, experimental_createProviderRegistry, experimental_customProvider, generateImage as experimental_generateImage, generateSpeech as experimental_generateSpeech, transcribe as experimental_transcribe, extractMaxToolInvocationStep, extractReasoningMiddleware, generateObject, generateText, getTextFromDataUrl, getToolInvocations, hasToolCall, isAssistantMessageWithCompletedToolCalls, isDeepEqualData, modelMessageSchema, parsePartialJson, pipeTextStreamToResponse, pipeUIMessageStreamToResponse, shouldResubmitMessages, simulateReadableStream, simulateStreamingMiddleware, smoothStream, stepCountIs, streamObject, streamText, systemModelMessageSchema, tool, toolModelMessageSchema, updateToolCallResult, userModelMessageSchema, wrapLanguageModel };
|
5104
|
+
export { ActiveResponse, AssistantContent, AssistantModelMessage, CallSettings, CallWarning, Chat, ChatRequestOptions, ChatStatus, ChatStore, ChatStoreEvent, ChatStoreFactory, ChatStoreOptions, ChatTransport, ChunkDetector, CompletionRequestOptions, CoreAssistantMessage, CoreMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, CreateUIMessage, DataContent, DataUIPart, DeepPartial, DefaultChatStoreOptions, DefaultChatTransport, DownloadError, EmbedManyResult, EmbedResult, Embedding, EmbeddingModel, EmbeddingModelUsage, GenerateImageResult as Experimental_GenerateImageResult, GeneratedFile as Experimental_GeneratedImage, SpeechResult as Experimental_SpeechResult, TranscriptionResult as Experimental_TranscriptionResult, FilePart, FileUIPart, FinishReason, GenerateObjectResult, GenerateTextOnStepFinishCallback, GenerateTextResult, GeneratedAudioFile, GeneratedFile, ImageModel, ImageGenerationWarning as ImageModelCallWarning, ImageModelProviderMetadata, ImageModelResponseMetadata, ImagePart, InferUIDataParts, InvalidArgumentError, InvalidDataContentError, InvalidMessageRoleError, InvalidStreamPartError, InvalidToolArgumentsError, JSONRPCError, JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, JSONValue, JsonToSseTransformStream, LanguageModel, LanguageModelRequestMetadata, LanguageModelResponseMetadata, LanguageModelUsage, MCPClientError, MCPTransport, MessageConversionError, ModelMessage, NoImageGeneratedError, NoObjectGeneratedError, NoOutputSpecifiedError, NoSuchProviderError, NoSuchToolError, ObjectStreamPart, OriginalUseChatOptions, output as Output, PrepareStepFunction, PrepareStepResult, Prompt, Provider, ProviderMetadata, ProviderOptions, ProviderRegistryProvider, ReasoningUIPart, RepairTextFunction, RetryError, SerialJobExecutor, SourceUrlUIPart, SpeechModel, SpeechModelResponseMetadata, SpeechWarning, StepResult, StepStartUIPart, StopCondition, StreamObjectOnFinishCallback, StreamObjectResult, StreamTextOnChunkCallback, StreamTextOnErrorCallback, StreamTextOnFinishCallback, StreamTextOnStepFinishCallback, StreamTextResult, StreamTextTransform, SystemModelMessage, TelemetrySettings, TextPart, TextStreamChatTransport, TextStreamPart, TextUIPart, Tool, ToolCallPart, ToolCallRepairError, ToolCallRepairFunction, ToolCallUnion, ToolChoice, ToolContent, ToolExecutionError, ToolExecutionOptions, ToolInvocation, ToolInvocationUIPart, ToolModelMessage, ToolResultPart, ToolResultUnion, ToolSet, TranscriptionModel, TranscriptionModelResponseMetadata, TranscriptionWarning, UIDataPartSchemas, UIDataTypes, UIMessage, UIMessagePart, UIMessageStreamOptions, UIMessageStreamPart, UIMessageStreamWriter, UseChatOptions, UseCompletionOptions, UserContent, UserModelMessage, appendClientMessage, assistantModelMessageSchema, callChatApi, callCompletionApi, convertFileListToFileUIParts, convertToCoreMessages, convertToModelMessages, coreAssistantMessageSchema, coreMessageSchema, coreSystemMessageSchema, coreToolMessageSchema, coreUserMessageSchema, cosineSimilarity, createProviderRegistry, createTextStreamResponse, createUIMessageStream, createUIMessageStreamResponse, customProvider, defaultChatStoreOptions, defaultSettingsMiddleware, embed, embedMany, createMCPClient as experimental_createMCPClient, experimental_createProviderRegistry, experimental_customProvider, generateImage as experimental_generateImage, generateSpeech as experimental_generateSpeech, transcribe as experimental_transcribe, extractMaxToolInvocationStep, extractReasoningMiddleware, generateObject, generateText, getTextFromDataUrl, getToolInvocations, hasToolCall, isAssistantMessageWithCompletedToolCalls, isDeepEqualData, modelMessageSchema, parsePartialJson, pipeTextStreamToResponse, pipeUIMessageStreamToResponse, shouldResubmitMessages, simulateReadableStream, simulateStreamingMiddleware, smoothStream, stepCountIs, streamObject, streamText, systemModelMessageSchema, tool, toolModelMessageSchema, updateToolCallResult, userModelMessageSchema, wrapLanguageModel };
|
package/dist/index.d.ts
CHANGED
@@ -2,6 +2,7 @@ import { ToolResultContent, Schema, ToolCall, ToolResult, IdGenerator, FetchFunc
|
|
2
2
|
export { IdGenerator, Schema, ToolCall, ToolResult, asSchema, createIdGenerator, generateId, jsonSchema } from '@ai-sdk/provider-utils';
|
3
3
|
import { AISDKError, SharedV2ProviderMetadata, SharedV2ProviderOptions, EmbeddingModelV2, EmbeddingModelV2Embedding, ImageModelV2, ImageModelV2CallWarning, ImageModelV2ProviderMetadata, JSONValue as JSONValue$1, LanguageModelV2, LanguageModelV2FinishReason, LanguageModelV2CallWarning, LanguageModelV2Source, SpeechModelV1, SpeechModelV1CallWarning, TranscriptionModelV1, TranscriptionModelV1CallWarning, LanguageModelV2Usage, JSONObject, LanguageModelV2ToolCall, JSONSchema7, LanguageModelV2CallOptions, JSONParseError, TypeValidationError, LanguageModelV2Middleware, ProviderV2, NoSuchModelError } from '@ai-sdk/provider';
|
4
4
|
export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, NoContentGeneratedError, NoSuchModelError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
|
5
|
+
import { GatewayModelId } from '@ai-sdk/gateway';
|
5
6
|
import { z } from 'zod';
|
6
7
|
import { ServerResponse } from 'node:http';
|
7
8
|
import { AttributeValue, Tracer } from '@opentelemetry/api';
|
@@ -382,7 +383,7 @@ type JSONValue = JSONValue$1;
|
|
382
383
|
/**
|
383
384
|
Language model that is used by the AI SDK Core functions.
|
384
385
|
*/
|
385
|
-
type LanguageModel = LanguageModelV2;
|
386
|
+
type LanguageModel = GatewayModelId | LanguageModelV2;
|
386
387
|
/**
|
387
388
|
Reason why a language model finished generating a response.
|
388
389
|
|
@@ -2708,14 +2709,12 @@ type PrepareStepFunction<TOOLS extends Record<string, Tool> = Record<string, Too
|
|
2708
2709
|
steps: Array<StepResult<NoInfer<TOOLS>>>;
|
2709
2710
|
stepNumber: number;
|
2710
2711
|
model: LanguageModel;
|
2711
|
-
}) => PromiseLike<
|
2712
|
-
|
2713
|
-
toolChoice?: ToolChoice<NoInfer<TOOLS>>;
|
2714
|
-
activeTools?: Array<keyof NoInfer<TOOLS>>;
|
2715
|
-
} | undefined> | {
|
2712
|
+
}) => PromiseLike<PrepareStepResult<TOOLS>> | PrepareStepResult<TOOLS>;
|
2713
|
+
type PrepareStepResult<TOOLS extends Record<string, Tool> = Record<string, Tool>> = {
|
2716
2714
|
model?: LanguageModel;
|
2717
2715
|
toolChoice?: ToolChoice<NoInfer<TOOLS>>;
|
2718
2716
|
activeTools?: Array<keyof NoInfer<TOOLS>>;
|
2717
|
+
system?: string;
|
2719
2718
|
} | undefined;
|
2720
2719
|
|
2721
2720
|
type StopCondition<TOOLS extends ToolSet> = (options: {
|
@@ -2776,7 +2775,7 @@ If set and supported by the model, calls will generate deterministic results.
|
|
2776
2775
|
@returns
|
2777
2776
|
A result object that contains the generated text, the results of the tool calls, and additional information.
|
2778
2777
|
*/
|
2779
|
-
declare function generateText<TOOLS extends ToolSet, OUTPUT = never, OUTPUT_PARTIAL = never>({ model, tools, toolChoice, system, prompt, messages, maxRetries: maxRetriesArg, abortSignal, headers, stopWhen, experimental_output: output, experimental_telemetry: telemetry, providerOptions, experimental_activeTools, activeTools, experimental_prepareStep, prepareStep, experimental_repairToolCall: repairToolCall, _internal: { generateId, currentDate, }, onStepFinish, ...settings }: CallSettings & Prompt & {
|
2778
|
+
declare function generateText<TOOLS extends ToolSet, OUTPUT = never, OUTPUT_PARTIAL = never>({ model: modelArg, tools, toolChoice, system, prompt, messages, maxRetries: maxRetriesArg, abortSignal, headers, stopWhen, experimental_output: output, experimental_telemetry: telemetry, providerOptions, experimental_activeTools, activeTools, experimental_prepareStep, prepareStep, experimental_repairToolCall: repairToolCall, _internal: { generateId, currentDate, }, onStepFinish, ...settings }: CallSettings & Prompt & {
|
2780
2779
|
/**
|
2781
2780
|
The language model to use.
|
2782
2781
|
*/
|
@@ -4162,15 +4161,15 @@ declare const wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, p
|
|
4162
4161
|
*
|
4163
4162
|
* @throws {NoSuchModelError} Throws when a requested model is not found and no fallback provider is available.
|
4164
4163
|
*/
|
4165
|
-
declare function customProvider<LANGUAGE_MODELS extends Record<string,
|
4164
|
+
declare function customProvider<LANGUAGE_MODELS extends Record<string, LanguageModelV2>, EMBEDDING_MODELS extends Record<string, EmbeddingModelV2<string>>, IMAGE_MODELS extends Record<string, ImageModelV2>>({ languageModels, textEmbeddingModels, imageModels, fallbackProvider, }: {
|
4166
4165
|
languageModels?: LANGUAGE_MODELS;
|
4167
4166
|
textEmbeddingModels?: EMBEDDING_MODELS;
|
4168
4167
|
imageModels?: IMAGE_MODELS;
|
4169
4168
|
fallbackProvider?: ProviderV2;
|
4170
|
-
}):
|
4171
|
-
languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>):
|
4172
|
-
textEmbeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>):
|
4173
|
-
imageModel(modelId: ExtractModelId<IMAGE_MODELS>):
|
4169
|
+
}): ProviderV2 & {
|
4170
|
+
languageModel(modelId: ExtractModelId<LANGUAGE_MODELS>): LanguageModelV2;
|
4171
|
+
textEmbeddingModel(modelId: ExtractModelId<EMBEDDING_MODELS>): EmbeddingModelV2<string>;
|
4172
|
+
imageModel(modelId: ExtractModelId<IMAGE_MODELS>): ImageModelV2;
|
4174
4173
|
};
|
4175
4174
|
/**
|
4176
4175
|
* @deprecated Use `customProvider` instead.
|
@@ -4195,12 +4194,12 @@ declare class NoSuchProviderError extends NoSuchModelError {
|
|
4195
4194
|
|
4196
4195
|
type ExtractLiteralUnion<T> = T extends string ? string extends T ? never : T : never;
|
4197
4196
|
interface ProviderRegistryProvider<PROVIDERS extends Record<string, ProviderV2> = Record<string, ProviderV2>, SEPARATOR extends string = ':'> {
|
4198
|
-
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['languageModel']>>[0]>}` : never):
|
4199
|
-
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4200
|
-
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['textEmbeddingModel']>>[0]>}` : never):
|
4201
|
-
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4202
|
-
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['imageModel']>>[0]>}` : never):
|
4203
|
-
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never):
|
4197
|
+
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['languageModel']>>[0]>}` : never): LanguageModelV2;
|
4198
|
+
languageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): LanguageModelV2;
|
4199
|
+
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['textEmbeddingModel']>>[0]>}` : never): EmbeddingModelV2<string>;
|
4200
|
+
textEmbeddingModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): EmbeddingModelV2<string>;
|
4201
|
+
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${ExtractLiteralUnion<Parameters<NonNullable<PROVIDERS[KEY]['imageModel']>>[0]>}` : never): ImageModelV2;
|
4202
|
+
imageModel<KEY extends keyof PROVIDERS>(id: KEY extends string ? `${KEY & string}${SEPARATOR}${string}` : never): ImageModelV2;
|
4204
4203
|
}
|
4205
4204
|
/**
|
4206
4205
|
* Creates a registry for the given providers.
|
@@ -5102,4 +5101,4 @@ interface DefaultChatStoreOptions<MESSAGE_METADATA = unknown, UI_DATA_PART_SCHEM
|
|
5102
5101
|
}
|
5103
5102
|
declare function defaultChatStoreOptions<MESSAGE_METADATA = unknown, UI_DATA_PART_SCHEMAS extends UIDataPartSchemas = UIDataPartSchemas>({ api, fetch, credentials, headers, body, prepareRequestBody, generateId, messageMetadataSchema, maxSteps, dataPartSchemas, chats, }: DefaultChatStoreOptions<MESSAGE_METADATA, UI_DATA_PART_SCHEMAS>): () => ChatStoreOptions<MESSAGE_METADATA, UI_DATA_PART_SCHEMAS>;
|
5104
5103
|
|
5105
|
-
export { ActiveResponse, AssistantContent, AssistantModelMessage, CallSettings, CallWarning, Chat, ChatRequestOptions, ChatStatus, ChatStore, ChatStoreEvent, ChatStoreFactory, ChatStoreOptions, ChatTransport, ChunkDetector, CompletionRequestOptions, CoreAssistantMessage, CoreMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, CreateUIMessage, DataContent, DataUIPart, DeepPartial, DefaultChatStoreOptions, DefaultChatTransport, DownloadError, EmbedManyResult, EmbedResult, Embedding, EmbeddingModel, EmbeddingModelUsage, GenerateImageResult as Experimental_GenerateImageResult, GeneratedFile as Experimental_GeneratedImage, SpeechResult as Experimental_SpeechResult, TranscriptionResult as Experimental_TranscriptionResult, FilePart, FileUIPart, FinishReason, GenerateObjectResult, GenerateTextOnStepFinishCallback, GenerateTextResult, GeneratedAudioFile, GeneratedFile, ImageModel, ImageGenerationWarning as ImageModelCallWarning, ImageModelProviderMetadata, ImageModelResponseMetadata, ImagePart, InferUIDataParts, InvalidArgumentError, InvalidDataContentError, InvalidMessageRoleError, InvalidStreamPartError, InvalidToolArgumentsError, JSONRPCError, JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, JSONValue, JsonToSseTransformStream, LanguageModel, LanguageModelRequestMetadata, LanguageModelResponseMetadata, LanguageModelUsage, MCPClientError, MCPTransport, MessageConversionError, ModelMessage, NoImageGeneratedError, NoObjectGeneratedError, NoOutputSpecifiedError, NoSuchProviderError, NoSuchToolError, ObjectStreamPart, OriginalUseChatOptions, output as Output, PrepareStepFunction, Prompt, Provider, ProviderMetadata, ProviderOptions, ProviderRegistryProvider, ReasoningUIPart, RepairTextFunction, RetryError, SerialJobExecutor, SourceUrlUIPart, SpeechModel, SpeechModelResponseMetadata, SpeechWarning, StepResult, StepStartUIPart, StopCondition, StreamObjectOnFinishCallback, StreamObjectResult, StreamTextOnChunkCallback, StreamTextOnErrorCallback, StreamTextOnFinishCallback, StreamTextOnStepFinishCallback, StreamTextResult, StreamTextTransform, SystemModelMessage, TelemetrySettings, TextPart, TextStreamChatTransport, TextStreamPart, TextUIPart, Tool, ToolCallPart, ToolCallRepairError, ToolCallRepairFunction, ToolCallUnion, ToolChoice, ToolContent, ToolExecutionError, ToolExecutionOptions, ToolInvocation, ToolInvocationUIPart, ToolModelMessage, ToolResultPart, ToolResultUnion, ToolSet, TranscriptionModel, TranscriptionModelResponseMetadata, TranscriptionWarning, UIDataPartSchemas, UIDataTypes, UIMessage, UIMessagePart, UIMessageStreamOptions, UIMessageStreamPart, UIMessageStreamWriter, UseChatOptions, UseCompletionOptions, UserContent, UserModelMessage, appendClientMessage, assistantModelMessageSchema, callChatApi, callCompletionApi, convertFileListToFileUIParts, convertToCoreMessages, convertToModelMessages, coreAssistantMessageSchema, coreMessageSchema, coreSystemMessageSchema, coreToolMessageSchema, coreUserMessageSchema, cosineSimilarity, createProviderRegistry, createTextStreamResponse, createUIMessageStream, createUIMessageStreamResponse, customProvider, defaultChatStoreOptions, defaultSettingsMiddleware, embed, embedMany, createMCPClient as experimental_createMCPClient, experimental_createProviderRegistry, experimental_customProvider, generateImage as experimental_generateImage, generateSpeech as experimental_generateSpeech, transcribe as experimental_transcribe, extractMaxToolInvocationStep, extractReasoningMiddleware, generateObject, generateText, getTextFromDataUrl, getToolInvocations, hasToolCall, isAssistantMessageWithCompletedToolCalls, isDeepEqualData, modelMessageSchema, parsePartialJson, pipeTextStreamToResponse, pipeUIMessageStreamToResponse, shouldResubmitMessages, simulateReadableStream, simulateStreamingMiddleware, smoothStream, stepCountIs, streamObject, streamText, systemModelMessageSchema, tool, toolModelMessageSchema, updateToolCallResult, userModelMessageSchema, wrapLanguageModel };
|
5104
|
+
export { ActiveResponse, AssistantContent, AssistantModelMessage, CallSettings, CallWarning, Chat, ChatRequestOptions, ChatStatus, ChatStore, ChatStoreEvent, ChatStoreFactory, ChatStoreOptions, ChatTransport, ChunkDetector, CompletionRequestOptions, CoreAssistantMessage, CoreMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, CreateUIMessage, DataContent, DataUIPart, DeepPartial, DefaultChatStoreOptions, DefaultChatTransport, DownloadError, EmbedManyResult, EmbedResult, Embedding, EmbeddingModel, EmbeddingModelUsage, GenerateImageResult as Experimental_GenerateImageResult, GeneratedFile as Experimental_GeneratedImage, SpeechResult as Experimental_SpeechResult, TranscriptionResult as Experimental_TranscriptionResult, FilePart, FileUIPart, FinishReason, GenerateObjectResult, GenerateTextOnStepFinishCallback, GenerateTextResult, GeneratedAudioFile, GeneratedFile, ImageModel, ImageGenerationWarning as ImageModelCallWarning, ImageModelProviderMetadata, ImageModelResponseMetadata, ImagePart, InferUIDataParts, InvalidArgumentError, InvalidDataContentError, InvalidMessageRoleError, InvalidStreamPartError, InvalidToolArgumentsError, JSONRPCError, JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, JSONValue, JsonToSseTransformStream, LanguageModel, LanguageModelRequestMetadata, LanguageModelResponseMetadata, LanguageModelUsage, MCPClientError, MCPTransport, MessageConversionError, ModelMessage, NoImageGeneratedError, NoObjectGeneratedError, NoOutputSpecifiedError, NoSuchProviderError, NoSuchToolError, ObjectStreamPart, OriginalUseChatOptions, output as Output, PrepareStepFunction, PrepareStepResult, Prompt, Provider, ProviderMetadata, ProviderOptions, ProviderRegistryProvider, ReasoningUIPart, RepairTextFunction, RetryError, SerialJobExecutor, SourceUrlUIPart, SpeechModel, SpeechModelResponseMetadata, SpeechWarning, StepResult, StepStartUIPart, StopCondition, StreamObjectOnFinishCallback, StreamObjectResult, StreamTextOnChunkCallback, StreamTextOnErrorCallback, StreamTextOnFinishCallback, StreamTextOnStepFinishCallback, StreamTextResult, StreamTextTransform, SystemModelMessage, TelemetrySettings, TextPart, TextStreamChatTransport, TextStreamPart, TextUIPart, Tool, ToolCallPart, ToolCallRepairError, ToolCallRepairFunction, ToolCallUnion, ToolChoice, ToolContent, ToolExecutionError, ToolExecutionOptions, ToolInvocation, ToolInvocationUIPart, ToolModelMessage, ToolResultPart, ToolResultUnion, ToolSet, TranscriptionModel, TranscriptionModelResponseMetadata, TranscriptionWarning, UIDataPartSchemas, UIDataTypes, UIMessage, UIMessagePart, UIMessageStreamOptions, UIMessageStreamPart, UIMessageStreamWriter, UseChatOptions, UseCompletionOptions, UserContent, UserModelMessage, appendClientMessage, assistantModelMessageSchema, callChatApi, callCompletionApi, convertFileListToFileUIParts, convertToCoreMessages, convertToModelMessages, coreAssistantMessageSchema, coreMessageSchema, coreSystemMessageSchema, coreToolMessageSchema, coreUserMessageSchema, cosineSimilarity, createProviderRegistry, createTextStreamResponse, createUIMessageStream, createUIMessageStreamResponse, customProvider, defaultChatStoreOptions, defaultSettingsMiddleware, embed, embedMany, createMCPClient as experimental_createMCPClient, experimental_createProviderRegistry, experimental_customProvider, generateImage as experimental_generateImage, generateSpeech as experimental_generateSpeech, transcribe as experimental_transcribe, extractMaxToolInvocationStep, extractReasoningMiddleware, generateObject, generateText, getTextFromDataUrl, getToolInvocations, hasToolCall, isAssistantMessageWithCompletedToolCalls, isDeepEqualData, modelMessageSchema, parsePartialJson, pipeTextStreamToResponse, pipeUIMessageStreamToResponse, shouldResubmitMessages, simulateReadableStream, simulateStreamingMiddleware, smoothStream, stepCountIs, streamObject, streamText, systemModelMessageSchema, tool, toolModelMessageSchema, updateToolCallResult, userModelMessageSchema, wrapLanguageModel };
|
package/dist/index.js
CHANGED
@@ -4525,11 +4525,17 @@ function validateObjectGenerationInput({
|
|
4525
4525
|
}
|
4526
4526
|
}
|
4527
4527
|
|
4528
|
+
// core/prompt/resolve-language-model.ts
|
4529
|
+
var import_gateway = require("@ai-sdk/gateway");
|
4530
|
+
function resolveLanguageModel(model) {
|
4531
|
+
return typeof model === "string" ? import_gateway.gateway.languageModel(model) : model;
|
4532
|
+
}
|
4533
|
+
|
4528
4534
|
// core/generate-object/generate-object.ts
|
4529
4535
|
var originalGenerateId = (0, import_provider_utils15.createIdGenerator)({ prefix: "aiobj", size: 24 });
|
4530
4536
|
async function generateObject(options) {
|
4531
4537
|
const {
|
4532
|
-
model,
|
4538
|
+
model: modelArg,
|
4533
4539
|
output = "object",
|
4534
4540
|
system,
|
4535
4541
|
prompt,
|
@@ -4546,6 +4552,7 @@ async function generateObject(options) {
|
|
4546
4552
|
} = {},
|
4547
4553
|
...settings
|
4548
4554
|
} = options;
|
4555
|
+
const model = resolveLanguageModel(modelArg);
|
4549
4556
|
const enumValues = "enum" in options ? options.enum : void 0;
|
4550
4557
|
const {
|
4551
4558
|
schema: inputSchema,
|
@@ -5005,7 +5012,7 @@ function streamObject(options) {
|
|
5005
5012
|
}
|
5006
5013
|
var DefaultStreamObjectResult = class {
|
5007
5014
|
constructor({
|
5008
|
-
model,
|
5015
|
+
model: modelArg,
|
5009
5016
|
headers,
|
5010
5017
|
telemetry,
|
5011
5018
|
settings,
|
@@ -5030,6 +5037,7 @@ var DefaultStreamObjectResult = class {
|
|
5030
5037
|
this._warnings = new DelayedPromise();
|
5031
5038
|
this._request = new DelayedPromise();
|
5032
5039
|
this._response = new DelayedPromise();
|
5040
|
+
const model = resolveLanguageModel(modelArg);
|
5033
5041
|
const { maxRetries, retry } = prepareRetries({
|
5034
5042
|
maxRetries: maxRetriesArg
|
5035
5043
|
});
|
@@ -5843,7 +5851,7 @@ var originalGenerateId3 = (0, import_provider_utils19.createIdGenerator)({
|
|
5843
5851
|
size: 24
|
5844
5852
|
});
|
5845
5853
|
async function generateText({
|
5846
|
-
model,
|
5854
|
+
model: modelArg,
|
5847
5855
|
tools,
|
5848
5856
|
toolChoice,
|
5849
5857
|
system,
|
@@ -5868,6 +5876,7 @@ async function generateText({
|
|
5868
5876
|
onStepFinish,
|
5869
5877
|
...settings
|
5870
5878
|
}) {
|
5879
|
+
const model = resolveLanguageModel(modelArg);
|
5871
5880
|
const stopConditions = asArray(stopWhen);
|
5872
5881
|
const { maxRetries, retry } = prepareRetries({ maxRetries: maxRetriesArg });
|
5873
5882
|
const callSettings = prepareCallSettings(settings);
|
@@ -5904,7 +5913,7 @@ async function generateText({
|
|
5904
5913
|
}),
|
5905
5914
|
tracer,
|
5906
5915
|
fn: async (span) => {
|
5907
|
-
var _a17, _b, _c, _d;
|
5916
|
+
var _a17, _b, _c, _d, _e;
|
5908
5917
|
const callSettings2 = prepareCallSettings(settings);
|
5909
5918
|
let currentModelResponse;
|
5910
5919
|
let currentToolCalls = [];
|
@@ -5923,16 +5932,18 @@ async function generateText({
|
|
5923
5932
|
}));
|
5924
5933
|
const promptMessages = await convertToLanguageModelPrompt({
|
5925
5934
|
prompt: {
|
5926
|
-
system: initialPrompt.system,
|
5935
|
+
system: (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _a17 : initialPrompt.system,
|
5927
5936
|
messages: stepInputMessages
|
5928
5937
|
},
|
5929
5938
|
supportedUrls: await model.supportedUrls
|
5930
5939
|
});
|
5931
|
-
const stepModel = (
|
5940
|
+
const stepModel = resolveLanguageModel(
|
5941
|
+
(_b = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _b : model
|
5942
|
+
);
|
5932
5943
|
const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
|
5933
5944
|
tools,
|
5934
|
-
toolChoice: (
|
5935
|
-
activeTools: (
|
5945
|
+
toolChoice: (_c = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _c : toolChoice,
|
5946
|
+
activeTools: (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools
|
5936
5947
|
});
|
5937
5948
|
currentModelResponse = await retry(
|
5938
5949
|
() => {
|
@@ -5975,7 +5986,7 @@ async function generateText({
|
|
5975
5986
|
}),
|
5976
5987
|
tracer,
|
5977
5988
|
fn: async (span2) => {
|
5978
|
-
var _a19, _b2, _c2, _d2,
|
5989
|
+
var _a19, _b2, _c2, _d2, _e2, _f, _g, _h;
|
5979
5990
|
const result = await stepModel.doGenerate({
|
5980
5991
|
...callSettings2,
|
5981
5992
|
tools: stepTools,
|
@@ -5989,7 +6000,7 @@ async function generateText({
|
|
5989
6000
|
const responseData = {
|
5990
6001
|
id: (_b2 = (_a19 = result.response) == null ? void 0 : _a19.id) != null ? _b2 : generateId3(),
|
5991
6002
|
timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
|
5992
|
-
modelId: (_f = (
|
6003
|
+
modelId: (_f = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f : stepModel.modelId,
|
5993
6004
|
headers: (_g = result.response) == null ? void 0 : _g.headers,
|
5994
6005
|
body: (_h = result.response) == null ? void 0 : _h.body
|
5995
6006
|
};
|
@@ -6065,7 +6076,7 @@ async function generateText({
|
|
6065
6076
|
usage: currentModelResponse.usage,
|
6066
6077
|
warnings: currentModelResponse.warnings,
|
6067
6078
|
providerMetadata: currentModelResponse.providerMetadata,
|
6068
|
-
request: (
|
6079
|
+
request: (_e = currentModelResponse.request) != null ? _e : {},
|
6069
6080
|
response: {
|
6070
6081
|
...currentModelResponse.response,
|
6071
6082
|
// deep clone msgs to avoid mutating past messages in multi-step:
|
@@ -6657,7 +6668,7 @@ function streamText({
|
|
6657
6668
|
...settings
|
6658
6669
|
}) {
|
6659
6670
|
return new DefaultStreamTextResult({
|
6660
|
-
model,
|
6671
|
+
model: resolveLanguageModel(model),
|
6661
6672
|
telemetry,
|
6662
6673
|
headers,
|
6663
6674
|
settings,
|
@@ -6972,7 +6983,7 @@ var DefaultStreamTextResult = class {
|
|
6972
6983
|
responseMessages,
|
6973
6984
|
usage
|
6974
6985
|
}) {
|
6975
|
-
var _a17, _b, _c;
|
6986
|
+
var _a17, _b, _c, _d;
|
6976
6987
|
stepFinish = new DelayedPromise();
|
6977
6988
|
const initialPrompt = await standardizePrompt({
|
6978
6989
|
system,
|
@@ -6990,16 +7001,18 @@ var DefaultStreamTextResult = class {
|
|
6990
7001
|
}));
|
6991
7002
|
const promptMessages = await convertToLanguageModelPrompt({
|
6992
7003
|
prompt: {
|
6993
|
-
system: initialPrompt.system,
|
7004
|
+
system: (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _a17 : initialPrompt.system,
|
6994
7005
|
messages: stepInputMessages
|
6995
7006
|
},
|
6996
7007
|
supportedUrls: await model.supportedUrls
|
6997
7008
|
});
|
6998
|
-
const stepModel = (
|
7009
|
+
const stepModel = resolveLanguageModel(
|
7010
|
+
(_b = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _b : model
|
7011
|
+
);
|
6999
7012
|
const { toolChoice: stepToolChoice, tools: stepTools } = prepareToolsAndToolChoice({
|
7000
7013
|
tools,
|
7001
|
-
toolChoice: (
|
7002
|
-
activeTools: (
|
7014
|
+
toolChoice: (_c = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _c : toolChoice,
|
7015
|
+
activeTools: (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools
|
7003
7016
|
});
|
7004
7017
|
const {
|
7005
7018
|
result: { stream: stream2, response, request },
|
@@ -7105,7 +7118,7 @@ var DefaultStreamTextResult = class {
|
|
7105
7118
|
streamWithToolResults.pipeThrough(
|
7106
7119
|
new TransformStream({
|
7107
7120
|
async transform(chunk, controller) {
|
7108
|
-
var _a18, _b2, _c2,
|
7121
|
+
var _a18, _b2, _c2, _d2;
|
7109
7122
|
if (chunk.type === "stream-start") {
|
7110
7123
|
warnings = chunk.warnings;
|
7111
7124
|
return;
|
@@ -7182,7 +7195,7 @@ var DefaultStreamTextResult = class {
|
|
7182
7195
|
doStreamSpan.addEvent("ai.stream.finish");
|
7183
7196
|
doStreamSpan.setAttributes({
|
7184
7197
|
"ai.response.msToFinish": msToFinish,
|
7185
|
-
"ai.response.avgOutputTokensPerSecond": 1e3 * ((
|
7198
|
+
"ai.response.avgOutputTokensPerSecond": 1e3 * ((_d2 = stepUsage.outputTokens) != null ? _d2 : 0) / msToFinish
|
7186
7199
|
});
|
7187
7200
|
break;
|
7188
7201
|
}
|