langchain-dev-utils 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

langchain_dev_utils/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.1"
+__version__ = "1.4.2"

langchain_dev_utils/_utils.py

@@ -1,11 +1,48 @@
 from importlib import util
 from typing import Literal, Optional, cast
 
+from langchain_core.tools import BaseTool
 from langgraph.graph import StateGraph
 from langgraph.graph.state import StateNode
 from pydantic import BaseModel
 
 
+def _duplicate_tools(tools: list[BaseTool]) -> list[BaseTool]:
+    """Duplicate tools with the same name.
+
+    Args:
+        tools (list[BaseTool]): The list of tools.
+
+    Returns:
+        list[BaseTool]: The duplicated tools.
+    """
+    tool_name_set = set()
+    duplicated_tools = []
+    for tool_obj in tools:
+        if tool_obj.name not in tool_name_set:
+            duplicated_tools.append(tool_obj)
+            tool_name_set.add(tool_obj.name)
+    return duplicated_tools
+
+
+def _merge_tools(tools: list[BaseTool]) -> list[BaseTool]:
+    """Merge tools with the same name.
+
+    Args:
+        tools (list[BaseTool]): The list of tools.
+
+    Returns:
+        list[BaseTool]: The merged tools.
+    """
+    tool_name_set = set()
+    merged_tools = []
+    for tool_obj in tools:
+        if tool_obj.name not in tool_name_set:
+            merged_tools.append(tool_obj)
+            tool_name_set.add(tool_obj.name)
+    return merged_tools
+
+
 def _transform_node_to_tuple(
     node: StateNode | tuple[str, StateNode],
 ) -> tuple[str, StateNode]:

langchain_dev_utils/agents/middleware/handoffs.py

@@ -1,4 +1,4 @@
-from typing import Any, Awaitable, Callable, Literal, cast
+from typing import Awaitable, Callable, Literal, cast
 
 from langchain.agents import AgentState
 from langchain.agents.middleware import AgentMiddleware, ModelRequest, ModelResponse
@@ -9,6 +9,7 @@ from langchain_core.messages import SystemMessage, ToolMessage
 from langgraph.types import Command
 from typing_extensions import NotRequired, Optional, TypedDict
 
+from langchain_dev_utils._utils import _duplicate_tools, _merge_tools
 from langchain_dev_utils.chat_models import load_chat_model
 
 
@@ -19,7 +20,7 @@ class MultiAgentState(AgentState):
 class AgentConfig(TypedDict):
     model: NotRequired[str | BaseChatModel]
     prompt: str | SystemMessage
-    tools: NotRequired[list[BaseTool | dict[str, Any]]]
+    tools: NotRequired[list[BaseTool]]
     default: NotRequired[bool]
     handoffs: list[str] | Literal["all"]
 
@@ -176,7 +177,16 @@ class HandoffAgentMiddleware(AgentMiddleware):
             agents_config,
             handoffs_tools,
         )
-        self.tools = handoffs_tools
+
+        all_tools = [
+            *handoffs_tools,
+        ]
+
+        for agent_name in agents_config:
+            tools = agents_config.get(agent_name, {}).get("tools", [])
+            all_tools.extend(tools)
+
+        self.tools = _merge_tools(all_tools)
 
     def _get_override_request(self, request: ModelRequest) -> ModelRequest:
         active_agent_name = request.state.get("active_agent", self.default_agent_name)
@@ -184,15 +194,14 @@ class HandoffAgentMiddleware(AgentMiddleware):
         _config = self.agents_config[active_agent_name]
 
         params = {}
-        if _config.get("model"):
-            model = _config.get("model")
+        if model := _config.get("model"):
             if isinstance(model, str):
                 model = load_chat_model(model)
             params["model"] = model
-        if _config.get("prompt"):
-            params["system_prompt"] = _config.get("prompt")
-        if _config.get("tools"):
-            params["tools"] = _config.get("tools")
+        if prompt := _config.get("prompt"):
+            params["system_prompt"] = prompt
+        if tools := _config.get("tools"):
+            params["tools"] = _duplicate_tools(tools)
 
         if params:
             return request.override(**params)

langchain_dev_utils/agents/middleware/model_router.py

@@ -10,6 +10,7 @@ from langgraph.runtime import Runtime
 from pydantic import BaseModel, Field
 from typing_extensions import TypedDict
 
+from langchain_dev_utils._utils import _duplicate_tools, _merge_tools
 from langchain_dev_utils.chat_models import load_chat_model
 from langchain_dev_utils.message_convert import format_sequence
 
@@ -120,6 +121,13 @@ class ModelRouterMiddleware(AgentMiddleware):
 
         self.router_prompt = router_prompt
 
