@ax-llm/ax 10.0.41 → 10.0.42

package/index.cjs

@@ -4878,9 +4878,6 @@ var checkMissingRequiredFields = (xstate, values, currentIndex) => {
   }
 };
 var streamingExtractValues = (sig, values, xstate, content) => {
-  if (content.endsWith("\n")) {
-    return true;
-  }
   const fields = sig.getOutputFields();
   for (const [index, field] of fields.entries()) {
     if (field.name in values) {
@@ -4896,10 +4893,6 @@ var streamingExtractValues = (sig, values, xstate, content) => {
         return true;
     }
     let prefixLen = prefix.length;
-    if (e - 1 >= 0 && content[e - 1] === "\n") {
-      e -= 1;
-      prefixLen += 1;
-    }
     if (xstate.currField) {
       const val = content.substring(xstate.s, e).trim();
       const parsedValue = validateAndParseFieldValue(xstate.currField, val);
@@ -4966,7 +4959,7 @@ var convertValueToType = (field, val) => {
       return val;
   }
 };
-function* streamValues(sig, values, xstate, content) {
+function* streamValues(sig, values, xstate, content, final = false) {
   if (!xstate.currField) {
     return;
   }
@@ -4974,13 +4967,17 @@ function* streamValues(sig, values, xstate, content) {
   if (!xstate.streamedIndex) {
     xstate.streamedIndex = { [fieldName]: 0 };
   }
-  if (!xstate.currField.type || !xstate.currField.type.isArray && xstate.currField.type.name === "string") {
-    const pos = xstate.streamedIndex[fieldName] ?? 0;
-    const s = xstate.s + pos;
-    const v = content.substring(s);
-    yield { [fieldName]: pos === 0 ? v.trimStart() : v };
-    xstate.streamedIndex[fieldName] = pos + v.length;
-    return;
+  if (!final) {
+    if (!xstate.currField.type || !xstate.currField.type.isArray && xstate.currField.type.name === "string") {
+      const pos = xstate.streamedIndex[fieldName] ?? 0;
+      const s = xstate.s + pos;
+      const v = content.substring(s);
+      const v1 = v.replace(/[\s\n\t]+$/, "");
+      const v2 = pos === 0 ? v1.trimStart() : v1;
+      yield { [fieldName]: v2 };
+      xstate.streamedIndex[fieldName] = pos + v1.length;
+      return;
+    }
   }
   for (const key of Object.keys(values)) {
     const value = values[key];
@@ -5406,6 +5403,7 @@ var AxGen = class extends AxProgramWithSignature {
       );
       this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
     }
+    streamingExtractFinalValue(this.signature, values, xstate, content);
     assertStreamingAssertions(
       this.streamingAsserts,
       values,
@@ -5413,9 +5411,8 @@ var AxGen = class extends AxProgramWithSignature {
       content,
       true
     );
-    streamingExtractFinalValue(this.signature, values, xstate, content);
     assertAssertions(this.asserts, values);
-    yield* streamValues(this.signature, values, xstate, content);
+    yield* streamValues(this.signature, values, xstate, content, true);
   }
   async processResponse({
     ai,