modelfusion 0.110.0 → 0.112.0

package/model-provider/stability/StabilityApiConfiguration.cjs

@@ -1,28 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StabilityApiConfiguration = void 0;
-const BaseUrlPartsApiConfiguration_js_1 = require("../../core/api/BaseUrlPartsApiConfiguration.cjs");
+const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
 const loadApiKey_js_1 = require("../../core/api/loadApiKey.cjs");
 /**
  * Creates an API configuration for the Stability AI API.
- * It calls the API at https://api.stability.ai/v1 by default.
+ * It calls the API at https://api.stability.ai/v1 by default and uses the `STABILITY_API_KEY` environment variable.
  */
-class StabilityApiConfiguration extends BaseUrlPartsApiConfiguration_js_1.BaseUrlPartsApiConfiguration {
-    constructor({ protocol = "https", host = "api.stability.ai", port = "443", path = "/v1", apiKey, headers, retry, throttle, } = {}) {
+class StabilityApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            protocol,
-            host,
-            port,
-            path,
-            headers: headers ?? {
+            ...settings,
+            headers: settings.headers ?? {
                 Authorization: `Bearer ${(0, loadApiKey_js_1.loadApiKey)({
-                    apiKey,
+                    apiKey: settings.apiKey,
                     environmentVariableName: "STABILITY_API_KEY",
                     description: "Stability",
                 })}`,
             },
-            retry,
-            throttle,
+            baseUrlDefaults: {
+                protocol: "https",
+                host: "api.stability.ai",
+                port: "443",
+                path: "/v1",
+            },
         });
     }
 }

package/model-provider/stability/StabilityApiConfiguration.d.ts

@@ -1,10 +1,10 @@
-import { BaseUrlPartsApiConfiguration, BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
 /**
  * Creates an API configuration for the Stability AI API.
- * It calls the API at https://api.stability.ai/v1 by default.
+ * It calls the API at https://api.stability.ai/v1 by default and uses the `STABILITY_API_KEY` environment variable.
  */
-export declare class StabilityApiConfiguration extends BaseUrlPartsApiConfiguration {
-    constructor({ protocol, host, port, path, apiKey, headers, retry, throttle, }?: Partial<BaseUrlPartsApiConfigurationOptions> & {
+export declare class StabilityApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions & {
         apiKey?: string;
     });
 }

package/model-provider/stability/StabilityApiConfiguration.js

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

package/model-provider/stability/StabilityError.cjs

@@ -4,10 +4,10 @@ exports.failedStabilityCallResponseHandler = 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 stabilityErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const stabilityErrorDataSchema = zod_1.z.object({
     message: zod_1.z.string(),
-}));
+});
 exports.failedStabilityCallResponseHandler = (0, postToApi_js_1.createJsonErrorResponseHandler)({
-    errorSchema: stabilityErrorDataSchema,
+    errorSchema: (0, ZodSchema_js_1.zodSchema)(stabilityErrorDataSchema),
     errorToMessage: (error) => error.message,
 });

package/model-provider/stability/StabilityError.d.ts

