@ax-llm/ax 10.0.47 → 10.0.48

package/index.cjs

@@ -84,6 +84,7 @@ __export(index_exports, {
   AxDefaultResultReranker: () => AxDefaultResultReranker,
   AxDockerSession: () => AxDockerSession,
   AxEmbeddingAdapter: () => AxEmbeddingAdapter,
+  AxFunctionError: () => AxFunctionError,
   AxFunctionProcessor: () => AxFunctionProcessor,
   AxGen: () => AxGen,
   AxHFDataLoader: () => AxHFDataLoader,
@@ -319,7 +320,7 @@ var AxAIServiceError = class extends Error {
     super(message);
     this.url = url;
     this.requestBody = requestBody;
-    this.name = "AxAIServiceError";
+    this.name = this.constructor.name;
     this.timestamp = (/* @__PURE__ */ new Date()).toISOString();
     this.errorId = crypto.randomUUID();
     this.context = context;
@@ -356,7 +357,7 @@ var AxAIServiceStatusError = class extends AxAIServiceError {
     });
     this.status = status;
     this.statusText = statusText;
-    this.name = "AxAIServiceStatusError";
+    this.name = this.constructor.name;
   }
 };
 var AxAIServiceNetworkError = class extends AxAIServiceError {
@@ -367,14 +368,14 @@ var AxAIServiceNetworkError = class extends AxAIServiceError {
       ...context
     });
     this.originalError = originalError;
-    this.name = "AxAIServiceNetworkError";
+    this.name = this.constructor.name;
     this.stack = originalError.stack;
   }
 };
 var AxAIServiceResponseError = class extends AxAIServiceError {
   constructor(message, url, requestBody, context) {
     super(message, url, requestBody, context);
-    this.name = "AxAIServiceResponseError";
+    this.name = this.constructor.name;
   }
 };
 var AxAIServiceStreamTerminatedError = class extends AxAIServiceError {
@@ -384,7 +385,7 @@ var AxAIServiceStreamTerminatedError = class extends AxAIServiceError {
       ...context
     });
     this.lastChunk = lastChunk;
-    this.name = "AxAIServiceStreamTerminatedError";
+    this.name = this.constructor.name;
   }
 };
 var AxAIServiceTimeoutError = class extends AxAIServiceError {
@@ -393,13 +394,13 @@ var AxAIServiceTimeoutError = class extends AxAIServiceError {
       timeoutMs,
       ...context
     });
