langchain-dev-utils 1.3.5__tar.gz → 1.3.6__tar.gz

{langchain_dev_utils-1.3.5 → langchain_dev_utils-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-dev-utils
-Version: 1.3.5
+Version: 1.3.6
 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.3.5 → langchain_dev_utils-1.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langchain-dev-utils"
-version = "1.3.5"
+version = "1.3.6"
 description = "A practical utility library for LangChain and LangGraph development"
 readme = "README.md"
 authors = [{ name = "tiebingice", email = "tiebingice123@outlook.com" }]

langchain_dev_utils-1.3.6/src/langchain_dev_utils/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.6"

{langchain_dev_utils-1.3.5 → langchain_dev_utils-1.3.6}/src/langchain_dev_utils/_utils.py

@@ -97,6 +97,11 @@ def _validate_model_cls_name(model_cls_name: str) -> None:
             f"model_cls_name should start with an uppercase letter (PEP 8). Received: {model_cls_name}"
         )
 
+    if len(model_cls_name) > 30:
+        raise ValueError(
+            f"model_cls_name must be 30 characters or fewer. Received: {model_cls_name}"
+        )
+
 
 def _validate_provider_name(provider_name: str) -> None:
     """Validate provider name follows Python naming conventions.
@@ -112,7 +117,7 @@ def _validate_provider_name(provider_name: str) -> None:
 
     if not provider_name[0].isalnum():
         raise ValueError(
-            f"provider_name must start with a letter. Received: {provider_name}"
+            f"provider_name must start with a letter or number. Received: {provider_name}"
         )
 
     if not all(c.isalnum() or c == "_" for c in provider_name):

{langchain_dev_utils-1.3.5 → langchain_dev_utils-1.3.6}/src/langchain_dev_utils/agents/wrap.py

@@ -1,8 +1,8 @@
 import asyncio
-from typing import Any, Awaitable, Callable, Optional, cast
+from typing import Any, Awaitable, Callable, Optional
 
 from langchain.tools import ToolRuntime
-from langchain_core.messages import AnyMessage, HumanMessage
+from langchain_core.messages import HumanMessage
 from langchain_core.tools import BaseTool, StructuredTool
 from langgraph.graph.state import CompiledStateGraph
 
@@ -14,9 +14,9 @@ def _process_input(request: str, runtime: ToolRuntime) -> str:
 
 
 def _process_output(
-    request: str, response: list[AnyMessage], runtime: ToolRuntime
+    request: str, response: dict[str, Any], runtime: ToolRuntime
 ) -> Any:
-    return response[-1].content
+    return response["messages"][-1].content
 
 
 def wrap_agent_as_tool(
@@ -25,17 +25,17 @@ def wrap_agent_as_tool(
     tool_description: Optional[str] = None,
     pre_input_hooks: Optional[
         tuple[
-            Callable[[str, ToolRuntime], str],
-            Callable[[str, ToolRuntime], Awaitable[str]],
+            Callable[[str, ToolRuntime], str | dict[str, Any]],
+            Callable[[str, ToolRuntime], Awaitable[str | dict[str, Any]]],
         ]
-        | Callable[[str, ToolRuntime], str]
+        | Callable[[str, ToolRuntime], str | dict[str, Any]]
     ] = None,
     post_output_hooks: Optional[
         tuple[
-            Callable[[str, list[AnyMessage], ToolRuntime], Any],
-            Callable[[str, list[AnyMessage], ToolRuntime], Awaitable[Any]],
+            Callable[[str, dict[str, Any], ToolRuntime], Any],
+            Callable[[str, dict[str, Any], ToolRuntime], Awaitable[Any]],
         ]
-        | Callable[[str, list[AnyMessage], ToolRuntime], Any]
+        | Callable[[str, dict[str, Any], ToolRuntime], Any]
     ] = None,
 ) -> BaseTool:
     """Wraps an agent as a tool
