@ax-llm/ax 10.0.47 → 10.0.49

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) {
@@ -1586,16 +1587,18 @@ function createMessages(chatPrompt) {
   const items = chatPrompt.map((msg) => {
     switch (msg.role) {
       case "function":
+        const content = [
+          {
+            type: "tool_result",
+            content: msg.result,
+            tool_use_id: msg.functionId,
+            ...msg.isError ? { is_error: true } : {},
+            ...msg.cache ? { cache: { type: "ephemeral" } } : {}
+          }
+        ];
         return {
           role: "user",
-          content: [
-            {
-              type: "tool_result",
-              content: msg.result,
-              tool_use_id: msg.functionId,
-              ...msg.cache ? { cache: { type: "ephemeral" } } : {}
-            }
-          ]
+          content
         };
       case "user": {
         if (typeof msg.content === "string") {
@@ -1604,7 +1607,7 @@ function createMessages(chatPrompt) {
             content: msg.content
           };
         }
-        const content = msg.content.map((v) => {
+        const content2 = msg.content.map((v) => {
           switch (v.type) {
             case "text":
               return {
@@ -1628,16 +1631,16 @@ function createMessages(chatPrompt) {
         });
         return {
           role: "user",
-          content
+          content: content2
         };
       }
       case "assistant": {
-        let content = "";
+        let content2 = "";
         if (typeof msg.content === "string") {
-          content = msg.content;
+          content2 = msg.content;
         }
         if (typeof msg.functionCalls !== "undefined") {
-          content = msg.functionCalls.map((v) => {
+          content2 = msg.functionCalls.map((v) => {
             let input;
             if (typeof v.function.params === "string") {
               input = JSON.parse(v.function.params);
@@ -1655,7 +1658,7 @@ function createMessages(chatPrompt) {
         }
         return {
           role: "assistant",
-          content
+          content: content2
         };
       }
       default:
@@ -3817,21 +3820,12 @@ 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 +3838,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 +3863,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 });
     }
   }
 };
@@ -4743,9 +4740,9 @@ var functionCallInstructions = `
 - Use the function results to generate the output fields.`;
 var formattingRules = `
 ## Output Formatting Rules
+- Output must strictly follow the defined plaintext \`key: value\` field format.
 - Each output key, value must strictly adhere to the specified output field formatting rules.
 - No preamble, postscript, or supplementary information.
-- Output must be in plain text, with each \`key: value\` pair on a new line.
 - Do not repeat output fields.`;
 var AxPromptTemplate = class {
   sig;
@@ -5126,13 +5123,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}.`
     }));
   };
@@ -5149,7 +5144,7 @@ function handleValidationError(mem, errorFields, ai, promptTemplate, sessionId)
   if (ai.getOptions().debug) {
     const errors = errorFields.map((field) => `- ${field.title}: ${field.description}`).join("\n");
     process.stdout.write(colorLog4.red(`
-Error Correction:
+\u274C Error Correction:
 ${errors}
 `));
   }
@@ -5490,6 +5485,43 @@ var validateJSONSchema = (schema) => {
 };
 
 // dsp/functions.ts
+var colorLog5 = new ColorLog();
+var AxFunctionError = class extends Error {
+  constructor(fields) {
+    super();
+    this.fields = fields;
+    this.name = this.constructor.name;
+  }
+  getFields = () => this.fields;
+};
+var FunctionError = class extends Error {
+  constructor(fields, func, funcId) {
+    super();
+    this.fields = fields;
+    this.func = func;
+    this.funcId = funcId;
+  }
+  getFunctionId = () => this.funcId;
+  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 = () => {
+    const bulletPoints = this.fields.map((fieldError) => {
+      const schemaDescription = this.getFieldDescription(fieldError.field) || "";
+      return `- \`${fieldError.field}\` - ${fieldError.message} (${schemaDescription}).`;
+    });
+    return `Errors In Function Arguments: Fix the following invalid arguments to '${this.func.name}'
+${bulletPoints.join("\n")}`;
+  };
+};
 var AxFunctionProcessor = class {
   funcList = [];
   constructor(funcList) {
@@ -5509,16 +5541,10 @@ var AxFunctionProcessor = class {
     } : void 0;
     if (!fnSpec.parameters) {
       const res2 = fnSpec.func.length === 1 ? await fnSpec.func(opt) : await fnSpec.func();
-      return {
-        id: func.id,
-        result: JSON.stringify(res2, null, 2)
-      };
+      return typeof res2 === "string" ? res2 : JSON.stringify(res2, null, 2);
     }
     const res = fnSpec.func.length === 2 ? await fnSpec.func(args, opt) : await fnSpec.func(args);
-    return {
-      id: func.id,
-      result: JSON.stringify(res, null, 2)
-    };
+    return typeof res === "string" ? res : JSON.stringify(res, null, 2);
   };
   execute = async (func, options) => {
     const fnSpec = this.funcList.find(
@@ -5530,7 +5556,14 @@ 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(e.getFields(), fnSpec, func.id);
+      }
+      throw e;
+    }
   };
 };
 var parseFunctions = (newFuncs, existingFuncs) => {
@@ -5551,19 +5584,44 @@ var parseFunctions = (newFuncs, existingFuncs) => {
 var processFunctions = async (ai, functionList, functionCalls, mem, sessionId, traceId) => {
   const funcProc = new AxFunctionProcessor(functionList);
   const functionsExecuted = /* @__PURE__ */ new Set();
-  const promises = functionCalls.map(
-    (func) => funcProc?.execute(func, { sessionId, traceId, ai }).then((fres) => {
+  const promises = functionCalls.map((func) => {
+    if (!func.id) {
+      throw new Error(`Function ${func.name} did not return an ID`);
+    }
+    const promise = funcProc.execute(func, { sessionId, traceId, ai }).then((functionResult) => {
       functionsExecuted.add(func.name.toLowerCase());
-      if (fres?.id) {
-        return {
-          role: "function",
-          result: fres.result ?? "",
-          functionId: fres.id
-        };
+      return {
+        role: "function",
+        result: functionResult ?? "",
+        functionId: func.id
+      };
+    }).catch((e) => {
+      if (e instanceof FunctionError) {
+        const result = e.getFixingInstructions();
+        mem.add(
+          {
+            role: "function",
+            functionId: func.id,
+            isError: true,
+            result
+          },
+          sessionId
+        );
+        mem.addTag("error");
+        if (ai.getOptions().debug) {
+          process.stdout.write(
+            colorLog5.red(`
+\u274C Function Error Correction:
+${result}
+`)
+          );
+        }
+      } else {
+        throw e;
       }
-      return null;
-    })
-  );
+    });
+    return promise;
+  });
   const results = await Promise.all(promises);
   results.forEach((result) => {
     if (result) {
@@ -5609,11 +5667,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,
@@ -5878,9 +5936,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}`);
@@ -7467,7 +7522,7 @@ var AxJSInterpreter = class {
 };
 
 // dsp/router.ts
-var colorLog5 = new ColorLog();
+var colorLog6 = new ColorLog();
 var AxRoute = class {
   name;
   context;
@@ -7519,7 +7574,7 @@ var AxRouter = class {
     }
     if (this.debug) {
       console.log(
-        colorLog5.whiteBright(`query: ${text}`) + "\n" + colorLog5.greenBright(
+        colorLog6.whiteBright(`query: ${text}`) + "\n" + colorLog6.greenBright(
           JSON.stringify(m.map((m2) => `${m2.id}, ${m2.score}`))
         )
       );
@@ -7940,6 +7995,7 @@ var AxRAG = class extends AxChainOfThought {
   AxDefaultResultReranker,
   AxDockerSession,
   AxEmbeddingAdapter,
+  AxFunctionError,
   AxFunctionProcessor,
   AxGen,
   AxHFDataLoader,