@ax-llm/ax 10.0.29 → 10.0.31

package/index.js

@@ -702,11 +702,11 @@ var logChatRequest = (req) => {
         return `${colorLog.blueBright("System:")}
 ${colorLog.whiteBright(msg.content)}`;
       case "function":
-        return `${colorLog.blueBright("Function Result:")}
+        return `${colorLog.blueBright("\nFunction Result:")}
 ${colorLog.whiteBright(msg.result)}`;
       case "user": {
         if (typeof msg.content === "string") {
-          return `${colorLog.blueBright("User:")}
+          return `${colorLog.blueBright("\nUser:")}
 ${colorLog.whiteBright(msg.content)}`;
         }
         const items2 = msg.content.map((v) => {
@@ -719,7 +719,7 @@ ${colorLog.whiteBright(msg.content)}`;
               throw new Error("Invalid content type");
           }
         });
-        return `${colorLog.blueBright("User:")}
+        return `${colorLog.blueBright("\nUser:")}
 ${items2.join("\n")}`;
       }
       case "assistant": {
@@ -728,10 +728,10 @@ ${items2.join("\n")}`;
             const args = typeof fn.params !== "string" ? JSON.stringify(fn.params, null, 2) : fn.params;
             return `${fn.name}(${args})`;
           });
-          return `${colorLog.blueBright("Functions:")}
+          return `${colorLog.blueBright("\nFunctions:")}
 ${colorLog.whiteBright(fns.join("\n"))}`;
         }
-        return `${colorLog.blueBright("Assistant:")}
+        return `${colorLog.blueBright("\nAssistant:")}
 ${colorLog.whiteBright(msg.content ?? "<empty>")}`;
       }
       default:
@@ -754,15 +754,16 @@ var logResponse = (resp) => {
     if (r.functionCalls) {
       for (const [i, f] of r.functionCalls.entries()) {
         if (f.function.name) {
+          if (i > 0) {
+            process.stdout.write("\n\n");
+          }
           process.stdout.write(
-            `
-Function ${i + 1} -> ${colorLog.greenBright(f.function.name)} `
+            `Function ${i + 1} -> ${colorLog.greenBright(f.function.name)} `
           );
         }
         if (f.function.params) {
-          process.stdout.write(
-            colorLog.greenBright(f.function.params)
-          );
+          const params = typeof f.function.params === "string" ? f.function.params : JSON.stringify(f.function.params, null, 2);
+          process.stdout.write(`${colorLog.greenBright(params)}`);
         }
       }
     }
@@ -4007,6 +4008,15 @@ var AxProgram = class {
 };
 
 // dsp/prompt.ts
+var formattingRules = `
+When providing responses:
+1. Only output the exact requested content - no additional text, commentary, explanations, or clarifications
+2. Each key's value must strictly adhere to the formatting rules specified in the reference documentation 
+3. Follow all formatting conventions precisely as defined
+4. Do not add any extra content beyond what is explicitly requested
+5. Match the exact structure and format specifications for each field
+6. No preamble, postscript, or supplementary information
+7. Pure output only - conforming exactly to the documented requirements`;
 var AxPromptTemplate = class {
   sig;
   fieldTemplates;
@@ -4019,22 +4029,19 @@ var AxPromptTemplate = class {
     const task = [
       `You will be provided with the following fields: ${inArgs}. Your task is to generate two new fields: ${outArgs}.`
     ];
-    const fnNames = functions?.map((f) => {
-      if ("toFunction" in f) {
-        return f.toFunction().name;
-      }
-      return f.name;
-    });
-    const funcList = fnNames?.map((fname) => `\`${fname}\``).join(", ");
+    const funcs = functions?.map(
+      (f) => "toFunction" in f ? f.toFunction() : f
+    );
+    const funcList = funcs?.map(
+      (fn) => `- \`${fn.name}\`: ${capitalizeFirstLetter(fn.description)}`
+    ).join("\n");
     if (funcList && funcList.length > 0) {
+      task.push(`## Available Functions
+${funcList}`);
       task.push(
-        `Complete the task, using the following functions as needed: ${funcList}. Refer to the function descriptions for proper usage. The output field values may be generated by applying these functions if appropriate for the task.`
+        `Complete the task, using the functions defined earlier in this prompt, as needed. The output field values may be generated by applying these functions if appropriate for the task.`
       );
     }
