@ax-llm/ax 12.0.23 → 12.0.25

package/index.d.cts

@@ -379,7 +379,7 @@ type AxInternalEmbedRequest<TEmbedModel> = Omit<AxEmbedRequest, 'embedModel'> &
 type AxRateLimiterFunction = <T = unknown>(reqFunc: () => Promise<T | ReadableStream$1<T>>, info: Readonly<{
     modelUsage?: AxModelUsage;
 }>) => Promise<T | ReadableStream$1<T>>;
-type AxLoggerTag = 'error' | 'warning' | 'success' | 'functionName' | 'functionArg' | 'functionEnd' | 'firstFunction' | 'multipleFunctions' | 'responseStart' | 'responseContent' | 'responseEnd' | 'requestStart' | 'requestContent' | 'requestEnd' | 'systemStart' | 'systemContent' | 'systemEnd' | 'userStart' | 'userContent' | 'userEnd' | 'assistantStart' | 'assistantContent' | 'assistantEnd' | 'discovery' | 'optimizer' | 'start' | 'config' | 'phase' | 'progress' | 'result' | 'complete' | 'checkpoint';
+type AxLoggerTag = 'error' | 'warning' | 'success' | 'functionName' | 'functionArg' | 'functionEnd' | 'functionResult' | 'functionError' | 'firstFunction' | 'multipleFunctions' | 'responseStart' | 'responseContent' | 'responseDelta' | 'responseEnd' | 'requestStart' | 'requestContent' | 'requestEnd' | 'systemStart' | 'systemContent' | 'systemEnd' | 'userStart' | 'userContent' | 'userEnd' | 'assistantStart' | 'assistantContent' | 'assistantEnd' | 'discovery' | 'optimizer' | 'start' | 'config' | 'phase' | 'progress' | 'result' | 'complete' | 'checkpoint';
 type AxLoggerFunction = (message: string, options?: {
     tags?: AxLoggerTag[];
 }) => void;
