@iqai/adk 0.3.6 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @iqai/adk
 
+## 0.4.0
+
+### Minor Changes
+
+- c538a1a: feat(adk): align before/after model callback signatures with runtime (single object arg) and wire before/after tool callbacks into tool execution.
+
+  - beforeModelCallback/afterModelCallback now receive `{ callbackContext, llmRequest|llmResponse }` to match runtime invocation; removes need for casts in examples.
+  - beforeToolCallback/afterToolCallback are now invoked around tool execution; allow argument mutation and result override.
+  - tracing updated to include final args and the produced event.
+  - minor lint/style cleanups in flows.
+
+## 0.3.7
+
+### Patch Changes
+
+- 737cb0f: Adds support for gpt 5 models
+
 ## 0.3.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1252,7 +1252,10 @@ type ToolUnion = BaseTool | ((...args: any[]) => any);
 /**
  * Single before model callback type
  */
-type SingleBeforeModelCallback = (callbackContext: CallbackContext, llmRequest: LlmRequest) => LlmResponse | null | Promise<LlmResponse | null>;
+type SingleBeforeModelCallback = (args: {
+    callbackContext: CallbackContext;
+    llmRequest: LlmRequest;
+}) => LlmResponse | null | Promise<LlmResponse | null>;
 /**
  * Before model callback type (single or array)
  */
@@ -1260,7 +1263,10 @@ type BeforeModelCallback = SingleBeforeModelCallback | SingleBeforeModelCallback
 /**
  * Single after model callback type
  */
-type SingleAfterModelCallback = (callbackContext: CallbackContext, llmResponse: LlmResponse) => LlmResponse | null | Promise<LlmResponse | null>;
+type SingleAfterModelCallback = (args: {
+    callbackContext: CallbackContext;
+    llmResponse: LlmResponse;
+}) => LlmResponse | null | Promise<LlmResponse | null>;
 /**
  * After model callback type (single or array)
  */
