modelfusion 0.117.0 → 0.119.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.
Files changed (161) hide show
  1. package/CHANGELOG.md +60 -0
  2. package/README.md +10 -9
  3. package/core/getFunctionCallLogger.cjs +6 -6
  4. package/core/getFunctionCallLogger.js +6 -6
  5. package/model-function/ModelCallEvent.d.ts +1 -1
  6. package/model-function/embed/EmbeddingEvent.d.ts +1 -1
  7. package/model-function/embed/EmbeddingModel.d.ts +1 -1
  8. package/model-function/embed/embed.cjs +5 -5
  9. package/model-function/embed/embed.d.ts +2 -2
  10. package/model-function/embed/embed.js +5 -5
  11. package/model-function/executeStandardCall.cjs +3 -3
  12. package/model-function/executeStandardCall.d.ts +2 -2
  13. package/model-function/executeStandardCall.js +3 -3
  14. package/model-function/generate-image/ImageGenerationEvent.d.ts +1 -1
  15. package/model-function/generate-image/ImageGenerationModel.d.ts +1 -1
  16. package/model-function/generate-image/PromptTemplateImageGenerationModel.d.ts +1 -1
  17. package/model-function/generate-image/generateImage.cjs +2 -2
  18. package/model-function/generate-image/generateImage.d.ts +1 -1
  19. package/model-function/generate-image/generateImage.js +2 -2
  20. package/model-function/generate-speech/SpeechGenerationEvent.d.ts +1 -1
  21. package/model-function/generate-speech/generateSpeech.cjs +2 -2
  22. package/model-function/generate-speech/generateSpeech.d.ts +1 -1
  23. package/model-function/generate-speech/generateSpeech.js +2 -2
  24. package/model-function/generate-structure/StructureFromTextGenerationModel.cjs +10 -1
  25. package/model-function/generate-structure/StructureFromTextGenerationModel.d.ts +1 -0
  26. package/model-function/generate-structure/StructureFromTextGenerationModel.js +10 -1
  27. package/model-function/generate-structure/StructureFromTextPromptTemplate.d.ts +12 -1
  28. package/model-function/generate-structure/StructureFromTextStreamingModel.cjs +1 -22
  29. package/model-function/generate-structure/StructureFromTextStreamingModel.d.ts +0 -5
  30. package/model-function/generate-structure/StructureFromTextStreamingModel.js +1 -22
  31. package/model-function/generate-structure/StructureGenerationEvent.d.ts +1 -1
  32. package/model-function/generate-structure/generateStructure.cjs +2 -2
  33. package/model-function/generate-structure/generateStructure.d.ts +1 -1
  34. package/model-function/generate-structure/generateStructure.js +2 -2
  35. package/model-function/generate-structure/jsonStructurePrompt.cjs +4 -12
  36. package/model-function/generate-structure/jsonStructurePrompt.js +4 -12
  37. package/model-function/generate-text/PromptTemplateFullTextModel.d.ts +2 -2
  38. package/model-function/generate-text/PromptTemplateTextGenerationModel.cjs +6 -0
  39. package/model-function/generate-text/PromptTemplateTextGenerationModel.d.ts +5 -2
  40. package/model-function/generate-text/PromptTemplateTextGenerationModel.js +6 -0
  41. package/model-function/generate-text/PromptTemplateTextStreamingModel.cjs +6 -0
  42. package/model-function/generate-text/PromptTemplateTextStreamingModel.d.ts +3 -0
  43. package/model-function/generate-text/PromptTemplateTextStreamingModel.js +6 -0
  44. package/model-function/generate-text/TextGenerationEvent.d.ts +1 -1
  45. package/model-function/generate-text/TextGenerationModel.d.ts +7 -4
  46. package/model-function/generate-text/generateText.cjs +3 -3
  47. package/model-function/generate-text/generateText.d.ts +1 -1
  48. package/model-function/generate-text/generateText.js +3 -3
  49. package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.cjs +8 -1
  50. package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.d.ts +5 -0
  51. package/model-function/generate-text/prompt-template/AlpacaPromptTemplate.js +6 -0
  52. package/model-function/generate-text/prompt-template/PromptTemplateProvider.cjs +2 -0
  53. package/model-function/generate-text/prompt-template/PromptTemplateProvider.d.ts +8 -0
  54. package/model-function/generate-text/prompt-template/PromptTemplateProvider.js +1 -0
  55. package/model-function/generate-text/prompt-template/VicunaPromptTemplate.cjs +34 -1
  56. package/model-function/generate-text/prompt-template/VicunaPromptTemplate.d.ts +9 -0
  57. package/model-function/generate-text/prompt-template/VicunaPromptTemplate.js +31 -0
  58. package/model-function/generate-text/prompt-template/VicunaPromptTemplate.test.cjs +28 -0
  59. package/model-function/generate-text/prompt-template/VicunaPromptTemplate.test.js +29 -1
  60. package/model-function/generate-text/prompt-template/index.cjs +1 -0
  61. package/model-function/generate-text/prompt-template/index.d.ts +1 -0
  62. package/model-function/generate-text/prompt-template/index.js +1 -0
  63. package/model-function/generate-transcription/TranscriptionEvent.d.ts +1 -1
  64. package/model-function/generate-transcription/TranscriptionModel.d.ts +1 -1
  65. package/model-function/generate-transcription/generateTranscription.cjs +1 -1
  66. package/model-function/generate-transcription/generateTranscription.d.ts +1 -1
  67. package/model-function/generate-transcription/generateTranscription.js +1 -1
  68. package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs +3 -3
  69. package/model-provider/automatic1111/Automatic1111ImageGenerationModel.d.ts +1 -1
  70. package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js +3 -3
  71. package/model-provider/cohere/CohereTextEmbeddingModel.cjs +3 -3
  72. package/model-provider/cohere/CohereTextEmbeddingModel.d.ts +1 -1
  73. package/model-provider/cohere/CohereTextEmbeddingModel.js +3 -3
  74. package/model-provider/cohere/CohereTextGenerationModel.cjs +6 -3
  75. package/model-provider/cohere/CohereTextGenerationModel.d.ts +5 -4
  76. package/model-provider/cohere/CohereTextGenerationModel.js +6 -3
  77. package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.cjs +3 -3
  78. package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.d.ts +1 -1
  79. package/model-provider/huggingface/HuggingFaceTextEmbeddingModel.js +3 -3
  80. package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs +6 -3
  81. package/model-provider/huggingface/HuggingFaceTextGenerationModel.d.ts +5 -4
  82. package/model-provider/huggingface/HuggingFaceTextGenerationModel.js +6 -3
  83. package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs +15 -1
  84. package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.d.ts +4 -0
  85. package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js +13 -0
  86. package/model-provider/llamacpp/LlamaCppCompletionModel.cjs +40 -33
  87. package/model-provider/llamacpp/LlamaCppCompletionModel.d.ts +20 -9
  88. package/model-provider/llamacpp/LlamaCppCompletionModel.js +40 -33
  89. package/model-provider/llamacpp/LlamaCppFacade.cjs +4 -3
  90. package/model-provider/llamacpp/LlamaCppFacade.d.ts +2 -1
  91. package/model-provider/llamacpp/LlamaCppFacade.js +2 -1
  92. package/model-provider/llamacpp/LlamaCppGrammars.cjs +3 -1
  93. package/model-provider/llamacpp/LlamaCppGrammars.d.ts +1 -0
  94. package/model-provider/llamacpp/LlamaCppGrammars.js +1 -0
  95. package/model-provider/llamacpp/LlamaCppPrompt.cjs +59 -0
  96. package/model-provider/llamacpp/LlamaCppPrompt.d.ts +14 -0
  97. package/model-provider/llamacpp/LlamaCppPrompt.js +31 -0
  98. package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.cjs +3 -3
  99. package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.d.ts +1 -1
  100. package/model-provider/llamacpp/LlamaCppTextEmbeddingModel.js +3 -3
  101. package/model-provider/llamacpp/convertJsonSchemaToGBNF.cjs +113 -0
  102. package/model-provider/llamacpp/convertJsonSchemaToGBNF.d.ts +7 -0
  103. package/model-provider/llamacpp/convertJsonSchemaToGBNF.js +109 -0
  104. package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.cjs +150 -0
  105. package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.d.ts +1 -0
  106. package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.js +148 -0
  107. package/model-provider/llamacpp/index.cjs +2 -3
  108. package/model-provider/llamacpp/index.d.ts +1 -2
  109. package/model-provider/llamacpp/index.js +1 -2
  110. package/model-provider/mistral/MistralChatModel.cjs +6 -3
  111. package/model-provider/mistral/MistralChatModel.d.ts +5 -4
  112. package/model-provider/mistral/MistralChatModel.js +6 -3
  113. package/model-provider/mistral/MistralTextEmbeddingModel.cjs +3 -3
  114. package/model-provider/mistral/MistralTextEmbeddingModel.d.ts +1 -1
  115. package/model-provider/mistral/MistralTextEmbeddingModel.js +3 -3
  116. package/model-provider/ollama/OllamaChatModel.cjs +3 -3
  117. package/model-provider/ollama/OllamaChatModel.d.ts +2 -2
  118. package/model-provider/ollama/OllamaChatModel.js +3 -3
  119. package/model-provider/ollama/OllamaCompletionModel.cjs +6 -3
  120. package/model-provider/ollama/OllamaCompletionModel.d.ts +15 -14
  121. package/model-provider/ollama/OllamaCompletionModel.js +6 -3
  122. package/model-provider/ollama/OllamaTextEmbeddingModel.cjs +3 -3
  123. package/model-provider/ollama/OllamaTextEmbeddingModel.d.ts +1 -1
  124. package/model-provider/ollama/OllamaTextEmbeddingModel.js +3 -3
  125. package/model-provider/openai/AbstractOpenAIChatModel.cjs +12 -12
  126. package/model-provider/openai/AbstractOpenAIChatModel.d.ts +6 -6
  127. package/model-provider/openai/AbstractOpenAIChatModel.js +12 -12
  128. package/model-provider/openai/AbstractOpenAICompletionModel.cjs +9 -6
  129. package/model-provider/openai/AbstractOpenAICompletionModel.d.ts +3 -2
  130. package/model-provider/openai/AbstractOpenAICompletionModel.js +9 -6
  131. package/model-provider/openai/OpenAIImageGenerationModel.cjs +3 -3
  132. package/model-provider/openai/OpenAIImageGenerationModel.d.ts +1 -1
  133. package/model-provider/openai/OpenAIImageGenerationModel.js +3 -3
  134. package/model-provider/openai/OpenAITextEmbeddingModel.cjs +3 -3
  135. package/model-provider/openai/OpenAITextEmbeddingModel.d.ts +1 -1
  136. package/model-provider/openai/OpenAITextEmbeddingModel.js +3 -3
  137. package/model-provider/openai/OpenAITranscriptionModel.cjs +3 -3
  138. package/model-provider/openai/OpenAITranscriptionModel.d.ts +1 -1
  139. package/model-provider/openai/OpenAITranscriptionModel.js +3 -3
  140. package/model-provider/stability/StabilityImageGenerationModel.cjs +3 -3
  141. package/model-provider/stability/StabilityImageGenerationModel.d.ts +1 -1
  142. package/model-provider/stability/StabilityImageGenerationModel.js +3 -3
  143. package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs +3 -3
  144. package/model-provider/whispercpp/WhisperCppTranscriptionModel.d.ts +1 -1
  145. package/model-provider/whispercpp/WhisperCppTranscriptionModel.js +3 -3
  146. package/package.json +1 -1
  147. package/tool/generate-tool-call/TextGenerationToolCallModel.cjs +2 -2
  148. package/tool/generate-tool-call/TextGenerationToolCallModel.d.ts +1 -1
  149. package/tool/generate-tool-call/TextGenerationToolCallModel.js +2 -2
  150. package/tool/generate-tool-call/ToolCallGenerationEvent.d.ts +1 -1
  151. package/tool/generate-tool-call/ToolCallGenerationModel.d.ts +1 -1
  152. package/tool/generate-tool-call/generateToolCall.cjs +2 -2
  153. package/tool/generate-tool-call/generateToolCall.js +2 -2
  154. package/tool/generate-tool-calls/TextGenerationToolCallsModel.cjs +2 -2
  155. package/tool/generate-tool-calls/TextGenerationToolCallsModel.d.ts +1 -1
  156. package/tool/generate-tool-calls/TextGenerationToolCallsModel.js +2 -2
  157. package/tool/generate-tool-calls/ToolCallsGenerationEvent.d.ts +1 -1
  158. package/tool/generate-tool-calls/ToolCallsGenerationModel.d.ts +1 -1
  159. package/tool/generate-tool-calls/generateToolCalls.cjs +2 -2
  160. package/tool/generate-tool-calls/generateToolCalls.d.ts +1 -1
  161. package/tool/generate-tool-calls/generateToolCalls.js +2 -2
