@ax-llm/ax 11.0.28 → 11.0.30

package/index.cjs

@@ -458,7 +458,7 @@ var apiCall = async (api, json) => {
   const metrics = createRequestMetrics();
   let timeoutId;
   const baseUrl = new URL(process.env["PROXY"] ?? api.url);
-  const apiPath = [baseUrl.pathname, api.name].filter(Boolean).join("/").replace(/\/+/g, "/");
+  const apiPath = `${[baseUrl.pathname, api.name].filter(Boolean).join("/").replace(/\/+/g, "/")}${baseUrl.search}`;
   const apiUrl = new URL(apiPath, baseUrl);
   const requestId = crypto.randomUUID();
   if (api.validateRequest) {
@@ -752,9 +752,12 @@ var ColorLog = class {
 
 // ai/debug.ts
 var colorLog = new ColorLog();
-var formatChatMessage = (msg, hideContent) => {
+var formatChatMessage = (msg, hideContent, hideSystemPrompt) => {
   switch (msg.role) {
     case "system":
+      if (hideSystemPrompt) {
+        return "";
+      }
       return `
 ${colorLog.blueBright("System:")}
 ${colorLog.whiteBright(msg.content)}`;
@@ -800,13 +803,15 @@ ${hideContent ? "" : colorLog.whiteBright(msg.content ?? "<empty>")}`;
       throw new Error("Invalid role");
   }
 };
-var logChatRequestMessage = (msg) => {
-  process.stdout.write(`${formatChatMessage(msg)}
+var logChatRequestMessage = (msg, hideSystemPrompt) => {
+  process.stdout.write(`${formatChatMessage(msg, hideSystemPrompt)}
 `);
   process.stdout.write(colorLog.blueBright("\nAssistant:\n"));
 };
-var logChatRequest = (chatPrompt) => {
-  const items = chatPrompt?.map((msg) => formatChatMessage(msg));
+var logChatRequest = (chatPrompt, hideSystemPrompt) => {
+  const items = chatPrompt?.map(
+    (msg) => formatChatMessage(msg, hideSystemPrompt)
+  );
   if (items) {
     process.stdout.write(items.join("\n"));
     process.stdout.write(colorLog.blueBright("\nAssistant:\n"));
@@ -1126,7 +1131,7 @@ var AxBaseAI = class {
       return res2;
     };
     if (options?.debug ?? this.debug) {
-      logChatRequest(req.chatPrompt);
+      logChatRequest(req.chatPrompt, options?.debugHideSystemPrompt);
     }
     const rt = options?.rateLimiter ?? this.rt;
     const rv = rt ? await rt(fn, { modelUsage: this.modelUsage }) : await fn();
@@ -3908,9 +3913,9 @@ function mergeFunctionCalls(functionCalls, functionCallDeltas) {
 // mem/memory.ts
 var defaultLimit = 1e4;
 var MemoryImpl = class {
-  constructor(limit = defaultLimit, debug = false) {
+  constructor(limit = defaultLimit, options) {
     this.limit = limit;
-    this.debug = debug;
+    this.options = options;
     if (limit <= 0) {
       throw Error("argument 'limit' must be greater than 0");
     }
@@ -3931,8 +3936,8 @@ var MemoryImpl = class {
   }
   add(value) {
     this.addMemory(value);
-    if (this.debug) {
-      debugRequest(value);
+    if (this.options?.debug) {
+      debugRequest(value, this.options?.debugHideSystemPrompt);
     }
   }
   addResultMessage({
@@ -3951,7 +3956,7 @@ var MemoryImpl = class {
     functionCalls
   }) {
     this.addResultMessage({ content, name, functionCalls });
-    if (this.debug) {
+    if (this.options?.debug) {
       debugResponse({ content, name, functionCalls });
     }
   }
@@ -3975,7 +3980,7 @@ var MemoryImpl = class {
         lastItem.chat.functionCalls = functionCalls;
       }
     }
-    if (this.debug) {
+    if (this.options?.debug) {
       if (delta && typeof delta === "string") {
         debugResponseDelta(delta);
       } else if (lastItem) {
@@ -4031,10 +4036,10 @@ var MemoryImpl = class {
   }
 };
 var AxMemory = class {
-  constructor(limit = defaultLimit, debug = false) {
+  constructor(limit = defaultLimit, options) {
     this.limit = limit;
-    this.debug = debug;
-    this.defaultMemory = new MemoryImpl(limit, debug);
+    this.options = options;
+    this.defaultMemory = new MemoryImpl(limit, options);
   }
   memories = /* @__PURE__ */ new Map();
   defaultMemory;
@@ -4043,7 +4048,7 @@ var AxMemory = class {
       return this.defaultMemory;
     }
     if (!this.memories.has(sessionId)) {
-      this.memories.set(sessionId, new MemoryImpl(this.limit));
+      this.memories.set(sessionId, new MemoryImpl(this.limit, this.options));
     }
     return this.memories.get(sessionId);
   }
@@ -4072,15 +4077,15 @@ var AxMemory = class {
     if (!sessionId) {
       this.defaultMemory.reset();
     } else {
-      this.memories.set(sessionId, new MemoryImpl(this.limit));
+      this.memories.set(sessionId, new MemoryImpl(this.limit, this.options));
     }
   }
 };
-function debugRequest(value) {
+function debugRequest(value, hideSystemPrompt) {
   if (Array.isArray(value)) {
-    logChatRequest(value);
+    logChatRequest(value, hideSystemPrompt);
   } else {
-    logChatRequestMessage(value);
+    logChatRequestMessage(value, hideSystemPrompt);
   }
 }
 function debugResponse(value) {
@@ -5565,10 +5570,13 @@ ${errors}
 }
 
 // dsp/datetime.ts
-function parseLLMFriendlyDate(field, dateStr) {
+function parseLLMFriendlyDate(field, dateStr, required = false) {
   try {
     return _parseLLMFriendlyDate(dateStr);
   } catch (err) {
+    if (field.isOptional && !required) {
+      return;
+    }
     const message = err.message;
     throw new ValidationError({ fields: [field], message, value: dateStr });
   }
@@ -5582,10 +5590,13 @@ function _parseLLMFriendlyDate(dateStr) {
   const date = import_moment_timezone.default.utc(dateStr, "YYYY-MM-DD").startOf("day");
   return date.toDate();
 }
-function parseLLMFriendlyDateTime(field, dateStr) {
+function parseLLMFriendlyDateTime(field, dateStr, required = false) {
   try {
     return _parseLLMFriendlyDateTime(dateStr);
   } catch (err) {
+    if (field.isOptional && !required) {
+      return;
+    }
     const message = err.message;
     throw new ValidationError({ fields: [field], message, value: dateStr });
   }
@@ -5654,8 +5665,9 @@ var streamingExtractValues = (sig, values, xstate, content, streamingValidation
     if (field.name in values) {
       continue;
     }
-    const prefix = field.title + ":";
-    let e = matchesContent(content, prefix, xstate.s + 1);
+    const isFirst = xstate.extractedFields.length === 0;
+    const prefix = (isFirst ? "" : "\n") + field.title + ":";
+    let e = matchesContent(content, prefix, xstate.s === 0 ? 0 : xstate.s + 1);
     switch (e) {
       case -1:
         if (streamingValidation && values.length == 0 && !field.isOptional) {
@@ -5683,7 +5695,11 @@ var streamingExtractValues = (sig, values, xstate, content, streamingValidation
       if (parsedValue !== void 0) {
         values[xstate.currField.name] = parsedValue;
       }
-      xstate.prevField = { field: xstate.currField, s: xstate.s, e };
+      if (xstate.prevFields) {
+        xstate.prevFields?.push({ field: xstate.currField, s: xstate.s, e });
+      } else {
+        xstate.prevFields = [{ field: xstate.currField, s: xstate.s, e }];
+      }
     }
     checkMissingRequiredFields(xstate, values, index);
     xstate.s = e + prefixLen;
@@ -5708,7 +5724,7 @@ var streamingExtractFinalValue = (sig, values, xstate, content) => {
   const sigFields = sig.getOutputFields();
   checkMissingRequiredFields(xstate, values, sigFields.length);
 };
-var convertValueToType = (field, val) => {
+var convertValueToType = (field, val, required = false) => {
   switch (field.type?.name) {
     case "code":
       return extractBlock(val);
@@ -5717,6 +5733,9 @@ var convertValueToType = (field, val) => {
     case "number": {
       const v = Number(val);
       if (Number.isNaN(v)) {
+        if (field.isOptional && !required) {
+          return;
+        }
         throw new Error("Invalid number");
       }
       return v;
@@ -5731,16 +5750,22 @@ var convertValueToType = (field, val) => {
       } else if (v === "false") {
         return false;
       } else {
+        if (field.isOptional && !required) {
+          return;
+        }
         throw new Error("Invalid boolean");
       }
     }
     case "date":
-      return parseLLMFriendlyDate(field, val);
+      return parseLLMFriendlyDate(field, val, required);
     case "datetime":
-      return parseLLMFriendlyDateTime(field, val);
+      return parseLLMFriendlyDateTime(field, val, required);
     case "class":
       const className = val;
       if (field.type.classes && !field.type.classes.includes(className)) {
+        if (field.isOptional) {
+          return;
+        }
         throw new Error(
           `Invalid class '${val}', expected one of the following: ${field.type.classes.join(", ")}`
         );
@@ -5776,11 +5801,11 @@ function* yieldDelta(content, field, s, e, xstate) {
   }
 }
 function* streamValues(sig, content, values, xstate) {
-  if (xstate.prevField && !xstate.prevField.field.isInternal) {
-    const { field, s, e } = xstate.prevField;
+  for (const prevField of xstate.prevFields ?? []) {
+    const { field, s, e } = prevField;
     yield* yieldDelta(content, field, s, e, xstate);
-    xstate.prevField = void 0;
   }
+  xstate.prevFields = void 0;
   if (!xstate.currField || xstate.currField.isInternal) {
     return;
   }
@@ -5861,7 +5886,7 @@ function validateAndParseFieldValue(field, fieldValue) {
       for (const [index, item] of value.entries()) {
         if (item !== void 0) {
           const v = typeof item === "string" ? item.trim() : item;
-          value[index] = convertValueToType(field, v);
+          value[index] = convertValueToType(field, v, true);
         }
       }
     } else {
@@ -6350,6 +6375,9 @@ var AxGen = class extends AxProgramWithSignature {
           content,
           streamingValidation
         );
+        if (skip) {
+          continue;
+        }
         if (this.streamingAsserts.length !== 0) {
           await assertStreamingAssertions(
             this.streamingAsserts,
@@ -6368,9 +6396,6 @@ var AxGen = class extends AxProgramWithSignature {
           );
         }
         yield* streamValues(this.signature, content, values, xstate);
-        if (skip) {
-          continue;
-        }
         await assertAssertions(this.asserts, values);
       }
       if (result.finishReason === "length") {
@@ -6486,7 +6511,11 @@ var AxGen = class extends AxProgramWithSignature {
     const maxRetries = options.maxRetries ?? this.options?.maxRetries ?? 10;
     const maxSteps = options.maxSteps ?? this.options?.maxSteps ?? 10;
     const debug = options.debug ?? ai.getOptions().debug;
-    const mem = options.mem ?? this.options?.mem ?? new AxMemory(1e4, debug);
+    const memOptions = {
+      debug: options.debug,
+      debugHideSystemPrompt: options.debugHideSystemPrompt
+    };
+    const mem = options.mem ?? this.options?.mem ?? new AxMemory(1e4, memOptions);
     let err;
     if (options?.functions && options.functions.length > 0) {
       const promptTemplate = this.options?.promptTemplate ?? AxPromptTemplate;