modelfusion 0.110.0 → 0.112.0

package/model-provider/anthropic/AnthropicTextGenerationModel.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
@@ -74,26 +74,24 @@ export class AnthropicTextGenerationModel extends AbstractModel {
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
-            call: async () => {
-                return postJsonToApi({
-                    url: api.assembleUrl(`/complete`),
-                    headers: api.headers,
-                    body: {
-                        model: this.settings.model,
-                        prompt,
-                        stream: responseFormat.stream,
-                        max_tokens_to_sample: this.settings.maxGenerationTokens ?? 100,
-                        temperature: this.settings.temperature,
-                        top_k: this.settings.topK,
-                        top_p: this.settings.topP,
-                        stop_sequences: this.settings.stopSequences,
-                        metadata: userId != null ? { user_id: userId } : undefined,
-                    },
-                    failedResponseHandler: failedAnthropicCallResponseHandler,
-                    successfulResponseHandler: responseFormat.handler,
-                    abortSignal,
-                });
-            },
+            call: async () => postJsonToApi({
+                url: api.assembleUrl(`/complete`),
+                headers: api.headers,
+                body: {
+                    model: this.settings.model,
+                    prompt,
+                    stream: responseFormat.stream,
+                    max_tokens_to_sample: this.settings.maxGenerationTokens ?? 100,
+                    temperature: this.settings.temperature,
+                    top_k: this.settings.topK,
+                    top_p: this.settings.topP,
+                    stop_sequences: this.settings.stopSequences,
+                    metadata: userId != null ? { user_id: userId } : undefined,
+                },
+                failedResponseHandler: failedAnthropicCallResponseHandler,
+                successfulResponseHandler: responseFormat.handler,
+                abortSignal,
+            }),
         });
     }
     get settingsForEvent() {
@@ -179,11 +177,11 @@ const anthropicTextGenerationResponseSchema = z.object({
     stop_reason: z.string(),
     model: z.string(),
 });
-const anthropicTextStreamChunkSchema = new ZodSchema(z.object({
+const anthropicTextStreamChunkSchema = z.object({
     completion: z.string(),
     stop_reason: z.string().nullable(),
     model: z.string(),
-}));
+});
 async function createAnthropicFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue();
     // process the stream asynchonously (no 'await' on purpose):
@@ -202,7 +200,7 @@ async function createAnthropicFullDeltaIterableQueue(stream) {
                 const data = event.data;
                 const eventData = parseJSON({
                     text: data,
-                    schema: anthropicTextStreamChunkSchema,
+                    schema: zodSchema(anthropicTextStreamChunkSchema),
                 });
                 queue.push({ type: "delta", deltaValue: eventData });
                 if (eventData.stop_reason != null) {
@@ -227,7 +225,7 @@ export const AnthropicTextGenerationResponseFormat = {
      */
     json: {
         stream: false,
-        handler: createJsonResponseHandler(anthropicTextGenerationResponseSchema),
+        handler: createJsonResponseHandler(zodSchema(anthropicTextGenerationResponseSchema)),
     },
     /**
      * Returns an async iterable over the full deltas (all choices, including full current state at time of event)

package/model-provider/anthropic/index.cjs

@@ -26,11 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnthropicPrompt = exports.anthropic = exports.anthropicErrorDataSchema = exports.AnthropicError = void 0;
+exports.AnthropicPrompt = exports.anthropic = void 0;
 __exportStar(require("./AnthropicApiConfiguration.cjs"), exports);
-var AnthropicError_js_1 = require("./AnthropicError.cjs");
-Object.defineProperty(exports, "AnthropicError", { enumerable: true, get: function () { return AnthropicError_js_1.AnthropicError; } });
-Object.defineProperty(exports, "anthropicErrorDataSchema", { enumerable: true, get: function () { return AnthropicError_js_1.anthropicErrorDataSchema; } });
 exports.anthropic = __importStar(require("./AnthropicFacade.cjs"));
 exports.AnthropicPrompt = __importStar(require("./AnthropicPromptTemplate.cjs"));
 __exportStar(require("./AnthropicTextGenerationModel.cjs"), exports);

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

@@ -1,5 +1,5 @@
 export * from "./AnthropicApiConfiguration.js";
-export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
+export { AnthropicErrorData } from "./AnthropicError.js";
 export * as anthropic from "./AnthropicFacade.js";
 export * as AnthropicPrompt from "./AnthropicPromptTemplate.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/anthropic/index.js

@@ -1,5 +1,4 @@
 export * from "./AnthropicApiConfiguration.js";
-export { AnthropicError, anthropicErrorDataSchema } from "./AnthropicError.js";
 export * as anthropic from "./AnthropicFacade.js";
 export * as AnthropicPrompt from "./AnthropicPromptTemplate.js";
 export * from "./AnthropicTextGenerationModel.js";

package/model-provider/automatic1111/Automatic1111ApiConfiguration.cjs

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Automatic1111ApiConfiguration = void 0;
-const BaseUrlPartsApiConfiguration_js_1 = require("../../core/api/BaseUrlPartsApiConfiguration.cjs");
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
 /**
  * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
  * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
  */
-class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration_js_1.BaseUrlPartsApiConfiguration {
-    constructor({ protocol = "http", host = "127.0.0.1", port = "7860", path = "/sdapi/v1", headers = {}, retry, throttle, } = {}) {
-        super({ protocol, host, port, path, headers, retry, throttle });
+class Automatic1111ApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
+        super({
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "7860",
+                path: "/sdapi/v1",
+            },
+        });
     }
 }
 exports.Automatic1111ApiConfiguration = Automatic1111ApiConfiguration;

package/model-provider/automatic1111/Automatic1111ApiConfiguration.d.ts

@@ -1,8 +1,8 @@
-import { BaseUrlPartsApiConfiguration, BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
 /**
  * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
  * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
  */
-export declare class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration {
-    constructor({ protocol, host, port, path, headers, retry, throttle, }?: Partial<BaseUrlPartsApiConfigurationOptions>);
+export declare class Automatic1111ApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions);
 }

package/model-provider/automatic1111/Automatic1111ApiConfiguration.js

@@ -1,10 +1,18 @@
-import { BaseUrlPartsApiConfiguration, } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
 /**
  * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
  * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
  */
-export class Automatic1111ApiConfiguration extends BaseUrlPartsApiConfiguration {
-    constructor({ protocol = "http", host = "127.0.0.1", port = "7860", path = "/sdapi/v1", headers = {}, retry, throttle, } = {}) {
-        super({ protocol, host, port, path, headers, retry, throttle });
+export class Automatic1111ApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
+        super({
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "7860",
+                path: "/sdapi/v1",
+            },
+        });
     }
 }

package/model-provider/automatic1111/Automatic1111Error.cjs

@@ -4,13 +4,13 @@ exports.failedAutomatic1111CallResponseHandler = void 0;
 const zod_1 = require("zod");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const automatic1111ErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const automatic1111ErrorDataSchema = zod_1.z.object({
     error: zod_1.z.string(),
     detail: zod_1.z.string(),
     body: zod_1.z.string(),
     errors: zod_1.z.string(),
-}));
+});
 exports.failedAutomatic1111CallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
