modelfusion 0.109.0 → 0.111.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v0.111.0 - 2024-01-01
+
+Reworked API configuration support.
+
+### Added
+
+- All providers now have an `Api` function that you can call to create custom API configurations. The base URL set up is more flexible and allows you to override parts of the base URL selectively.
+- `api` namespace with retry and throttle configurations
+
+### Changed
+
+- Updated Cohere models.
+- Updated LMNT API calls to LMNT `v1` API.
+- **breaking change**: Renamed `throttleUnlimitedConcurrency` to `throttleOff`.
+
+## v0.110.0 - 2023-12-30
+
+### Changed
+
+- **breaking change**: renamed `modelfusion/extension` to `modelfusion/internal`. This requires updating `modelfusion-experimental` (if used) to `v0.3.0`
+
+### Removed
+
+- Deprecated OpenAI completion models that will be deactivated on January 4, 2024.
+
 ## v0.109.0 - 2023-12-30
 
 ### Added

package/core/api/ApiFacade.cjs

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./retryNever.cjs"), exports);
+__exportStar(require("./retryWithExponentialBackoff.cjs"), exports);
+__exportStar(require("./throttleMaxConcurrency.cjs"), exports);
+__exportStar(require("./throttleOff.cjs"), exports);

package/core/api/ApiFacade.d.ts

@@ -0,0 +1,4 @@
+export * from "./retryNever.js";
+export * from "./retryWithExponentialBackoff.js";
+export * from "./throttleMaxConcurrency.js";
+export * from "./throttleOff.js";

package/core/api/ApiFacade.js

@@ -0,0 +1,4 @@
+export * from "./retryNever.js";
+export * from "./retryWithExponentialBackoff.js";
+export * from "./throttleMaxConcurrency.js";
+export * from "./throttleOff.js";

package/core/api/BaseUrlApiConfiguration.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseUrlApiConfiguration = void 0;
+exports.BaseUrlApiConfigurationWithDefaults = exports.BaseUrlApiConfiguration = void 0;
 const AbstractApiConfiguration_js_1 = require("./AbstractApiConfiguration.cjs");
 /**
- * An API configuration that uses a base URL and a set of headers.
+ * An API configuration that uses different URL parts and a set of headers.
  *
  * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
  */
@@ -22,11 +22,53 @@ class BaseUrlApiConfiguration extends AbstractApiConfiguration_js_1.AbstractApiC
             writable: true,
             value: void 0
         });
-        this.baseUrl = baseUrl;
-        this.headers = headers;
+        this.baseUrl = typeof baseUrl == "string" ? parseBaseUrl(baseUrl) : baseUrl;
+        this.headers = headers ?? {};
     }
     assembleUrl(path) {
-        return `${this.baseUrl}${path}`;
+        let basePath = this.baseUrl.path;
+        // ensure base path ends without a slash
+        if (basePath.endsWith("/")) {
+            basePath = basePath.slice(0, -1);
+        }
+        // ensure path starts with a slash
+        if (!path.startsWith("/")) {
+            path = `/${path}`;
+        }
+        return `${this.baseUrl.protocol}://${this.baseUrl.host}:${this.baseUrl.port}${basePath}${path}`;
     }
 }
 exports.BaseUrlApiConfiguration = BaseUrlApiConfiguration;
+class BaseUrlApiConfigurationWithDefaults extends BaseUrlApiConfiguration {
+    constructor({ baseUrlDefaults, baseUrl, headers, retry, throttle, }) {
+        super({
+            baseUrl: resolveBaseUrl(baseUrl, baseUrlDefaults),
+            headers,
+            retry,
+            throttle,
+        });
+    }
+}
+exports.BaseUrlApiConfigurationWithDefaults = BaseUrlApiConfigurationWithDefaults;
+function parseBaseUrl(baseUrl) {
+    const url = new URL(baseUrl);
+    return {
+        protocol: url.protocol.slice(0, -1), // remove trailing colon
+        host: url.hostname,
+        port: url.port,
+        path: url.pathname,
+    };
+}
+function resolveBaseUrl(baseUrl = {}, baseUrlDefaults) {
+    if (typeof baseUrl == "string") {
+        return baseUrl;
+    }
+    else {
+        return {
+            protocol: baseUrl.protocol ?? baseUrlDefaults.protocol,
+            host: baseUrl.host ?? baseUrlDefaults.host,
+            port: baseUrl.port ?? baseUrlDefaults.port,
+            path: baseUrl.path ?? baseUrlDefaults.path,
+        };
+    }
+}

