@ax-llm/ax 11.0.58 → 11.0.60

package/index.js

@@ -1036,6 +1036,9 @@ var AxBaseAI = class {
         `Model ${model} does not support thinkingTokenBudget.`
       );
     }
+    if (options?.showThoughts && !this.getFeatures(model).hasShowThoughts) {
+      throw new Error(`Model ${model} does not support showThoughts.`);
+    }
     modelConfig.stream = (options?.stream !== void 0 ? options.stream : modelConfig.stream) ?? true;
     const canStream = this.getFeatures(model).streaming;
     if (!canStream) {
@@ -1144,13 +1147,6 @@ var AxBaseAI = class {
       const wrappedRespFn = (state) => (resp) => {
         const res2 = respFn(resp, state);
         res2.sessionId = options?.sessionId;
-        if (options?.hideThought) {
-          res2.results.forEach((result) => {
-            if (result.thought) {
-              result.thought = void 0;
-            }
-          });
-        }
         if (!res2.modelUsage) {
           res2.modelUsage = {
             ai: this.name,
@@ -1189,13 +1185,6 @@ var AxBaseAI = class {
     }
     const res = this.aiImpl.createChatResp(rv);
     res.sessionId = options?.sessionId;
-    if (options?.hideThought) {
-      res.results.forEach((result) => {
-        if (result.thought) {
-          result.thought = void 0;
-        }
-      });
-    }
     if (!res.modelUsage) {
       const tokenUsage = this.aiImpl.getTokenUsage();
       if (tokenUsage) {
@@ -1416,7 +1405,14 @@ function setChatResponseEvents(res, span, excludeContentFromTrace) {
   if (!res.results) {
     return;
   }
-  for (const [index, result] of res.results.entries()) {
+  for (let index = 0; index < res.results.length; index++) {
+    const result = res.results[index];
+    if (!result) {
+      continue;
+    }
+    if (!result.content && !result.thought && !result.functionCalls?.length && !result.finishReason) {
+      continue;
+    }
     const toolCalls = result.functionCalls?.map((call) => {
       return {
         id: call.id,
@@ -3331,6 +3327,9 @@ var AxAIGoogleGeminiImpl = class {
           break;
       }
     }
+    if (config.showThoughts !== void 0) {
+      thinkingConfig.includeThoughts = config.showThoughts;
+    }
     const generationConfig = {
       maxOutputTokens: req.modelConfig?.maxTokens ?? this.config.maxTokens,
       temperature: req.modelConfig?.temperature ?? this.config.temperature,
@@ -4119,7 +4118,7 @@ var AxAIOpenAIResponsesImpl = class {
     }
     return items;
   }
-  createChatReq(req, _config) {
+  createChatReq(req, config) {
     const model = req.model;
     const apiConfig = { name: "/responses" };
     let instructionsFromPrompt = null;
@@ -4142,6 +4141,10 @@ var AxAIOpenAIResponsesImpl = class {
         parameters: v.parameters ?? {}
       })
     );
+    const includeFields = [];
+    if (config.showThoughts) {
+      includeFields.push("reasoning.encrypted_content");
+    }
     let mutableReq = {
       model,
       input: "",
@@ -4156,7 +4159,7 @@ var AxAIOpenAIResponsesImpl = class {
       // Sourced from modelConfig or global config
       // Optional fields from AxAIOpenAIResponsesRequest that need to be in Mutable for initialization
       background: void 0,
-      include: void 0,
+      include: includeFields.length > 0 ? includeFields : void 0,
       metadata: void 0,
       parallel_tool_calls: this.config.parallelToolCalls,
       previous_response_id: void 0,
@@ -4229,9 +4232,13 @@ var AxAIOpenAIResponsesImpl = class {
           break;
         case "reasoning":
           currentResult.id = item.id;
-          currentResult.thought = item.summary.map(
-            (s) => typeof s === "object" ? JSON.stringify(s) : s
-          ).join("\n");
+          if (item.encrypted_content) {
+            currentResult.thought = item.encrypted_content;
+          } else {
+            currentResult.thought = item.summary.map(
+              (s) => typeof s === "object" ? JSON.stringify(s) : s
+            ).join("\n");
+          }
           break;
         case "file_search_call":
           currentResult.id = item.id;
@@ -4549,7 +4556,9 @@ var AxAIOpenAIResponsesImpl = class {
             {
               const reasoningItem = event.item;
               baseResult.id = event.item.id;
-              if (reasoningItem.summary) {
+              if (reasoningItem.encrypted_content) {
+                baseResult.thought = reasoningItem.encrypted_content;
+              } else if (reasoningItem.summary) {
                 baseResult.thought = reasoningItem.summary.map(
                   (s) => typeof s === "object" ? JSON.stringify(s) : s
                 ).join("\n");
@@ -5994,24 +6003,11 @@ ${outputFields}`);
           );
           messageContent = userMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
         } else if (message.role === "assistant") {
-          const assistantValues = message.values;
-          let assistantContentParts = [];
-          const outputFields = this.sig.getOutputFields();
-          for (const field of outputFields) {
-            const value = assistantValues[field.name];
-            if (value !== void 0 && value !== null && (typeof value === "string" ? value !== "" : true)) {
-              const renderedValue = processValue(field, value);
-              assistantContentParts.push(`${field.name}: ${renderedValue}`);
-            } else {
-              const isThoughtField = field.name === this.thoughtFieldName;
-              if (!field.isOptional && !field.isInternal && !isThoughtField) {
-                throw new Error(
-                  `Value for output field '${field.name}' ('${field.title}') is required in assistant message history but was not found or was empty.`
-                );
-              }
-            }
-          }
-          messageContent = assistantContentParts.join("\n");
+          const assistantMsgParts = this.renderInputFields(
+            message.values
+            // Cast message.values (AxGenIn) to T (which extends AxGenIn)
+          );
+          messageContent = assistantMsgParts.map((part) => part.type === "text" ? part.text : "").join("").trim();
         }
         if (messageContent) {
           if (lastRole === message.role && userMessages.length > 0) {
@@ -8000,7 +7996,8 @@ var AxGen = class extends AxProgramWithSignature {
       stream,
       functions: _functions,
       functionCall: _functionCall,
-      thinkingTokenBudget
+      thinkingTokenBudget,
+      showThoughts
     } = options ?? {};
     const chatPrompt = mem?.history(sessionId) ?? [];
     if (chatPrompt.length === 0) {
@@ -8026,6 +8023,7 @@ var AxGen = class extends AxProgramWithSignature {
         stream,
         debug: false,
         thinkingTokenBudget,
+        showThoughts,
         traceContext,
         abortSignal: options?.abortSignal
       }
@@ -8440,6 +8438,7 @@ Content: ${result.content}`
       ...funcNames ? { provided_functions: funcNames } : {},
       ...options?.model ? { model: options.model } : {},
       ...options?.thinkingTokenBudget ? { thinking_token_budget: options.thinkingTokenBudget } : {},
+      ...options?.showThoughts ? { show_thoughts: options.showThoughts } : {},
       ...options?.maxSteps ? { max_steps: options.maxSteps } : {},
       ...options?.maxRetries ? { max_retries: options.maxRetries } : {},
       ...options?.fastFail ? { fast_fail: options.fastFail } : {}
@@ -10051,6 +10050,23 @@ var getTopInPercent = (entries, percent = 0.1) => {
   return sortedEntries.slice(0, topTenPercentCount);
 };
 
+// docs/rewriter.ts
+var AxDefaultQueryRewriter = class extends AxGen {
+  constructor(options) {
+    const signature = `"You are a query rewriter assistant tasked with rewriting a given query to improve its clarity, specificity, and relevance. Your role involves analyzing the query to identify any ambiguities, generalizations, or irrelevant information and then rephrasing it to make it more focused and precise. The rewritten query should be concise, easy to understand, and directly related to the original query. Output only the rewritten query."
+    query: string -> rewrittenQuery: string`;
+    super(signature, options);
+  }
+};
+var AxRewriter = class extends AxGen {
+  constructor(options) {
+    super(
+      '"Rewrite a given text to be clear and concise" original -> rewritten "improved text"',
+      options
+    );
+  }
+};
+
 // funcs/docker.ts
 var AxDockerSession = class {
   apiUrl;
@@ -11684,15 +11700,6 @@ var AxChainOfThought = class extends AxGen {
   }
 };
 
-// docs/rewriter.ts
-var AxDefaultQueryRewriter = class extends AxGen {
-  constructor(options) {
-    const signature = `"You are a query rewriter assistant tasked with rewriting a given query to improve its clarity, specificity, and relevance. Your role involves analyzing the query to identify any ambiguities, generalizations, or irrelevant information and then rephrasing it to make it more focused and precise. The rewritten query should be concise, easy to understand, and directly related to the original query. Output only the rewritten query."
-    query: string -> rewrittenQuery: string`;
-    super(signature, options);
-  }
-};
-
 // dsp/strutil.ts
 var trimNonAlphaNum = (str) => {
   return str.replace(/^\W+|\W+$/g, "");
@@ -13526,20 +13533,16 @@ var AxRAG = class extends AxChainOfThought {
     this.register(this.genQuery);
   }
   async forward(ai, { question }, options) {
+    let hop = 0;
     let context3 = [];
-    for (let i = 0; i < this.maxHops; i++) {
-      const { query } = await this.genQuery.forward(
-        ai,
-        {
-          context: context3,
-          question
-        },
-        options
-      );
-      const val = await this.queryFn(query);
-      context3 = AxStringUtil.dedup([...context3, val]);
+    while (hop < this.maxHops) {
+      const query = await this.genQuery.forward(ai, { context: context3, question });
+      const queryResult = await this.queryFn(query.query);
+      context3 = AxStringUtil.dedup([...context3, queryResult]);
+      hop++;
     }
-    return super.forward(ai, { context: context3, question }, options);
+    const res = await super.forward(ai, { context: context3, question }, options);
+    return res;
   }
 };
 export {
@@ -13629,6 +13632,7 @@ export {
   AxPromptTemplate,
   AxRAG,
   AxRateLimiterTokenUsage,
+  AxRewriter,
   AxSignature,
   AxSimpleClassifier,
   AxSimpleClassifierClass,