-    errorSchema: automatic1111ErrorDataSchema,
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(automatic1111ErrorDataSchema),
     errorToMessage: (error) => error.detail,
 });

package/model-provider/automatic1111/Automatic1111Error.d.ts

@@ -1,12 +1,22 @@
+import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-declare const automatic1111ErrorDataSchema: ZodSchema<{
+declare const automatic1111ErrorDataSchema: z.ZodObject<{
+    error: z.ZodString;
+    detail: z.ZodString;
+    body: z.ZodString;
+    errors: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    error: string;
+    errors: string;
+    body: string;
+    detail: string;
+}, {
     error: string;
     errors: string;
     body: string;
     detail: string;
 }>;
-export type Automatic1111ErrorData = (typeof automatic1111ErrorDataSchema)["_type"];
+export type Automatic1111ErrorData = z.infer<typeof automatic1111ErrorDataSchema>;
 export declare const failedAutomatic1111CallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/automatic1111/Automatic1111Error.js

@@ -1,13 +1,13 @@
 import { z } from "zod";
 import { createJsonErrorResponseHandler, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-const automatic1111ErrorDataSchema = new ZodSchema(z.object({
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const automatic1111ErrorDataSchema = z.object({
     error: z.string(),
     detail: z.string(),
     body: z.string(),
     errors: z.string(),
-}));
+});
 export const failedAutomatic1111CallResponseHandler = createJsonErrorResponseHandler({
-    errorSchema: automatic1111ErrorDataSchema,
+    errorSchema: zodSchema(automatic1111ErrorDataSchema),
     errorToMessage: (error) => error.detail,
 });

package/model-provider/automatic1111/Automatic1111Facade.cjs

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Api = exports.ImageGenerator = void 0;
+exports.ImageGenerator = exports.Api = void 0;
 const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
 const Automatic1111ImageGenerationModel_js_1 = require("./Automatic1111ImageGenerationModel.cjs");
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+function Api(settings) {
+    return new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration(settings);
+}
+exports.Api = Api;
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -14,11 +22,3 @@ function ImageGenerator(settings) {
     return new Automatic1111ImageGenerationModel_js_1.Automatic1111ImageGenerationModel(settings);
 }
 exports.ImageGenerator = ImageGenerator;
-/**
- * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
- * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
- */
-function Api(settings) {
-    return new Automatic1111ApiConfiguration_js_1.Automatic1111ApiConfiguration(settings);
-}
-exports.Api = Api;

package/model-provider/automatic1111/Automatic1111Facade.d.ts

@@ -1,6 +1,11 @@
-import { BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { Automatic1111ImageGenerationModel, Automatic1111ImageGenerationSettings } from "./Automatic1111ImageGenerationModel.js";
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions): Automatic1111ApiConfiguration;
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -9,8 +14,3 @@ import { Automatic1111ImageGenerationModel, Automatic1111ImageGenerationSettings
  * @return A new instance of ${@link Automatic1111ImageGenerationModel}.
  */
 export declare function ImageGenerator(settings: Automatic1111ImageGenerationSettings): Automatic1111ImageGenerationModel;
-/**
- * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
- * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
- */
-export declare function Api(settings: Partial<BaseUrlPartsApiConfigurationOptions>): Automatic1111ApiConfiguration;

package/model-provider/automatic1111/Automatic1111Facade.js

@@ -1,5 +1,12 @@
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
 import { Automatic1111ImageGenerationModel, } from "./Automatic1111ImageGenerationModel.js";
+/**
+ * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
+ * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
+ */
+export function Api(settings) {
+    return new Automatic1111ApiConfiguration(settings);
+}
 /**
  * Create an image generation model that calls the AUTOMATIC1111 Stable Diffusion Web UI API.
  *
@@ -10,10 +17,3 @@ import { Automatic1111ImageGenerationModel, } from "./Automatic1111ImageGenerati
 export function ImageGenerator(settings) {
     return new Automatic1111ImageGenerationModel(settings);
 }
-/**
- * Creates an API configuration for the AUTOMATIC1111 Stable Diffusion Web UI API.
- * It calls the API at http://127.0.0.1:7860/sdapi/v1 by default.
- */
-export function Api(settings) {
-    return new Automatic1111ApiConfiguration(settings);
-}

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.Automatic1111ImageGenerationModel = void 0;
 const zod_1 = require("zod");
 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 AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateImageGenerationModel_js_1 = require("../../model-function/generate-image/PromptTemplateImageGenerationModel.cjs");
 const Automatic1111ApiConfiguration_js_1 = require("./Automatic1111ApiConfiguration.cjs");
@@ -51,18 +52,21 @@ class Automatic1111ImageGenerationModel extends AbstractModel_js_1.AbstractModel
                     },
                 },
                 failedResponseHandler: Automatic1111Error_js_1.failedAutomatic1111CallResponseHandler,
-                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(Automatic1111ImageGenerationResponseSchema),
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(Automatic1111ImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        return {
-            height: this.settings.height,
-            width: this.settings.width,
-            sampler: this.settings.sampler,
-            steps: this.settings.steps,
-        };
+        const eventSettingProperties = [
+            "height",
+            "width",
+            "sampler",
+            "steps",
+            "cfgScale",
+            "seed",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);

package/model-provider/automatic1111/Automatic1111ImageGenerationModel.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateImageGenerationModel } from "../../model-function/generate-image/PromptTemplateImageGenerationModel.js";
 import { Automatic1111ApiConfiguration } from "./Automatic1111ApiConfiguration.js";
@@ -48,18 +49,21 @@ export class Automatic1111ImageGenerationModel extends AbstractModel {
                     },
                 },
                 failedResponseHandler: failedAutomatic1111CallResponseHandler,