package/core/api/BaseUrlApiConfiguration.d.ts

@@ -1,20 +1,37 @@
 import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
 import { RetryFunction } from "./RetryFunction.js";
 import { ThrottleFunction } from "./ThrottleFunction.js";
-export type BaseUrlApiConfigurationOptions = {
-    baseUrl: string;
-    headers: Record<string, string>;
+export type UrlParts = {
+    protocol: string;
+    host: string;
+    port: string;
+    path: string;
+};
+export type BaseUrlPartsApiConfigurationOptions = {
+    baseUrl: string | UrlParts;
+    headers?: Record<string, string>;
     retry?: RetryFunction;
     throttle?: ThrottleFunction;
 };
 /**
- * An API configuration that uses a base URL and a set of headers.
+ * An API configuration that uses different URL parts and a set of headers.
  *
  * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
  */
 export declare class BaseUrlApiConfiguration extends AbstractApiConfiguration {
-    readonly baseUrl: string;
+    readonly baseUrl: UrlParts;
     readonly headers: Record<string, string>;
-    constructor({ baseUrl, headers, retry, throttle, }: BaseUrlApiConfigurationOptions);
+    constructor({ baseUrl, headers, retry, throttle, }: BaseUrlPartsApiConfigurationOptions);
     assembleUrl(path: string): string;
 }
+export type PartialBaseUrlPartsApiConfigurationOptions = {
+    baseUrl?: string | Partial<UrlParts>;
+    headers?: Record<string, string>;
+    retry?: RetryFunction;
+    throttle?: ThrottleFunction;
+};
+export declare class BaseUrlApiConfigurationWithDefaults extends BaseUrlApiConfiguration {
+    constructor({ baseUrlDefaults, baseUrl, headers, retry, throttle, }: {
+        baseUrlDefaults: UrlParts;
+    } & PartialBaseUrlPartsApiConfigurationOptions);
+}

package/core/api/BaseUrlApiConfiguration.js

@@ -1,6 +1,6 @@
 import { AbstractApiConfiguration } from "./AbstractApiConfiguration.js";
 /**
- * An API configuration that uses a base URL and a set of headers.
+ * An API configuration that uses different URL parts and a set of headers.
  *
  * You can use it to configure custom APIs for models, e.g. your own internal OpenAI proxy with custom headers.
  */
@@ -19,10 +19,51 @@ export class BaseUrlApiConfiguration extends AbstractApiConfiguration {
             writable: true,
             value: void 0
         });
-        this.baseUrl = baseUrl;
-        this.headers = headers;
+        this.baseUrl = typeof baseUrl == "string" ? parseBaseUrl(baseUrl) : baseUrl;
+        this.headers = headers ?? {};
     }
     assembleUrl(path) {
-        return `${this.baseUrl}${path}`;
+        let basePath = this.baseUrl.path;
+        // ensure base path ends without a slash
+        if (basePath.endsWith("/")) {
+            basePath = basePath.slice(0, -1);
+        }
+        // ensure path starts with a slash
+        if (!path.startsWith("/")) {
+            path = `/${path}`;
+        }
+        return `${this.baseUrl.protocol}://${this.baseUrl.host}:${this.baseUrl.port}${basePath}${path}`;
+    }
+}
+export class BaseUrlApiConfigurationWithDefaults extends BaseUrlApiConfiguration {
+    constructor({ baseUrlDefaults, baseUrl, headers, retry, throttle, }) {
+        super({
+            baseUrl: resolveBaseUrl(baseUrl, baseUrlDefaults),
+            headers,
+            retry,
+            throttle,
+        });
+    }
+}
+function parseBaseUrl(baseUrl) {
+    const url = new URL(baseUrl);
+    return {
+        protocol: url.protocol.slice(0, -1), // remove trailing colon
+        host: url.hostname,
+        port: url.port,
+        path: url.pathname,
+    };
+}
+function resolveBaseUrl(baseUrl = {}, baseUrlDefaults) {
+    if (typeof baseUrl == "string") {
+        return baseUrl;
+    }
+    else {
+        return {
+            protocol: baseUrl.protocol ?? baseUrlDefaults.protocol,
+            host: baseUrl.host ?? baseUrlDefaults.host,
+            port: baseUrl.port ?? baseUrlDefaults.port,
+            path: baseUrl.path ?? baseUrlDefaults.path,
+        };
     }
 }

