modelfusion 0.103.0 → 0.105.0
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 +56 -0
- package/model-function/Delta.d.ts +1 -2
- package/model-function/executeStreamCall.cjs +6 -4
- package/model-function/executeStreamCall.d.ts +2 -2
- package/model-function/executeStreamCall.js +6 -4
- package/model-function/generate-speech/streamSpeech.cjs +1 -2
- package/model-function/generate-speech/streamSpeech.js +1 -2
- package/model-function/generate-structure/StructureFromTextStreamingModel.cjs +25 -29
- package/model-function/generate-structure/StructureFromTextStreamingModel.d.ts +3 -1
- package/model-function/generate-structure/StructureFromTextStreamingModel.js +25 -29
- package/model-function/generate-structure/StructureGenerationModel.d.ts +2 -0
- package/model-function/generate-structure/streamStructure.cjs +7 -8
- package/model-function/generate-structure/streamStructure.d.ts +1 -1
- package/model-function/generate-structure/streamStructure.js +7 -8
- package/model-function/generate-text/PromptTemplateFullTextModel.cjs +35 -0
- package/model-function/generate-text/PromptTemplateFullTextModel.d.ts +41 -0
- package/model-function/generate-text/PromptTemplateFullTextModel.js +31 -0
- package/model-function/generate-text/PromptTemplateTextStreamingModel.cjs +3 -0
- package/model-function/generate-text/PromptTemplateTextStreamingModel.d.ts +2 -1
- package/model-function/generate-text/PromptTemplateTextStreamingModel.js +3 -0
- package/model-function/generate-text/TextGenerationModel.d.ts +2 -1
- package/model-function/generate-text/index.cjs +1 -0
- package/model-function/generate-text/index.d.ts +1 -0
- package/model-function/generate-text/index.js +1 -0
- package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.cjs +2 -1
- package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.d.ts +2 -2
- package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.js +2 -1
- package/model-function/generate-text/prompt-template/ChatMLPromptTemplate.cjs +9 -5
- package/model-function/generate-text/prompt-template/ChatMLPromptTemplate.d.ts +4 -4
- package/model-function/generate-text/prompt-template/ChatMLPromptTemplate.js +9 -5
- package/model-function/generate-text/prompt-template/ChatPrompt.cjs +38 -20
- package/model-function/generate-text/prompt-template/ChatPrompt.d.ts +33 -34
- package/model-function/generate-text/prompt-template/ChatPrompt.js +37 -18
- package/model-function/generate-text/prompt-template/ContentPart.cjs +11 -0
- package/model-function/generate-text/prompt-template/ContentPart.d.ts +30 -0
- package/model-function/generate-text/prompt-template/ContentPart.js +7 -0
- package/model-function/generate-text/prompt-template/InstructionPrompt.d.ts +7 -22
- package/model-function/generate-text/prompt-template/Llama2PromptTemplate.cjs +40 -6
- package/model-function/generate-text/prompt-template/Llama2PromptTemplate.d.ts +16 -4
- package/model-function/generate-text/prompt-template/Llama2PromptTemplate.js +38 -5
- package/model-function/generate-text/prompt-template/NeuralChatPromptTemplate.cjs +10 -5
- package/model-function/generate-text/prompt-template/NeuralChatPromptTemplate.d.ts +4 -4
- package/model-function/generate-text/prompt-template/NeuralChatPromptTemplate.js +10 -5
- package/model-function/generate-text/prompt-template/TextPromptTemplate.cjs +8 -5
- package/model-function/generate-text/prompt-template/TextPromptTemplate.d.ts +4 -4
- package/model-function/generate-text/prompt-template/TextPromptTemplate.js +8 -5
- package/model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs +8 -4
- package/model-function/generate-text/prompt-template/VicunaPromptTemplate.d.ts +2 -2
- package/model-function/generate-text/prompt-template/VicunaPromptTemplate.js +8 -4
- package/model-function/generate-text/prompt-template/index.cjs +1 -1
- package/model-function/generate-text/prompt-template/index.d.ts +1 -1
- package/model-function/generate-text/prompt-template/index.js +1 -1
- package/model-function/generate-text/prompt-template/trimChatPrompt.cjs +0 -2
- package/model-function/generate-text/prompt-template/trimChatPrompt.d.ts +4 -4
- package/model-function/generate-text/prompt-template/trimChatPrompt.js +0 -2
- package/model-function/generate-text/streamText.cjs +27 -28
- package/model-function/generate-text/streamText.d.ts +1 -0
- package/model-function/generate-text/streamText.js +27 -28
- package/model-provider/anthropic/AnthropicPromptTemplate.cjs +9 -4
- package/model-provider/anthropic/AnthropicPromptTemplate.d.ts +4 -4
- package/model-provider/anthropic/AnthropicPromptTemplate.js +9 -4
- package/model-provider/anthropic/AnthropicTextGenerationModel.cjs +8 -14
- package/model-provider/anthropic/AnthropicTextGenerationModel.d.ts +13 -4
- package/model-provider/anthropic/AnthropicTextGenerationModel.js +8 -14
- package/model-provider/anthropic/AnthropicTextGenerationModel.test.cjs +44 -0
- package/model-provider/anthropic/AnthropicTextGenerationModel.test.js +42 -0
- package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts +1 -1
- package/model-provider/cohere/CohereTextGenerationModel.cjs +6 -44
- package/model-provider/cohere/CohereTextGenerationModel.d.ts +47 -13
- package/model-provider/cohere/CohereTextGenerationModel.js +7 -45
- package/model-provider/cohere/CohereTextGenerationModel.test.cjs +33 -0
- package/model-provider/cohere/CohereTextGenerationModel.test.js +31 -0
- package/model-provider/elevenlabs/ElevenLabsSpeechModel.cjs +1 -2
- package/model-provider/elevenlabs/ElevenLabsSpeechModel.js +1 -2
- package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs +29 -17
- package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.d.ts +4 -4
- package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js +29 -17
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.cjs +7 -14
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.d.ts +157 -6
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.js +8 -15
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.test.cjs +37 -0
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.test.d.ts +1 -0
- package/model-provider/llamacpp/LlamaCppTextGenerationModel.test.js +35 -0
- package/model-provider/mistral/MistralChatModel.cjs +30 -104
- package/model-provider/mistral/MistralChatModel.d.ts +49 -16
- package/model-provider/mistral/MistralChatModel.js +30 -104
- package/model-provider/mistral/MistralChatModel.test.cjs +51 -0
- package/model-provider/mistral/MistralChatModel.test.d.ts +1 -0
- package/model-provider/mistral/MistralChatModel.test.js +49 -0
- package/model-provider/mistral/MistralPromptTemplate.cjs +13 -5
- package/model-provider/mistral/MistralPromptTemplate.d.ts +4 -4
- package/model-provider/mistral/MistralPromptTemplate.js +13 -5
- package/model-provider/ollama/OllamaChatModel.cjs +7 -43
- package/model-provider/ollama/OllamaChatModel.d.ts +63 -11
- package/model-provider/ollama/OllamaChatModel.js +7 -43
- package/model-provider/ollama/OllamaChatModel.test.cjs +27 -0
- package/model-provider/ollama/OllamaChatModel.test.d.ts +1 -0
- package/model-provider/ollama/OllamaChatModel.test.js +25 -0
- package/model-provider/ollama/OllamaChatPromptTemplate.cjs +43 -17
- package/model-provider/ollama/OllamaChatPromptTemplate.d.ts +4 -4
- package/model-provider/ollama/OllamaChatPromptTemplate.js +43 -17
- package/model-provider/ollama/OllamaCompletionModel.cjs +22 -43
- package/model-provider/ollama/OllamaCompletionModel.d.ts +65 -9
- package/model-provider/ollama/OllamaCompletionModel.js +23 -44
- package/model-provider/ollama/OllamaCompletionModel.test.cjs +101 -13
- package/model-provider/ollama/OllamaCompletionModel.test.js +78 -13
- package/model-provider/openai/{chat/AbstractOpenAIChatModel.cjs → AbstractOpenAIChatModel.cjs} +71 -15
- package/model-provider/openai/{chat/AbstractOpenAIChatModel.d.ts → AbstractOpenAIChatModel.d.ts} +273 -19
- package/model-provider/openai/{chat/AbstractOpenAIChatModel.js → AbstractOpenAIChatModel.js} +71 -15
- package/model-provider/openai/{chat/OpenAIChatFunctionCallStructureGenerationModel.cjs → OpenAIChatFunctionCallStructureGenerationModel.cjs} +18 -2
- package/model-provider/openai/{chat/OpenAIChatFunctionCallStructureGenerationModel.d.ts → OpenAIChatFunctionCallStructureGenerationModel.d.ts} +41 -11
- package/model-provider/openai/{chat/OpenAIChatFunctionCallStructureGenerationModel.js → OpenAIChatFunctionCallStructureGenerationModel.js} +18 -2
- package/model-provider/openai/{chat/OpenAIChatMessage.d.ts → OpenAIChatMessage.d.ts} +3 -3
- package/model-provider/openai/{chat/OpenAIChatModel.cjs → OpenAIChatModel.cjs} +5 -5
- package/model-provider/openai/{chat/OpenAIChatModel.d.ts → OpenAIChatModel.d.ts} +12 -12
- package/model-provider/openai/{chat/OpenAIChatModel.js → OpenAIChatModel.js} +5 -5
- package/model-provider/openai/OpenAIChatModel.test.cjs +94 -0
- package/model-provider/openai/OpenAIChatModel.test.d.ts +1 -0
- package/model-provider/openai/OpenAIChatModel.test.js +92 -0
- package/model-provider/openai/OpenAIChatPromptTemplate.cjs +114 -0
- package/model-provider/openai/OpenAIChatPromptTemplate.d.ts +20 -0
- package/model-provider/openai/OpenAIChatPromptTemplate.js +107 -0
- package/model-provider/openai/OpenAICompletionModel.cjs +32 -84
- package/model-provider/openai/OpenAICompletionModel.d.ts +29 -12
- package/model-provider/openai/OpenAICompletionModel.js +33 -85
- package/model-provider/openai/OpenAICompletionModel.test.cjs +53 -0
- package/model-provider/openai/OpenAICompletionModel.test.d.ts +1 -0
- package/model-provider/openai/OpenAICompletionModel.test.js +51 -0
- package/model-provider/openai/OpenAICostCalculator.cjs +1 -1
- package/model-provider/openai/OpenAICostCalculator.js +1 -1
- package/model-provider/openai/OpenAIFacade.cjs +2 -2
- package/model-provider/openai/OpenAIFacade.d.ts +3 -3
- package/model-provider/openai/OpenAIFacade.js +2 -2
- package/model-provider/openai/OpenAITranscriptionModel.d.ts +6 -6
- package/model-provider/openai/TikTokenTokenizer.d.ts +1 -1
- package/model-provider/openai/{chat/countOpenAIChatMessageTokens.cjs → countOpenAIChatMessageTokens.cjs} +2 -2
- package/model-provider/openai/{chat/countOpenAIChatMessageTokens.js → countOpenAIChatMessageTokens.js} +2 -2
- package/model-provider/openai/index.cjs +6 -6
- package/model-provider/openai/index.d.ts +5 -6
- package/model-provider/openai/index.js +5 -5
- package/model-provider/openai-compatible/OpenAICompatibleChatModel.cjs +4 -4
- package/model-provider/openai-compatible/OpenAICompatibleChatModel.d.ts +6 -6
- package/model-provider/openai-compatible/OpenAICompatibleChatModel.js +4 -4
- package/model-provider/stability/StabilityImageGenerationModel.d.ts +1 -1
- package/package.json +5 -5
- package/test/JsonTestServer.cjs +33 -0
- package/test/JsonTestServer.d.ts +7 -0
- package/test/JsonTestServer.js +29 -0
- package/test/StreamingTestServer.cjs +55 -0
- package/test/StreamingTestServer.d.ts +7 -0
- package/test/StreamingTestServer.js +51 -0
- package/test/arrayFromAsync.cjs +13 -0
- package/test/arrayFromAsync.d.ts +1 -0
- package/test/arrayFromAsync.js +9 -0
- package/util/streaming/createEventSourceResponseHandler.cjs +9 -0
- package/util/streaming/createEventSourceResponseHandler.d.ts +4 -0
- package/util/streaming/createEventSourceResponseHandler.js +5 -0
- package/util/streaming/createJsonStreamResponseHandler.cjs +9 -0
- package/util/streaming/createJsonStreamResponseHandler.d.ts +4 -0
- package/util/streaming/createJsonStreamResponseHandler.js +5 -0
- package/util/streaming/parseEventSourceStreamAsAsyncIterable.cjs +52 -0
- package/util/streaming/parseEventSourceStreamAsAsyncIterable.d.ts +6 -0
- package/util/streaming/parseEventSourceStreamAsAsyncIterable.js +48 -0
- package/util/streaming/parseJsonStreamAsAsyncIterable.cjs +21 -0
- package/util/streaming/parseJsonStreamAsAsyncIterable.d.ts +6 -0
- package/util/streaming/parseJsonStreamAsAsyncIterable.js +17 -0
- package/model-function/generate-text/prompt-template/Content.cjs +0 -2
- package/model-function/generate-text/prompt-template/Content.d.ts +0 -20
- package/model-provider/openai/chat/OpenAIChatModel.test.cjs +0 -61
- package/model-provider/openai/chat/OpenAIChatModel.test.js +0 -59
- package/model-provider/openai/chat/OpenAIChatPromptTemplate.cjs +0 -72
- package/model-provider/openai/chat/OpenAIChatPromptTemplate.d.ts +0 -20
- package/model-provider/openai/chat/OpenAIChatPromptTemplate.js +0 -65
- package/model-provider/openai/chat/OpenAIChatStreamIterable.cjs +0 -156
- package/model-provider/openai/chat/OpenAIChatStreamIterable.d.ts +0 -19
- package/model-provider/openai/chat/OpenAIChatStreamIterable.js +0 -152
- /package/{model-function/generate-text/prompt-template/Content.js → model-provider/anthropic/AnthropicTextGenerationModel.test.d.ts} +0 -0
- /package/model-provider/{openai/chat/OpenAIChatModel.test.d.ts → cohere/CohereTextGenerationModel.test.d.ts} +0 -0
- /package/model-provider/openai/{chat/OpenAIChatMessage.cjs → OpenAIChatMessage.cjs} +0 -0
- /package/model-provider/openai/{chat/OpenAIChatMessage.js → OpenAIChatMessage.js} +0 -0
- /package/model-provider/openai/{chat/countOpenAIChatMessageTokens.d.ts → countOpenAIChatMessageTokens.d.ts} +0 -0
@@ -1,152 +0,0 @@
|
|
1
|
-
import { z } from "zod";
|
2
|
-
import { AsyncQueue } from "../../../util/AsyncQueue.js";
|
3
|
-
import { parseEventSourceStream } from "../../../util/streaming/parseEventSourceStream.js";
|
4
|
-
import { safeParseJSON } from "../../../core/schema/parseJSON.js";
|
5
|
-
import { ZodSchema } from "../../../core/schema/ZodSchema.js";
|
6
|
-
const chatCompletionChunkSchema = z.object({
|
7
|
-
object: z.literal("chat.completion.chunk"),
|
8
|
-
id: z.string(),
|
9
|
-
choices: z.array(z.object({
|
10
|
-
delta: z.object({
|
11
|
-
role: z.enum(["assistant", "user"]).optional(),
|
12
|
-
content: z.string().nullable().optional(),
|
13
|
-
function_call: z
|
14
|
-
.object({
|
15
|
-
name: z.string().optional(),
|
16
|
-
arguments: z.string().optional(),
|
17
|
-
})
|
18
|
-
.optional(),
|
19
|
-
tool_calls: z
|
20
|
-
.array(z.object({
|
21
|
-
id: z.string(),
|
22
|
-
type: z.literal("function"),
|
23
|
-
function: z.object({
|
24
|
-
name: z.string(),
|
25
|
-
arguments: z.string(),
|
26
|
-
}),
|
27
|
-
}))
|
28
|
-
.optional(),
|
29
|
-
}),
|
30
|
-
finish_reason: z
|
31
|
-
.enum([
|
32
|
-
"stop",
|
33
|
-
"length",
|
34
|
-
"tool_calls",
|
35
|
-
"content_filter",
|
36
|
-
"function_call",
|
37
|
-
])
|
38
|
-
.nullable()
|
39
|
-
.optional(),
|
40
|
-
index: z.number(),
|
41
|
-
})),
|
42
|
-
created: z.number(),
|
43
|
-
model: z.string(),
|
44
|
-
system_fingerprint: z.string().optional().nullable(),
|
45
|
-
});
|
46
|
-
const chatResponseStreamEventSchema = new ZodSchema(z.union([
|
47
|
-
chatCompletionChunkSchema,
|
48
|
-
z.object({
|
49
|
-
object: z.string().refine((obj) => obj !== "chat.completion.chunk", {
|
50
|
-
message: "Object must be 'chat.completion.chunk'",
|
51
|
-
}),
|
52
|
-
}),
|
53
|
-
]));
|
54
|
-
export async function createOpenAIChatDeltaIterableQueue(stream, extractDeltaValue) {
|
55
|
-
const queue = new AsyncQueue();
|
56
|
-
const streamDelta = [];
|
57
|
-
// process the stream asynchonously (no 'await' on purpose):
|
58
|
-
parseEventSourceStream({ stream })
|
59
|
-
.then(async (events) => {
|
60
|
-
try {
|
61
|
-
for await (const event of events) {
|
62
|
-
const data = event.data;
|
63
|
-
if (data === "[DONE]") {
|
64
|
-
queue.close();
|
65
|
-
return;
|
66
|
-
}
|
67
|
-
const parseResult = safeParseJSON({
|
68
|
-
text: data,
|
69
|
-
schema: chatResponseStreamEventSchema,
|
70
|
-
});
|
71
|
-
if (!parseResult.success) {
|
72
|
-
queue.push({
|
73
|
-
type: "error",
|
74
|
-
error: parseResult.error,
|
75
|
-
});
|
76
|
-
// Note: the queue is not closed on purpose. Some providers might add additional
|
77
|
-
// chunks that are not parsable, and ModelFusion should be resilient to that.
|
78
|
-
continue;
|
79
|
-
}
|
80
|
-
const eventData = parseResult.data;
|
81
|
-
// ignore objects that are not "chat.completion.chunk" events.
|
82
|
-
// Such additional objects are e.g. sent by Azure OpenAI.
|
83
|
-
if (eventData.object !== "chat.completion.chunk") {
|
84
|
-
continue;
|
85
|
-
}
|
86
|
-
const completionChunk = eventData;
|
87
|
-
// reset delta for all existing streamDeltas
|
88
|
-
for (const delta of streamDelta) {
|
89
|
-
delta.delta = undefined;
|
90
|
-
}
|
91
|
-
for (let i = 0; i < completionChunk.choices.length; i++) {
|
92
|
-
const eventChoice = completionChunk.choices[i];
|
93
|
-
const index = eventChoice.index;
|
94
|
-
const delta = eventChoice.delta;
|
95
|
-
if (streamDelta[index] == null) {
|
96
|
-
streamDelta[index] = {
|
97
|
-
role: undefined,
|
98
|
-
content: "",
|
99
|
-
isComplete: false,
|
100
|
-
delta,
|
101
|
-
};
|
102
|
-
}
|
103
|
-
const choice = streamDelta[index];
|
104
|
-
choice.delta = delta;
|
105
|
-
if (eventChoice.finish_reason != null) {
|
106
|
-
choice.isComplete = true;
|
107
|
-
}
|
108
|
-
if (delta.content != undefined) {
|
109
|
-
choice.content += delta.content;
|
110
|
-
}
|
111
|
-
if (delta.function_call != undefined) {
|
112
|
-
if (choice.function_call == undefined) {
|
113
|
-
choice.function_call = {
|
114
|
-
name: "",
|
115
|
-
arguments: "",
|
116
|
-
};
|
117
|
-
}
|
118
|
-
if (delta.function_call.name != undefined) {
|
119
|
-
choice.function_call.name += delta.function_call.name;
|
120
|
-
}
|
121
|
-
if (delta.function_call.arguments != undefined) {
|
122
|
-
choice.function_call.arguments +=
|
123
|
-
delta.function_call.arguments;
|
124
|
-
}
|
125
|
-
}
|
126
|
-
if (delta.role != undefined) {
|
127
|
-
choice.role = delta.role;
|
128
|
-
}
|
129
|
-
}
|
130
|
-
// Since we're mutating the choices array in an async scenario,
|
131
|
-
// we need to make a deep copy:
|
132
|
-
const streamDeltaDeepCopy = JSON.parse(JSON.stringify(streamDelta));
|
133
|
-
queue.push({
|
134
|
-
type: "delta",
|
135
|
-
fullDelta: streamDeltaDeepCopy,
|
136
|
-
valueDelta: extractDeltaValue(streamDeltaDeepCopy),
|
137
|
-
});
|
138
|
-
}
|
139
|
-
}
|
140
|
-
catch (error) {
|
141
|
-
queue.push({ type: "error", error });
|
142
|
-
queue.close();
|
143
|
-
return;
|
144
|
-
}
|
145
|
-
})
|
146
|
-
.catch((error) => {
|
147
|
-
queue.push({ type: "error", error });
|
148
|
-
queue.close();
|
149
|
-
return;
|
150
|
-
});
|
151
|
-
return queue;
|
152
|
-
}
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|