-                successfulResponseHandler: createJsonResponseHandler(Automatic1111ImageGenerationResponseSchema),
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(Automatic1111ImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });
     }
     get settingsForEvent() {
-        return {
-            height: this.settings.height,
-            width: this.settings.width,
-            sampler: this.settings.sampler,
-            steps: this.settings.steps,
-        };
+        const eventSettingProperties = [
+            "height",
+            "width",
+            "sampler",
+            "steps",
+            "cfgScale",
+            "seed",
+        ];
+        return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
     async doGenerateImages(prompt, options) {
         const response = await this.callAPI(prompt, options);

package/model-provider/cohere/CohereApiConfiguration.cjs

@@ -3,19 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CohereApiConfiguration = void 0;
 const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
 const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
-class CohereApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.cohere.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+class CohereApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "COHERE_API_KEY",
                     description: "Cohere",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.cohere.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/cohere/CohereApiConfiguration.d.ts

@@ -1,11 +1,10 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export declare class CohereApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, apiKey, retry, throttle, }?: {
-        baseUrl?: string;
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export declare class CohereApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
     });
 }

package/model-provider/cohere/CohereApiConfiguration.js

@@ -1,18 +1,26 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
 import { loadApiKey } from "../../core/api/loadApiKey.js";
-export class CohereApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.cohere.ai/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Cohere API.
+ * It calls the API at https://api.cohere.ai/v1 and uses the `COHERE_API_KEY` env variable by default.
+ */
+export class CohereApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 Authorization: `Bearer ${loadApiKey({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "COHERE_API_KEY",
                     description: "Cohere",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.cohere.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/cohere/CohereError.cjs

@@ -1,48 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failedCohereCallResponseHandler = exports.CohereError = exports.cohereErrorDataSchema = void 0;
+exports.failedCohereCallResponseHandler = void 0;
 const zod_1 = require("zod");
-const ApiCallError_js_1 = require("../../core/api/ApiCallError.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");
-exports.cohereErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const cohereErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
-}));
-class CohereError extends ApiCallError_js_1.ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-exports.CohereError = CohereError;
-const failedCohereCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    // For some errors, the body of Cohere responses is empty:
-    if (responseBody.trim() === "") {
-        return new CohereError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: {
-                message: response.statusText,
-            },
-        });
-    }
-    const parsedError = (0, parseJSON_js_1.parseJSON)({
-        text: responseBody,
-        schema: exports.cohereErrorDataSchema,
-    });
-    return new CohereError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
-exports.failedCohereCallResponseHandler = failedCohereCallResponseHandler;
+});
+exports.failedCohereCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(cohereErrorDataSchema),
+    errorToMessage: (error) => error.message,
+});

package/model-provider/cohere/CohereError.d.ts

@@ -1,18 +1,11 @@
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { ResponseHandler } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-export declare const cohereErrorDataSchema: ZodSchema<{
+import { z } from "zod";
+declare const cohereErrorDataSchema: z.ZodObject<{
+    message: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    message: string;
+}, {
     message: string;
 }>;
-export type CohereErrorData = (typeof cohereErrorDataSchema)["_type"];
-export declare class CohereError extends ApiCallError {
-    readonly data: CohereErrorData;
-    constructor({ data, statusCode, url, requestBodyValues, message, }: {
-        message?: string;
-        statusCode: number;
-        url: string;
-        requestBodyValues: unknown;
-        data: CohereErrorData;
-    });
-}
-export declare const failedCohereCallResponseHandler: ResponseHandler<ApiCallError>;
+export type CohereErrorData = z.infer<typeof cohereErrorDataSchema>;
+export declare const failedCohereCallResponseHandler: import("../../core/api/postToApi.js").ResponseHandler<import("../../index.js").ApiCallError>;
+export {};

package/model-provider/cohere/CohereError.js

@@ -1,43 +1,10 @@
 import { z } from "zod";
-import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
-export const cohereErrorDataSchema = new ZodSchema(z.object({
+import { createJsonErrorResponseHandler } from "../../core/api/postToApi.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const cohereErrorDataSchema = z.object({
     message: z.string(),
-}));
-export class CohereError extends ApiCallError {
-    constructor({ data, statusCode, url, requestBodyValues, message = data.message, }) {
-        super({ message, statusCode, requestBodyValues, url });
-        Object.defineProperty(this, "data", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.data = data;
-    }
-}
-export const failedCohereCallResponseHandler = async ({ response, url, requestBodyValues }) => {
-    const responseBody = await response.text();
-    // For some errors, the body of Cohere responses is empty:
-    if (responseBody.trim() === "") {
-        return new CohereError({
-            url,
-            requestBodyValues,
-            statusCode: response.status,
-            data: {
-                message: response.statusText,
-            },
-        });
-    }
-    const parsedError = parseJSON({
-        text: responseBody,
-        schema: cohereErrorDataSchema,
-    });
-    return new CohereError({
-        url,
-        requestBodyValues,
-        statusCode: response.status,
-        data: parsedError,
-    });
-};
+});
+export const failedCohereCallResponseHandler = createJsonErrorResponseHandler({
+    errorSchema: zodSchema(cohereErrorDataSchema),
+    errorToMessage: (error) => error.message,
+});