@@ -1228,7 +1228,7 @@ type AxAIGoogleGeminiChatRequest = {
 type AxAIGoogleGeminiChatResponse = {
     candidates: {
         content: AxAIGoogleGeminiContent;
-        finishReason: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER' | 'MALFORMED_FUNCTION_CALL';
+        finishReason: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER' | 'BLOCKLIST' | 'PROHIBITED_CONTENT' | 'SPII' | 'MALFORMED_FUNCTION_CALL' | 'UNEXPECTED_TOOL_CALL' | 'FINISH_REASON_UNSPECIFIED';
         citationMetadata: {
             citations: {
                 startIndex: number;

package/index.d.ts

@@ -379,7 +379,7 @@ type AxInternalEmbedRequest<TEmbedModel> = Omit<AxEmbedRequest, 'embedModel'> &
 type AxRateLimiterFunction = <T = unknown>(reqFunc: () => Promise<T | ReadableStream$1<T>>, info: Readonly<{
     modelUsage?: AxModelUsage;
 }>) => Promise<T | ReadableStream$1<T>>;
-type AxLoggerTag = 'error' | 'warning' | 'success' | 'functionName' | 'functionArg' | 'functionEnd' | 'firstFunction' | 'multipleFunctions' | 'responseStart' | 'responseContent' | 'responseEnd' | 'requestStart' | 'requestContent' | 'requestEnd' | 'systemStart' | 'systemContent' | 'systemEnd' | 'userStart' | 'userContent' | 'userEnd' | 'assistantStart' | 'assistantContent' | 'assistantEnd' | 'discovery' | 'optimizer' | 'start' | 'config' | 'phase' | 'progress' | 'result' | 'complete' | 'checkpoint';
+type AxLoggerTag = 'error' | 'warning' | 'success' | 'functionName' | 'functionArg' | 'functionEnd' | 'functionResult' | 'functionError' | 'firstFunction' | 'multipleFunctions' | 'responseStart' | 'responseContent' | 'responseDelta' | 'responseEnd' | 'requestStart' | 'requestContent' | 'requestEnd' | 'systemStart' | 'systemContent' | 'systemEnd' | 'userStart' | 'userContent' | 'userEnd' | 'assistantStart' | 'assistantContent' | 'assistantEnd' | 'discovery' | 'optimizer' | 'start' | 'config' | 'phase' | 'progress' | 'result' | 'complete' | 'checkpoint';
 type AxLoggerFunction = (message: string, options?: {
     tags?: AxLoggerTag[];
 }) => void;
@@ -1228,7 +1228,7 @@ type AxAIGoogleGeminiChatRequest = {
 type AxAIGoogleGeminiChatResponse = {
     candidates: {
         content: AxAIGoogleGeminiContent;
-        finishReason: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER' | 'MALFORMED_FUNCTION_CALL';
+        finishReason: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER' | 'BLOCKLIST' | 'PROHIBITED_CONTENT' | 'SPII' | 'MALFORMED_FUNCTION_CALL' | 'UNEXPECTED_TOOL_CALL' | 'FINISH_REASON_UNSPECIFIED';
         citationMetadata: {
             citations: {
                 startIndex: number;

package/index.js

@@ -731,64 +731,42 @@ var axCreateDefaultLogger = (output = defaultOutput) => {
   return (message, options) => {
     const tags = options?.tags ?? [];
     let formattedMessage = message;
-    if (tags.includes("error")) {
-      formattedMessage = colorLog.red(formattedMessage);
+    let colorFunction = (text) => text;
+    if (tags.includes("warning") || tags.includes("discovery")) {
+      colorFunction = (text) => colorLog.yellow(text);
+    } else if (tags.includes("error")) {
+      colorFunction = (text) => colorLog.red(text);
     } else if (tags.includes("success") || tags.includes("responseContent")) {
-      formattedMessage = colorLog.greenBright(formattedMessage);
-    } else if (tags.includes("functionName")) {
-      if (tags.includes("firstFunction")) {
-        formattedMessage = `
-${colorLog.whiteBright(formattedMessage)}`;
-      } else {
-        formattedMessage = `${colorLog.whiteBright(formattedMessage)}`;
-      }
+      colorFunction = (text) => colorLog.greenBright(text);
     } else if (tags.includes("systemContent") || tags.includes("assistantContent")) {
-      formattedMessage = colorLog.blueBright(formattedMessage);
-    } else if (tags.includes("warning") || tags.includes("discovery")) {
-      formattedMessage = colorLog.yellow(formattedMessage);
+      colorFunction = (text) => colorLog.blueBright(text);
+    } else if (tags.includes("functionName")) {
+      colorFunction = (text) => colorLog.whiteBright(text);
     } else if (tags.includes("functionArg")) {
-      formattedMessage = "";
+      colorFunction = (text) => colorLog.blueBright(text);
+    } else if (tags.includes("functionResult")) {
+      colorFunction = (text) => colorLog.yellow(text);
     }
-    if (tags.includes("responseStart") || tags.includes("systemStart") || tags.includes("userStart")) {
+    if (tags.includes("responseStart") || tags.includes("systemStart") || tags.includes("userStart") || tags.includes("assistantStart") || tags.includes("error") || tags.includes("functionName") || tags.includes("functionArg")) {
       formattedMessage = `
 ${formattedMessage}`;
-    } else if (tags.includes("responseEnd") || tags.includes("systemEnd") || tags.includes("userEnd")) {
+    }
+    if (tags.includes("responseEnd") || tags.includes("systemEnd") || tags.includes("userEnd") || tags.includes("assistantStart") || tags.includes("error") || tags.includes("functionEnd")) {
       formattedMessage = `${formattedMessage}
-`;
-    } else if (tags.includes("assistantStart")) {
-      formattedMessage = `
-${formattedMessage}
-`;
-    } else if (tags.includes("error")) {
-      formattedMessage = `
-${formattedMessage}
-`;
-    } else if (tags.includes("functionEnd")) {
-      formattedMessage = `
 `;
     }
-    output(formattedMessage);
+    output(colorFunction(formattedMessage));
   };
 };
 var axCreateDefaultTextLogger = (output = defaultOutput) => {
   return (message, options) => {
     const tags = options?.tags ?? [];
     let formattedMessage = message;
-    if (tags.includes("responseStart") || tags.includes("systemStart") || tags.includes("userStart")) {
+    if (tags.includes("responseStart") || tags.includes("systemStart") || tags.includes("userStart") || tags.includes("assistantStart") || tags.includes("error") || tags.includes("functionName") || tags.includes("functionArg")) {
       formattedMessage = `
 ${formattedMessage}`;
-    } else if (tags.includes("responseEnd") || tags.includes("systemEnd") || tags.includes("userEnd")) {
-      formattedMessage = `${formattedMessage}
-`;
-    } else if (tags.includes("assistantStart")) {
-      formattedMessage = `
-${formattedMessage}
-`;
-    } else if (tags.includes("error")) {
-      formattedMessage = `
-${formattedMessage}
-`;
-    } else if (tags.includes("functionEnd")) {
+    }
+    if (tags.includes("responseEnd") || tags.includes("systemEnd") || tags.includes("userEnd") || tags.includes("assistantStart") || tags.includes("error") || tags.includes("functionEnd")) {
       formattedMessage = `${formattedMessage}
 `;
     }
@@ -999,9 +977,14 @@ var logResponseResult = (r, logger = defaultLogger) => {
   if (r.content) {
     logger(r.content, { tags: ["responseContent"] });
   }
+  const loggedFunctionCalls = /* @__PURE__ */ new Set();
   if (r.functionCalls && r.functionCalls.length > 0) {
     for (const [i, f2] of r.functionCalls.entries()) {
-      if (f2.function.name) {
+      if (f2.id) {
+        if (loggedFunctionCalls.has(f2.id)) {
+          continue;
+        }
+        loggedFunctionCalls.add(f2.id);
         const tags = ["functionName"];
         if (i === 0) {
           tags.push("firstFunction");
@@ -1009,7 +992,7 @@ var logResponseResult = (r, logger = defaultLogger) => {
         if (r.functionCalls.length > 1) {
           tags.push("multipleFunctions");
         }
-        logger(`[${i + 1}] ${f2.function.name}`, { tags });
+        logger(`[${i + 1}] ${f2.function.name}[${f2.id}]`, { tags });
       }
       if (f2.function.params) {
         const params = typeof f2.function.params === "string" ? f2.function.params : JSON.stringify(f2.function.params, null, 2);
@@ -1028,7 +1011,20 @@ var logResponse = (resp, logger = defaultLogger) => {
   }
 };
 var logResponseDelta = (delta, logger = defaultLogger) => {
-  logger(delta, { tags: ["responseContent"] });
+  logger(delta, { tags: ["responseContent", "responseDelta"] });
+};
+var logFunctionResults = (results, logger = defaultLogger) => {
+  for (const result of results) {
+    logger(`Function Result [${result.functionId}]:`, {
+      tags: ["functionName"]
+    });
+    if (result.isError) {
+      logger(result.result, { tags: ["functionResult", "error"] });
+    } else {
+      logger(result.result, { tags: ["functionResult"] });
+    }
+  }
+  logger("", { tags: ["functionEnd"] });
 };
 
 // ai/metrics.ts
@@ -4719,6 +4715,54 @@ var AxAIGoogleGeminiImpl = class {
               void 0
               // requestId not available
             );
+          case "UNEXPECTED_TOOL_CALL":
+            throw new AxAIRefusalError(
+              "Unexpected tool call",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
+          case "FINISH_REASON_UNSPECIFIED":
+            throw new AxAIRefusalError(
+              "Finish reason unspecified",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
+          case "BLOCKLIST":
+            throw new AxAIRefusalError(
+              "Content was blocked due to blocklist",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
+          case "PROHIBITED_CONTENT":
+            throw new AxAIRefusalError(
+              "Content was blocked due to prohibited content",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
+          case "SPII":
+            throw new AxAIRefusalError(
+              "Content was blocked due to SPII",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
+          case "OTHER":
+            throw new AxAIRefusalError(
+              "Other finish reason",
+              void 0,
+              // model not available in candidate
+              void 0
+              // requestId not available
+            );
         }
         if (!candidate.content || !candidate.content.parts) {
           return result;
@@ -4798,7 +4842,8 @@ var AxAIGoogleGemini = class extends AxBaseAI {
       } else {
         path = "publishers/google";
       }
-      apiURL = `https://${region}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${region}/${path}`;
+      const tld = region === "global" ? "aiplatform" : `${region}-aiplatform`;
+      apiURL = `https://${tld}.googleapis.com/v1/projects/${projectId}/locations/${region}/${path}`;
       if (apiKey) {
         headers = async () => ({ Authorization: `Bearer ${apiKey}` });
       } else {
@@ -7085,6 +7130,9 @@ var MemoryImpl = class {
     } else {
       this.data.push({ role: "function", chat });
     }
+    if (this.options?.debug) {
+      debugFunctionResults(results);
+    }
   }
   addResponse(results) {
     const chat = results.map(({ index, ...value }) => ({
@@ -7273,6 +7321,9 @@ function debugResponse(value) {
 function debugResponseDelta(delta) {
   logResponseDelta(delta);
 }
+function debugFunctionResults(results) {
+  logFunctionResults(results);
+}
 
 // dsp/asserts.ts
 var AxAssertionError = class extends Error {