@ax-llm/ax 10.0.48 → 10.0.50

package/index.cjs

@@ -1587,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") {
@@ -1605,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 {
@@ -1629,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);
@@ -1656,7 +1658,7 @@ function createMessages(chatPrompt) {
         }
         return {
           role: "assistant",
-          content
+          content: content2
         };
       }
       default:
@@ -3823,7 +3825,6 @@ var AxAssertionError = class extends Error {
   }) {
     super(message);
     this.name = this.constructor.name;
-    this.stack = new Error().stack;
   }
   getFixingInstructions = () => {
     const extraFields = [];
@@ -4739,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;
@@ -5143,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}
 `));
   }
@@ -5233,7 +5234,7 @@ var checkMissingRequiredFields = (xstate, values, currentIndex) => {
     });
   }
 };
-var streamingExtractValues = (sig, values, xstate, content) => {
+var streamingExtractValues = (sig, values, xstate, content, streamingValidation = false) => {
   const fields = sig.getOutputFields();
   for (const [index, field] of fields.entries()) {
     if (field.name in values) {
@@ -5243,6 +5244,12 @@ var streamingExtractValues = (sig, values, xstate, content) => {
     let e = matchesContent(content, prefix, xstate.s + 1);
     switch (e) {
       case -1:
+        if (streamingValidation && xstate.s == -1 && !field.isOptional) {
+          throw new ValidationError({
+            message: "Required field not found",
+            fields: [field]
+          });
+        }
         continue;
       // Field is not found, continue to the next field
       case -2:
@@ -5259,6 +5266,7 @@ var streamingExtractValues = (sig, values, xstate, content) => {
     checkMissingRequiredFields(xstate, values, index);
     xstate.s = e + prefixLen;
     xstate.currField = field;
+    xstate.currFieldIndex = index;
     if (!xstate.extractedFields.includes(field)) {
       xstate.extractedFields.push(field);
     }
@@ -5272,8 +5280,8 @@ var streamingExtractFinalValue = (sig, values, xstate, content) => {
       values[xstate.currField.name] = parsedValue;
     }
   }
-  const fields = sig.getOutputFields();
-  checkMissingRequiredFields(xstate, values, fields.length - 1);
+  const sigFields = sig.getOutputFields();
+  checkMissingRequiredFields(xstate, values, sigFields.length);
 };
 var convertValueToType = (field, val) => {
   switch (field.type?.name) {
@@ -5484,6 +5492,7 @@ var validateJSONSchema = (schema) => {
 };
 
 // dsp/functions.ts
+var colorLog5 = new ColorLog();
 var AxFunctionError = class extends Error {
   constructor(fields) {
     super();
@@ -5493,17 +5502,13 @@ var AxFunctionError = class extends Error {
   getFields = () => this.fields;
 };
 var FunctionError = class extends Error {
-  fields;
-  func;
-  constructor({
-    fields,
-    func
-  }) {
+  constructor(fields, func, funcId) {
     super();
     this.fields = fields;
     this.func = func;
-    this.name = this.constructor.name;
+    this.funcId = funcId;
   }
+  getFunctionId = () => this.funcId;
   getFieldDescription(fieldName) {
     if (!this.func.parameters?.properties?.[fieldName]) {
       return "";
@@ -5516,15 +5521,12 @@ var FunctionError = class extends Error {
     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}`
-      };
+    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 {
@@ -5546,16 +5548,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(
@@ -5571,10 +5567,7 @@ var AxFunctionProcessor = class {
       return await this.executeFunction(fnSpec, func, options);
     } catch (e) {
       if (e instanceof AxFunctionError) {
-        throw new FunctionError({
-          fields: e.getFields(),
-          func: fnSpec
-        });
+        throw new FunctionError(e.getFields(), fnSpec, func.id);
       }
       throw e;
     }
@@ -5598,19 +5591,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) {
@@ -5748,6 +5766,7 @@ var AxGen = class extends AxProgramWithSignature {
     traceId,
     functions
   }) {
+    const streamingValidation = !functions || functions.length == 0;
     const functionCalls = [];
     const values = {};
     const xstate = {
@@ -5763,14 +5782,21 @@ var AxGen = class extends AxProgramWithSignature {
       if (v.modelUsage) {
         this.usage.push({ ...usageInfo, ...v.modelUsage });
       }
-      if (result.content) {
+      if (result.functionCalls) {
+        mergeFunctionCalls(functionCalls, result.functionCalls);
+        mem.updateResult(
+          { name: result.name, content, functionCalls },
+          sessionId
+        );
+      } else if (result.content) {
         content += result.content;
         mem.updateResult({ name: result.name, content }, sessionId);
         const skip = streamingExtractValues(
           this.signature,
           values,
           xstate,
-          content
+          content,
+          streamingValidation
         );
         if (skip) {
           continue;
@@ -5785,13 +5811,6 @@ var AxGen = class extends AxProgramWithSignature {
         assertAssertions(this.asserts, values);
         yield* streamValues(this.signature, values, xstate, content);
       }
-      if (result.functionCalls) {
-        mergeFunctionCalls(functionCalls, result.functionCalls);
-        mem.updateResult(
-          { name: result.name, content, functionCalls },
-          sessionId
-        );
-      }
       if (result.finishReason === "length") {
         throw new Error("Max tokens reached before completion");
       }
@@ -5810,17 +5829,18 @@ var AxGen = class extends AxProgramWithSignature {
         traceId
       );
       this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
+    } else {
+      streamingExtractFinalValue(this.signature, values, xstate, content);
+      assertStreamingAssertions(
+        this.streamingAsserts,
+        values,
+        xstate,
+        content,
+        true
+      );
+      assertAssertions(this.asserts, values);
+      yield* streamValues(this.signature, values, xstate, content, true);
     }
-    streamingExtractFinalValue(this.signature, values, xstate, content);
-    assertStreamingAssertions(
-      this.streamingAsserts,
-      values,
-      xstate,
-      content,
-      true
-    );
-    assertAssertions(this.asserts, values);
-    yield* streamValues(this.signature, values, xstate, content, true);
   }
   async processResponse({
     ai,
@@ -5832,15 +5852,15 @@ var AxGen = class extends AxProgramWithSignature {
     functions
   }) {
     const values = {};
-    for (const result of res.results ?? []) {
+    let results = res.results ?? [];
+    if (res.results.length > 1) {
+      results = res.results.filter((r) => r.functionCalls);
+    }
+    for (const result of results) {
       if (res.modelUsage) {
         this.usage.push({ ...usageInfo, ...res.modelUsage });
       }
       mem.addResult(result, sessionId);
-      if (result.content) {
-        extractValues(this.signature, values, result.content);
-        assertAssertions(this.asserts, values);
-      }
       if (result.functionCalls) {
         const funcs = parseFunctionCalls(ai, result.functionCalls, values);
         if (funcs) {
@@ -5857,6 +5877,9 @@ var AxGen = class extends AxProgramWithSignature {
           );
           this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
         }
+      } else if (result.content) {
+        extractValues(this.signature, values, result.content);
+        assertAssertions(this.asserts, values);
       }
       if (result.finishReason === "length") {
         throw new Error("Max tokens reached before completion");
@@ -5910,9 +5933,6 @@ 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;
@@ -7514,7 +7534,7 @@ var AxJSInterpreter = class {
 };
 
 // dsp/router.ts
-var colorLog5 = new ColorLog();
+var colorLog6 = new ColorLog();
 var AxRoute = class {
   name;
   context;
@@ -7566,7 +7586,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}`))
         )
       );