package/core/api/BaseUrlApiConfiguration.test.cjs

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseUrlApiConfiguration_js_1 = require("./BaseUrlApiConfiguration.cjs");
+describe("with text URLs", () => {
+    it("should assemble the correct url", async () => {
+        const api = new BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration({
+            baseUrl: "http://localhost:8080",
+        });
+        expect(api.assembleUrl("/test")).toBe("http://localhost:8080/test");
+    });
+});

package/core/api/BaseUrlApiConfiguration.test.d.ts

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

package/core/api/BaseUrlApiConfiguration.test.js

@@ -0,0 +1,9 @@
+import { BaseUrlApiConfiguration } from "./BaseUrlApiConfiguration.js";
+describe("with text URLs", () => {
+    it("should assemble the correct url", async () => {
+        const api = new BaseUrlApiConfiguration({
+            baseUrl: "http://localhost:8080",
+        });
+        expect(api.assembleUrl("/test")).toBe("http://localhost:8080/test");
+    });
+});

package/core/api/callWithRetryAndThrottle.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callWithRetryAndThrottle = void 0;
-const retryWithExponentialBackoff_js_1 = require("./retryWithExponentialBackoff.cjs");
-const throttleUnlimitedConcurrency_js_1 = require("./throttleUnlimitedConcurrency.cjs");
-const callWithRetryAndThrottle = async ({ retry = (0, retryWithExponentialBackoff_js_1.retryWithExponentialBackoff)(), throttle = (0, throttleUnlimitedConcurrency_js_1.throttleUnlimitedConcurrency)(), call, }) => retry(async () => throttle(call));
+const retryNever_js_1 = require("./retryNever.cjs");
+const throttleOff_js_1 = require("./throttleOff.cjs");
+const callWithRetryAndThrottle = async ({ retry = (0, retryNever_js_1.retryNever)(), throttle = (0, throttleOff_js_1.throttleOff)(), call, }) => retry(async () => throttle(call));
 exports.callWithRetryAndThrottle = callWithRetryAndThrottle;

package/core/api/callWithRetryAndThrottle.js

@@ -1,3 +1,3 @@
-import { retryWithExponentialBackoff } from "./retryWithExponentialBackoff.js";
-import { throttleUnlimitedConcurrency } from "./throttleUnlimitedConcurrency.js";
-export const callWithRetryAndThrottle = async ({ retry = retryWithExponentialBackoff(), throttle = throttleUnlimitedConcurrency(), call, }) => retry(async () => throttle(call));
+import { retryNever } from "./retryNever.js";
+import { throttleOff } from "./throttleOff.js";
+export const callWithRetryAndThrottle = async ({ retry = retryNever(), throttle = throttleOff(), call, }) => retry(async () => throttle(call));

package/core/api/index.cjs

@@ -10,19 +10,32 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.api = void 0;
 __exportStar(require("./AbortError.cjs"), exports);
 __exportStar(require("./ApiCallError.cjs"), exports);
 __exportStar(require("./ApiConfiguration.cjs"), exports);
+exports.api = __importStar(require("./ApiFacade.cjs"));
 __exportStar(require("./BaseUrlApiConfiguration.cjs"), exports);
-__exportStar(require("./BaseUrlPartsApiConfiguration.cjs"), exports);
 __exportStar(require("./RetryError.cjs"), exports);
 __exportStar(require("./RetryFunction.cjs"), exports);
 __exportStar(require("./ThrottleFunction.cjs"), exports);
 __exportStar(require("./retryNever.cjs"), exports);
 __exportStar(require("./retryWithExponentialBackoff.cjs"), exports);
 __exportStar(require("./throttleMaxConcurrency.cjs"), exports);
-__exportStar(require("./throttleUnlimitedConcurrency.cjs"), exports);
+__exportStar(require("./throttleOff.cjs"), exports);

package/core/api/index.d.ts

@@ -1,12 +1,12 @@
 export * from "./AbortError.js";
 export * from "./ApiCallError.js";
 export * from "./ApiConfiguration.js";
+export * as api from "./ApiFacade.js";
 export * from "./BaseUrlApiConfiguration.js";
-export * from "./BaseUrlPartsApiConfiguration.js";
 export * from "./RetryError.js";
 export * from "./RetryFunction.js";
 export * from "./ThrottleFunction.js";
 export * from "./retryNever.js";
 export * from "./retryWithExponentialBackoff.js";
 export * from "./throttleMaxConcurrency.js";