@@ -1517,7 +1523,7 @@ declare class LlmAgent<T extends BaseLlm = BaseLlm> extends BaseAgent {
      * The resolved tools field as a list of BaseTool based on the context
      * This method is only for use by Agent Development Kit
      */
-    canonicalTools(ctx?: ReadonlyContext): Promise<BaseTool[]>;
+    canonicalTools(_ctx?: ReadonlyContext): Promise<BaseTool[]>;
     /**
      * Gets the canonical before model callbacks as an array
      */

package/dist/index.d.ts

@@ -1252,7 +1252,10 @@ type ToolUnion = BaseTool | ((...args: any[]) => any);
 /**
  * Single before model callback type
  */
-type SingleBeforeModelCallback = (callbackContext: CallbackContext, llmRequest: LlmRequest) => LlmResponse | null | Promise<LlmResponse | null>;
+type SingleBeforeModelCallback = (args: {
+    callbackContext: CallbackContext;
+    llmRequest: LlmRequest;
+}) => LlmResponse | null | Promise<LlmResponse | null>;
 /**
  * Before model callback type (single or array)
  */
@@ -1260,7 +1263,10 @@ type BeforeModelCallback = SingleBeforeModelCallback | SingleBeforeModelCallback
 /**
  * Single after model callback type
  */
-type SingleAfterModelCallback = (callbackContext: CallbackContext, llmResponse: LlmResponse) => LlmResponse | null | Promise<LlmResponse | null>;
+type SingleAfterModelCallback = (args: {
+    callbackContext: CallbackContext;
+    llmResponse: LlmResponse;
+}) => LlmResponse | null | Promise<LlmResponse | null>;
 /**
  * After model callback type (single or array)
  */
@@ -1517,7 +1523,7 @@ declare class LlmAgent<T extends BaseLlm = BaseLlm> extends BaseAgent {
      * The resolved tools field as a list of BaseTool based on the context
      * This method is only for use by Agent Development Kit
      */
-    canonicalTools(ctx?: ReadonlyContext): Promise<BaseTool[]>;
+    canonicalTools(_ctx?: ReadonlyContext): Promise<BaseTool[]>;
     /**
      * Gets the canonical before model callbacks as an array
      */

package/dist/index.js

@@ -2343,7 +2343,7 @@ var OpenAiLlm = class extends BaseLlm {
    * Provides the list of supported models
    */
   static supportedModels() {
-    return ["gpt-3.5-.*", "gpt-4.*", "gpt-4o.*", "o1-.*", "o3-.*"];
+    return ["gpt-3.5-.*", "gpt-4.*", "gpt-4o.*", "gpt-5.*", "o1-.*", "o3-.*"];
   }
   /**
    * Main content generation method - handles both streaming and non-streaming
@@ -6531,7 +6531,6 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
     }
     const { tool, toolContext } = getToolAndContext(
       invocationContext,
-      functionCallEvent,
       functionCall,
       toolsDict
     );
@@ -6541,10 +6540,44 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
     const spanContext = _api.trace.setSpan(_api.context.active(), span);
     try {
       const functionResponse = await _api.context.with(spanContext, async () => {
-        const result = await callToolAsync(tool, functionArgs, toolContext);
+        const argsForTool = { ...functionArgs };
+        if (isLlmAgent2(agent)) {
+          for (const cb of agent.canonicalBeforeToolCallbacks) {
+            const maybeOverride = await cb(tool, argsForTool, toolContext);
+            if (maybeOverride !== null && maybeOverride !== void 0) {
+              const overriddenEvent = buildResponseEvent(
+                tool,
+                maybeOverride,
+                toolContext,
+                invocationContext
+              );
+              telemetryService.traceToolCall(
+                tool,
+                argsForTool,
+                overriddenEvent
+              );
+              return { result: maybeOverride, event: overriddenEvent };
+            }
+          }
+        }
+        let result = await callToolAsync(tool, argsForTool, toolContext);
         if (tool.isLongRunning && !result) {
           return null;
         }
+        if (isLlmAgent2(agent)) {
+          for (const cb of agent.canonicalAfterToolCallbacks) {
+            const maybeModified = await cb(
+              tool,
+              argsForTool,
+              toolContext,
+              result
+            );
+            if (maybeModified !== null && maybeModified !== void 0) {
+              result = maybeModified;
+              break;
+            }
+          }
+        }
         const functionResponseEvent = buildResponseEvent(
           tool,
           result,
@@ -6553,7 +6586,7 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
         );
         telemetryService.traceToolCall(
           tool,
-          functionArgs,
+          argsForTool,
           functionResponseEvent
         );
         return { result, event: functionResponseEvent };
@@ -6583,7 +6616,7 @@ async function handleFunctionCallsLive(invocationContext, functionCallEvent, too
     toolsDict
   );
 }
-function getToolAndContext(invocationContext, functionCallEvent, functionCall, toolsDict) {
+function getToolAndContext(invocationContext, functionCall, toolsDict) {
   if (!(functionCall.name in toolsDict)) {
     throw new Error(
       `Function ${functionCall.name} is not found in the tools_dict.`
@@ -6700,12 +6733,10 @@ var BaseLlmFlow = (_class25 = class {constructor() { _class25.prototype.__init43
   }
   async *_runOneStepAsync(invocationContext) {
     const llmRequest = new LlmRequest();
-    let preprocessEventCount = 0;
     for await (const event of this._preprocessAsync(
       invocationContext,
       llmRequest
     )) {
-      preprocessEventCount++;
       yield event;
     }
     if (invocationContext.endInvocation) {
@@ -6718,13 +6749,11 @@ var BaseLlmFlow = (_class25 = class {constructor() { _class25.prototype.__init43
       author: invocationContext.agent.name,
       branch: invocationContext.branch
     });
-    let llmResponseCount = 0;
     for await (const llmResponse of this._callLlmAsync(
       invocationContext,
       llmRequest,
       modelResponseEvent
     )) {
-      llmResponseCount++;
       for await (const event of this._postprocessAsync(
         invocationContext,
         llmRequest,
@@ -9241,7 +9270,7 @@ var LlmAgent = (_class27 = class _LlmAgent extends BaseAgent {
    * The resolved tools field as a list of BaseTool based on the context
    * This method is only for use by Agent Development Kit
    */
-  async canonicalTools(ctx) {
+  async canonicalTools(_ctx) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
       if (typeof toolUnion === "function") {

package/dist/index.mjs

@@ -2343,7 +2343,7 @@ var OpenAiLlm = class extends BaseLlm {
    * Provides the list of supported models
    */
   static supportedModels() {
-    return ["gpt-3.5-.*", "gpt-4.*", "gpt-4o.*", "o1-.*", "o3-.*"];
+    return ["gpt-3.5-.*", "gpt-4.*", "gpt-4o.*", "gpt-5.*", "o1-.*", "o3-.*"];
   }
   /**
    * Main content generation method - handles both streaming and non-streaming
@@ -6531,7 +6531,6 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
     }
     const { tool, toolContext } = getToolAndContext(
       invocationContext,
-      functionCallEvent,
       functionCall,
       toolsDict
     );
@@ -6541,10 +6540,44 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
     const spanContext = trace2.setSpan(context2.active(), span);
     try {
       const functionResponse = await context2.with(spanContext, async () => {
-        const result = await callToolAsync(tool, functionArgs, toolContext);
+        const argsForTool = { ...functionArgs };
+        if (isLlmAgent2(agent)) {
+          for (const cb of agent.canonicalBeforeToolCallbacks) {
+            const maybeOverride = await cb(tool, argsForTool, toolContext);
+            if (maybeOverride !== null && maybeOverride !== void 0) {
+              const overriddenEvent = buildResponseEvent(
+                tool,
+                maybeOverride,
+                toolContext,
+                invocationContext
+              );
+              telemetryService.traceToolCall(
+                tool,
+                argsForTool,
+                overriddenEvent
+              );
+              return { result: maybeOverride, event: overriddenEvent };
+            }
+          }
+        }
+        let result = await callToolAsync(tool, argsForTool, toolContext);
         if (tool.isLongRunning && !result) {
           return null;
         }
+        if (isLlmAgent2(agent)) {
+          for (const cb of agent.canonicalAfterToolCallbacks) {
+            const maybeModified = await cb(
+              tool,
+              argsForTool,
+              toolContext,
+              result
+            );
+            if (maybeModified !== null && maybeModified !== void 0) {
+              result = maybeModified;
+              break;
+            }
+          }
+        }
         const functionResponseEvent = buildResponseEvent(
           tool,
           result,
@@ -6553,7 +6586,7 @@ async function handleFunctionCallsAsync(invocationContext, functionCallEvent, to
         );
         telemetryService.traceToolCall(
           tool,
-          functionArgs,
+          argsForTool,
           functionResponseEvent
         );
         return { result, event: functionResponseEvent };
@@ -6583,7 +6616,7 @@ async function handleFunctionCallsLive(invocationContext, functionCallEvent, too
     toolsDict
   );
 }
-function getToolAndContext(invocationContext, functionCallEvent, functionCall, toolsDict) {
+function getToolAndContext(invocationContext, functionCall, toolsDict) {
   if (!(functionCall.name in toolsDict)) {
     throw new Error(
       `Function ${functionCall.name} is not found in the tools_dict.`
@@ -6700,12 +6733,10 @@ var BaseLlmFlow = class {
   }
   async *_runOneStepAsync(invocationContext) {
     const llmRequest = new LlmRequest();
-    let preprocessEventCount = 0;
     for await (const event of this._preprocessAsync(
       invocationContext,
       llmRequest
     )) {
-      preprocessEventCount++;
       yield event;
     }
     if (invocationContext.endInvocation) {
@@ -6718,13 +6749,11 @@ var BaseLlmFlow = class {
       author: invocationContext.agent.name,
       branch: invocationContext.branch
     });
-    let llmResponseCount = 0;
     for await (const llmResponse of this._callLlmAsync(
       invocationContext,
       llmRequest,
       modelResponseEvent
     )) {
-      llmResponseCount++;
       for await (const event of this._postprocessAsync(
         invocationContext,
         llmRequest,
@@ -9241,7 +9270,7 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
    * The resolved tools field as a list of BaseTool based on the context
    * This method is only for use by Agent Development Kit
    */
-  async canonicalTools(ctx) {
+  async canonicalTools(_ctx) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
       if (typeof toolUnion === "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iqai/adk",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "Agent Development Kit for TypeScript with multi-provider LLM support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",