-    const desc = this.sig.getDescription();
-    if (desc) {
-      task.push(capitalizeFirstLetter(desc.endsWith(".") ? desc : desc + "."));
-    }
     const inputFields = this.renderFields(this.sig.getInputFields());
     task.push(`## Input Fields
 ${inputFields}`);
@@ -4044,9 +4051,14 @@ ${outputFields}`);
     task.push(
       "Output must be in plain text, with each `key: value` pair on a new line. The format of each `value` should strictly adhere to the formatting instructions for its corresponding `key`, as defined earlier in this prompt."
     );
-    task.push(
-      "No additional text or formatting is permitted. The specific formatting rules for each key are provided above; ensure the corresponding values follow those rules precisely."
-    );
+    task.push(formattingRules);
+    const desc = this.sig.getDescription();
+    if (desc) {
+      task.push(
+        `## TASK DESCRIPTION
+${capitalizeFirstLetter(desc.endsWith(".") ? desc : desc + ".")}`
+      );
+    }
     this.task = {
       type: "text",
       text: task.join("\n\n")
@@ -4057,21 +4069,22 @@ ${outputFields}`);
     demos
   }) => {
     const renderedExamples = examples ? [
-      { type: "text", text: "\n## Examples:\n" },
+      { type: "text", text: "## Examples:\n" },
       ...this.renderExamples(examples)
     ] : [];
     const renderedDemos = demos ? this.renderDemos(demos) : [];
     const completion = this.renderInputFields(values);
     const allTextExamples = renderedExamples.every((v) => v.type === "text");
     const allTextDemos = renderedDemos.every((v) => v.type === "text");
+    const examplesInSystemPrompt = allTextExamples && allTextDemos;
     let systemContent = this.task.text;
-    if (allTextExamples && allTextDemos) {
+    if (examplesInSystemPrompt) {
       const combinedItems = [
-        { type: "text", text: this.task.text },
+        { type: "text", text: systemContent + "\n\n" },
         ...renderedExamples,
         ...renderedDemos
       ];
-      combinedItems.reduce(combineConsecutiveStrings("\n"), []);
+      combinedItems.reduce(combineConsecutiveStrings(""), []);
       if (combinedItems && combinedItems[0]) {
         systemContent = combinedItems[0].text;
       }
@@ -4080,7 +4093,7 @@ ${outputFields}`);
       role: "system",
       content: systemContent
     };
-    const promptList = allTextExamples && allTextDemos ? completion : [...renderedExamples, ...renderedDemos, ...completion];
+    const promptList = examplesInSystemPrompt ? completion : [...renderedExamples, ...renderedDemos, ...completion];
     const prompt = promptList.filter((v) => v !== void 0);
     const userContent = prompt.every((v) => v.type === "text") ? prompt.map((v) => v.text).join("\n") : prompt.reduce(combineConsecutiveStrings("\n"), []);
     const userPrompt = {
@@ -4115,16 +4128,13 @@ ${outputFields}`);
       const renderedItem = [...renderedInputItem, ...renderedOutputItem];
       renderedItem.forEach((v) => {
         if ("text" in v) {
-          v.text = v.text;
+          v.text = v.text + "\n";
         }
         if ("image" in v) {
           v.image = v.image;
         }
         list.push(v);
       });
-      if (renderedItem.length > 0) {
-        list.push({ type: "text", text: "\n" });
-      }
     }
     return list;
   };
@@ -4135,23 +4145,20 @@ ${outputFields}`);
       const renderedItem = fields.map((field) => this.renderInField(field, item, true)).filter((v) => v !== void 0).flat();
       renderedItem.slice(0, -1).forEach((v) => {
         if ("text" in v) {
-          v.text = v.text;
+          v.text = v.text + "\n";
         }
         if ("image" in v) {
           v.image = v.image;
         }
         list.push(v);
       });
-      if (renderedItem.length > 0) {
-        list.push({ type: "text", text: "\n" });
-      }
     }
     return list;
   };
   renderInputFields = (values) => {
     const renderedItems = this.sig.getInputFields().map((field) => this.renderInField(field, values)).filter((v) => v !== void 0).flat();
     renderedItems.filter((v) => v.type === "text").forEach((v) => {
-      v.text = v.text + "\n\n";
+      v.text = v.text + "\n";
     });
     return renderedItems;
   };