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

langchain_dev_utils/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.0"
+__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]:
@@ -23,13 +60,15 @@ def _transform_node_to_tuple(
 
 
 def _check_pkg_install(
-    pkg: Literal["langchain_openai", "json_repair"],
+    pkg: Literal["langchain_openai", "json_repair", "jinja2"],
 ) -> None:
     if not util.find_spec(pkg):
         if pkg == "langchain_openai":
             msg = "Please install langchain_dev_utils[standard],when use 'openai-compatible'"
-        else:
+        elif pkg == "json_repair":
             msg = "Please install langchain_dev_utils[standard] to use ToolCallRepairMiddleware."
+        else:
+            msg = "Please install langchain_dev_utils[standard] to use FormatPromptMiddleware."
         raise ImportError(msg)
 
 

langchain_dev_utils/agents/middleware/__init__.py

@@ -1,10 +1,10 @@
-from .format_prompt import format_prompt
+from .format_prompt import FormatPromptMiddleware, format_prompt
 from .handoffs import HandoffAgentMiddleware
 from .model_fallback import ModelFallbackMiddleware
 from .model_router import ModelRouterMiddleware
 from .plan import PlanMiddleware
 from .summarization import SummarizationMiddleware
-from .tool_call_repair import ToolCallRepairMiddleware
+from .tool_call_repair import ToolCallRepairMiddleware, tool_call_repair
 from .tool_emulator import LLMToolEmulator
 from .tool_selection import LLMToolSelectorMiddleware
 
@@ -16,6 +16,8 @@ __all__ = [
     "LLMToolEmulator",
     "ModelRouterMiddleware",
     "ToolCallRepairMiddleware",
-    "format_prompt",
+    "FormatPromptMiddleware",
     "HandoffAgentMiddleware",
+    "tool_call_repair",
+    "format_prompt",
 ]

langchain_dev_utils/agents/middleware/format_prompt.py

@@ -1,66 +1,156 @@
-from langchain.agents.middleware import ModelRequest, dynamic_prompt
+from typing import Awaitable, Callable, Literal
+
+from langchain.agents.middleware import ModelRequest
+from langchain.agents.middleware.types import (
+    AgentMiddleware,
+    ModelCallResult,
+    ModelResponse,
+)
+from langchain_core.messages import SystemMessage
 from langchain_core.prompts.string import get_template_variables
 
+from langchain_dev_utils._utils import _check_pkg_install
+
 
-@dynamic_prompt
-def format_prompt(request: ModelRequest) -> str:
+class FormatPromptMiddleware(AgentMiddleware):
     """Format the system prompt with variables from state and context.
 
     This middleware function extracts template variables from the system prompt
     and populates them with values from the agent's state and runtime context.
     Variables are first resolved from the state, then from the context if not found.
 
+    Args:
+        template_format: The format of the template. Defaults to "f-string".
+
     Example:
-        >>> from langchain_dev_utils.agents.middleware import format_prompt
-        >>> from langchain.agents import create_agent
-        >>> from langchain_core.messages import HumanMessage
-        >>> from dataclasses import dataclass
-        >>>
-        >>> @dataclass
-        ... class Context:
-        ...       name: str
-        ...       user: str
-        >>>
-        >>> agent=create_agent(
-        ...     model=model,
-        ...     tools=tools,
-        ...     system_prompt="You are a helpful assistant. Your name is {name}. Your user is {user}.",
-        ...     middleware=[format_prompt],
-        ...     context_schema=Context,
-        ... )
-        >>> agent.invoke(
-        ...     {
-        ...         "messages": [HumanMessage(content="Hello")],
-        ...     },
-        ...     context=Context(name="assistant", user="Tom"),
-        ... )
 
+        # Use format_prompt middleware instance rather than FormatPromptMiddleware class (Recommended)
+
+        ```python
+        from langchain_dev_utils.agents.middleware import format_prompt
+        from langchain.agents import create_agent
+        from langchain_core.messages import HumanMessage
+        from dataclasses import dataclass
+
+        @dataclass
+        class Context:
+            name: str
+            user: str
+
+        agent = create_agent(
+            model=model,
+            tools=tools,
+            system_prompt="You are a helpful assistant. Your name is {name}. Your user is {user}.",
+            middleware=[format_prompt],
+            context_schema=Context,
+        )
+        agent.invoke(
+            {
+                "messages": [HumanMessage(content="Hello")],
+            },
+            context=Context(name="assistant", user="Tom"),
+        )
+        ```
+
+        # Use FormatPromptMiddleware class(Use when template_format is jinja2)
+
+        ```python
+        from langchain_dev_utils.agents.middleware import FormatPromptMiddleware
+        from langchain.agents import create_agent
+        from langchain_core.messages import HumanMessage
+        from dataclasses import dataclass
+
+        @dataclass
+        class Context:
+            name: str
+            user: str
+
+        agent = create_agent(
+            model=model,
+            tools=tools,
+            system_prompt="You are a helpful assistant. Your name is {{ name }}. Your user is {{ user }}.",
+            middleware=[FormatPromptMiddleware(template_format="jinja2")],
+            context_schema=Context,
+        )
+        agent.invoke(
+            {
+                "messages": [HumanMessage(content="Hello")],
+            },
+            context=Context(name="assistant", user="Tom"),
+        )
+        ```
     """
-    system_msg = request.system_message
-    if system_msg is None:
-        raise ValueError(
-            "system_message must be provided,while use format_prompt in middleware."
+
+    def __init__(
+        self,
+        *,
+        template_format: Literal["f-string", "jinja2"] = "f-string",
+    ) -> None:
+        super().__init__()
+
+        self.template_format = template_format
+
+        if template_format == "jinja2":
+            _check_pkg_install("jinja2")
+
+    def _format_prompt(self, request: ModelRequest) -> str:
+        """Add the plan system prompt to the system message."""
+        system_msg = request.system_message
+        if system_msg is None:
+            raise ValueError(
+                "system_message must be provided,while use format_prompt in middleware."
+            )
+
+        system_prompt = "\n".join(
+            [content.get("text", "") for content in system_msg.content_blocks]
         )
+        variables = get_template_variables(system_prompt, self.template_format)
+
+        format_params = {}
+
+        state = request.state
+        for key in variables:
+            if var := state.get(key, None):
+                format_params[key] = var
 
-    system_prompt = "\n".join(
-        [content.get("text", "") for content in system_msg.content_blocks]
-    )
-    variables = get_template_variables(system_prompt, "f-string")
+        other_var_keys = set(variables) - set(format_params.keys())
 
-    format_params = {}
+        if other_var_keys:
+            context = request.runtime.context
+            if context is not None:
+                for key in other_var_keys:
+                    if var := getattr(context, key, None):
+                        format_params[key] = var
 
-    state = request.state
-    for key in variables:
-        if var := state.get(key, None):
-            format_params[key] = var
+        if self.template_format == "jinja2":
+            from jinja2 import Template
 
-    other_var_keys = set(variables) - set(format_params.keys())
+            template = Template(system_prompt)
+            return template.render(**format_params)
+        else:
+            return system_prompt.format(**format_params)
+
+    def wrap_model_call(
+        self,
+        request: ModelRequest,
+        handler: Callable[[ModelRequest], ModelResponse],
+    ) -> ModelCallResult:
+        """Update the system prompt with variables from state and context."""
+        prompt = self._format_prompt(request)
+        request = request.override(system_message=SystemMessage(content=prompt))
+        return handler(request)
+
+    async def awrap_model_call(
+        self,
+        request: ModelRequest,
+        handler: Callable[[ModelRequest], Awaitable[ModelResponse]],
+    ) -> ModelCallResult:
+        """Update the system prompt with variables from state and context."""
+        prompt = self._format_prompt(request)
+        override_request = request.override(
+            system_message=SystemMessage(content=prompt)
+        )
+        return await handler(override_request)
 
-    if other_var_keys:
-        context = request.runtime.context
-        if context is not None:
-            for key in other_var_keys:
-                if var := getattr(context, key, None):
-                    format_params[key] = var
 
-    return system_prompt.format(**format_params)
+format_prompt = FormatPromptMiddleware()

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/middleware/tool_call_repair.py

@@ -94,3 +94,6 @@ class ToolCallRepairMiddleware(AgentMiddleware):
             result=results,
             structured_response=response.structured_response,
         )
+
+
+tool_call_repair = ToolCallRepairMiddleware()

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/chat_models/adapters/openai_compatible.py

@@ -261,6 +261,8 @@ class _BaseChatOpenAICompatible(BaseChatOpenAI):
                 payload_messages.append(_convert_message_to_dict(m))
 
         payload["messages"] = payload_messages
+        if "tools" in payload and len(payload["tools"]) == 0:
+            payload.pop("tools")
         return payload
 
     @model_validator(mode="after")
@@ -302,6 +304,8 @@ class _BaseChatOpenAICompatible(BaseChatOpenAI):
                 ModelProfile,
                 _get_profile_by_provider_and_model(self._provider, self.model_name),
             )