@@ -1,9 +1,13 @@
+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 stabilityErrorDataSchema: ZodSchema<{
+declare const stabilityErrorDataSchema: z.ZodObject<{
+    message: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    message: string;
+}, {
     message: string;
 }>;
-export type StabilityErrorData = (typeof stabilityErrorDataSchema)["_type"];
+export type StabilityErrorData = z.infer<typeof stabilityErrorDataSchema>;
 export declare const failedStabilityCallResponseHandler: ResponseHandler<ApiCallError>;
 export {};

package/model-provider/stability/StabilityError.js

@@ -1,10 +1,10 @@
 import { z } from "zod";
 import { createJsonErrorResponseHandler, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-const stabilityErrorDataSchema = new ZodSchema(z.object({
+import { zodSchema } from "../../core/schema/ZodSchema.js";
+const stabilityErrorDataSchema = z.object({
     message: z.string(),
-}));
+});
 export const failedStabilityCallResponseHandler = createJsonErrorResponseHandler({
-    errorSchema: stabilityErrorDataSchema,
+    errorSchema: zodSchema(stabilityErrorDataSchema),
     errorToMessage: (error) => error.message,
 });

package/model-provider/stability/StabilityFacade.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 StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
 const StabilityImageGenerationModel_js_1 = require("./StabilityImageGenerationModel.cjs");
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default and uses the `STABILITY_API_KEY` environment variable.
+ */
+function Api(settings) {
+    return new StabilityApiConfiguration_js_1.StabilityApiConfiguration(settings);
+}
+exports.Api = Api;
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -30,11 +38,3 @@ function ImageGenerator(settings) {
     return new StabilityImageGenerationModel_js_1.StabilityImageGenerationModel(settings);
 }
 exports.ImageGenerator = ImageGenerator;
-/**
- * Creates an API configuration for the Stability AI API.
- * It calls the API at https://api.stability.ai/v1 by default.
- */
-function Api(settings) {
-    return new StabilityApiConfiguration_js_1.StabilityApiConfiguration(settings);
-}
-exports.Api = Api;

package/model-provider/stability/StabilityFacade.d.ts

@@ -1,6 +1,13 @@
-import { BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlPartsApiConfiguration.js";
+import { BaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
 import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { StabilityImageGenerationModel, StabilityImageGenerationSettings } from "./StabilityImageGenerationModel.js";
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default and uses the `STABILITY_API_KEY` environment variable.
+ */
+export declare function Api(settings: Partial<BaseUrlPartsApiConfigurationOptions> & {
+    apiKey?: string;
+}): StabilityApiConfiguration;
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -25,10 +32,3 @@ import { StabilityImageGenerationModel, StabilityImageGenerationSettings } from
  * @returns A new instance of {@link StabilityImageGenerationModel}.
  */
 export declare function ImageGenerator(settings: StabilityImageGenerationSettings): StabilityImageGenerationModel;
-/**
- * Creates an API configuration for the Stability AI API.
- * It calls the API at https://api.stability.ai/v1 by default.
- */
-export declare function Api(settings: Partial<BaseUrlPartsApiConfigurationOptions> & {
-    apiKey?: string;
-}): StabilityApiConfiguration;

package/model-provider/stability/StabilityFacade.js

@@ -1,5 +1,12 @@
 import { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
 import { StabilityImageGenerationModel, } from "./StabilityImageGenerationModel.js";
+/**
+ * Creates an API configuration for the Stability AI API.
+ * It calls the API at https://api.stability.ai/v1 by default and uses the `STABILITY_API_KEY` environment variable.
+ */
+export function Api(settings) {
+    return new StabilityApiConfiguration(settings);
+}
 /**
  * Create an image generation model that calls the Stability AI image generation API.
  *
@@ -26,10 +33,3 @@ import { StabilityImageGenerationModel, } from "./StabilityImageGenerationModel.
 export function ImageGenerator(settings) {
     return new StabilityImageGenerationModel(settings);
 }
-/**
- * Creates an API configuration for the Stability AI API.
- * It calls the API at https://api.stability.ai/v1 by default.
- */
-export function Api(settings) {
-    return new StabilityApiConfiguration(settings);
-}

package/model-provider/stability/StabilityImageGenerationModel.cjs

@@ -4,6 +4,7 @@ exports.StabilityImageGenerationModel = 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 StabilityApiConfiguration_js_1 = require("./StabilityApiConfiguration.cjs");
@@ -69,7 +70,7 @@ class StabilityImageGenerationModel extends AbstractModel_js_1.AbstractModel {
                     style_preset: this.settings.stylePreset,
                 },
                 failedResponseHandler: StabilityError_js_1.failedStabilityCallResponseHandler,
-                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)(stabilityImageGenerationResponseSchema),
+                successfulResponseHandler: (0, postToApi_js_1.createJsonResponseHandler)((0, ZodSchema_js_1.zodSchema)(stabilityImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });

package/model-provider/stability/StabilityImageGenerationModel.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 { StabilityApiConfiguration } from "./StabilityApiConfiguration.js";
@@ -66,7 +67,7 @@ export class StabilityImageGenerationModel extends AbstractModel {
                     style_preset: this.settings.stylePreset,
                 },
                 failedResponseHandler: failedStabilityCallResponseHandler,
-                successfulResponseHandler: createJsonResponseHandler(stabilityImageGenerationResponseSchema),
+                successfulResponseHandler: createJsonResponseHandler(zodSchema(stabilityImageGenerationResponseSchema)),
                 abortSignal,
             }),
         });

package/model-provider/whispercpp/WhisperCppApiConfiguration.cjs

@@ -2,13 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WhisperCppApiConfiguration = void 0;
 const BaseUrlApiConfiguration_js_1 = require("../../core/api/BaseUrlApiConfiguration.cjs");