-    this.name = "AxAIServiceTimeoutError";
+    this.name = this.constructor.name;
   }
 };
 var AxAIServiceAuthenticationError = class extends AxAIServiceError {
   constructor(url, requestBody, context) {
     super("Authentication failed", url, requestBody, context);
-    this.name = "AxAIServiceAuthenticationError";
+    this.name = this.constructor.name;
   }
 };
 function calculateRetryDelay(attempt, config) {
@@ -3817,21 +3818,13 @@ var AxMemory = class {
 
 // dsp/asserts.ts
 var AxAssertionError = class extends Error {
-  values;
-  optional;
   constructor({
-    message,
-    values,
-    optional
+    message
   }) {
     super(message);
-    this.values = values;
-    this.optional = optional;
     this.name = this.constructor.name;
     this.stack = new Error().stack;
   }
-  getValue = () => this.values;
-  getOptional = () => this.optional;
   getFixingInstructions = () => {
     const extraFields = [];
     extraFields.push({
@@ -3844,13 +3837,16 @@ var AxAssertionError = class extends Error {
 };
 var assertAssertions = (asserts, values) => {
   for (const assert of asserts) {
-    const { fn, message, optional } = assert;
+    const { fn, message } = assert;
     const res = fn(values);
     if (res === void 0) {
       continue;
     }
-    if (!res && message) {
-      throw new AxAssertionError({ message, values, optional });
+    if (!res) {
+      if (!message) {
+        throw new Error(`Assertion Failed: No message provided for assertion`);
+      }
+      throw new AxAssertionError({ message });
     }
   }
 };
@@ -3866,13 +3862,13 @@ var assertStreamingAssertions = (asserts, values, xstate, content, final) => {
   }
   const currValue = content.substring(xstate.s);
   for (const assert of fieldAsserts) {
-    const { message, optional, fn } = assert;
+    const { message, fn } = assert;
     const res = fn(currValue, final);
     if (res === void 0) {
       continue;
     }
     if (!res && message) {
-      throw new AxAssertionError({ message, values, optional });
+      throw new AxAssertionError({ message });
     }
   }
 };
@@ -5126,13 +5122,11 @@ var ValidationError = class extends Error {
     super(message);
     this.fields = fields;
     this.name = this.constructor.name;
-    Error.captureStackTrace(this, this.constructor);
   }
-  getFields = () => this.fields;
   getFixingInstructions = () => {
     return this.fields.map((field) => ({
       name: "outputError",
-      title: "Error In Output",
+      title: "Errors In Output Fields",
       description: `Please fix and return the field \`${field.title}\` of type \`${toFieldType(field.type)}\`, ${this.message}.`
     }));
   };
@@ -5490,6 +5484,49 @@ var validateJSONSchema = (schema) => {
 };
 
 // dsp/functions.ts
+var AxFunctionError = class extends Error {
+  constructor(fields) {
+    super();
+    this.fields = fields;
+    this.name = this.constructor.name;
+  }
+  getFields = () => this.fields;
+};
+var FunctionError = class extends Error {
+  fields;
+  func;
+  constructor({
+    fields,
+    func
+  }) {
+    super();
+    this.fields = fields;
+    this.func = func;
+    this.name = this.constructor.name;
+  }
+  getFieldDescription(fieldName) {
+    if (!this.func.parameters?.properties?.[fieldName]) {
+      return "";
+    }
+    const fieldSchema = this.func.parameters.properties[fieldName];
+    let description = fieldSchema.description;
+    if (fieldSchema.enum?.length) {
+      description += ` Allowed values are: ${fieldSchema.enum.join(", ")}`;
+    }
+    return description;
+  }
+  getFixingInstructions = () => {
+    return this.fields.map((fieldError) => {
+      const schemaDescription = this.getFieldDescription(fieldError.field);
+      const fullDescription = schemaDescription ? `${fieldError.message}. ${schemaDescription}` : fieldError.message;
+      return {
+        name: "functionArgumentError",
+        title: `Errors in Function '${this.func.name}' Arguments`,
+        description: `Please fix the argument '${fieldError.field}' in function '${this.func.name}': ${fullDescription}`
+      };
+    });
+  };
+};
 var AxFunctionProcessor = class {
   funcList = [];
   constructor(funcList) {
@@ -5530,7 +5567,17 @@ var AxFunctionProcessor = class {
     if (!fnSpec.func) {
       throw new Error("No handler for function: " + func.name);
     }
-    return await this.executeFunction(fnSpec, func, options);
+    try {
+      return await this.executeFunction(fnSpec, func, options);
+    } catch (e) {
+      if (e instanceof AxFunctionError) {
+        throw new FunctionError({
+          fields: e.getFields(),
+          func: fnSpec
+        });
+      }
+      throw e;
+    }
   };
 };
 var parseFunctions = (newFuncs, existingFuncs) => {
@@ -5609,11 +5656,11 @@ var AxGen = class extends AxProgramWithSignature {
       this.functions = parseFunctions(options.functions);
     }
   }
-  addAssert = (fn, message, optional) => {
-    this.asserts.push({ fn, message, optional });
+  addAssert = (fn, message) => {
+    this.asserts.push({ fn, message });
   };
-  addStreamingAssert = (fieldName, fn, message, optional) => {
-    this.streamingAsserts.push({ fieldName, fn, message, optional });
+  addStreamingAssert = (fieldName, fn, message) => {
+    this.streamingAsserts.push({ fieldName, fn, message });
   };
   async forwardSendRequest({
     ai,
@@ -5863,6 +5910,9 @@ var AxGen = class extends AxProgramWithSignature {
             const e1 = e;
             errorFields = e1.getFixingInstructions();
             err = e;
+          } else if (e instanceof FunctionError) {
+            errorFields = e.getFixingInstructions();
+            err = e;
           } else if (e instanceof AxAIServiceStreamTerminatedError) {
           } else {
             throw e;
@@ -5878,9 +5928,6 @@ var AxGen = class extends AxProgramWithSignature {
           }
         }
       }
-      if (err instanceof AxAssertionError && err.getOptional()) {
-        return err.getValue();
-      }
       throw new Error(`Unable to fix validation error: ${err?.message}`);
     }
     throw new Error(`Max steps reached: ${maxSteps}`);
@@ -7940,6 +7987,7 @@ var AxRAG = class extends AxChainOfThought {
   AxDefaultResultReranker,
   AxDockerSession,
   AxEmbeddingAdapter,
+  AxFunctionError,
   AxFunctionProcessor,
   AxGen,
   AxHFDataLoader,