@ax-llm/ax 11.0.59 → 11.0.61

package/index.cjs

@@ -116,6 +116,7 @@ __export(index_exports, {
   AxPromptTemplate: () => AxPromptTemplate,
   AxRAG: () => AxRAG,
   AxRateLimiterTokenUsage: () => AxRateLimiterTokenUsage,
+  AxRewriter: () => AxRewriter,
   AxSignature: () => AxSignature,
   AxSimpleClassifier: () => AxSimpleClassifier,
   AxSimpleClassifierClass: () => AxSimpleClassifierClass,
@@ -6165,24 +6166,11 @@ ${outputFields}`);
           );
           messageContent = userMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
         } else if (message.role === "assistant") {
-          const assistantValues = message.values;
-          let assistantContentParts = [];
-          const outputFields = this.sig.getOutputFields();
-          for (const field of outputFields) {
-            const value = assistantValues[field.name];
-            if (value !== void 0 && value !== null && (typeof value === "string" ? value !== "" : true)) {
-              const renderedValue = processValue(field, value);
-              assistantContentParts.push(`${field.name}: ${renderedValue}`);
-            } else {
-              const isThoughtField = field.name === this.thoughtFieldName;
-              if (!field.isOptional && !field.isInternal && !isThoughtField) {
-                throw new Error(
-                  `Value for output field '${field.name}' ('${field.title}') is required in assistant message history but was not found or was empty.`
-                );
-              }
-            }
-          }
-          messageContent = assistantContentParts.join("\n");
+          const assistantMsgParts = this.renderInputFields(
+            message.values
+            // Cast message.values (AxGenIn) to T (which extends AxGenIn)
+          );
+          messageContent = assistantMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
         }
         if (messageContent) {
           if (lastRole === message.role && userMessages.length > 0) {
@@ -8716,9 +8704,21 @@ function processChildAgentFunction(childFunction, parentValues, parentInputKeys,
       );
       const originalFunc = processedFunction.func;
       processedFunction.func = async (childArgs, funcOptions) => {
+        let valuesToInject = {};
+        if (Array.isArray(parentValues)) {
+          const lastUserMessage = parentValues.filter((msg) => msg.role === "user").pop();
+          if (lastUserMessage) {
+            valuesToInject = pick(
+              lastUserMessage.values,
+              injectionKeys
+            );
+          }
+        } else {
+          valuesToInject = pick(parentValues, injectionKeys);
+        }
         const updatedChildArgs = {
           ...childArgs,
-          ...pick(parentValues, injectionKeys)
+          ...valuesToInject
         };
         if (options.debug && injectionKeys.length > 0) {
           const ai = funcOptions?.ai;
@@ -10225,6 +10225,23 @@ var getTopInPercent = (entries, percent = 0.1) => {
   return sortedEntries.slice(0, topTenPercentCount);
 };
 
+// docs/rewriter.ts
+var AxDefaultQueryRewriter = class extends AxGen {
+  constructor(options) {
+    const signature = `"You are a query rewriter assistant tasked with rewriting a given query to improve its clarity, specificity, and relevance. Your role involves analyzing the query to identify any ambiguities, generalizations, or irrelevant information and then rephrasing it to make it more focused and precise. The rewritten query should be concise, easy to understand, and directly related to the original query. Output only the rewritten query."
+    query: string -> rewrittenQuery: string`;
+    super(signature, options);
+  }
+};
+var AxRewriter = class extends AxGen {
+  constructor(options) {
+    super(
+      '"Rewrite a given text to be clear and concise" original -> rewritten "improved text"',
+      options
+    );
+  }
+};
+
 // funcs/docker.ts
 var AxDockerSession = class {
   apiUrl;
@@ -11858,15 +11875,6 @@ var AxChainOfThought = class extends AxGen {
   }
 };
 
-// docs/rewriter.ts
-var AxDefaultQueryRewriter = class extends AxGen {
-  constructor(options) {
-    const signature = `"You are a query rewriter assistant tasked with rewriting a given query to improve its clarity, specificity, and relevance. Your role involves analyzing the query to identify any ambiguities, generalizations, or irrelevant information and then rephrasing it to make it more focused and precise. The rewritten query should be concise, easy to understand, and directly related to the original query. Output only the rewritten query."
-    query: string -> rewrittenQuery: string`;
-    super(signature, options);
-  }
-};
-
 // dsp/strutil.ts
 var trimNonAlphaNum = (str) => {
   return str.replace(/^\W+|\W+$/g, "");
@@ -13699,21 +13707,27 @@ var AxRAG = class extends AxChainOfThought {
     this.queryFn = queryFn;
     this.register(this.genQuery);
   }
-  async forward(ai, { question }, options) {
+  async forward(ai, values, options) {
+    let question;
+    if (Array.isArray(values)) {
+      const lastUserMessage = values.filter((msg) => msg.role === "user").pop();
+      if (!lastUserMessage) {
+        throw new Error("No user message found in values array");
+      }
+      question = lastUserMessage.values.question;
+    } else {
+      question = values.question;
+    }
+    let hop = 0;
     let context3 = [];
-    for (let i = 0; i < this.maxHops; i++) {
-      const { query } = await this.genQuery.forward(
-        ai,
-        {
-          context: context3,
-          question
-        },
-        options
-      );
-      const val = await this.queryFn(query);
-      context3 = AxStringUtil.dedup([...context3, val]);
+    while (hop < this.maxHops) {
+      const query = await this.genQuery.forward(ai, { context: context3, question });
+      const queryResult = await this.queryFn(query.query);
+      context3 = AxStringUtil.dedup([...context3, queryResult]);
+      hop++;
     }
-    return super.forward(ai, { context: context3, question }, options);
+    const res = await super.forward(ai, { context: context3, question }, options);
+    return res;
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -13804,6 +13818,7 @@ var AxRAG = class extends AxChainOfThought {
   AxPromptTemplate,
   AxRAG,
   AxRateLimiterTokenUsage,
+  AxRewriter,
   AxSignature,
   AxSimpleClassifier,
   AxSimpleClassifierClass,