@@ -91,33 +91,58 @@ def wrap_agent_as_tool(
     def call_agent(
         request: str,
         runtime: ToolRuntime,
-    ) -> str:
-        request = process_input(request, runtime) if process_input else request
+    ):
+        _processed_input = process_input(request, runtime) if process_input else request
+        if isinstance(_processed_input, str):
+            agent_input = {"messages": [HumanMessage(content=_processed_input)]}
+        elif isinstance(_processed_input, dict):
+            if "messages" not in _processed_input:
+                raise ValueError("Agent input must contain 'messages' key")
+            agent_input = _processed_input
+        else:
+            raise ValueError("Pre Hooks must return a string or a dict")
 
-        messages = [HumanMessage(content=request)]
-        response = agent.invoke({"messages": messages})
+        response = agent.invoke(agent_input)
 
-        response = process_output(request, response["messages"], runtime)
+        response = (
+            process_output(request, response, runtime)
+            if process_output
+            else response["messages"][-1].content
+        )
         return response
 
     async def acall_agent(
         request: str,
         runtime: ToolRuntime,
-    ) -> str:
+    ):
         if asyncio.iscoroutinefunction(process_input_async):
-            request = await process_input_async(request, runtime)
+            _processed_input = await process_input_async(request, runtime)
+        else:
+            _processed_input = (
+                process_input_async(request, runtime)
+                if process_input_async
+                else request
+            )
+
+        if isinstance(_processed_input, str):
+            agent_input = {"messages": [HumanMessage(content=_processed_input)]}
+        elif isinstance(_processed_input, dict):
+            if "messages" not in _processed_input:
+                raise ValueError("Agent input must contain 'messages' key")
+            agent_input = _processed_input
         else:
-            request = cast(str, process_input_async(request, runtime))
+            raise ValueError("Pre Hooks must return a string or a dict")
 
-        messages = [HumanMessage(content=request)]
-        response = await agent.ainvoke({"messages": messages})
+        response = await agent.ainvoke(agent_input)
 
         if asyncio.iscoroutinefunction(process_output_async):
-            response = await process_output_async(
-                request, response["messages"], runtime
-            )
+            response = await process_output_async(request, response, runtime)
         else:
-            response = process_output(request, response["messages"], runtime)
+            response = (
+                process_output(request, response, runtime)
+                if process_output
+                else response["messages"][-1].content
+            )
 
         return response
 
