@ax-llm/ax 12.0.5 → 12.0.7

package/index.js

@@ -2451,48 +2451,59 @@ function createMessages2(req) {
       case "system":
         return { role: "system", content: msg.content };
       case "user":
-        if (Array.isArray(msg.content)) {
+        const content = Array.isArray(msg.content) ? msg.content.map((c) => {
+          switch (c.type) {
+            case "text":
+              return { type: "text", text: c.text };
+            case "image": {
+              const url = `data:${c.mimeType};base64,` + c.image;
+              return {
+                type: "image_url",
+                image_url: { url, details: c.details ?? "auto" }
+              };
+            }
+            case "audio": {
+              const data = c.data;
+              return {
+                type: "input_audio",
+                input_audio: { data, format: c.format ?? "wav" }
+              };
+            }
+            default:
+              throw new Error("Invalid content type");
+          }
+        }) : msg.content;
+        return {
+          role: "user",
+          ...msg.name ? { name: msg.name } : {},
+          content
+        };
+      case "assistant":
+        const toolCalls = msg.functionCalls?.map((v) => ({
+          id: v.id,
+          type: "function",
+          function: {
+            name: v.function.name,
+            arguments: typeof v.function.params === "object" ? JSON.stringify(v.function.params) : v.function.params
+          }
+        }));
+        if (toolCalls && toolCalls.length > 0) {
           return {
-            role: "user",
+            role: "assistant",
+            ...msg.content ? { content: msg.content } : {},
             name: msg.name,
-            content: msg.content.map((c) => {
-              switch (c.type) {
-                case "text":
-                  return { type: "text", text: c.text };
-                case "image": {
-                  const url = `data:${c.mimeType};base64,` + c.image;
-                  return {
-                    type: "image_url",
-                    image_url: { url, details: c.details ?? "auto" }
-                  };
-                }
-                case "audio": {
-                  const data = c.data;
-                  return {
-                    type: "input_audio",
-                    input_audio: { data, format: c.format ?? "wav" }
-                  };
-                }
-                default:
-                  throw new Error("Invalid content type");
-              }
-            })
+            tool_calls: toolCalls
           };
         }
-        return { role: "user", content: msg.content, name: msg.name };
-      case "assistant":
+        if (!msg.content) {
+          throw new Error(
+            "Assistant content is required when no tool calls are provided"
+          );
+        }
         return {
           role: "assistant",
           content: msg.content,
-          name: msg.name,
-          tool_calls: msg.functionCalls?.map((v) => ({
-            id: v.id,
-            type: "function",
-            function: {
-              name: v.function.name,
-              arguments: typeof v.function.params === "object" ? JSON.stringify(v.function.params) : v.function.params
-            }
-          }))
+          ...msg.name ? { name: msg.name } : {}
         };
       case "function":
         return {
@@ -3328,7 +3339,7 @@ var AxAIGoogleGeminiImpl = class {
             }
           ];
           return {
-            role: "model",
+            role: "user",
             parts
           };
         }
@@ -4051,8 +4062,11 @@ var AxAIMistral = class extends AxAIOpenAIBase {
     for (const message of messages) {
       if (message.role === "user" && Array.isArray(message.content)) {
         const contentUpdated = message.content.map((item) => {
-          if (typeof item === "object" && item !== null && item.type === "image_url") {
-            return { type: "image_url", image_url: item.image_url?.url };
+          if (typeof item === "object" && item !== null && "image_url" in item) {
+            return {
+              type: "image_url",
+              image_url: { url: item.image_url?.url }
+            };
           }
           return item;
         });
@@ -4725,8 +4739,6 @@ var AxAIOpenAIResponsesImpl = class {
         baseResult.content = event.delta;
         break;
       case "response.output_text.done":
-        baseResult.id = event.item_id;
-        baseResult.content = event.text;
         break;
       case "response.function_call_arguments.delta":
         baseResult.id = event.item_id;
@@ -5549,9 +5561,6 @@ var MemoryImpl = class {
     functionCalls
   }) {
     const isContentEmpty = typeof content === "string" && content.trim() === "";
-    if (isContentEmpty && (!functionCalls || functionCalls.length === 0)) {
-      return;
-    }
     if (isContentEmpty) {
       this.addMemory({ name, role: "assistant", functionCalls });
     } else {
@@ -5576,17 +5585,16 @@ var MemoryImpl = class {
   }) {
     const lastItem = this.data.at(-1);
     if (!lastItem || lastItem.chat.role !== "assistant") {
-      this.addResultMessage({ content, name, functionCalls });
-    } else {
-      if ("content" in lastItem.chat && typeof content === "string" && content.trim() !== "") {
-        lastItem.chat.content = content;
-      }
-      if ("name" in lastItem.chat && name) {
-        lastItem.chat.name = name;
-      }
-      if ("functionCalls" in lastItem.chat && functionCalls) {
-        lastItem.chat.functionCalls = functionCalls;
-      }
+      throw new Error("No assistant message to update");
+    }
+    if (typeof content === "string" && content.trim() !== "") {
+      lastItem.chat.content = content;
+    }
+    if (name && name.trim() !== "") {
+      lastItem.chat.name = name;
+    }
+    if (functionCalls && functionCalls.length > 0) {
+      lastItem.chat.functionCalls = functionCalls;
     }
     if (this.options?.debug) {
       if (delta && typeof delta === "string") {
@@ -6116,6 +6124,12 @@ ${outputFields}`);
       text: task.join("\n\n")
     };
   }
+  renderSingleValueUserContent = (values, renderedExamples, renderedDemos, examplesInSystemPrompt) => {
+    const completion = this.renderInputFields(values);
+    const promptList = examplesInSystemPrompt ? completion : [...renderedExamples, ...renderedDemos, ...completion];
+    const prompt = promptList.filter((v) => v !== void 0);
+    return prompt.every((v) => v.type === "text") ? prompt.map((v) => v.text).join("\n") : prompt.reduce(combineConsecutiveStrings("\n"), []);
+  };
   render = (values, {
     examples,
     demos
@@ -6144,60 +6158,49 @@ ${outputFields}`);
       role: "system",
       content: systemContent
     };
-    let userMessages = [];
     if (Array.isArray(values)) {
+      let userMessages = [];
       const history = values;
-      let lastRole = void 0;
-      for (const message of history) {
-        let messageContent = "";
-        if (message.role === "user") {
-          const userMsgParts = this.renderInputFields(
-            message.values
-            // Cast message.values (AxGenIn) to T (which extends AxGenIn)
+      for (const [index, message] of history.entries()) {
+        let content;
+        if (index === 0) {
+          content = this.renderSingleValueUserContent(
+            message.values,
+            renderedExamples,
+            renderedDemos,
+            examplesInSystemPrompt
           );
-          messageContent = userMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
-        } else if (message.role === "assistant") {
-          const assistantMsgParts = this.renderInputFields(
-            message.values
-            // Cast message.values (AxGenIn) to T (which extends AxGenIn)
+        } else {
+          content = this.renderSingleValueUserContent(
+            message.values,
+            [],
+            [],
+            false
           );
-          messageContent = assistantMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
         }
-        if (messageContent) {
-          if (lastRole === message.role && userMessages.length > 0) {
-            const lastMessage = userMessages[userMessages.length - 1];
-            if (lastMessage) {
-              lastMessage.content += "\n" + messageContent;
-            }
-          } else {
-            if (message.role === "user") {
-              userMessages.push({ role: "user", content: messageContent });
-            } else if (message.role === "assistant") {
-              userMessages.push({ role: "assistant", content: messageContent });
-            }
-          }
-          lastRole = message.role;
+        if (message.role === "user") {
+          userMessages.push({ role: "user", content });
+          continue;
         }
+        if (message.role !== "assistant") {
+          throw new Error("Invalid message role");
+        }
+        if (typeof content !== "string") {
+          throw new Error(
+            "Assistant message cannot contain non-text content like images, files,etc"
+          );
+        }
+        userMessages.push({ role: "assistant", content });
       }
-    } else {
-      const currentValues = values;
-      const completion = this.renderInputFields(currentValues);
-      const promptList = examplesInSystemPrompt ? completion : [...renderedExamples, ...renderedDemos, ...completion];
-      const promptFilter = promptList.filter((v) => v !== void 0);
-      let userContent;
-      if (promptFilter.every((v) => v.type === "text")) {
-        userContent = promptFilter.map((v) => v.text).join("\n");
-      } else {
-        userContent = promptFilter.map((part) => {
-          if (part.type === "text") return part.text;
-          if (part.type === "image") return "[IMAGE]";
-          if (part.type === "audio") return "[AUDIO]";
-          return "";
-        }).join("\n").trim();
-      }
-      userMessages.push({ role: "user", content: userContent });
+      return [systemPrompt, ...userMessages];
     }
-    return [systemPrompt, ...userMessages];
+    const userContent = this.renderSingleValueUserContent(
+      values,
+      renderedExamples,
+      renderedDemos,
+      examplesInSystemPrompt
+    );
+    return [systemPrompt, { role: "user", content: userContent }];
   };
   renderExtraFields = (extraFields) => {
     const prompt = [];
@@ -6264,9 +6267,6 @@ ${outputFields}`);
         if ("text" in v) {
           v.text = v.text + "\n";
         }
-        if ("image" in v) {
-          v.image = v.image;
-        }
         list.push(v);
       });
     }
@@ -6297,9 +6297,6 @@ ${outputFields}`);
         if ("text" in v) {
           v.text = v.text + "\n";
         }
-        if ("image" in v) {
-          v.image = v.image;
-        }
         list.push(v);
       });
     }
@@ -8061,11 +8058,41 @@ var AxSignature = class _AxSignature {
       if (signature.validatedAtHash === this.sigHash) {
         this.validatedAtHash = this.sigHash;
       }
+    } else if (typeof signature === "object" && signature !== null) {
+      if (!("inputs" in signature) || !("outputs" in signature)) {
+        throw new AxSignatureValidationError(
+          "Invalid signature object: missing inputs or outputs",
+          void 0,
+          'Signature object must have "inputs" and "outputs" arrays. Example: { inputs: [...], outputs: [...] }'
+        );
+      }
+      if (!Array.isArray(signature.inputs) || !Array.isArray(signature.outputs)) {
+        throw new AxSignatureValidationError(
+          "Invalid signature object: inputs and outputs must be arrays",
+          void 0,
+          'Both "inputs" and "outputs" must be arrays of AxField objects'
+        );
+      }
+      try {
+        this.description = signature.description;
+        this.inputFields = signature.inputs.map((v) => this.parseField(v));
+        this.outputFields = signature.outputs.map((v) => this.parseField(v));
+        [this.sigHash, this.sigString] = this.updateHash();
+      } catch (error) {
+        if (error instanceof AxSignatureValidationError) {
+          throw error;
+        }
+        throw new AxSignatureValidationError(
+          `Failed to create signature from object: ${error instanceof Error ? error.message : "Unknown error"}`,
+          void 0,
+          "Check that all fields in inputs and outputs arrays are valid AxField objects"
+        );
+      }
     } else {
       throw new AxSignatureValidationError(
         "Invalid signature argument type",
         void 0,
-        "Signature must be a string or another AxSignature instance"
+        "Signature must be a string, another AxSignature instance, or an object with inputs and outputs arrays"
       );
     }
   }
@@ -8108,7 +8135,7 @@ var AxSignature = class _AxSignature {
     }
     this.description = desc;
     this.invalidateValidationCache();
-    this.updateHash();
+    this.updateHashLight();
   };
   addInputField = (field) => {
     try {
@@ -8784,11 +8811,9 @@ var AxGen = class extends AxProgramWithSignature {
   values = {};
   excludeContentFromTrace = false;
   thoughtFieldName;
-  logger;
   constructor(signature, options) {
     super(signature, { description: options?.description });
     this.options = options;
-    this.logger = options?.logger;
     this.thoughtFieldName = options?.thoughtFieldName ?? "thought";
     const promptTemplateOptions = {
       functions: options?.functions,
@@ -8878,6 +8903,7 @@ var AxGen = class extends AxProgramWithSignature {
         rateLimiter,
         stream,
         debug: false,
+        // we do our own debug logging
         thinkingTokenBudget,
         showThoughts,
         traceContext,
@@ -8917,6 +8943,7 @@ var AxGen = class extends AxProgramWithSignature {
         fastFail,
         span
       });
+      this.getLogger(ai, options)?.("", { tags: ["responseEnd"] });
     } else {
       yield await this.processResponse({
         ai,
@@ -8950,6 +8977,13 @@ var AxGen = class extends AxProgramWithSignature {
       s: -1
     };
     let content = "";
+    mem.addResult(
+      {
+        content: "",
+        functionCalls: []
+      },
+      sessionId
+    );
     for await (const v of res) {
       const result = v.results[0];
       if (!result) {
@@ -9078,10 +9112,6 @@ Content: ${content}`
         xstate
       );
     }
-    if (ai.getOptions().debug) {
-      const logger = ai.getLogger();
-      logger("", { tags: ["responseEnd"] });
-    }
   }
   async processResponse({
     ai,
@@ -9153,9 +9183,11 @@ Content: ${result.content}`
     const stopFunction = (options?.stopFunction ?? this.options?.stopFunction)?.toLowerCase();
     const maxRetries = options.maxRetries ?? this.options?.maxRetries ?? 10;
     const maxSteps = options.maxSteps ?? this.options?.maxSteps ?? 10;
-    const debug = options.debug ?? ai.getOptions().debug;
     const debugHideSystemPrompt = options.debugHideSystemPrompt;
-    const memOptions = { debug, debugHideSystemPrompt };
+    const memOptions = {
+      debug: this.isDebug(ai, options),
+      debugHideSystemPrompt
+    };
     const mem = options.mem ?? this.options?.mem ?? new AxMemory(1e4, memOptions);
     let err;
     if (options?.functions && options.functions.length > 0) {
@@ -9209,10 +9241,7 @@ Content: ${result.content}`
           if (shouldContinue) {
             continue multiStepLoop;
           }
-          if (debug) {
-            const logger = options.logger ?? this.logger ?? ai.getLogger();
-            logger("", { tags: ["responseEnd"] });
-          }
+          this.getLogger(ai, options)?.("", { tags: ["responseEnd"] });
           return;
         } catch (e) {
           let errorFields;
@@ -9354,6 +9383,12 @@ Content: ${result.content}`
   setExamples(examples, options) {
     super.setExamples(examples, options);
   }
+  isDebug(ai, options) {
+    return options?.debug ?? this.options?.debug ?? ai.getOptions().debug ?? false;
+  }
+  getLogger(ai, options) {
+    return options?.logger ?? this.options?.logger ?? ai.getLogger();
+  }
 };
 var AxGenerateError = class extends Error {
   details;