@ax-llm/ax 11.0.65 → 11.0.67

package/index.cjs

@@ -159,7 +159,6 @@ __export(index_exports, {
   axAITogetherDefaultConfig: () => axAITogetherDefaultConfig,
   axBaseAIDefaultConfig: () => axBaseAIDefaultConfig,
   axBaseAIDefaultCreativeConfig: () => axBaseAIDefaultCreativeConfig,
-  axField: () => axField,
   axModelInfoAnthropic: () => axModelInfoAnthropic,
   axModelInfoCohere: () => axModelInfoCohere,
   axModelInfoDeepSeek: () => axModelInfoDeepSeek,
@@ -172,7 +171,9 @@ __export(index_exports, {
   axModelInfoReka: () => axModelInfoReka,
   axModelInfoTogether: () => axModelInfoTogether,
   axSpanAttributes: () => axSpanAttributes,
-  axSpanEvents: () => axSpanEvents
+  axSpanEvents: () => axSpanEvents,
+  f: () => f,
+  s: () => s
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -953,14 +954,14 @@ var logResponseResult = (r, logger = defaultLogger) => {
     logger(r.content, { tags: ["responseContent"] });
   }
   if (r.functionCalls && r.functionCalls.length > 0) {
-    for (const [i, f] of r.functionCalls.entries()) {
-      if (f.function.name) {
-        logger(`[${i + 1}] ${f.function.name}`, {
+    for (const [i, f2] of r.functionCalls.entries()) {
+      if (f2.function.name) {
+        logger(`[${i + 1}] ${f2.function.name}`, {
           tags: ["functionName"]
         });
       }
-      if (f.function.params) {
-        const params = typeof f.function.params === "string" ? f.function.params : JSON.stringify(f.function.params, null, 2);
+      if (f2.function.params) {
+        const params = typeof f2.function.params === "string" ? f2.function.params : JSON.stringify(f2.function.params, null, 2);
         logger(params, { tags: ["functionArg"] });
       }
     }
@@ -2442,7 +2443,7 @@ var AxAIOpenAIImpl = class {
         }
       };
     }
-    if (config.thinkingTokenBudget) {
+    if (config?.thinkingTokenBudget) {
       switch (config.thinkingTokenBudget) {
         case "none":
           reqValue.reasoning_effort = void 0;
@@ -3087,7 +3088,7 @@ function createHistory(chatPrompt) {
       case "function": {
         const functionCalls = chatPrompt.map((v) => {
           if (v.role === "assistant") {
-            return v.functionCalls?.find((f) => f.id === chat.functionId);
+            return v.functionCalls?.find((f2) => f2.id === chat.functionId);
           }
           return void 0;
         }).filter((v) => v !== void 0);
@@ -3407,11 +3408,11 @@ var AxAIGoogleGeminiImpl = class {
         case "assistant": {
           let parts = [];
           if (msg.functionCalls) {
-            parts = msg.functionCalls.map((f) => {
-              const args = typeof f.function.params === "string" ? JSON.parse(f.function.params) : f.function.params;
+            parts = msg.functionCalls.map((f2) => {
+              const args = typeof f2.function.params === "string" ? JSON.parse(f2.function.params) : f2.function.params;
               return {
                 functionCall: {
-                  name: f.function.name,
+                  name: f2.function.name,
                   args
                 }
               };
@@ -3506,7 +3507,7 @@ var AxAIGoogleGeminiImpl = class {
     if (this.config.thinking?.thinkingTokenBudget) {
       thinkingConfig.thinkingBudget = this.config.thinking.thinkingTokenBudget;
     }
-    if (config.thinkingTokenBudget) {
+    if (config?.thinkingTokenBudget) {
       switch (config.thinkingTokenBudget) {
         case "none":
           thinkingConfig.thinkingBudget = 0;
@@ -3529,8 +3530,8 @@ var AxAIGoogleGeminiImpl = class {
           break;
       }
     }
-    if (config.showThoughts !== void 0) {
-      if (config.thinkingTokenBudget !== "none") {
+    if (config?.showThoughts !== void 0) {
+      if (config?.thinkingTokenBudget !== "none") {
         thinkingConfig.includeThoughts = config.showThoughts;
       }
     }
@@ -4468,7 +4469,7 @@ var AxAIOpenAIResponsesImpl = class {
             currentResult.thought = item.encrypted_content;
           } else {
             currentResult.thought = item.summary.map(
-              (s) => typeof s === "object" ? JSON.stringify(s) : s
+              (s2) => typeof s2 === "object" ? JSON.stringify(s2) : s2
             ).join("\n");
           }
           break;
@@ -4792,7 +4793,7 @@ var AxAIOpenAIResponsesImpl = class {
                 baseResult.thought = reasoningItem.encrypted_content;
               } else if (reasoningItem.summary) {
                 baseResult.thought = reasoningItem.summary.map(
-                  (s) => typeof s === "object" ? JSON.stringify(s) : s
+                  (s2) => typeof s2 === "object" ? JSON.stringify(s2) : s2
                 ).join("\n");
               }
             }
@@ -6164,7 +6165,7 @@ var AxPromptTemplate = class {
     task.push(
       `You will be provided with the following fields: ${inArgs}. Your task is to generate new fields: ${outArgs}.`
     );
-    const funcs = this.functions?.map((f) => "toFunction" in f ? f.toFunction() : f)?.flat();
+    const funcs = this.functions?.map((f2) => "toFunction" in f2 ? f2.toFunction() : f2)?.flat();
     const funcList = funcs?.map((fn) => `- \`${fn.name}\`: ${formatDescription(fn.description)}`).join("\n");
     if (funcList && funcList.length > 0) {
       task.push(`## Available Functions
@@ -6858,7 +6859,7 @@ var convertValueToType = (field, val, required = false) => {
       return val;
   }
 };
-function* yieldDelta(content, field, s, e, xstate) {
+function* yieldDelta(content, field, s2, e, xstate) {
   const { name: fieldName, isInternal } = field;
   const { isArray: fieldIsArray, name: fieldTypeName } = field.type ?? {};
   if (isInternal || fieldIsArray || fieldTypeName && fieldTypeName !== "string" && fieldTypeName !== "code") {
@@ -6866,7 +6867,7 @@ function* yieldDelta(content, field, s, e, xstate) {
   }
   const pos = xstate.streamedIndex[fieldName] ?? 0;
   const isFirstChunk = pos === 0;
-  const d1 = content.substring(s + pos, e);
+  const d1 = content.substring(s2 + pos, e);
   if (d1.length === 0) {
     return;
   }
@@ -6885,8 +6886,8 @@ function* yieldDelta(content, field, s, e, xstate) {
 }
 function* streamValues(sig, content, values, xstate) {
   for (const prevField of xstate.prevFields ?? []) {
-    const { field, s, e } = prevField;
-    yield* yieldDelta(content, field, s, e, xstate);
+    const { field, s: s2, e } = prevField;
+    yield* yieldDelta(content, field, s2, e, xstate);
   }
   xstate.prevFields = void 0;
   if (!xstate.currField || xstate.currField.isInternal) {
@@ -6901,17 +6902,17 @@ function* streamValues(sig, content, values, xstate) {
   );
   const outputFields = sig.getOutputFields();
   for (const key of Object.keys(values)) {
-    const field = outputFields.find((f) => f.name === key);
+    const field = outputFields.find((f2) => f2.name === key);
     if (!field || field.isInternal) {
       continue;
     }
     const value = values[key];
     if (Array.isArray(value)) {
-      const s = xstate.streamedIndex?.[key] ?? 0;
-      const v = value.slice(s);
+      const s2 = xstate.streamedIndex?.[key] ?? 0;
+      const v = value.slice(s2);
       if (v && v.length > 0) {
         yield { [key]: v };
-        xstate.streamedIndex[key] = s + v.length;
+        xstate.streamedIndex[key] = s2 + v.length;
       }
       continue;
     }
@@ -7334,11 +7335,11 @@ var parseFunctions = (newFuncs, existingFuncs) => {
   if (newFuncs.length === 0) {
     return [...existingFuncs ?? []];
   }
-  const functions = newFuncs.map((f) => {
-    if ("toFunction" in f) {
-      return f.toFunction();
+  const functions = newFuncs.map((f2) => {
+    if ("toFunction" in f2) {
+      return f2.toFunction();
     }
-    return f;
+    return f2;
   }).flat();
   for (const fn of functions.filter((v) => v.parameters)) {
     if (fn.parameters) {
@@ -7423,10 +7424,10 @@ function parseFunctionCalls(ai, functionCalls, values, model) {
   if (!ai.getFeatures(model).functions) {
     throw new Error("Functions are not supported by the AI service");
   }
-  const funcs = functionCalls.map((f) => ({
-    id: f.id,
-    name: f.function.name,
-    args: f.function.params
+  const funcs = functionCalls.map((f2) => ({
+    id: f2.id,
+    name: f2.function.name,
+    args: f2.function.params
   }));
   return funcs;
 }
@@ -7629,7 +7630,7 @@ ${pointer}`;
             `Output field "${name}": Expected class names in quotes after "class" type. Example: class "MyClass1, MyClass2"`
           );
         }
-        const options = classNamesString.split(/[,\s]+/).map((s) => s.trim()).filter((s) => s.length > 0);
+        const options = classNamesString.split(/[,\s]+/).map((s2) => s2.trim()).filter((s2) => s2.length > 0);
         if (options.length === 0) {
           throw new Error(
             `Output field "${name}": Empty class list provided. At least one class name is required`
@@ -7853,25 +7854,25 @@ var AxSignature = class _AxSignature {
   toJSONSchema = () => {
     const properties = {};
     const required = [];
-    for (const f of this.inputFields) {
-      const type = f.type ? f.type.name : "string";
-      if (f.type?.isArray) {
-        properties[f.name] = {
-          description: f.description,
+    for (const f2 of this.inputFields) {
+      const type = f2.type ? f2.type.name : "string";
+      if (f2.type?.isArray) {
+        properties[f2.name] = {
+          description: f2.description,
           type: "array",
           items: {
             type,
-            description: f.description
+            description: f2.description
           }
         };
       } else {
-        properties[f.name] = {
-          description: f.description,
+        properties[f2.name] = {
+          description: f2.description,
           type
         };
       }
-      if (!f.isOptional) {
-        required.push(f.name);
+      if (!f2.isOptional) {
+        required.push(f2.name);
       }
     }
     const schema = {
@@ -8037,11 +8038,11 @@ var AxProgramWithSignature = class {
       const fields = [...sig.getInputFields(), ...sig.getOutputFields()];
       this.examples = traces.map((e) => {
         const res = {};
-        for (const f of fields) {
-          const value = e[f.name];
+        for (const f2 of fields) {
+          const value = e[f2.name];
           if (value !== void 0) {
-            validateValue(f, value);
-            res[f.name] = value;
+            validateValue(f2, value);
+            res[f2.name] = value;
           }
         }
         return res;
@@ -8195,7 +8196,7 @@ var AxGen = class extends AxProgramWithSignature {
     this.streamingAsserts.push({ fieldName, fn, message });
   };
   addFieldProcessorInternal = (fieldName, fn, streaming = false) => {
-    const field = this.signature.getOutputFields().find((f) => f.name === fieldName);
+    const field = this.signature.getOutputFields().find((f2) => f2.name === fieldName);
     if (!field) {
       throw new Error(`addFieldProcessor: field ${fieldName} not found`);
     }
@@ -8241,7 +8242,7 @@ var AxGen = class extends AxProgramWithSignature {
     if (chatPrompt.length === 0) {
       throw new Error("No chat prompt found");
     }
-    const functions = _functions?.map((f) => "toFunction" in f ? f.toFunction() : f)?.flat();
+    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;
@@ -8279,7 +8280,7 @@ var AxGen = class extends AxProgramWithSignature {
     const { sessionId, traceId, functions: _functions } = options ?? {};
     const fastFail = options?.fastFail ?? this.options?.fastFail;
     const model = options.model;
-    const functions = _functions?.map((f) => "toFunction" in f ? f.toFunction() : f)?.flat();
+    const functions = _functions?.map((f2) => "toFunction" in f2 ? f2.toFunction() : f2)?.flat();
     const res = await this.forwardSendRequest({
       ai,
       mem,
@@ -8604,7 +8605,7 @@ Content: ${result.content}`
             if (span) {
               span.addEvent("validation.error", {
                 message: e.toString(),
-                fixing_instructions: errorFields?.map((f) => f.title).join(", ") ?? ""
+                fixing_instructions: errorFields?.map((f2) => f2.title).join(", ") ?? ""
               });
             }
           } else if (e instanceof AxAssertionError) {
@@ -8614,7 +8615,7 @@ Content: ${result.content}`
             if (span) {
               span.addEvent("assertion.error", {
                 message: e1.toString(),
-                fixing_instructions: errorFields?.map((f) => f.title).join(", ") ?? ""
+                fixing_instructions: errorFields?.map((f2) => f2.title).join(", ") ?? ""
               });
             }
           } else if (e instanceof AxAIServiceStreamTerminatedError) {
@@ -8669,7 +8670,7 @@ Content: ${result.content}`
       });
       return;
     }
-    const funcNames = functions?.map((f) => f.name).join(",");
+    const funcNames = functions?.map((f2) => f2.name).join(",");
     const attributes = {
       signature: JSON.stringify(this.signature.toJSON(), null, 2),
       ...this.examples ? { examples: JSON.stringify(this.examples, null, 2) } : {},
@@ -8928,7 +8929,7 @@ var AxAgent = class {
       const sig = this.program.getSignature();
       const outFields = sig.getOutputFields();
       const result = Object.keys(ret).map((k) => {
-        const field = outFields.find((f) => f.name === k);
+        const field = outFields.find((f2) => f2.name === k);
         if (field) {
           return `${field.title}: ${ret[k]}`;
         }
@@ -8957,12 +8958,12 @@ var AxAgent = class {
     const parentKeys = parentSchema.map((p) => p.name);
     const debug = this.getDebug(ai, options);
     const agentFuncs = this.agents?.map((agent) => {
-      const f = agent.getFeatures();
+      const f2 = agent.getFeatures();
       const processOptions = {
         debug,
         disableSmartModelRouting: !!this.disableSmartModelRouting,
-        excludeFieldsFromPassthrough: f.excludeFieldsFromPassthrough,
-        canConfigureSmartModelRouting: f.canConfigureSmartModelRouting
+        excludeFieldsFromPassthrough: f2.excludeFieldsFromPassthrough,
+        canConfigureSmartModelRouting: f2.canConfigureSmartModelRouting
       };
       return processChildAgentFunction(
         agent.getFunction(),
@@ -11934,7 +11935,7 @@ var AxTestPrompt = class {
 };
 
 // dsp/template.ts
-function ax(strings, ...values) {
+function s(strings, ...values) {
   let result = "";
   for (let i = 0; i < strings.length; i++) {
     result += strings[i] ?? "";
@@ -11962,6 +11963,34 @@ function ax(strings, ...values) {
   }
   return new AxSignature(result);
 }
+function ax(strings, ...values) {
+  let result = "";
+  for (let i = 0; i < strings.length; i++) {
+    result += strings[i] ?? "";
+    if (i < values.length) {
+      const val = values[i];
+      if (isAxFieldType(val)) {
+        const fieldNameMatch = result.match(/(\w+)\s*:\s*$/);
+        if (fieldNameMatch && (val.isOptional || val.isInternal)) {
+          const fieldName = fieldNameMatch[1];
+          let modifiedFieldName = fieldName;
+          if (val.isOptional) modifiedFieldName += "?";
+          if (val.isInternal) modifiedFieldName += "!";
+          result = result.replace(/(\w+)(\s*:\s*)$/, `${modifiedFieldName}$2`);
+        }
+        const { isOptional: _o, isInternal: _i, ...typeNoFlags } = val;
+        result += convertFieldTypeToString(typeNoFlags);
+      } else if (isAxFieldDescriptor(val)) {
+        result += convertFieldDescriptorToString(val);
+      } else if (typeof val === "string" || val instanceof AxSignature) {
+        result += convertValueToSignatureString(val);
+      } else {
+        throw new Error("Unsupported template interpolation value");
+      }
+    }
+  }
+  return new AxGen(result);
+}
 function convertValueToSignatureString(value) {
   if (typeof value === "string") {
     return value;
@@ -12017,7 +12046,7 @@ function isAxFieldType(value) {
 function isAxFieldDescriptor(value) {
   return value !== null && typeof value === "object" && value !== void 0 && "name" in value && typeof value.name === "string";
 }
-var axField = {
+var f = {
   string: (desc) => ({
     type: "string",
     description: desc
@@ -13398,12 +13427,12 @@ function countTokens(tokens) {
   }
   return counter;
 }
-function normalizeText(s) {
-  s = s.normalize("NFD");
-  s = s.replace(/\b(a|an|the)\b/g, " ");
-  s = s.split(/\s+/).join(" ");
-  s = s.replace(/[!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~]/g, "");
-  return s.toLowerCase();
+function normalizeText(s2) {
+  s2 = s2.normalize("NFD");
+  s2 = s2.replace(/\b(a|an|the)\b/g, " ");
+  s2 = s2.split(/\s+/).join(" ");
+  s2 = s2.replace(/[!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~]/g, "");
+  return s2.toLowerCase();
 }
 function emScore(prediction, groundTruth) {
   return normalizeText(prediction) === normalizeText(groundTruth) ? 1 : 0;
@@ -13817,7 +13846,7 @@ var AxMultiServiceRouter = class {
    * Returns a composite ID built from the IDs of the underlying services.
    */
   getId() {
-    return "MultiServiceRouter:" + Array.from(this.services.values()).map((s) => s.service.getId()).join(",");
+    return "MultiServiceRouter:" + Array.from(this.services.values()).map((s2) => s2.service.getId()).join(",");
   }
   /**
    * Returns the name of this router.
@@ -14077,7 +14106,6 @@ var AxRAG = class extends AxChainOfThought {
   axAITogetherDefaultConfig,
   axBaseAIDefaultConfig,
   axBaseAIDefaultCreativeConfig,
-  axField,
   axModelInfoAnthropic,
   axModelInfoCohere,
   axModelInfoDeepSeek,
@@ -14090,6 +14118,8 @@ var AxRAG = class extends AxChainOfThought {
   axModelInfoReka,
   axModelInfoTogether,
   axSpanAttributes,
-  axSpanEvents
+  axSpanEvents,
+  f,
+  s
 });
 //# sourceMappingURL=index.cjs.map