@@ -143,17 +168,17 @@ def wrap_all_agents_as_tool(
     tool_description: Optional[str] = None,
     pre_input_hooks: Optional[
         tuple[
-            Callable[[str, ToolRuntime], str],
-            Callable[[str, ToolRuntime], Awaitable[str]],
+            Callable[[str, ToolRuntime], str | dict[str, Any]],
+            Callable[[str, ToolRuntime], Awaitable[str | dict[str, Any]]],
         ]
-        | Callable[[str, ToolRuntime], str]
+        | Callable[[str, ToolRuntime], str | dict[str, Any]]
     ] = None,
     post_output_hooks: Optional[
         tuple[
-            Callable[[str, list[AnyMessage], ToolRuntime], Any],
-            Callable[[str, list[AnyMessage], ToolRuntime], Awaitable[Any]],
+            Callable[[str, dict[str, Any], ToolRuntime], Any],
+            Callable[[str, dict[str, Any], ToolRuntime], Awaitable[Any]],
         ]
-        | Callable[[str, list[AnyMessage], ToolRuntime], Any]
+        | Callable[[str, dict[str, Any], ToolRuntime], Any]
     ] = None,
 ) -> BaseTool:
     """Wraps all agents as single tool
@@ -219,42 +244,67 @@ def wrap_all_agents_as_tool(
         agent_name: str,
         description: str,
         runtime: ToolRuntime,
-    ) -> str:
-        task_description = (
-            process_input(description, runtime) if process_input else description
-        )
-
+    ):
         if agent_name not in agents_map:
             raise ValueError(f"Agent {agent_name} not found")
 
-        messages = [HumanMessage(content=task_description)]
-        response = agents_map[agent_name].invoke({"messages": messages})
+        _processed_input = (
+            process_input(description, runtime) if process_input else description
+        )
+        if isinstance(_processed_input, str):
+            agent_input = {"messages": [HumanMessage(content=_processed_input)]}
+        elif isinstance(_processed_input, dict):
+            if "messages" not in _processed_input:
+                raise ValueError("Agent input must contain 'messages' key")
+            agent_input = _processed_input
+        else:
+            raise ValueError("Pre Hooks must return str or dict")
+
+        response = agent.invoke(agent_input)
 
-        response = process_output(task_description, response["messages"], runtime)
+        response = (
+            process_output(description, response, runtime)
+            if process_output
+            else response["messages"][-1].content
+        )
         return response
 
     async def acall_agent(
         agent_name: str,
         description: str,
         runtime: ToolRuntime,
-    ) -> str:
+    ):
+        if agent_name not in agents_map:
+            raise ValueError(f"Agent {agent_name} not found")
+
         if asyncio.iscoroutinefunction(process_input_async):
-            task_description = await process_input_async(description, runtime)
+            _processed_input = await process_input_async(description, runtime)
         else:
-            task_description = cast(str, process_input_async(description, runtime))
+            _processed_input = (
+                process_input_async(description, runtime)
+                if process_input_async
+                else description
+            )
 
-        if agent_name not in agents_map:
-            raise ValueError(f"Agent {agent_name} not found")
+        if isinstance(_processed_input, str):
+            agent_input = {"messages": [HumanMessage(content=_processed_input)]}
+        elif isinstance(_processed_input, dict):
+            if "messages" not in _processed_input:
+                raise ValueError("Agent input must contain 'messages' key")
+            agent_input = _processed_input
+        else:
+            raise ValueError("Pre Hooks must return str or dict")
 
-        messages = [HumanMessage(content=task_description)]
-        response = await agents_map[agent_name].ainvoke({"messages": messages})
+        response = await agents_map[agent_name].ainvoke(agent_input)
 
         if asyncio.iscoroutinefunction(process_output_async):
-            response = await process_output_async(
-                task_description, response["messages"], runtime
-            )
+            response = await process_output_async(description, response, runtime)
         else:
-            response = process_output(task_description, response["messages"], runtime)
+            response = (
+                process_output(description, response, runtime)
+                if process_output
+                else response["messages"][-1].content
+            )
 
         return response
 

{langchain_dev_utils-1.3.5 → langchain_dev_utils-1.3.6}/tests/test_wrap_agent.py

@@ -31,18 +31,22 @@ async def process_input_async(request: str, runtime: ToolRuntime) -> str:
     return "<task_description>" + request + "</task_description>"
 
 
-def process_output(request: str, messages: list, runtime: ToolRuntime) -> str:
-    assert request.startswith("<task_description>")
-    assert request.endswith("</task_description>")
-    return "<task_response>" + messages[-1].content + "</task_response>"
+def process_output(request: str, response: dict[str, Any], runtime: ToolRuntime) -> str:
+    human_message = response["messages"][0]
+    assert human_message.content.startswith(
+        "<task_description>"
+    ) and human_message.content.endswith("</task_description>")
+    return "<task_response>" + response["messages"][-1].content + "</task_response>"
 
 
 async def process_output_async(
-    request: str, messages: list, runtime: ToolRuntime
+    request: str, response: dict[str, Any], runtime: ToolRuntime
 ) -> str:
-    assert request.startswith("<task_description>")
-    assert request.endswith("</task_description>")
-    return "<task_response>" + messages[-1].content + "</task_response>"
+    human_message = response["messages"][0]
+    assert human_message.content.startswith(
+        "<task_description>"
+    ) and human_message.content.endswith("</task_description>")
+    return "<task_response>" + response["messages"][-1].content + "</task_response>"
 
 
 def test_wrap_agent():

langchain_dev_utils-1.3.5/src/langchain_dev_utils/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.3.5"