+        if "json_schema" in self.supported_response_format:
+            self.profile.update({"structured_output": True})
         return self
 
     def _create_chat_result(
@@ -347,9 +351,9 @@ class _BaseChatOpenAICompatible(BaseChatOpenAI):
             if isinstance(model_extra, dict) and (
                 reasoning := model_extra.get("reasoning")
             ):
-                rtn.generations[0].message.additional_kwargs["reasoning_content"] = (
-                    reasoning
-                )
+                rtn.generations[0].message.additional_kwargs[
+                    "reasoning_content"
+                ] = reasoning
 
         return rtn
 

{langchain_dev_utils-1.4.0.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.0
+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
@@ -12,6 +12,7 @@ Requires-Dist: langchain-core>=1.2.5
 Requires-Dist: langchain>=1.2.0
 Requires-Dist: langgraph>=1.0.0
 Provides-Extra: standard
+Requires-Dist: jinja2>=3.1.6; extra == 'standard'
 Requires-Dist: json-repair>=0.53.1; extra == 'standard'
 Requires-Dist: langchain-openai; extra == 'standard'
 Description-Content-Type: text/markdown

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

@@ -1,17 +1,17 @@
-langchain_dev_utils/__init__.py,sha256=-pa9pj_zJgPDZtE3ena4mjuVS3FEWQWYij1shjLYS80,23
-langchain_dev_utils/_utils.py,sha256=cWWq0sLA3yNGtcB9YyM60gcUg-hz0mjEa5CYg60cXHE,4663
+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/middleware/__init__.py,sha256=QVQibaNHvHPyNTZ2UNFfYL153ZboaCHcoioTHK0FsiY,710
-langchain_dev_utils/agents/middleware/format_prompt.py,sha256=yIkoSVPp0FemkjezvGsOmtgOkZDyEYQ8yh4YWYYGtVc,2343
-langchain_dev_utils/agents/middleware/handoffs.py,sha256=rSkNXxqtjB8_xT0HUdxnKbchgY76BuTPX-Zc69H-_wI,7687
+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=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=oZF0Oejemqs9kSn8xbW79FWyVVarL4IGCz0gpqYBkFM,3529
+langchain_dev_utils/agents/middleware/tool_call_repair.py,sha256=mO21g9nzukdjNcERTg63jS7UOEF47Wx8yd7CqFS_VVQ,3580
 langchain_dev_utils/agents/middleware/tool_emulator.py,sha256=OgtPhqturaWzF4fRSJ3f_IXvIrYrrAjlpOC5zmLtrkY,2031
 langchain_dev_utils/agents/middleware/tool_selection.py,sha256=dRH5ejR6N02Djwxt6Gd63MYkg6SV5pySlzaRt53OoZk,3113
 langchain_dev_utils/chat_models/__init__.py,sha256=YSLUyHrWEEj4y4DtGFCOnDW02VIYZdfAH800m4Klgeg,224
@@ -19,7 +19,7 @@ langchain_dev_utils/chat_models/base.py,sha256=G_SNvd53ogho-LRgD7DCD65xj51J2JxmO
 langchain_dev_utils/chat_models/types.py,sha256=MD3cv_ZIe9fCdgwisNfuxAOhy-j4YSs1ZOQYyCjlNKs,927
 langchain_dev_utils/chat_models/adapters/__init__.py,sha256=4tTbhAAQdpX_gWyWeH97hqS5HnaoqQqW6QBh9Qd1SKs,106
 langchain_dev_utils/chat_models/adapters/create_utils.py,sha256=r8_XWLNF3Yc6sumlBhmgG1QcBa4Dsba7X3f_9YeMeGA,2479
-langchain_dev_utils/chat_models/adapters/openai_compatible.py,sha256=Z-AOpMm6MldKpL8EtuZ9pzfOFAjirZUKxw2K7EPk87w,27200
+langchain_dev_utils/chat_models/adapters/openai_compatible.py,sha256=I9MXplglcTSzrRx8Y7sDGliiT7_Wiugv3wdv5y1cpr0,27418
 langchain_dev_utils/chat_models/adapters/register_profiles.py,sha256=YS9ItCEq2ISoB_bp6QH5NVKOVR9-7la3r7B_xQNxZxE,366
 langchain_dev_utils/embeddings/__init__.py,sha256=zbEOaV86TUi9Zrg_dH9dpdgacWg31HMJTlTQknA9EKk,244
 langchain_dev_utils/embeddings/base.py,sha256=GXFKZSAExMtCFUpsd6mY4NxCWCrq7JAatBw3kS9LaKY,8803
@@ -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.0.dist-info/METADATA,sha256=bF2sQIAP0N0yDnBm-_DZDQbFS5sHqrmF7HtRHFQEexY,4758
-langchain_dev_utils-1.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-langchain_dev_utils-1.4.0.dist-info/licenses/LICENSE,sha256=AWAOzNEcsvCEzHOF0qby5OKxviVH_eT9Yce1sgJTico,1084
-langchain_dev_utils-1.4.0.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,,