-class WhisperCppApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+class WhisperCppApiConfiguration extends BaseUrlApiConfiguration_js_1.BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "8080",
+                path: "",
+            },
         });
     }
 }

package/model-provider/whispercpp/WhisperCppApiConfiguration.d.ts

@@ -1,11 +1,8 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-import { RetryFunction } from "../../core/api/RetryFunction.js";
-import { ThrottleFunction } from "../../core/api/ThrottleFunction.js";
-export type WhisperCppApiConfigurationSettings = {
-    baseUrl?: string;
-    retry?: RetryFunction;
-    throttle?: ThrottleFunction;
-};
-export declare class WhisperCppApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl, retry, throttle, }?: WhisperCppApiConfigurationSettings);
+import { BaseUrlApiConfigurationWithDefaults, PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export declare class WhisperCppApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings?: PartialBaseUrlPartsApiConfigurationOptions);
 }

package/model-provider/whispercpp/WhisperCppApiConfiguration.js

@@ -1,11 +1,18 @@
-import { BaseUrlApiConfiguration } from "../../core/api/BaseUrlApiConfiguration.js";
-export class WhisperCppApiConfiguration extends BaseUrlApiConfiguration {
-    constructor({ baseUrl = "http://127.0.0.1:8080", retry, throttle, } = {}) {
+import { BaseUrlApiConfigurationWithDefaults, } from "../../core/api/BaseUrlApiConfiguration.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export class WhisperCppApiConfiguration extends BaseUrlApiConfigurationWithDefaults {
+    constructor(settings = {}) {
         super({
-            baseUrl,
-            headers: {},
-            retry,
-            throttle,
+            ...settings,
+            baseUrlDefaults: {
+                protocol: "http",
+                host: "127.0.0.1",
+                port: "8080",
+                path: "",
+            },
         });
     }
 }

package/model-provider/whispercpp/WhisperCppFacade.cjs

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Api = exports.Transcriber = void 0;
+exports.Transcriber = exports.Api = void 0;
 const WhisperCppApiConfiguration_js_1 = require("./WhisperCppApiConfiguration.cjs");
 const WhisperCppTranscriptionModel_js_1 = require("./WhisperCppTranscriptionModel.cjs");
-function Transcriber(settings = {}) {
-    return new WhisperCppTranscriptionModel_js_1.WhisperCppTranscriptionModel(settings);
-}
-exports.Transcriber = Transcriber;
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
 function Api(settings) {
     return new WhisperCppApiConfiguration_js_1.WhisperCppApiConfiguration(settings);
 }
 exports.Api = Api;
+function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel_js_1.WhisperCppTranscriptionModel(settings);
+}
+exports.Transcriber = Transcriber;

package/model-provider/whispercpp/WhisperCppFacade.d.ts

@@ -1,4 +1,9 @@
-import { WhisperCppApiConfiguration, WhisperCppApiConfigurationSettings } from "./WhisperCppApiConfiguration.js";
+import { PartialBaseUrlPartsApiConfigurationOptions } from "../../core/api/BaseUrlApiConfiguration.js";
+import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
 import { WhisperCppTranscriptionModel, WhisperCppTranscriptionModelSettings } from "./WhisperCppTranscriptionModel.js";
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
+export declare function Api(settings: PartialBaseUrlPartsApiConfigurationOptions): WhisperCppApiConfiguration;
 export declare function Transcriber(settings?: WhisperCppTranscriptionModelSettings): WhisperCppTranscriptionModel;
-export declare function Api(settings: WhisperCppApiConfigurationSettings): WhisperCppApiConfiguration;

package/model-provider/whispercpp/WhisperCppFacade.js

@@ -1,8 +1,12 @@
-import { WhisperCppApiConfiguration, } from "./WhisperCppApiConfiguration.js";
+import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
 import { WhisperCppTranscriptionModel, } from "./WhisperCppTranscriptionModel.js";
-export function Transcriber(settings = {}) {
-    return new WhisperCppTranscriptionModel(settings);
-}
+/**
+ * Creates an API configuration for the Whisper.cpp server.
+ * It calls the API at http://127.0.0.1:8080 by default.
+ */
 export function Api(settings) {
     return new WhisperCppApiConfiguration(settings);
 }
+export function Transcriber(settings = {}) {
+    return new WhisperCppTranscriptionModel(settings);
+}

package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs

@@ -73,12 +73,15 @@ class WhisperCppTranscriptionModel extends AbstractModel_js_1.AbstractModel {
     }
 }
 exports.WhisperCppTranscriptionModel = WhisperCppTranscriptionModel;
-const whisperCppTranscriptionJsonSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.union([zod_1.z.object({ text: zod_1.z.string() }), zod_1.z.object({ error: zod_1.z.string() })]));
+const whisperCppTranscriptionJsonSchema = zod_1.z.union([
+    zod_1.z.object({ text: zod_1.z.string() }),
+    zod_1.z.object({ error: zod_1.z.string() }),
+]);
 const successfulResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     const parsedResult = (0, parseJSON_js_1.safeParseJSON)({
         text: responseBody,
-        schema: whisperCppTranscriptionJsonSchema,
+        schema: (0, ZodSchema_js_1.zodSchema)(whisperCppTranscriptionJsonSchema),
     });
     if (!parsedResult.success) {
         throw new ApiCallError_js_1.ApiCallError({

package/model-provider/whispercpp/WhisperCppTranscriptionModel.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { postToApi } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { WhisperCppApiConfiguration } from "./WhisperCppApiConfiguration.js";
@@ -69,12 +69,15 @@ export class WhisperCppTranscriptionModel extends AbstractModel {
         return new WhisperCppTranscriptionModel(Object.assign({}, this.settings, additionalSettings));
     }
 }
-const whisperCppTranscriptionJsonSchema = new ZodSchema(z.union([z.object({ text: z.string() }), z.object({ error: z.string() })]));
+const whisperCppTranscriptionJsonSchema = z.union([
+    z.object({ text: z.string() }),
+    z.object({ error: z.string() }),
+]);
 const successfulResponseHandler = async ({ response, url, requestBodyValues }) => {
     const responseBody = await response.text();
     const parsedResult = safeParseJSON({
         text: responseBody,
-        schema: whisperCppTranscriptionJsonSchema,
+        schema: zodSchema(whisperCppTranscriptionJsonSchema),
     });
     if (!parsedResult.success) {
         throw new ApiCallError({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building multi-modal AI applications.",
-  "version": "0.110.0",
+  "version": "0.112.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/Tool.cjs

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tool = void 0;
-const InvalidToolNameError_js_1 = require("./InvalidToolNameError.cjs");
-const namePattern = /^[a-zA-Z0-9_-]{1,64}$/;
 /**
  * A tool is a function with a name, description and defined inputs that can be used
  * by agents and chatbots.
@@ -11,7 +9,6 @@ class Tool {
     constructor({ name, description, parameters, returnType, execute, }) {
         /**
          * The name of the tool.
-         * It has to be a function name that matches the regular expression pattern '^[a-zA-Z0-9_-]{1,64}$'.
          * Should be understandable for language models and unique among the tools that they know.
          */
         Object.defineProperty(this, "name", {
@@ -57,13 +54,6 @@ class Tool {
             writable: true,
             value: void 0
         });
-        // check that the name is a valid function name:
-        if (!namePattern.test(name)) {
-            throw new InvalidToolNameError_js_1.InvalidToolNameError({
-                toolName: name,
-                namePattern,
-            });
-        }
         this.name = name;
         this.description = description;
         this.parameters = parameters;

package/tool/Tool.d.ts

@@ -9,7 +9,6 @@ import { ToolDefinition } from "./ToolDefinition.js";
 export declare class Tool<NAME extends string, PARAMETERS, RESULT> implements ToolDefinition<NAME, PARAMETERS> {
     /**
      * The name of the tool.
-     * It has to be a function name that matches the regular expression pattern '^[a-zA-Z0-9_-]{1,64}$'.
      * Should be understandable for language models and unique among the tools that they know.
      */
     readonly name: NAME;

package/tool/Tool.js

@@ -1,5 +1,3 @@
-import { InvalidToolNameError } from "./InvalidToolNameError.js";
-const namePattern = /^[a-zA-Z0-9_-]{1,64}$/;
 /**
  * A tool is a function with a name, description and defined inputs that can be used
  * by agents and chatbots.
@@ -8,7 +6,6 @@ export class Tool {
     constructor({ name, description, parameters, returnType, execute, }) {
         /**
          * The name of the tool.
-         * It has to be a function name that matches the regular expression pattern '^[a-zA-Z0-9_-]{1,64}$'.
          * Should be understandable for language models and unique among the tools that they know.
          */
         Object.defineProperty(this, "name", {
@@ -54,13 +51,6 @@ export class Tool {
             writable: true,
             value: void 0
         });
-        // check that the name is a valid function name:
-        if (!namePattern.test(name)) {
-            throw new InvalidToolNameError({
-                toolName: name,
-                namePattern,
-            });
-        }
         this.name = name;
         this.description = description;
         this.parameters = parameters;

package/tool/WebSearchTool.cjs

@@ -4,7 +4,7 @@ exports.WebSearchTool = void 0;
 const zod_1 = require("zod");
 const ZodSchema_js_1 = require("../core/schema/ZodSchema.cjs");
 const Tool_js_1 = require("./Tool.cjs");
-const RETURN_TYPE_SCHEMA = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+const RETURN_TYPE_SCHEMA = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     results: zod_1.z.array(zod_1.z.object({
         title: zod_1.z.string(),
         link: zod_1.z.string().url(),
@@ -14,7 +14,7 @@ const RETURN_TYPE_SCHEMA = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
 // expose the schemas to library consumers:
 const createParameters = (description) => 
 // same structure, but with description:
-new ZodSchema_js_1.ZodSchema(zod_1.z.object({
+(0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     query: zod_1.z.string().describe(description),
 }));
 /**

package/tool/WebSearchTool.d.ts

@@ -1,7 +1,6 @@
 import { FunctionOptions } from "../core/FunctionOptions.js";
-import { ZodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
-declare const RETURN_TYPE_SCHEMA: ZodSchema<{
+declare const RETURN_TYPE_SCHEMA: import("../core/schema/ZodSchema.js").ZodSchema<{
     results: {
         link: string;
         title: string;

package/tool/WebSearchTool.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { ZodSchema } from "../core/schema/ZodSchema.js";
+import { zodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
-const RETURN_TYPE_SCHEMA = new ZodSchema(z.object({
+const RETURN_TYPE_SCHEMA = zodSchema(z.object({
     results: z.array(z.object({
         title: z.string(),
         link: z.string().url(),
@@ -11,7 +11,7 @@ const RETURN_TYPE_SCHEMA = new ZodSchema(z.object({
 // expose the schemas to library consumers:
 const createParameters = (description) => 
 // same structure, but with description:
-new ZodSchema(z.object({
+zodSchema(z.object({
     query: z.string().describe(description),
 }));
 /**

package/tool/{generate-tool-calls-or-text/TextGenerationToolCallsOrGenerateTextModel.cjs → generate-tool-calls/TextGenerationToolCallsModel.cjs}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextGenerationToolCallsOrGenerateTextModel = void 0;
+exports.TextGenerationToolCallsModel = void 0;
 const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
-const ToolCallsOrTextParseError_js_1 = require("./ToolCallsOrTextParseError.cjs");
-class TextGenerationToolCallsOrGenerateTextModel {
+const ToolCallsParseError_js_1 = require("./ToolCallsParseError.cjs");
+class TextGenerationToolCallsModel {
     constructor({ model, template, }) {
         Object.defineProperty(this, "model", {
             enumerable: true,
@@ -29,7 +29,7 @@ class TextGenerationToolCallsOrGenerateTextModel {
     get settingsForEvent() {
         return this.model.settingsForEvent;
     }
-    async doGenerateToolCallsOrText(tools, prompt, options) {
+    async doGenerateToolCalls(tools, prompt, options) {
         const { response, text: generatedText, metadata, } = await (0, generateText_js_1.generateText)(this.model, this.template.createPrompt(prompt, tools), {
             ...options,
             fullResponse: true,
@@ -44,17 +44,17 @@ class TextGenerationToolCallsOrGenerateTextModel {
             };
         }
         catch (error) {
-            throw new ToolCallsOrTextParseError_js_1.ToolCallsOrTextParseError({
+            throw new ToolCallsParseError_js_1.ToolCallsParseError({
                 valueText: generatedText,
                 cause: error,
             });
         }
     }
     withSettings(additionalSettings) {
-        return new TextGenerationToolCallsOrGenerateTextModel({
+        return new TextGenerationToolCallsModel({
             model: this.model.withSettings(additionalSettings),
             template: this.template,
         });
     }
 }
-exports.TextGenerationToolCallsOrGenerateTextModel = TextGenerationToolCallsOrGenerateTextModel;
+exports.TextGenerationToolCallsModel = TextGenerationToolCallsModel;