@ax-llm/ax 11.0.8 → 11.0.11

package/index.d.cts

@@ -326,6 +326,7 @@ declare class AxBaseAI<TModel, TEmbedModel, TChatRequest, TEmbedRequest, TChatRe
     getMetrics(): AxAIServiceMetrics;
     chat(req: Readonly<AxChatRequest<TModel>>, options?: Readonly<AxAIPromptConfig & AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxChatResponse | ReadableStream$1<AxChatResponse>>;
     private _chat1;
+    private cleanupFunctionSchema;
     private _chat2;
     embed(req: Readonly<AxEmbedRequest<TEmbedModel>>, options?: Readonly<AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxEmbedResponse>;
     private _embed1;
@@ -1637,20 +1638,18 @@ interface AxAgentFeatures {
  */
 declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> implements AxAgentic {
     private ai?;
-    private signature;
     private program;
     private functions?;
     private agents?;
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private description;
-    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[];

package/index.d.ts

@@ -326,6 +326,7 @@ declare class AxBaseAI<TModel, TEmbedModel, TChatRequest, TEmbedRequest, TChatRe
     getMetrics(): AxAIServiceMetrics;
     chat(req: Readonly<AxChatRequest<TModel>>, options?: Readonly<AxAIPromptConfig & AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxChatResponse | ReadableStream$1<AxChatResponse>>;
     private _chat1;
+    private cleanupFunctionSchema;
     private _chat2;
     embed(req: Readonly<AxEmbedRequest<TEmbedModel>>, options?: Readonly<AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxEmbedResponse>;
     private _embed1;
@@ -1637,20 +1638,18 @@ interface AxAgentFeatures {
  */
 declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> implements AxAgentic {
     private ai?;
-    private signature;
     private program;
     private functions?;
     private agents?;
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private description;
-    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[];

package/index.js

@@ -803,7 +803,8 @@ var AxBaseAI = class {
     const startTime = performance.now();
     let isError = false;
     try {
-      return this._chat1(req, options);
+      const result = await this._chat1(req, options);
+      return result;
     } catch (error) {
       isError = true;
       throw error;
@@ -856,13 +857,31 @@ var AxBaseAI = class {
     }
     return await this._chat2(model, modelConfig, req, options);
   }
+  cleanupFunctionSchema(fn) {
+    const cleanFn = { ...fn };
+    if (cleanFn.parameters) {
+      const cleanParams = { ...cleanFn.parameters };
+      if (Array.isArray(cleanParams.required) && cleanParams.required.length === 0) {
+        delete cleanParams.required;
+      }
+      if (cleanParams.properties && Object.keys(cleanParams.properties).length === 0) {
+        delete cleanParams.properties;
+      }
+      if (Object.keys(cleanParams).length === 0 || Object.keys(cleanParams).length === 1 && cleanParams.type === "object") {
+        delete cleanFn.parameters;
+      } else {
+        cleanFn.parameters = cleanParams;
+      }
+    }
+    return cleanFn;
+  }
   async _chat2(model, modelConfig, chatReq, options, span) {
     if (!this.aiImpl.createChatReq) {
       throw new Error("generateChatReq not implemented");
     }
     let functions;
     if (chatReq.functions && chatReq.functions.length > 0) {
-      functions = chatReq.functions;
+      functions = chatReq.functions.map((fn2) => this.cleanupFunctionSchema(fn2));
     }
     const req = {
       ...chatReq,
@@ -1029,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:")}
@@ -4701,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;
@@ -4718,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
     );
@@ -4730,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")
@@ -6032,31 +6055,29 @@ function processChildAgentFunction(childFunction, parentValues, parentInputKeys,
 }
 var AxAgent = class {
   ai;
-  signature;
   program;
   functions;
   agents;
   disableSmartModelRouting;
   excludeFieldsFromPassthrough;
   name;
-  description;
-  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 ?? [];
-    this.signature = new AxSignature(signature);
-    this.signature.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}`
@@ -6067,17 +6088,23 @@ var AxAgent = class {
         `Agent description must be at least 20 characters (explain in detail what the agent does): ${description}`
       );
     }
-    this.program = new AxGen(this.signature, options);
+    if (definition && definition.length < 100) {
+      throw new Error(
+        `Agent definition is the prompt you give to the LLM for the agent. It must be detailed and at least 100 characters`
+      );
+    }
+    this.program = new AxGen(signature, {
+      ...options,
+      description: definition
+    });
     for (const agent of agents ?? []) {
       this.program.register(agent);
     }
     this.name = name;
-    this.description = description;
-    this.subAgentList = agents?.map((a) => a.getFunction().name).join(", ");
     this.func = {
       name: toCamelCase(this.name),
-      description: this.description,
-      parameters: this.signature.toJSONSchema(),
+      description,
+      parameters: this.program.getSignature().toJSONSchema(),
       func: () => this.forward
     };
     const mm = ai?.getModelList();
@@ -6108,13 +6135,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,
@@ -6133,7 +6173,7 @@ var AxAgent = class {
   init(parentAi, values, options) {
     const ai = this.ai ?? parentAi;
     const mm = ai?.getModelList();
-    const parentSchema = this.signature.getInputFields();
+    const parentSchema = this.program.getSignature().getInputFields();
     const parentKeys = parentSchema.map((p) => p.name);
     const agentFuncs = this.agents?.map((agent) => {
       const f = agent.getFeatures();
@@ -6181,8 +6221,7 @@ var AxAgent = class {
         "Agent description must be at least 20 characters (explain in detail what the agent does)"
       );
     }
-    this.description = description;
-    this.signature.setDescription(description);
+    this.program.getSignature().setDescription(description);
     this.func.description = description;
   }
 };