modelfusion 0.92.0 → 0.92.1

package/core/api/ApiCallError.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiCallError = void 0;
 class ApiCallError extends Error {
     constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable = statusCode != null &&
-        (statusCode === 429 || statusCode >= 500), }) {
+        (statusCode === 429 || statusCode >= 500), data, }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,
@@ -41,6 +41,12 @@ class ApiCallError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.name = "ApiCallError";
         this.url = url;
         this.requestBodyValues = requestBodyValues;
@@ -48,6 +54,7 @@ class ApiCallError extends Error {
         this.responseBody = responseBody;
         this.cause = cause;
         this.isRetryable = isRetryable;
+        this.data = data;
     }
     toJSON() {
         return {
@@ -59,6 +66,7 @@ class ApiCallError extends Error {
             responseBody: this.responseBody,
             cause: this.cause,
             isRetryable: this.isRetryable,
+            data: this.data,
         };
     }
 }

package/core/api/ApiCallError.d.ts

@@ -5,7 +5,8 @@ export declare class ApiCallError extends Error {
     readonly responseBody?: string;
     readonly cause?: unknown;
     readonly isRetryable: boolean;
-    constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable, }: {
+    readonly data?: unknown;
+    constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable, data, }: {
         message: string;
         url: string;
         requestBodyValues: unknown;
@@ -13,6 +14,7 @@ export declare class ApiCallError extends Error {
         responseBody?: string;
         cause?: unknown;
         isRetryable?: boolean;
+        data?: unknown;
     });
     toJSON(): {
         name: string;
@@ -23,5 +25,6 @@ export declare class ApiCallError extends Error {
         responseBody: string | undefined;
         cause: unknown;
         isRetryable: boolean;
+        data: unknown;
     };
 }

package/core/api/ApiCallError.js

