@ax-llm/ax 12.0.14 → 12.0.15

package/index.cjs

@@ -7710,6 +7710,22 @@ function parseFunctionCalls(ai, functionCalls, values, model) {
   }));
   return funcs;
 }
+function createFunctionConfig(functionList, definedFunctionCall, firstStep) {
+  let functionCall = definedFunctionCall;
+  if (!firstStep && (functionCall === "required" || typeof functionCall === "function")) {
+    return { functions: [], functionCall: void 0 };
+  }
+  if (!functionList) {
+    return { functions: [], functionCall };
+  }
+  const functions = functionList.map((f2) => {
+    if ("toFunction" in f2) {
+      return f2.toFunction();
+    }
+    return f2;
+  }).flat();
+  return { functions, functionCall };
+}
 
 // dsp/processResponse.ts
 var import_web5 = require("stream/web");
@@ -10158,7 +10174,8 @@ var AxGen = class extends AxProgramWithSignature {
     mem,
     options,
     traceContext,
-    firstStep
+    functions,
+    functionCall
   }) {
     const {
       sessionId,
@@ -10166,8 +10183,6 @@ var AxGen = class extends AxProgramWithSignature {
       model,
       rateLimiter,
       stream,
-      functions: _functions,
-      functionCall: _functionCall,
       thinkingTokenBudget,
       showThoughts
     } = options ?? {};
@@ -10178,11 +10193,6 @@ var AxGen = class extends AxProgramWithSignature {
     if (chatPrompt.length === 0) {
       throw new Error("No chat prompt found");
     }
-    const functions = _functions?.map((f2) => "toFunction" in f2 ? f2.toFunction() : f2)?.flat();
-    let functionCall = _functionCall ?? this.options?.functionCall;
-    if (!firstStep && (functionCall === "required" || typeof functionCall === "function")) {
-      functionCall = void 0;
-    }
     const modelConfig = {
       ...options?.modelConfig,
       ...options?.sampleCount ? { n: options.sampleCount } : {},
@@ -10219,18 +10229,24 @@ var AxGen = class extends AxProgramWithSignature {
     span,
     traceContext
   }) {
-    const { sessionId, traceId, functions: _functions } = options ?? {};
+    const { sessionId, traceId, functions: functionList } = options ?? {};
+    const definedFunctionCall = options?.functionCall ?? this.options?.functionCall;
     const strictMode = options?.strictMode ?? false;
     const model = options.model;
     const states = this.createStates(options.sampleCount ?? 1);
     const usage = this.usage;
-    const functions = _functions?.map((f2) => "toFunction" in f2 ? f2.toFunction() : f2)?.flat() ?? [];
+    const { functions, functionCall } = createFunctionConfig(
+      functionList,
+      definedFunctionCall,
+      firstStep
+    );
     const res = await this.forwardSendRequest({
       ai,
       mem,
       options,
       traceContext,
-      firstStep
+      functions,
+      functionCall
     });
     if (res instanceof import_web6.ReadableStream) {
       yield* processStreamingResponse({