@@ -33,7 +33,7 @@ async function generateToolCall(model, tool, prompt, options) {
33
33
  });
34
34
  }
35
35
  return {
36
- response: result.response,
36
+ rawResponse: result.rawResponse,
37
37
  extractedValue: {
38
38
  id: toolCall.id,
39
39
  name: tool.name,
@@ -57,7 +57,7 @@ async function generateToolCall(model, tool, prompt, options) {
57
57
  return options?.fullResponse
58
58
  ? {
59
59
  toolCall: fullResponse.value,
60
- response: fullResponse.response,
60
+ response: fullResponse.rawResponse,
61
61
  metadata: fullResponse.metadata,
62
62
  }
63
63
  : fullResponse.value;
@@ -30,7 +30,7 @@ export async function generateToolCall(model, tool, prompt, options) {
30
30
  });
31
31
  }
32
32
  return {
33
- response: result.response,
33
+ rawResponse: result.rawResponse,
34
34
  extractedValue: {
35
35
  id: toolCall.id,
36
36
  name: tool.name,
@@ -54,7 +54,7 @@ export async function generateToolCall(model, tool, prompt, options) {
54
54
  return options?.fullResponse
55
55
  ? {
56
56
  toolCall: fullResponse.value,
57
- response: fullResponse.response,
57
+ response: fullResponse.rawResponse,
58
58
  metadata: fullResponse.metadata,
59
59
  }
60
60
  : fullResponse.value;
@@ -30,14 +30,14 @@ class TextGenerationToolCallsModel {
30
30
  return this.model.settingsForEvent;
31
31
  }
32
32
  async doGenerateToolCalls(tools, prompt, options) {
33
- const { response, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
33
+ const { rawResponse, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
34
34
  ...options,
35
35
  fullResponse: true,
36
36
  });
37
37
  try {
38
38
  const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
39
39
  return {
40
- response,
40
+ rawResponse,
41
41
  text,
42
42
  toolCalls,
43
43
  usage: metadata?.usage,
@@ -14,7 +14,7 @@ export declare class TextGenerationToolCallsModel<SOURCE_PROMPT, TARGET_PROMPT,
14
14
  get settings(): ToolCallsGenerationModelSettings;
15
15
  get settingsForEvent(): Partial<MODEL["settings"]>;
16
16
  doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: SOURCE_PROMPT, options?: FunctionOptions): Promise<{
17
- response: unknown;
17
+ rawResponse: unknown;
18
18
  text: string | null;
19
19
  toolCalls: {
20
20
  id: string;
@@ -27,14 +27,14 @@ export class TextGenerationToolCallsModel {
27
27
  return this.model.settingsForEvent;
28
28
  }
29
29
  async doGenerateToolCalls(tools, prompt, options) {
30
- const { response, text: generatedText, metadata, } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
30
+ const { rawResponse, text: generatedText, metadata, } = await generateText(this.model, this.template.createPrompt(prompt, tools), {
31
31
  ...options,
32
32
  fullResponse: true,
33
33
  });
34
34
  try {
35
35
  const { text, toolCalls } = this.template.extractToolCallsAndText(generatedText);
36
36
  return {
37
- response,
37
+ rawResponse,
38
38
  text,
39
39
  toolCalls,
40
40
  usage: metadata?.usage,
@@ -4,7 +4,7 @@ export interface ToolCallsGenerationStartedEvent extends BaseModelCallStartedEve
4
4
  }
5
5
  export type ToolCallsGenerationFinishedEventResult = {
6
6
  status: "success";
7
- response: unknown;
7
+ rawResponse: unknown;
8
8
  value: unknown;
9
9
  usage?: {
10
10
  promptTokens: number;
@@ -5,7 +5,7 @@ export interface ToolCallsGenerationModelSettings extends ModelSettings {
5
5
  }
6
6
  export interface ToolCallsGenerationModel<PROMPT, SETTINGS extends ToolCallsGenerationModelSettings> extends Model<SETTINGS> {
7
7
  doGenerateToolCalls(tools: Array<ToolDefinition<string, unknown>>, prompt: PROMPT, options?: FunctionOptions): PromiseLike<{
8
- response: unknown;
8
+ rawResponse: unknown;
9
9
  text: string | null;
10
10
  toolCalls: Array<{
11
11
  id: string;
@@ -20,7 +20,7 @@ async function generateToolCalls(model, tools, prompt, options) {
20
20
  // no tool calls:
21
21
  if (rawToolCalls == null) {
22
22
  return {
23
- response: result.response,
23
+ rawResponse: result.rawResponse,
24
24
  extractedValue: { text, toolCalls: null },
25
25
  usage: result.usage,
26
26
  };
@@ -49,7 +49,7 @@ async function generateToolCalls(model, tools, prompt, options) {
49
49
  };
50
50
  });
51
51
  return {
52
- response: result.response,
52
+ rawResponse: result.rawResponse,
53
53
  extractedValue: {
54
54
  text,
55
55
  toolCalls: toolCalls,
@@ -27,7 +27,7 @@ export declare function generateToolCalls<TOOLS extends ToolDefinition<any, any>
27
27
  text: string | null;
28
28
  toolCalls: Array<ToOutputValue<TOOLS>>;
29
29
  };
30
- response: unknown;
30
+ rawResponse: unknown;
31
31
  metadata: ModelCallMetadata;
32
32
  }>;
33
33
  export {};
@@ -17,7 +17,7 @@ export async function generateToolCalls(model, tools, prompt, options) {
17
17
  // no tool calls:
18
18
  if (rawToolCalls == null) {
19
19
  return {
20
- response: result.response,
20
+ rawResponse: result.rawResponse,
21
21
  extractedValue: { text, toolCalls: null },
22
22
  usage: result.usage,
23
23
  };
@@ -46,7 +46,7 @@ export async function generateToolCalls(model, tools, prompt, options) {
46
46
  };
47
47
  });
48
48
  return {
49
- response: result.response,
49
+ rawResponse: result.rawResponse,
50
50
  extractedValue: {
51
51
  text,
52
52
  toolCalls: toolCalls,