+        all_tools = []
+        for model in model_list:
+            if tools := model.get("tools"):
+                all_tools.extend(tools)
+
+        self.tools = _merge_tools(all_tools)
+
     def _select_model(self, messages: list[AnyMessage]):
         response = cast(
             SelectModel,
@@ -174,7 +182,7 @@ class ModelRouterMiddleware(AgentMiddleware):
                     model = load_chat_model(select_model_name)
             override_kwargs["model"] = model
             if model_values["tools"] is not None:
-                override_kwargs["tools"] = model_values["tools"]
+                override_kwargs["tools"] = _duplicate_tools(model_values["tools"])
             if model_values["system_prompt"] is not None:
                 override_kwargs["system_message"] = SystemMessage(
                     content=model_values["system_prompt"]

langchain_dev_utils/agents/wrap.py

@@ -17,7 +17,7 @@ def _process_input(request: str, runtime: ToolRuntime) -> str:
 def _process_output(
     request: str, response: dict[str, Any], runtime: ToolRuntime
 ) -> Any:
-    return response["messages"][-1].content
+    return response["messages"][-1].text
 
 
 def get_subagent_name(runtime: ToolRuntime) -> str:

{langchain_dev_utils-1.4.1.dist-info → langchain_dev_utils-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-dev-utils
-Version: 1.4.1
+Version: 1.4.2
 Summary: A practical utility library for LangChain and LangGraph development
 Project-URL: Source Code, https://github.com/TBice123123/langchain-dev-utils
 Project-URL: repository, https://github.com/TBice123123/langchain-dev-utils

{langchain_dev_utils-1.4.1.dist-info → langchain_dev_utils-1.4.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-langchain_dev_utils/__init__.py,sha256=nxjQ6mMSJJKqkpX2IY-1BmdpErEa1Lx5hYzk9ULB09w,23
-langchain_dev_utils/_utils.py,sha256=EC1mlQggFvso1csYxCrk4XbXkJuK_8zrrjsD19ELzgk,4806
+langchain_dev_utils/__init__.py,sha256=BG12pmEO_YOxB_xUz7sNv20lzgrwQ60u0paDn7SG_9Q,23
+langchain_dev_utils/_utils.py,sha256=tDC-Hp8yRgqGi8KQbUgjnFLqE5who8mv5SREbZWPshQ,5827
 langchain_dev_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langchain_dev_utils/agents/__init__.py,sha256=69_biZzyJvW9OBT1g8TX_77mp9-I_TvWo9QtlvHq83E,177
 langchain_dev_utils/agents/factory.py,sha256=8XB6y_ddf58vXlTLHBL6KCirFqkD2GjtzsuOt98sS7U,3732
-langchain_dev_utils/agents/wrap.py,sha256=ufxcOCLDE4Aw2TbgcyFYor0BXXaJDzLTTJJyyD4x7bQ,12011
+langchain_dev_utils/agents/wrap.py,sha256=kPyxm4CP6-Q-iBV_NBkVkCBB5tg9rKI0B6qzEyK_JEA,12008
 langchain_dev_utils/agents/middleware/__init__.py,sha256=SiTibbzv2QC0FvGKN_1A10yOO62F7wtdScbGARjkyjA,808
 langchain_dev_utils/agents/middleware/format_prompt.py,sha256=HrgHsMCnfHQ-Eh_RY-h56otAJ62-2zJJHbOi2kRyEiw,5303
-langchain_dev_utils/agents/middleware/handoffs.py,sha256=rSkNXxqtjB8_xT0HUdxnKbchgY76BuTPX-Zc69H-_wI,7687
+langchain_dev_utils/agents/middleware/handoffs.py,sha256=Q99X8QnaPr6yr9OF-IHZPmYL_RsLnaAMZkPLDF7BRPQ,7940
 langchain_dev_utils/agents/middleware/model_fallback.py,sha256=8xiNjTJ0yiRkPLCRfAGNnqY1TLstj1Anmiqyv5w2mA8,1633
-langchain_dev_utils/agents/middleware/model_router.py,sha256=IidYq72tPLa053gEg5IQpPzDzyCxYYEvpgT1K4qBwXw,7862
+langchain_dev_utils/agents/middleware/model_router.py,sha256=wsrC_Yg-i_mLlMM0SG8lLOFoOCNpmen6WI2PAj73anQ,8145
 langchain_dev_utils/agents/middleware/plan.py,sha256=Zz0dh1BRbsVgROmhjH2IIqylSsuKHZXJx0iztMBm8EU,14719
 langchain_dev_utils/agents/middleware/summarization.py,sha256=IoZ2PM1OC3AXwf0DWpfreuPOAipeiYu0KPmAABWXuY0,3087
 langchain_dev_utils/agents/middleware/tool_call_repair.py,sha256=mO21g9nzukdjNcERTg63jS7UOEF47Wx8yd7CqFS_VVQ,3580
@@ -40,7 +40,7 @@ langchain_dev_utils/pipeline/types.py,sha256=T3aROKKXeWvd0jcH5XkgMDQfEkLfPaiOhhV
 langchain_dev_utils/tool_calling/__init__.py,sha256=mu_WxKMcu6RoTf4vkTPbA1WSBSNc6YIqyBtOQ6iVQj4,322
 langchain_dev_utils/tool_calling/human_in_the_loop.py,sha256=7Z_QO5OZUR6K8nLoIcafc6osnvX2IYNorOJcbx6bVso,9672
 langchain_dev_utils/tool_calling/utils.py,sha256=S4-KXQ8jWmpGTXYZitovF8rxKpaSSUkFruM8LDwvcvE,2765
-langchain_dev_utils-1.4.1.dist-info/METADATA,sha256=QqpJZwTwFUIzwIXZRjfSVGHMrtZG7pJ6salBq_zYEL0,4808
-langchain_dev_utils-1.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-langchain_dev_utils-1.4.1.dist-info/licenses/LICENSE,sha256=AWAOzNEcsvCEzHOF0qby5OKxviVH_eT9Yce1sgJTico,1084
-langchain_dev_utils-1.4.1.dist-info/RECORD,,
+langchain_dev_utils-1.4.2.dist-info/METADATA,sha256=VEE7lWcW1nMGXgx6QX_c7C565NXXDufHAnAqDqCfkAY,4808
+langchain_dev_utils-1.4.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+langchain_dev_utils-1.4.2.dist-info/licenses/LICENSE,sha256=AWAOzNEcsvCEzHOF0qby5OKxviVH_eT9Yce1sgJTico,1084
+langchain_dev_utils-1.4.2.dist-info/RECORD,,