-export * from "./throttleUnlimitedConcurrency.js";
+export * from "./throttleOff.js";

package/core/api/index.js

@@ -1,12 +1,12 @@
 export * from "./AbortError.js";
 export * from "./ApiCallError.js";
 export * from "./ApiConfiguration.js";
+export * as api from "./ApiFacade.js";
 export * from "./BaseUrlApiConfiguration.js";
-export * from "./BaseUrlPartsApiConfiguration.js";
 export * from "./RetryError.js";
 export * from "./RetryFunction.js";
 export * from "./ThrottleFunction.js";
 export * from "./retryNever.js";
 export * from "./retryWithExponentialBackoff.js";
 export * from "./throttleMaxConcurrency.js";
-export * from "./throttleUnlimitedConcurrency.js";
+export * from "./throttleOff.js";

package/core/api/postToApi.cjs

@@ -1,11 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postToApi = exports.postJsonToApi = exports.createAudioMpegResponseHandler = exports.createTextResponseHandler = exports.createJsonResponseHandler = exports.createJsonErrorResponseHandler = void 0;
-const ZodSchema_js_1 = require("../schema/ZodSchema.cjs");
+exports.postToApi = exports.postJsonToApi = exports.createAudioMpegResponseHandler = exports.createTextResponseHandler = exports.createJsonResponseHandler = exports.createTextErrorResponseHandler = exports.createJsonErrorResponseHandler = void 0;
 const parseJSON_js_1 = require("../schema/parseJSON.cjs");
 const ApiCallError_js_1 = require("./ApiCallError.cjs");
 const createJsonErrorResponseHandler = ({ errorSchema, errorToMessage, isRetryable, }) => async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
+    // Some providers return an empty response body for some errors:
+    if (responseBody.trim() === "") {
+        return new ApiCallError_js_1.ApiCallError({
+            message: response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            isRetryable: isRetryable?.(response),
+        });
+    }
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
         const parsedError = (0, parseJSON_js_1.parseJSON)({
@@ -19,25 +29,38 @@ const createJsonErrorResponseHandler = ({ errorSchema, errorToMessage, isRetryab
             statusCode: response.status,
             responseBody,
             data: parsedError,
-            isRetryable: isRetryable?.(parsedError, response),
+            isRetryable: isRetryable?.(response, parsedError),
         });
     }
     catch (parseError) {
         return new ApiCallError_js_1.ApiCallError({
-            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            message: response.statusText,
             url,
             requestBodyValues,
             statusCode: response.status,
             responseBody,
+            isRetryable: isRetryable?.(response),
         });
     }
 };
 exports.createJsonErrorResponseHandler = createJsonErrorResponseHandler;
+const createTextErrorResponseHandler = ({ isRetryable, } = {}) => async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    return new ApiCallError_js_1.ApiCallError({
+        message: responseBody.trim() !== "" ? responseBody : response.statusText,
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        responseBody,
+        isRetryable: isRetryable?.(response),
+    });
+};
+exports.createTextErrorResponseHandler = createTextErrorResponseHandler;
 const createJsonResponseHandler = (responseSchema) => async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
         text: responseBody,
