modelfusion 0.117.0 → 0.119.0

package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.cjs

@@ -0,0 +1,150 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const convertJsonSchemaToGBNF_js_1 = require("./convertJsonSchemaToGBNF.cjs");
+describe("primitives", () => {
+    it("should convert string", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "string",
+        })).toMatchSnapshot();
+    });
+    it("should convert number", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "number",
+        })).toMatchSnapshot();
+    });
+    it("should convert integer", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "integer",
+        })).toMatchSnapshot();
+    });
+    it("should convert boolean", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "boolean",
+        })).toMatchSnapshot();
+    });
+    it("should convert null", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "null",
+        })).toMatchSnapshot();
+    });
+});
+describe("array", () => {
+    it("should convert array of string", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "array",
+            items: {
+                type: "string",
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert array of array of string", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "array",
+            items: {
+                type: "array",
+                items: {
+                    type: "string",
+                },
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert array of object", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "array",
+            items: {
+                type: "object",
+                properties: {
+                    name: {
+                        type: "string",
+                    },
+                    age: {
+                        type: "number",
+                    },
+                },
+            },
+        })).toMatchSnapshot();
+    });
+});
+describe("object", () => {
+    it("should convert object", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert object with required properties", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            required: ["name"],
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: true,
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties of string", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: {
+                type: "string",
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties of object", () => {
+        expect((0, convertJsonSchemaToGBNF_js_1.convertJsonSchemaToGBNF)({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: {
+                type: "object",
+                properties: {
+                    name: {
+                        type: "string",
+                    },
+                    age: {
+                        type: "number",
+                    },
+                },
+            },
+        })).toMatchSnapshot();
+    });
+});

package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.d.ts

@@ -0,0 +1 @@
+export {};

package/model-provider/llamacpp/convertJsonSchemaToGBNF.test.js

@@ -0,0 +1,148 @@
+import { convertJsonSchemaToGBNF } from "./convertJsonSchemaToGBNF.js";
+describe("primitives", () => {
+    it("should convert string", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "string",
+        })).toMatchSnapshot();
+    });
+    it("should convert number", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "number",
+        })).toMatchSnapshot();
+    });
+    it("should convert integer", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "integer",
+        })).toMatchSnapshot();
+    });
+    it("should convert boolean", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "boolean",
+        })).toMatchSnapshot();
+    });
+    it("should convert null", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "null",
+        })).toMatchSnapshot();
+    });
+});
+describe("array", () => {
+    it("should convert array of string", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "array",
+            items: {
+                type: "string",
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert array of array of string", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "array",
+            items: {
+                type: "array",
+                items: {
+                    type: "string",
+                },
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert array of object", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "array",
+            items: {
+                type: "object",
+                properties: {
+                    name: {
+                        type: "string",
+                    },
+                    age: {
+                        type: "number",
+                    },
+                },
+            },
+        })).toMatchSnapshot();
+    });
+});
+describe("object", () => {
+    it("should convert object", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert object with required properties", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            required: ["name"],
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: true,
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties of string", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: {
+                type: "string",
+            },
+        })).toMatchSnapshot();
+    });
+    it("should convert object with additional properties of object", () => {
+        expect(convertJsonSchemaToGBNF({
+            type: "object",
+            properties: {
+                name: {
+                    type: "string",
+                },
+                age: {
+                    type: "number",
+                },
+            },
+            additionalProperties: {
+                type: "object",
+                properties: {
+                    name: {
+                        type: "string",
+                    },
+                    age: {
+                        type: "number",
+                    },
+                },
+            },
+        })).toMatchSnapshot();
+    });
+});

package/model-provider/llamacpp/index.cjs

@@ -26,10 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.llamacpp = exports.LlamaCppBakLLaVA1Prompt = void 0;
+exports.llamacpp = void 0;
 __exportStar(require("./LlamaCppApiConfiguration.cjs"), exports);
-exports.LlamaCppBakLLaVA1Prompt = __importStar(require("./LlamaCppBakLLaVA1PromptTemplate.cjs"));
+__exportStar(require("./LlamaCppCompletionModel.cjs"), exports);
 exports.llamacpp = __importStar(require("./LlamaCppFacade.cjs"));
 __exportStar(require("./LlamaCppTextEmbeddingModel.cjs"), exports);
-__exportStar(require("./LlamaCppCompletionModel.cjs"), exports);
 __exportStar(require("./LlamaCppTokenizer.cjs"), exports);

package/model-provider/llamacpp/index.d.ts

@@ -1,7 +1,6 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+export * from "./LlamaCppCompletionModel.js";
 export { LlamaCppErrorData } from "./LlamaCppError.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/llamacpp/index.js

