@ax-llm/ax 10.0.49 → 10.0.50

package/index.js

@@ -5133,7 +5133,7 @@ var checkMissingRequiredFields = (xstate, values, currentIndex) => {
     });
   }
 };
-var streamingExtractValues = (sig, values, xstate, content) => {
+var streamingExtractValues = (sig, values, xstate, content, streamingValidation = false) => {
   const fields = sig.getOutputFields();
   for (const [index, field] of fields.entries()) {
     if (field.name in values) {
@@ -5143,6 +5143,12 @@ var streamingExtractValues = (sig, values, xstate, content) => {
     let e = matchesContent(content, prefix, xstate.s + 1);
     switch (e) {
       case -1:
+        if (streamingValidation && xstate.s == -1 && !field.isOptional) {
+          throw new ValidationError({
+            message: "Required field not found",
+            fields: [field]
+          });
+        }
         continue;
       // Field is not found, continue to the next field
       case -2:
@@ -5159,6 +5165,7 @@ var streamingExtractValues = (sig, values, xstate, content) => {
     checkMissingRequiredFields(xstate, values, index);
     xstate.s = e + prefixLen;
     xstate.currField = field;
+    xstate.currFieldIndex = index;
     if (!xstate.extractedFields.includes(field)) {
       xstate.extractedFields.push(field);
     }
@@ -5172,8 +5179,8 @@ var streamingExtractFinalValue = (sig, values, xstate, content) => {
       values[xstate.currField.name] = parsedValue;
     }
   }
-  const fields = sig.getOutputFields();
-  checkMissingRequiredFields(xstate, values, fields.length - 1);
+  const sigFields = sig.getOutputFields();
+  checkMissingRequiredFields(xstate, values, sigFields.length);
 };
 var convertValueToType = (field, val) => {
   switch (field.type?.name) {
@@ -5658,6 +5665,7 @@ var AxGen = class extends AxProgramWithSignature {
     traceId,
     functions
   }) {
+    const streamingValidation = !functions || functions.length == 0;
     const functionCalls = [];
     const values = {};
     const xstate = {
@@ -5673,14 +5681,21 @@ var AxGen = class extends AxProgramWithSignature {
       if (v.modelUsage) {
         this.usage.push({ ...usageInfo, ...v.modelUsage });
       }
-      if (result.content) {
+      if (result.functionCalls) {
+        mergeFunctionCalls(functionCalls, result.functionCalls);
+        mem.updateResult(
+          { name: result.name, content, functionCalls },
+          sessionId
+        );
+      } else if (result.content) {
         content += result.content;
         mem.updateResult({ name: result.name, content }, sessionId);
         const skip = streamingExtractValues(
           this.signature,
           values,
           xstate,
-          content
+          content,
+          streamingValidation
         );
         if (skip) {
           continue;
@@ -5695,13 +5710,6 @@ var AxGen = class extends AxProgramWithSignature {
         assertAssertions(this.asserts, values);
         yield* streamValues(this.signature, values, xstate, content);
       }
-      if (result.functionCalls) {
-        mergeFunctionCalls(functionCalls, result.functionCalls);
-        mem.updateResult(
-          { name: result.name, content, functionCalls },
-          sessionId
-        );
-      }
       if (result.finishReason === "length") {
         throw new Error("Max tokens reached before completion");
       }
@@ -5720,17 +5728,18 @@ var AxGen = class extends AxProgramWithSignature {
         traceId
       );
       this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
+    } else {
+      streamingExtractFinalValue(this.signature, values, xstate, content);
+      assertStreamingAssertions(
+        this.streamingAsserts,
+        values,
+        xstate,
+        content,
+        true
+      );
+      assertAssertions(this.asserts, values);
+      yield* streamValues(this.signature, values, xstate, content, true);
     }
-    streamingExtractFinalValue(this.signature, values, xstate, content);
-    assertStreamingAssertions(
-      this.streamingAsserts,
-      values,
-      xstate,
-      content,
-      true
-    );
-    assertAssertions(this.asserts, values);
-    yield* streamValues(this.signature, values, xstate, content, true);
   }
   async processResponse({
     ai,
@@ -5742,15 +5751,15 @@ var AxGen = class extends AxProgramWithSignature {
     functions
   }) {
     const values = {};
-    for (const result of res.results ?? []) {
+    let results = res.results ?? [];
+    if (res.results.length > 1) {
+      results = res.results.filter((r) => r.functionCalls);
+    }
+    for (const result of results) {
       if (res.modelUsage) {
         this.usage.push({ ...usageInfo, ...res.modelUsage });
       }
       mem.addResult(result, sessionId);
-      if (result.content) {
-        extractValues(this.signature, values, result.content);
-        assertAssertions(this.asserts, values);
-      }
       if (result.functionCalls) {
         const funcs = parseFunctionCalls(ai, result.functionCalls, values);
         if (funcs) {
@@ -5767,6 +5776,9 @@ var AxGen = class extends AxProgramWithSignature {
           );
           this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
         }
+      } else if (result.content) {
+        extractValues(this.signature, values, result.content);
+        assertAssertions(this.asserts, values);
       }
       if (result.finishReason === "length") {
         throw new Error("Max tokens reached before completion");