-        schema: new ZodSchema_js_1.ZodSchema(responseSchema),
+        schema: responseSchema,
     });
     if (!parsedResult.success) {
         throw new ApiCallError_js_1.ApiCallError({

package/core/api/postToApi.d.ts

@@ -1,7 +1,5 @@
 /// <reference types="node" />
-import { z } from "zod";
 import { Schema } from "../schema/Schema.js";
-import { ZodSchema } from "../schema/ZodSchema.js";
 import { ApiCallError } from "./ApiCallError.js";
 export type ResponseHandler<T> = (options: {
     url: string;
@@ -11,9 +9,12 @@ export type ResponseHandler<T> = (options: {
 export declare const createJsonErrorResponseHandler: <T>({ errorSchema, errorToMessage, isRetryable, }: {
     errorSchema: Schema<T>;
     errorToMessage: (error: T) => string;
-    isRetryable?: ((error: T, response: Response) => boolean) | undefined;
+    isRetryable?: ((response: Response, error?: T | undefined) => boolean) | undefined;
 }) => ResponseHandler<ApiCallError>;
-export declare const createJsonResponseHandler: <T>(responseSchema: z.ZodType<T, z.ZodTypeDef, T>) => ResponseHandler<T>;
+export declare const createTextErrorResponseHandler: ({ isRetryable, }?: {
+    isRetryable?: ((response: Response) => boolean) | undefined;
+}) => ResponseHandler<ApiCallError>;
+export declare const createJsonResponseHandler: <T>(responseSchema: Schema<T>) => ResponseHandler<T>;
 export declare const createTextResponseHandler: () => ResponseHandler<string>;
 export declare const createAudioMpegResponseHandler: () => ResponseHandler<Buffer>;
 export declare const postJsonToApi: <T>({ url, headers, body, failedResponseHandler, successfulResponseHandler, abortSignal, }: {

package/core/api/postToApi.js

@@ -1,8 +1,18 @@
-import { ZodSchema } from "../schema/ZodSchema.js";
 import { parseJSON, safeParseJSON } from "../schema/parseJSON.js";
 import { ApiCallError } from "./ApiCallError.js";
 export const createJsonErrorResponseHandler = ({ errorSchema, errorToMessage, isRetryable, }) => async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
+    // Some providers return an empty response body for some errors:
+    if (responseBody.trim() === "") {
+        return new ApiCallError({
+            message: response.statusText,
+            url,
+            requestBodyValues,
+            statusCode: response.status,
+            responseBody,
+            isRetryable: isRetryable?.(response),
+        });
+    }
     // resilient parsing in case the response is not JSON or does not match the schema:
     try {
         const parsedError = parseJSON({
@@ -16,24 +26,36 @@ export const createJsonErrorResponseHandler = ({ errorSchema, errorToMessage, is
             statusCode: response.status,
             responseBody,
             data: parsedError,
-            isRetryable: isRetryable?.(parsedError, response),
+            isRetryable: isRetryable?.(response, parsedError),
         });
     }
     catch (parseError) {
         return new ApiCallError({
-            message: responseBody.trim() !== "" ? responseBody : response.statusText,
+            message: response.statusText,
             url,
             requestBodyValues,
             statusCode: response.status,
             responseBody,
+            isRetryable: isRetryable?.(response),
         });
     }
 };
+export const createTextErrorResponseHandler = ({ isRetryable, } = {}) => async ({ response, url, requestBodyValues }) => {
+    const responseBody = await response.text();
+    return new ApiCallError({
+        message: responseBody.trim() !== "" ? responseBody : response.statusText,
+        url,
+        requestBodyValues,
+        statusCode: response.status,
+        responseBody,
+        isRetryable: isRetryable?.(response),
+    });
+};
 export const createJsonResponseHandler = (responseSchema) => async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     const parsedResult = safeParseJSON({
         text: responseBody,
-        schema: new ZodSchema(responseSchema),
+        schema: responseSchema,
     });
     if (!parsedResult.success) {
         throw new ApiCallError({

package/core/api/throttleOff.cjs

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.throttleOff = void 0;
+/**
+ * The `throttleOff` strategy does not limit parallel API calls.
+ */
+const throttleOff = () => (fn) => fn();
+exports.throttleOff = throttleOff;

package/core/api/throttleOff.d.ts

@@ -0,0 +1,5 @@
+import { ThrottleFunction } from "./ThrottleFunction.js";
+/**
+ * The `throttleOff` strategy does not limit parallel API calls.
+ */
+export declare const throttleOff: () => ThrottleFunction;

package/core/api/throttleOff.js

@@ -0,0 +1,4 @@
+/**
+ * The `throttleOff` strategy does not limit parallel API calls.
+ */
+export const throttleOff = () => (fn) => fn();

package/{extension → internal}/index.cjs

@@ -14,18 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseEventSourceStream = exports.AbstractModel = exports.executeFunctionCall = exports.postToApi = exports.postJsonToApi = exports.createTextResponseHandler = exports.createJsonResponseHandler = exports.createAudioMpegResponseHandler = exports.loadApiKey = exports.callWithRetryAndThrottle = void 0;
+exports.parseEventSourceStream = exports.AbstractModel = exports.executeFunctionCall = exports.loadApiKey = exports.callWithRetryAndThrottle = void 0;
 __exportStar(require("../core/ExtensionFunctionEvent.cjs"), exports);
 var callWithRetryAndThrottle_js_1 = require("../core/api/callWithRetryAndThrottle.cjs");
 Object.defineProperty(exports, "callWithRetryAndThrottle", { enumerable: true, get: function () { return callWithRetryAndThrottle_js_1.callWithRetryAndThrottle; } });
 var loadApiKey_js_1 = require("../core/api/loadApiKey.cjs");
 Object.defineProperty(exports, "loadApiKey", { enumerable: true, get: function () { return loadApiKey_js_1.loadApiKey; } });
-var postToApi_js_1 = require("../core/api/postToApi.cjs");
-Object.defineProperty(exports, "createAudioMpegResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createAudioMpegResponseHandler; } });
-Object.defineProperty(exports, "createJsonResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createJsonResponseHandler; } });
-Object.defineProperty(exports, "createTextResponseHandler", { enumerable: true, get: function () { return postToApi_js_1.createTextResponseHandler; } });
-Object.defineProperty(exports, "postJsonToApi", { enumerable: true, get: function () { return postToApi_js_1.postJsonToApi; } });
-Object.defineProperty(exports, "postToApi", { enumerable: true, get: function () { return postToApi_js_1.postToApi; } });
+__exportStar(require("../core/api/postToApi.cjs"), exports);
 var executeFunctionCall_js_1 = require("../core/executeFunctionCall.cjs");
 Object.defineProperty(exports, "executeFunctionCall", { enumerable: true, get: function () { return executeFunctionCall_js_1.executeFunctionCall; } });
 var AbstractModel_js_1 = require("../model-function/AbstractModel.cjs");

package/{extension → internal}/index.d.ts

@@ -1,7 +1,7 @@
 export * from "../core/ExtensionFunctionEvent.js";
 export { callWithRetryAndThrottle } from "../core/api/callWithRetryAndThrottle.js";
 export { loadApiKey } from "../core/api/loadApiKey.js";
-export { ResponseHandler, createAudioMpegResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
+export * from "../core/api/postToApi.js";
 export { executeFunctionCall } from "../core/executeFunctionCall.js";
 export { AbstractModel } from "../model-function/AbstractModel.js";
 export { ErrorHandler } from "../util/ErrorHandler.js";

package/{extension → internal}/index.js

@@ -1,7 +1,7 @@
 export * from "../core/ExtensionFunctionEvent.js";
 export { callWithRetryAndThrottle } from "../core/api/callWithRetryAndThrottle.js";
 export { loadApiKey } from "../core/api/loadApiKey.js";
-export { createAudioMpegResponseHandler, createJsonResponseHandler, createTextResponseHandler, postJsonToApi, postToApi, } from "../core/api/postToApi.js";
+export * from "../core/api/postToApi.js";
 export { executeFunctionCall } from "../core/executeFunctionCall.js";
 export { AbstractModel } from "../model-function/AbstractModel.js";
 export { parseEventSourceStream } from "../util/streaming/parseEventSourceStream.js";

package/model-function/generate-structure/generateStructure.d.ts

@@ -11,7 +11,7 @@ import { StructureGenerationModel, StructureGenerationModelSettings } from "./St
  * @example
  * const sentiment = await generateStructure(
  *   openai.ChatTextGenerator(...).asFunctionCallStructureGenerationModel(...),
- *   new ZodSchema(z.object({
+ *   zodSchema(z.object({
  *     sentiment: z
  *       .enum(["positive", "neutral", "negative"])
  *       .describe("Sentiment."),

package/model-provider/anthropic/AnthropicApiConfiguration.cjs

@@ -3,20 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnthropicApiConfiguration = void 0;
 const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
 const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
-class AnthropicApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "https://api.anthropic.com/v1", apiKey, retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Anthropic API.
+ * It calls the API at https://api.anthropic.com/v1 and uses the `ANTHROPIC_API_KEY` env variable by default.
+ */
+class AnthropicApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
+            ...settings,
             headers: {
                 "x-api-key": (0, loadApiKey_js_1.loadApiKey)({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "ANTHROPIC_API_KEY",
                     description: "Anthropic",
                 }),
                 "anthropic-version": "2023-06-01",
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.anthropic.com",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/anthropic/AnthropicApiConfiguration.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 AnthropicApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, apiKey, retry, throttle, }?: {
-        baseUrl?: string;
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Anthropic API.
+ * It calls the API at https://api.anthropic.com/v1 and uses the `ANTHROPIC_API_KEY` env variable by default.
+ */
+export declare class AnthropicApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
-        retry?: RetryFunction;
-        throttle?: ThrottleFunction;
     });
 }