@@ -1,6 +1,6 @@
 export class ApiCallError extends Error {
     constructor({ message, url, requestBodyValues, statusCode, responseBody, cause, isRetryable = statusCode != null &&
-        (statusCode === 429 || statusCode >= 500), }) {
+        (statusCode === 429 || statusCode >= 500), data, }) {
         super(message);
         Object.defineProperty(this, "url", {
             enumerable: true,
@@ -38,6 +38,12 @@ export class ApiCallError extends Error {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.name = "ApiCallError";
         this.url = url;
         this.requestBodyValues = requestBodyValues;
@@ -45,6 +51,7 @@ export class ApiCallError extends Error {
         this.responseBody = responseBody;
         this.cause = cause;
         this.isRetryable = isRetryable;
+        this.data = data;
     }
     toJSON() {
         return {
@@ -56,6 +63,7 @@ export class ApiCallError extends Error {
             responseBody: this.responseBody,
             cause: this.cause,
             isRetryable: this.isRetryable,
+            data: this.data,
         };
     }
 }

package/model-provider/ollama/OllamaError.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedOllamaCallResponseHandler = exports.OllamaError = void 0;
+exports.failedOllamaCallResponseHandler = void 0;
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
@@ -8,30 +8,31 @@ const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const ollamaErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.string(),
 }));
-class OllamaError extends ApiCallError_js_1.ApiCallError {
-    constructor({ statusCode, url, requestBodyValues, data, message = data.error, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.OllamaError = OllamaError;
 const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = (0, parseJSON_js_1.parseJSON)({
-        text: responseBody,
-        schema: ollamaErrorDataSchema,
-    });
-    return new OllamaError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
+    // resilient parsing in case the response is not JSON or does not match the schema:
+    try {
+        const parsedError = (0, parseJSON_js_1.parseJSON)({
+            text: responseBody,
+            schema: ollamaErrorDataSchema,
+        });
+        return new ApiCallError_js_1.ApiCallError({
+            message: parsedError.error,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            data: parsedError,
+        });
+    }
+    catch (parseError) {
+        return new ApiCallError_js_1.ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+        });
+    }
 };
 exports.failedOllamaCallResponseHandler = failedOllamaCallResponseHandler;

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

@@ -4,16 +4,6 @@ import { ZodSchema } from "../../core/schema/ZodSchema.js";
 declare const ollamaErrorDataSchema: ZodSchema<{
     error: string;
 }>;
-type OllamaErrorData = (typeof ollamaErrorDataSchema)["_type"];
-export declare class OllamaError extends ApiCallError {
-    readonly data: OllamaErrorData;
-    constructor({ statusCode, url, requestBodyValues, data, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: OllamaErrorData;
-    });
-}
+export type OllamaErrorData = (typeof ollamaErrorDataSchema)["_type"];
 export declare const failedOllamaCallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/ollama/OllamaError.js

@@ -5,28 +5,30 @@ import { parseJSON } from "../../core/schema/parseJSON.js";
 const ollamaErrorDataSchema = new ZodSchema(z.object({
     error: z.string(),
 }));
-export class OllamaError extends ApiCallError {
-    constructor({ statusCode, url, requestBodyValues, data, message = data.error, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
 export const failedOllamaCallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
-    const parsedError = parseJSON({
-        text: responseBody,
-        schema: ollamaErrorDataSchema,
-    });
-    return new OllamaError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
+    // resilient parsing in case the response is not JSON or does not match the schema:
+    try {
+        const parsedError = parseJSON({
+            text: responseBody,
+            schema: ollamaErrorDataSchema,
+        });
+        return new ApiCallError({
+            message: parsedError.error,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            data: parsedError,
+        });
+    }
+    catch (parseError) {
+        return new ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+        });
+    }
 };

package/model-provider/ollama/OllamaTextGenerationModel.cjs

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OllamaTextGenerationResponseFormat = exports.OllamaTextGenerationModel = void 0;
 const zod_1 = require("zod");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
@@ -238,7 +240,42 @@ exports.OllamaTextGenerationResponseFormat = {
      */
     json: {
         stream: false,
-        handler: (0, postToApi_js_1.createJsonResponseHandler)(ollamaTextGenerationResponseSchema),
+        handler: (async ({ response, url, requestBodyValues }) => {
+            const responseBody = await response.text();
+            const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
+                text: responseBody,
+                schema: new ZodSchema_js_1.ZodSchema(zod_1.z.union([
+                    ollamaTextGenerationResponseSchema,
+                    zod_1.z.object({
+                        done: zod_1.z.literal(false),
+                        model: zod_1.z.string(),
+                        created_at: zod_1.z.string(),
+                        response: zod_1.z.string(),
+                    }),
+                ])),
+            });
+            if (!parsedResult.success) {
+                throw new ApiCallError_js_1.ApiCallError({
+                    message: "Invalid JSON response",
+                    cause: parsedResult.error,
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                });
+            }
+            if (parsedResult.data.done === false) {
+                throw new ApiCallError_js_1.ApiCallError({
+                    message: "Incomplete Ollama response received",
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                    isRetryable: true,
+                });
+            }
+            return parsedResult.data;
+        }),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

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

@@ -189,7 +189,11 @@ export declare const OllamaTextGenerationResponseFormat: {
      */
     json: {
         stream: false;
-        handler: ResponseHandler<{
+        handler: ({ response, url, requestBodyValues }: {
+            url: string;
+            requestBodyValues: unknown;
+            response: Response;
+        }) => Promise<{
             response: string;
             model: string;
             done: true;

package/model-provider/ollama/OllamaTextGenerationModel.js

@@ -1,7 +1,9 @@
 import { z } from "zod";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
-import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { postJsonToApi } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptFormatTextStreamingModel } from "../../model-function/generate-text/PromptFormatTextStreamingModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
@@ -234,7 +236,42 @@ export const OllamaTextGenerationResponseFormat = {
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(ollamaTextGenerationResponseSchema),
+        handler: (async ({ response, url, requestBodyValues }) => {
+            const responseBody = await response.text();
+            const parsedResult = safeParseJSON({
+                text: responseBody,
+                schema: new ZodSchema(z.union([
+                    ollamaTextGenerationResponseSchema,
+                    z.object({
+                        done: z.literal(false),
+                        model: z.string(),
+                        created_at: z.string(),
+                        response: z.string(),
+                    }),
+                ])),
+            });
+            if (!parsedResult.success) {
+                throw new ApiCallError({
+                    message: "Invalid JSON response",
+                    cause: parsedResult.error,
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                });
+            }
+            if (parsedResult.data.done === false) {
+                throw new ApiCallError({
+                    message: "Incomplete Ollama response received",
+                    statusCode: response.status,
+                    responseBody,
+                    url,
+                    requestBodyValues,
+                    isRetryable: true,
+                });
+            }
+            return parsedResult.data;
+        }),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

package/model-provider/ollama/OllamaTextGenerationModel.test.cjs

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const msw_1 = require("msw");
+const node_1 = require("msw/node");
+const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
+const retryNever_js_1 = require("../../core/api/retryNever.cjs");
+const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
+const OllamaApiConfiguration_js_1 = require("./OllamaApiConfiguration.cjs");
+const OllamaTextGenerationModel_js_1 = require("./OllamaTextGenerationModel.cjs");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let responseBodyJson = {};
+const server = (0, node_1.setupServer)(msw_1.http.post("http://127.0.0.1:11434/api/generate", () => msw_1.HttpResponse.json(responseBodyJson)));
+beforeAll(() => server.listen());
+beforeEach(() => {
+    responseBodyJson = {};
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+describe("generateText", () => {
+    it("should return the generated text", async () => {
+        responseBodyJson = {
+            model: "test-model",
+            created_at: "2023-08-04T19:22:45.499127Z",
+            response: "test response",
+            context: [1, 2, 3],
+            done: true,
+            total_duration: 5589157167,
+            load_duration: 3013701500,
+            sample_count: 114,
+            sample_duration: 81442000,
+            prompt_eval_count: 46,
+            prompt_eval_duration: 1160282000,
+            eval_count: 113,
+            eval_duration: 1325948000,
+        };
+        const result = await (0, generateText_js_1.generateText)(new OllamaTextGenerationModel_js_1.OllamaTextGenerationModel({
+            model: "test-model",
+        }), "test prompt");
+        expect(result).toEqual("test response");
+    });
+    it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
+        responseBodyJson = {
+            model: "",
+            created_at: "0001-01-01T00:00:00Z",
+            response: "",
+            done: false,
+        };
+        try {
+            await (0, generateText_js_1.generateText)(new OllamaTextGenerationModel_js_1.OllamaTextGenerationModel({
+                api: new OllamaApiConfiguration_js_1.OllamaApiConfiguration({
+                    retry: (0, retryNever_js_1.retryNever)(),
+                }),
+                model: "test-model",
+            }), "test prompt");
+            (0, assert_1.fail)("Should have thrown ApiCallError");
+        }
+        catch (expectedError) {
+            expect(expectedError).toBeInstanceOf(ApiCallError_js_1.ApiCallError);
+            expect(expectedError.isRetryable).toBe(true);
+        }
+    });
+});

package/model-provider/ollama/OllamaTextGenerationModel.test.d.ts

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

package/model-provider/ollama/OllamaTextGenerationModel.test.js

@@ -0,0 +1,61 @@
+import { fail } from "assert";
+import { HttpResponse, http } from "msw";
+import { setupServer } from "msw/node";
+import { ApiCallError } from "../../core/api/ApiCallError.js";
+import { retryNever } from "../../core/api/retryNever.js";
+import { generateText } from "../../model-function/generate-text/generateText.js";
+import { OllamaApiConfiguration } from "./OllamaApiConfiguration.js";
+import { OllamaTextGenerationModel } from "./OllamaTextGenerationModel.js";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let responseBodyJson = {};
+const server = setupServer(http.post("http://127.0.0.1:11434/api/generate", () => HttpResponse.json(responseBodyJson)));
+beforeAll(() => server.listen());
+beforeEach(() => {
+    responseBodyJson = {};
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+describe("generateText", () => {
+    it("should return the generated text", async () => {
+        responseBodyJson = {
+            model: "test-model",
+            created_at: "2023-08-04T19:22:45.499127Z",
+            response: "test response",
+            context: [1, 2, 3],
+            done: true,
+            total_duration: 5589157167,
+            load_duration: 3013701500,
+            sample_count: 114,
+            sample_duration: 81442000,
+            prompt_eval_count: 46,
+            prompt_eval_duration: 1160282000,
+            eval_count: 113,
+            eval_duration: 1325948000,
+        };
+        const result = await generateText(new OllamaTextGenerationModel({
+            model: "test-model",
+        }), "test prompt");
+        expect(result).toEqual("test response");
+    });
+    it("should throw retryable ApiCallError when Ollama is overloaded", async () => {
+        responseBodyJson = {
+            model: "",
+            created_at: "0001-01-01T00:00:00Z",
+            response: "",
+            done: false,
+        };
+        try {
+            await generateText(new OllamaTextGenerationModel({
+                api: new OllamaApiConfiguration({
+                    retry: retryNever(),
+                }),
+                model: "test-model",
+            }), "test prompt");
+            fail("Should have thrown ApiCallError");
+        }
+        catch (expectedError) {
+            expect(expectedError).toBeInstanceOf(ApiCallError);
+            expect(expectedError.isRetryable).toBe(true);
+        }
+    });
+});

package/model-provider/ollama/index.cjs

@@ -26,10 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ollama = exports.OllamaError = void 0;
+exports.ollama = void 0;
 __exportStar(require("./OllamaApiConfiguration.cjs"), exports);
-var OllamaError_js_1 = require("./OllamaError.cjs");
-Object.defineProperty(exports, "OllamaError", { enumerable: true, get: function () { return OllamaError_js_1.OllamaError; } });
 exports.ollama = __importStar(require("./OllamaFacade.cjs"));
 __exportStar(require("./OllamaTextEmbeddingModel.cjs"), exports);
 __exportStar(require("./OllamaTextGenerationModel.cjs"), exports);

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

@@ -1,5 +1,5 @@
 export * from "./OllamaApiConfiguration.js";
-export { OllamaError } from "./OllamaError.js";
+export { OllamaErrorData } from "./OllamaError.js";
 export * as ollama from "./OllamaFacade.js";
 export * from "./OllamaTextEmbeddingModel.js";
 export * from "./OllamaTextGenerationModel.js";

package/model-provider/ollama/index.js

@@ -1,5 +1,4 @@
 export * from "./OllamaApiConfiguration.js";
-export { OllamaError } from "./OllamaError.js";
 export * as ollama from "./OllamaFacade.js";
 export * from "./OllamaTextEmbeddingModel.js";
 export * from "./OllamaTextGenerationModel.js";

package/model-provider/openai/OpenAIError.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedOpenAICallResponseHandler = exports.OpenAIError = exports.openAIErrorDataSchema = void 0;
+exports.failedOpenAICallResponseHandler = void 0;
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
-exports.openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.object({
         message: zod_1.z.string(),
         type: zod_1.z.string(),
@@ -13,50 +13,34 @@ exports.openAIErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
         code: zod_1.z.string().nullable(),
     }),
 }));
-class OpenAIError extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message, }) {
-        super({
-            message,
-            statusCode,
-            requestBodyValues,
-            url,
-            isRetryable: (statusCode === 429 &&
-                // insufficient_quota is also reported as a 429, but it's not retryable:
-                data?.error.type !== "insufficient_quota") ||
-                statusCode >= 500,
-        });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.OpenAIError = OpenAIError;
 const failedOpenAICallResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
         const parsedError = (0, parseJSON_js_1.parseJSON)({
             text: responseBody,
-            schema: exports.openAIErrorDataSchema,
+            schema: openAIErrorDataSchema,
         });
-        return new OpenAIError({
+        return new ApiCallError_js_1.ApiCallError({
+            message: parsedError.error.message,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: parsedError.error.message,
+            responseBody,
             data: parsedError,
+            isRetryable: (response.status === 429 &&
+                // insufficient_quota is also reported as a 429, but it's not retryable:
+                parsedError?.error.type !== "insufficient_quota") ||
+                response.status >= 500,
         });
     }
     catch (parseError) {
-        return new OpenAIError({
+        return new ApiCallError_js_1.ApiCallError({
+            message: responseBody.trim() !== "" ? responseBody : response.statusText,
             url,
             requestBodyValues,
             statusCode: response.status,
-            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            responseBody,
         });
     }
 };

package/model-provider/openai/OpenAIError.d.ts

@@ -1,7 +1,7 @@
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const openAIErrorDataSchema: ZodSchema<{
+declare const openAIErrorDataSchema: ZodSchema<{
     error: {
         message: string;
         code: string | null;
@@ -10,14 +10,5 @@ export declare const openAIErrorDataSchema: ZodSchema<{
     };
 }>;
 export type OpenAIErrorData = (typeof openAIErrorDataSchema)["_type"];
-export declare class OpenAIError extends ApiCallError {
-    readonly data?: OpenAIErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data?: OpenAIErrorData;
-    });
-}
 export declare const failedOpenAICallResponseHandler: ResponseHandler<ApiCallError>;
+export {};