@@ -1,6 +1,5 @@
 export * from "./LlamaCppApiConfiguration.js";
-export * as LlamaCppBakLLaVA1Prompt from "./LlamaCppBakLLaVA1PromptTemplate.js";
+export * from "./LlamaCppCompletionModel.js";
 export * as llamacpp from "./LlamaCppFacade.js";
 export * from "./LlamaCppTextEmbeddingModel.js";
-export * from "./LlamaCppCompletionModel.js";
 export * from "./LlamaCppTokenizer.js";

package/model-provider/mistral/MistralChatModel.cjs

@@ -97,10 +97,10 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(mistralChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => ({
                 text: choice.message.content,
                 finishReason: this.translateFinishReason(choice.finish_reason),
             })),
@@ -144,6 +144,9 @@ class MistralChatModel extends AbstractModel_js_1.AbstractModel {
     withChatPrompt() {
         return this.withPromptTemplate((0, MistralChatPromptTemplate_js_1.chat)());
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel_js_1.PromptTemplateTextStreamingModel({
             model: this, // stop tokens are not supported by this model

package/model-provider/mistral/MistralChatModel.d.ts

@@ -59,7 +59,7 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
     }): Promise<RESULT>;
     get settingsForEvent(): Partial<MistralChatModelSettings>;
     doGenerateTexts(prompt: MistralChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {
@@ -84,7 +84,7 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {
@@ -108,8 +108,8 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
             finishReason: TextGenerationFinishReason;
         }[];
     };
-    processTextGenerationResponse(response: MistralChatResponse): {
-        response: {
+    processTextGenerationResponse(rawResponse: MistralChatResponse): {
+        rawResponse: {
             object: string;
             model: string;
             usage: {
@@ -161,6 +161,7 @@ export declare class MistralChatModel extends AbstractModel<MistralChatModelSett
      * Returns this model with a chat prompt template.
      */
     withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, MistralChatPrompt, MistralChatModelSettings, this>;
+    withJsonOutput(): this;
     withPromptTemplate<INPUT_PROMPT>(promptTemplate: TextGenerationPromptTemplate<INPUT_PROMPT, MistralChatPrompt>): PromptTemplateTextStreamingModel<INPUT_PROMPT, MistralChatPrompt, MistralChatModelSettings, this>;
     withSettings(additionalSettings: Partial<MistralChatModelSettings>): this;
 }

package/model-provider/mistral/MistralChatModel.js

@@ -94,10 +94,10 @@ export class MistralChatModel extends AbstractModel {
             schema: zodSchema(mistralChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
-            textGenerationResults: response.choices.map((choice) => ({
+            rawResponse,
+            textGenerationResults: rawResponse.choices.map((choice) => ({
                 text: choice.message.content,
                 finishReason: this.translateFinishReason(choice.finish_reason),
             })),
@@ -141,6 +141,9 @@ export class MistralChatModel extends AbstractModel {
     withChatPrompt() {
         return this.withPromptTemplate(chat());
     }
+    withJsonOutput() {
+        return this;
+    }
     withPromptTemplate(promptTemplate) {
         return new PromptTemplateTextStreamingModel({
             model: this, // stop tokens are not supported by this model

package/model-provider/mistral/MistralTextEmbeddingModel.cjs

@@ -79,10 +79,10 @@ class MistralTextEmbeddingModel extends AbstractModel_js_1.AbstractModel {
         };
     }
     async doEmbedValues(texts, options) {
-        const response = await this.callAPI(texts, options);
+        const rawResponse = await this.callAPI(texts, options);
         return {
-            response,
-            embeddings: response.data.map((entry) => entry.embedding),
+            rawResponse,
+            embeddings: rawResponse.data.map((entry) => entry.embedding),
         };
     }
     withSettings(additionalSettings) {

package/model-provider/mistral/MistralTextEmbeddingModel.d.ts

@@ -30,7 +30,7 @@ export declare class MistralTextEmbeddingModel extends AbstractModel<MistralText
     callAPI(texts: Array<string>, callOptions: FunctionCallOptions): Promise<MistralTextEmbeddingResponse>;
     get settingsForEvent(): Partial<MistralTextEmbeddingModelSettings>;
     doEmbedValues(texts: string[], options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             object: string;
             model: string;
             usage: {

package/model-provider/mistral/MistralTextEmbeddingModel.js

@@ -76,10 +76,10 @@ export class MistralTextEmbeddingModel extends AbstractModel {
         };
     }
     async doEmbedValues(texts, options) {
-        const response = await this.callAPI(texts, options);
+        const rawResponse = await this.callAPI(texts, options);
         return {
-            response,
-            embeddings: response.data.map((entry) => entry.embedding),
+            rawResponse,
+            embeddings: rawResponse.data.map((entry) => entry.embedding),
         };
     }
     withSettings(additionalSettings) {

package/model-provider/ollama/OllamaChatModel.cjs

@@ -129,12 +129,12 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(ollamaChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.message.content,
+                    text: rawResponse.message.content,
                     finishReason: "unknown",
                 },
             ],

package/model-provider/ollama/OllamaChatModel.d.ts

@@ -39,7 +39,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaChatModelSettings>;
     doGenerateTexts(prompt: OllamaChatPrompt, options: FunctionCallOptions): Promise<{
-        response: {
+        rawResponse: {
             model: string;
             message: {
                 role: string;
@@ -60,7 +60,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
+        rawResponse: {
             model: string;
             message: {
                 role: string;

package/model-provider/ollama/OllamaChatModel.js

@@ -126,12 +126,12 @@ export class OllamaChatModel extends AbstractModel {
             schema: zodSchema(ollamaChatResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.message.content,
+                    text: rawResponse.message.content,
                     finishReason: "unknown",
                 },
             ],

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -130,12 +130,12 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
             schema: (0, ZodSchema_js_1.zodSchema)(ollamaCompletionResponseSchema),
         }));
     }
-    processTextGenerationResponse(response) {
+    processTextGenerationResponse(rawResponse) {
         return {
-            response,
+            rawResponse,
             textGenerationResults: [
                 {
-                    text: response.response,
+                    text: rawResponse.response,
                     finishReason: "unknown",
                 },
             ],
@@ -163,6 +163,9 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
             template: promptTemplate,
         });
     }
+    withJsonOutput() {
+        return this;
+    }
     withTextPrompt() {
         return this.withPromptTemplate({
             format(prompt) {

package/model-provider/ollama/OllamaCompletionModel.d.ts

@@ -52,10 +52,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     }): Promise<RESPONSE>;
     get settingsForEvent(): Partial<OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>>;
     doGenerateTexts(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<{
-        response: {
-            response: string;
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -71,10 +71,10 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         }[];
     }>;
     restoreGeneratedTexts(rawResponse: unknown): {
-        response: {
-            response: string;
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -89,11 +89,11 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
             finishReason: "unknown";
         }[];
     };
-    processTextGenerationResponse(response: OllamaCompletionResponse): {
-        response: {
-            response: string;
+    processTextGenerationResponse(rawResponse: OllamaCompletionResponse): {
+        rawResponse: {
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -109,9 +109,9 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         }[];
     };
     doStreamText(prompt: OllamaCompletionPrompt, options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
-        response: string;
         model: string;
         done: false;
+        response: string;
         created_at: string;
     } | {
         model: string;
@@ -130,6 +130,7 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
+    withJsonOutput(): this;
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaCompletionPrompt, OllamaCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;
     /**
      * Maps the prompt for a text version of the Ollama completion prompt template (without image support).
@@ -151,9 +152,9 @@ declare const ollamaCompletionResponseSchema: z.ZodObject<{
     eval_duration: z.ZodNumber;
     context: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
 }, "strip", z.ZodTypeAny, {
-    response: string;
     model: string;
     done: true;
+    response: string;
     created_at: string;
     total_duration: number;
     prompt_eval_count: number;
@@ -163,9 +164,9 @@ declare const ollamaCompletionResponseSchema: z.ZodObject<{
     prompt_eval_duration?: number | undefined;
     context?: number[] | undefined;
 }, {
-    response: string;
     model: string;
     done: true;
+    response: string;
     created_at: string;
     total_duration: number;
     prompt_eval_count: number;
@@ -182,14 +183,14 @@ declare const ollamaCompletionStreamChunkSchema: z.ZodDiscriminatedUnion<"done",
     created_at: z.ZodString;
     response: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    response: string;
     model: string;
     done: false;
+    response: string;
     created_at: string;
 }, {
-    response: string;
     model: string;
     done: false;
+    response: string;
     created_at: string;
 }>, z.ZodObject<{
     done: z.ZodLiteral<true>;
@@ -247,9 +248,9 @@ export declare const OllamaCompletionResponseFormat: {
             requestBodyValues: unknown;
             response: Response;
         }) => Promise<{
-            response: string;
             model: string;
             done: true;
+            response: string;
             created_at: string;
             total_duration: number;
             prompt_eval_count: number;
@@ -269,9 +270,9 @@ export declare const OllamaCompletionResponseFormat: {
         handler: ({ response }: {
             response: Response;
         }) => Promise<AsyncIterable<import("../../index.js").Delta<{
-            response: string;
             model: string;
             done: false;
+            response: string;
             created_at: string;
         } | {
             model: string;