langchain[patch]: Make AgentExecutor pass config object through to to…

…ols (#4436) * Make AgentExecutor pass config object through to tools * Formatting
langchain-ai · Feb 16, 2024 · 8c918dc · 8c918dc
1 parent c12bc7f
commit 8c918dc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/langchain/src/agents/executor.ts b/langchain/src/agents/executor.ts
@@ -4,7 +4,11 @@ import {
   ToolInputParsingException,
   Tool,
 } from "@langchain/core/tools";
-import { Runnable, type RunnableConfig } from "@langchain/core/runnables";
+import {
+  Runnable,
+  type RunnableConfig,
+  patchConfig,
+} from "@langchain/core/runnables";
 import { AgentAction, AgentFinish, AgentStep } from "@langchain/core/agents";
 import { ChainValues } from "@langchain/core/utils/types";
 import {
@@ -428,7 +432,8 @@ export class AgentExecutor extends BaseChain<ChainValues, AgentExecutorOutput> {
   /** @ignore */
   async _call(
     inputs: ChainValues,
-    runManager?: CallbackManagerForChainRun
+    runManager?: CallbackManagerForChainRun,
+    config?: RunnableConfig
   ): Promise<AgentExecutorOutput> {
     const toolsByName = Object.fromEntries(
       this.tools.map((t) => [t.name.toLowerCase(), t])
@@ -511,7 +516,10 @@ export class AgentExecutor extends BaseChain<ChainValues, AgentExecutorOutput> {
           let observation;
           try {
             observation = tool
-              ? await tool.call(action.toolInput, runManager?.getChild())
+              ? await tool.invoke(
+                  action.toolInput,
+                  patchConfig(config, { callbacks: runManager?.getChild() })
+                )
               : `${action.tool} is not a valid tool, try another one.`;
           } catch (e) {
             // eslint-disable-next-line no-instanceof/no-instanceof

diff --git a/langchain/src/chains/base.ts b/langchain/src/chains/base.ts
@@ -107,14 +107,14 @@ export abstract class BaseChain<
     try {
       outputValues = await (fullValues.signal
         ? (Promise.race([
-            this._call(fullValues as RunInput, runManager),
+            this._call(fullValues as RunInput, runManager, config),
             new Promise((_, reject) => {
               fullValues.signal?.addEventListener("abort", () => {
                 reject(new Error("AbortError"));
               });
             }),
           ]) as Promise<RunOutput>)
-        : this._call(fullValues as RunInput, runManager));
+        : this._call(fullValues as RunInput, runManager, config));
     } catch (e) {
       await runManager?.handleChainError(e);
       throw e;
@@ -165,7 +165,8 @@ export abstract class BaseChain<
    */
   abstract _call(
     values: RunInput,
-    runManager?: CallbackManagerForChainRun
+    runManager?: CallbackManagerForChainRun,
+    config?: RunnableConfig
   ): Promise<RunOutput>;
 
   /**