@ax-llm/ax 11.0.9 → 11.0.12

package/index.d.cts

@@ -1644,12 +1644,12 @@ declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> imple
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private subAgentList?;
     private func;
-    constructor({ ai, name, description, signature, agents, functions, }: Readonly<{
+    constructor({ ai, name, description, definition, signature, agents, functions, }: Readonly<{
         ai?: Readonly<AxAIService>;
         name: string;
         description: string;
+        definition?: string;
         signature: AxSignature | string;
         agents?: AxAgentic[];
         functions?: AxFunction[];
@@ -1680,6 +1680,7 @@ declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> imple
      * @throws Error if description is too short
      */
     setDescription(description: string): void;
+    setDefinition(definition: string): void;
 }
 
 interface AxApacheTikaArgs {

package/index.d.ts

@@ -1644,12 +1644,12 @@ declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> imple
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private subAgentList?;
     private func;
-    constructor({ ai, name, description, signature, agents, functions, }: Readonly<{
+    constructor({ ai, name, description, definition, signature, agents, functions, }: Readonly<{
         ai?: Readonly<AxAIService>;
         name: string;
         description: string;
+        definition?: string;
         signature: AxSignature | string;
         agents?: AxAgentic[];
         functions?: AxFunction[];
@@ -1680,6 +1680,7 @@ declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> imple
      * @throws Error if description is too short
      */
     setDescription(description: string): void;
+    setDefinition(definition: string): void;
 }
 
 interface AxApacheTikaArgs {

package/index.js

@@ -1048,7 +1048,11 @@ var AxBaseAI = class {
   }
 };
 var logChatRequest = (req) => {
+  const hasAssistant = req.chatPrompt?.some((msg) => msg.role === "assistant");
   const items = req.chatPrompt?.map((msg) => {
+    if (hasAssistant && msg.role === "system") {
+      return "";
+    }
     switch (msg.role) {
       case "system":
         return `${colorLog.blueBright("System:")}
@@ -4720,16 +4724,17 @@ var AxProgram = class {
 
 // dsp/prompt.ts
 var functionCallInstructions = `
-## Function Call Instructions
+### Function Call Instructions
 - Complete the task, using the functions defined earlier in this prompt. 
 - Call functions step-by-step, using the output of one function as input to the next.
 - 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.
+### Output Formatting Rules
+- Output must strictly follow the defined plain-text \`key: value\` field format.
 - Each output key, value must strictly adhere to the specified output field formatting rules.
 - No preamble, postscript, or supplementary information.
-- Do not repeat output fields.`;
+- Do not repeat output fields.
+- Do not use JSON to format the output.`;
 var AxPromptTemplate = class {
   sig;
   fieldTemplates;
@@ -4737,11 +4742,18 @@ var AxPromptTemplate = class {
   constructor(sig, functions, fieldTemplates) {
     this.sig = sig;
     this.fieldTemplates = fieldTemplates;
+    const task = [];
+    const desc = this.sig.getDescription();
+    if (desc) {
+      const capitalized = capitalizeFirstLetter(desc.trim());
+      task.push(capitalized.endsWith(".") ? capitalized : capitalized + ".");
+    }
     const inArgs = this.renderDescFields(this.sig.getInputFields());
     const outArgs = this.renderDescFields(this.sig.getOutputFields());
-    const task = [
-      `You will be provided with the following fields: ${inArgs}. Your task is to generate new fields: ${outArgs}.`
-    ];
+    task.push(
+      `## Processing Instructions
+You will be provided with the following fields: ${inArgs}. Your task is to generate new fields: ${outArgs}.`
+    );
     const funcs = functions?.map(
       (f) => "toFunction" in f ? f.toFunction() : f
     );
@@ -4749,27 +4761,19 @@ var AxPromptTemplate = class {
       (fn) => `- \`${fn.name}\`: ${capitalizeFirstLetter(fn.description)}.`
     ).join("\n");
     if (funcList && funcList.length > 0) {
-      task.push(`## Available Functions
+      task.push(`### Available Functions
 ${funcList}`);
     }
     const inputFields = this.renderFields(this.sig.getInputFields());
-    task.push(`## Input Fields
+    task.push(`### Input Fields
 ${inputFields}`);
     const outputFields = this.renderFields(this.sig.getOutputFields());
-    task.push(`## Output Fields
+    task.push(`### Output Fields
 ${outputFields}`);
     if (funcList && funcList.length > 0) {
       task.push(functionCallInstructions.trim());
     }
     task.push(formattingRules.trim());
-    const desc = this.sig.getDescription();
-    if (desc) {
-      const capitalized = capitalizeFirstLetter(desc.trim());
-      task.push(
-        `## TASK DESCRIPTION
-${capitalized.endsWith(".") ? capitalized : capitalized + "."}`
-      );
-    }
     this.task = {
       type: "text",
       text: task.join("\n\n")
@@ -6049,6 +6053,12 @@ function processChildAgentFunction(childFunction, parentValues, parentInputKeys,
   }
   return processedFunction;
 }
+var descriptionError = new Error(
+  "Agent description must be at least 20 characters (explain in detail what the agent does)"
+);
+var definitionError = new Error(
+  "Agent definition is the prompt you give to the LLM for the agent. It must be detailed and at least 100 characters"
+);
 var AxAgent = class {
   ai;
   program;
@@ -6057,43 +6067,46 @@ var AxAgent = class {
   disableSmartModelRouting;
   excludeFieldsFromPassthrough;
   name;
-  subAgentList;
+  //   private subAgentList?: string
   func;
   constructor({
     ai,
     name,
     description,
+    definition,
     signature,
     agents,
     functions
   }, options) {
+    const { disableSmartModelRouting, excludeFieldsFromPassthrough } = options ?? {};
     this.ai = ai;
     this.agents = agents;
     this.functions = functions;
-    this.disableSmartModelRouting = options?.disableSmartModelRouting;
-    this.excludeFieldsFromPassthrough = options?.excludeFieldsFromPassthrough ?? [];
-    const sig = new AxSignature(signature);
-    sig.setDescription(description);
+    this.disableSmartModelRouting = disableSmartModelRouting;
+    this.excludeFieldsFromPassthrough = excludeFieldsFromPassthrough ?? [];
     if (!name || name.length < 5) {
       throw new Error(
-        `Agent name must be at least 10 characters (more descriptive): ${name}`
+        `Agent name must be at least 10 characters (more descriptive)`
       );
     }
     if (!description || description.length < 20) {
-      throw new Error(
-        `Agent description must be at least 20 characters (explain in detail what the agent does): ${description}`
-      );
+      throw descriptionError;
+    }
+    if (definition && definition.length < 100) {
+      throw definitionError;
     }
-    this.program = new AxGen(sig, options);
+    this.program = new AxGen(signature, {
+      ...options,
+      description: definition ?? description
+    });
     for (const agent of agents ?? []) {
       this.program.register(agent);
     }
     this.name = name;
-    this.subAgentList = agents?.map((a) => a.getFunction().name).join(", ");
     this.func = {
       name: toCamelCase(this.name),
       description,
-      parameters: sig.toJSONSchema(),
+      parameters: this.program.getSignature().toJSONSchema(),
       func: () => this.forward
     };
     const mm = ai?.getModelList();
@@ -6124,13 +6137,26 @@ var AxAgent = class {
   }
   getFunction() {
     const boundFunc = this.forward.bind(this);
-    const wrappedFunc = (valuesAndModel, options) => {
+    const wrappedFunc = async (valuesAndModel, options) => {
       const { model, ...values } = valuesAndModel;
       const ai = this.ai ?? options?.ai;
       if (!ai) {
         throw new Error("AI service is required to run the agent");
       }
-      return boundFunc(ai, values, { ...options, model });
+      const ret = await boundFunc(ai, values, {
+        ...options,
+        model
+      });
+      const sig = this.program.getSignature();
+      const outFields = sig.getOutputFields();
+      const result = Object.keys(ret).map((k) => {
+        const field = outFields.find((f) => f.name === k);
+        if (field) {
+          return `${field.title}: ${ret[k]}`;
+        }
+        return `${k}: ${ret[k]}`;
+      }).join("\n");
+      return result;
     };
     return {
       ...this.func,
@@ -6193,13 +6219,17 @@ var AxAgent = class {
    */
   setDescription(description) {
     if (!description || description.length < 20) {
-      throw new Error(
-        "Agent description must be at least 20 characters (explain in detail what the agent does)"
-      );
+      throw descriptionError;
     }
     this.program.getSignature().setDescription(description);
     this.func.description = description;
   }
+  setDefinition(definition) {
+    if (!definition || definition.length < 100) {
+      throw definitionError;
+    }
+    this.program.getSignature().setDescription(definition);
+  }
 };
 function toCamelCase(inputString) {
   const words = inputString.split(/[^a-zA-Z0-9]/);