@ax-llm/ax 11.0.7 → 11.0.9

package/index.d.cts

@@ -326,6 +326,7 @@ declare class AxBaseAI<TModel, TEmbedModel, TChatRequest, TEmbedRequest, TChatRe
     getMetrics(): AxAIServiceMetrics;
     chat(req: Readonly<AxChatRequest<TModel>>, options?: Readonly<AxAIPromptConfig & AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxChatResponse | ReadableStream$1<AxChatResponse>>;
     private _chat1;
+    private cleanupFunctionSchema;
     private _chat2;
     embed(req: Readonly<AxEmbedRequest<TEmbedModel>>, options?: Readonly<AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxEmbedResponse>;
     private _embed1;
@@ -1637,14 +1638,12 @@ interface AxAgentFeatures {
  */
 declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> implements AxAgentic {
     private ai?;
-    private signature;
     private program;
     private functions?;
     private agents?;
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private description;
     private subAgentList?;
     private func;
     constructor({ ai, name, description, signature, agents, functions, }: Readonly<{

package/index.d.ts

@@ -326,6 +326,7 @@ declare class AxBaseAI<TModel, TEmbedModel, TChatRequest, TEmbedRequest, TChatRe
     getMetrics(): AxAIServiceMetrics;
     chat(req: Readonly<AxChatRequest<TModel>>, options?: Readonly<AxAIPromptConfig & AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxChatResponse | ReadableStream$1<AxChatResponse>>;
     private _chat1;
+    private cleanupFunctionSchema;
     private _chat2;
     embed(req: Readonly<AxEmbedRequest<TEmbedModel>>, options?: Readonly<AxAIServiceActionOptions<TModel, TEmbedModel>>): Promise<AxEmbedResponse>;
     private _embed1;
@@ -1637,14 +1638,12 @@ interface AxAgentFeatures {
  */
 declare class AxAgent<IN extends AxGenIn, OUT extends AxGenOut = AxGenOut> implements AxAgentic {
     private ai?;
-    private signature;
     private program;
     private functions?;
     private agents?;
     private disableSmartModelRouting?;
     private excludeFieldsFromPassthrough;
     private name;
-    private description;
     private subAgentList?;
     private func;
     constructor({ ai, name, description, signature, agents, functions, }: Readonly<{

package/index.js

@@ -803,7 +803,8 @@ var AxBaseAI = class {
     const startTime = performance.now();
     let isError = false;
     try {
-      return this._chat1(req, options);
+      const result = await this._chat1(req, options);
+      return result;
     } catch (error) {
       isError = true;
       throw error;
@@ -856,13 +857,31 @@ var AxBaseAI = class {
     }
     return await this._chat2(model, modelConfig, req, options);
   }
+  cleanupFunctionSchema(fn) {
+    const cleanFn = { ...fn };
+    if (cleanFn.parameters) {
+      const cleanParams = { ...cleanFn.parameters };
+      if (Array.isArray(cleanParams.required) && cleanParams.required.length === 0) {
+        delete cleanParams.required;
+      }
+      if (cleanParams.properties && Object.keys(cleanParams.properties).length === 0) {
+        delete cleanParams.properties;
+      }
+      if (Object.keys(cleanParams).length === 0 || Object.keys(cleanParams).length === 1 && cleanParams.type === "object") {
+        delete cleanFn.parameters;
+      } else {
+        cleanFn.parameters = cleanParams;
+      }
+    }
+    return cleanFn;
+  }
   async _chat2(model, modelConfig, chatReq, options, span) {
     if (!this.aiImpl.createChatReq) {
       throw new Error("generateChatReq not implemented");
     }
     let functions;
     if (chatReq.functions && chatReq.functions.length > 0) {
-      functions = chatReq.functions;
+      functions = chatReq.functions.map((fn2) => this.cleanupFunctionSchema(fn2));
     }
     const req = {
       ...chatReq,
@@ -2555,7 +2574,7 @@ var safetySettings = [
   }
 ];
 var axAIGoogleGeminiDefaultConfig = () => structuredClone({
-  model: "gemini-1.5-pro" /* Gemini15Pro */,
+  model: "gemini-2.0-flash" /* Gemini20Flash */,
   embedModel: "text-embedding-004" /* TextEmbedding004 */,
   safetySettings,
   ...axBaseAIDefaultConfig()
@@ -4494,6 +4513,9 @@ var LRUCache = class {
 };
 var globalPrefixCache = new LRUCache(500);
 function matchesContent(content, prefix, startIndex = 0, prefixCache = globalPrefixCache) {
+  if (/^\s*$/.test(content)) {
+    return -3;
+  }
   const exactMatchIndex = content.indexOf(prefix, startIndex);
   if (exactMatchIndex !== -1) {
     return exactMatchIndex;
@@ -5218,6 +5240,9 @@ var streamingExtractValues = (sig, values, xstate, content, streamingValidation
       // Field is not found, continue to the next field
       case -2:
         return true;
+      // Partial match at end, skip and gather more content
+      case -3:
+        return true;
     }
     let prefixLen = prefix.length;
     if (xstate.currField) {
@@ -6001,14 +6026,20 @@ function processChildAgentFunction(childFunction, parentValues, parentInputKeys,
         injectionKeys
       );
       const originalFunc = processedFunction.func;
-      processedFunction.func = (childArgs, funcOptions) => originalFunc(
-        {
+      processedFunction.func = (childArgs, funcOptions) => {
+        const updatedChildArgs = {
           ...childArgs,
           ...pick(parentValues, injectionKeys)
-        },
-        funcOptions
-      );
+        };
+        if (options.debug && injectionKeys.length > 0) {
+          process.stdout.write(
+            `Function Params: ${JSON.stringify(updatedChildArgs, null, 2)}`
+          );
+        }
+        return originalFunc(updatedChildArgs, funcOptions);
+      };
     }
+    return processedFunction;
   }
   if (modelList && !options.disableSmartModelRouting && options.canConfigureSmartModelRouting) {
     processedFunction.parameters = addModelParameter(
@@ -6020,14 +6051,12 @@ function processChildAgentFunction(childFunction, parentValues, parentInputKeys,
 }
 var AxAgent = class {
   ai;
-  signature;
   program;
   functions;
   agents;
   disableSmartModelRouting;
   excludeFieldsFromPassthrough;
   name;
-  description;
   subAgentList;
   func;
   constructor({
@@ -6043,8 +6072,8 @@ var AxAgent = class {
     this.functions = functions;
     this.disableSmartModelRouting = options?.disableSmartModelRouting;
     this.excludeFieldsFromPassthrough = options?.excludeFieldsFromPassthrough ?? [];
-    this.signature = new AxSignature(signature);
-    this.signature.setDescription(description);
+    const sig = new AxSignature(signature);
+    sig.setDescription(description);
     if (!name || name.length < 5) {
       throw new Error(
         `Agent name must be at least 10 characters (more descriptive): ${name}`
@@ -6055,17 +6084,16 @@ var AxAgent = class {
         `Agent description must be at least 20 characters (explain in detail what the agent does): ${description}`
       );
     }
-    this.program = new AxGen(this.signature, options);
+    this.program = new AxGen(sig, options);
     for (const agent of agents ?? []) {
       this.program.register(agent);
     }
     this.name = name;
-    this.description = description;
     this.subAgentList = agents?.map((a) => a.getFunction().name).join(", ");
     this.func = {
       name: toCamelCase(this.name),
-      description: this.description,
-      parameters: this.signature.toJSONSchema(),
+      description,
+      parameters: sig.toJSONSchema(),
       func: () => this.forward
     };
     const mm = ai?.getModelList();
@@ -6121,11 +6149,12 @@ var AxAgent = class {
   init(parentAi, values, options) {
     const ai = this.ai ?? parentAi;
     const mm = ai?.getModelList();
-    const parentSchema = this.signature.toJSONSchema();
-    const parentKeys = parentSchema.properties ? Object.keys(parentSchema.properties) : [];
+    const parentSchema = this.program.getSignature().getInputFields();
+    const parentKeys = parentSchema.map((p) => p.name);
     const agentFuncs = this.agents?.map((agent) => {
       const f = agent.getFeatures();
       const processOptions = {
+        debug: ai?.getOptions()?.debug ?? false,
         disableSmartModelRouting: !!this.disableSmartModelRouting,
         excludeFieldsFromPassthrough: f.excludeFieldsFromPassthrough,
         canConfigureSmartModelRouting: f.canConfigureSmartModelRouting
@@ -6168,8 +6197,7 @@ var AxAgent = class {
         "Agent description must be at least 20 characters (explain in detail what the agent does)"
       );
     }
-    this.description = description;
-    this.signature.setDescription(description);
+    this.program.getSignature().setDescription(description);
     this.func.description = description;
   }
 };
@@ -6196,7 +6224,7 @@ function addModelParameter(parameters, models) {
   const modelProperty = {
     type: "string",
     enum: models.map((m) => m.key),
-    description: `The AI model to use for this function call. Available options: ${models.map((m) => `${m.key}: ${m.description}`).join(" | ")}`
+    description: `The AI model to use for this function call. Available options: ${models.map((m) => `\`${m.key}\` ${m.description}`).join(", ")}`
   };
   const newProperties = {
     ...baseSchema.properties ?? {},