Add input args for tool kwargs

egan-mw · Oct 5, 2023 · 6036346 · 6036346
1 parent 8d06c19
commit 6036346
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/langchain-core/src/main/java/com/hw/langchain/agents/agent/AgentExecutor.java b/langchain-core/src/main/java/com/hw/langchain/agents/agent/AgentExecutor.java
@@ -118,6 +118,8 @@ public Object takeNextStep(Map<String, BaseTool> nameToToolMap, Map<String, Obje
                 var tool = nameToToolMap.get(agentAction.getTool());
                 boolean returnDirect = tool.isReturnDirect();
                 var toolRunKwargs = agent.toolRunLoggingKwargs();
+                // add input args for tools
+                toolRunKwargs.putAll(inputs);
                 if (returnDirect) {
                     toolRunKwargs.put("llm_prefix", "");
                 }

diff --git a/langchain-core/src/main/java/com/hw/langchain/tools/base/BaseTool.java b/langchain-core/src/main/java/com/hw/langchain/tools/base/BaseTool.java
@@ -111,6 +111,8 @@ public Object run(Object toolInput, Map<String, Object> kwargs) {
         LOG.debug("kwargs: {}", kwargs);
         Pair<Object[], Map<String, Object>> pair = toArgsAndKwargs(toolInput);
         String args = pair.getKey()[0].toString();
-        return innerRun(args, pair.getValue());
+
+        kwargs.putAll(pair.getValue());
+        return innerRun(args, kwargs);
     }
 }