langroid 0.53.0__py3-none-any.whl → 0.53.2__py3-none-any.whl

langroid/agent/tools/mcp/__init__.py

@@ -1,10 +1,22 @@
 from .decorators import mcp_tool
-from .fastmcp_client import FastMCPClient, make_mcp_tool_sync, make_mcp_tool
+from .fastmcp_client import (
+    FastMCPClient,
+    get_langroid_tool,
+    get_langroid_tool_async,
+    get_langroid_tools,
+    get_langroid_tools_async,
+    get_mcp_tool_async,
+    get_mcp_tools_async,
+)
 
 
 __all__ = [
     "mcp_tool",
     "FastMCPClient",
-    "make_mcp_tool_sync",
-    "make_mcp_tool",
+    "get_langroid_tool",
+    "get_langroid_tool_async",
+    "get_langroid_tools",
+    "get_langroid_tools_async",
+    "get_mcp_tool_async",
+    "get_mcp_tools_async",
 ]

langroid/agent/tools/mcp/decorators.py

@@ -1,7 +1,7 @@
 from typing import Callable, Type
 
 from langroid.agent.tool_message import ToolMessage
-from langroid.agent.tools.mcp.fastmcp_client import make_mcp_tool_sync
+from langroid.agent.tools.mcp.fastmcp_client import get_langroid_tool
 
 
 def mcp_tool(
@@ -18,7 +18,7 @@ def mcp_tool(
 
     def decorator(user_cls: Type[ToolMessage]) -> Type[ToolMessage]:
         # build the “real” ToolMessage subclass for this server/tool
-        RealTool: Type[ToolMessage] = make_mcp_tool_sync(server, tool_name)
+        RealTool: Type[ToolMessage] = get_langroid_tool(server, tool_name)
 
         # copy user‐defined methods / attributes onto RealTool
         for name, attr in user_cls.__dict__.items():

langroid/agent/tools/mcp/fastmcp_client.py

@@ -113,11 +113,14 @@ class FastMCPClient:
         # Default fallback
         return Any, Field(default=default, description=desc)
 
-    async def make_tool(self, tool_name: str) -> Type[ToolMessage]:
-        """Create a Langroid ToolMessage subclass for the given tool name."""
+    async def get_langroid_tool(self, tool_name: str) -> Type[ToolMessage]:
+        """
+        Create a Langroid ToolMessage subclass from the MCP Tool
+        with the given `tool_name`.
+        """
         if not self.client:
             raise RuntimeError("Client not initialized. Use async with FastMCPClient.")
-        target = await self.find_mcp_tool(tool_name)
+        target = await self.get_mcp_tool_async(tool_name)
         if target is None:
             raise ValueError(f"No tool named {tool_name}")
         props = target.inputSchema.get("properties", {})
@@ -131,6 +134,24 @@ class FastMCPClient:
         camel_case = "".join(part.capitalize() for part in parts)
         model_name = f"{camel_case}Tool"
 
+        from langroid.agent.tool_message import ToolMessage as _BaseToolMessage
+
+        # IMPORTANT: Avoid clashes with reserved field names in Langroid ToolMessage!
+        # First figure out which field names are reserved
+        reserved = set(_BaseToolMessage.__annotations__.keys())
+        reserved.update(["recipient", "_handler"])
+        renamed: Dict[str, str] = {}
+        new_fields: Dict[str, Tuple[type, Any]] = {}
+        for fname, (ftype, fld) in fields.items():
+            if fname in reserved:
+                new_name = fname + "__"
+                renamed[fname] = new_name
+                new_fields[new_name] = (ftype, fld)
+            else:
+                new_fields[fname] = (ftype, fld)
+        # now replace fields with our renamed‐aware mapping
+        fields = new_fields
+
         # create Langroid ToolMessage subclass, with expected fields.
         tool_model = cast(
             Type[ToolMessage],
@@ -143,6 +164,7 @@ class FastMCPClient:
             ),
         )
         tool_model._server = self.server  # type: ignore[attr-defined]
+        tool_model._renamed_fields = renamed  # type: ignore[attr-defined]
 
         # 2) define an arg-free call_tool_async()
         async def call_tool_async(self: ToolMessage) -> Any:
@@ -150,6 +172,12 @@ class FastMCPClient:
 
             # pack up the payload
             payload = self.dict(exclude=self.Config.schema_extra["exclude"])
+
+            # restore any renamed fields
+            for orig, new in self.__class__._renamed_fields.items():  # type: ignore
+                if new in payload:
+                    payload[orig] = payload.pop(new)
+
             # open a fresh client, call the tool, then close
             async with FastMCPClient(self.__class__._server) as client:  # type: ignore
                 return await client.call_mcp_tool(self.request, payload)
@@ -167,7 +195,7 @@ class FastMCPClient:
 
         return tool_model
 
-    async def get_tools(self) -> List[Type[ToolMessage]]:
+    async def get_langroid_tools(self) -> List[Type[ToolMessage]]:
         """
         Get all available tools as Langroid ToolMessage classes,
         handling nested schemas, with `handle_async` methods
@@ -177,11 +205,13 @@ class FastMCPClient:
         resp = await self.client.list_tools()
         tools: List[Type[ToolMessage]] = []
         for t in resp:
-            tools.append(await self.make_tool(t.name))
+            tools.append(await self.get_langroid_tool(t.name))
         return tools
 
-    async def find_mcp_tool(self, name: str) -> Optional[Tool]:
-        """Find the MCP Tool matching `name`, or None if missing.
+    async def get_mcp_tool_async(self, name: str) -> Optional[Tool]:
+        """Find the "original" MCP Tool (i.e. of type mcp.types.Tool) on the server
+         matching `name`, or None if missing. This contains the metadata for the tool:
+         name, description, inputSchema, etc.
 
         Args:
             name: Name of the tool to look up.
@@ -240,10 +270,46 @@ class FastMCPClient:
         return self._convert_tool_result(tool_name, result)
 
 
-async def make_mcp_tool(server: str, tool_name: str) -> Type[ToolMessage]:
+async def get_langroid_tool_async(
+    server: str | ClientTransport,
+    tool_name: str,
+) -> Type[ToolMessage]:
     async with FastMCPClient(server) as client:
-        return await client.make_tool(tool_name)
+        return await client.get_langroid_tool(tool_name)
 
 
-def make_mcp_tool_sync(server: str, tool_name: str) -> Type[ToolMessage]:
-    return asyncio.run(make_mcp_tool(server, tool_name))
+def get_langroid_tool(
+    server: str | ClientTransport,
+    tool_name: str,
+) -> Type[ToolMessage]:
+    return asyncio.run(get_langroid_tool_async(server, tool_name))
+
+
+async def get_langroid_tools_async(
+    server: str | ClientTransport,
+) -> List[Type[ToolMessage]]:
+    async with FastMCPClient(server) as client:
+        return await client.get_langroid_tools()
+
+
+def get_langroid_tools(
+    server: str | ClientTransport,
+) -> List[Type[ToolMessage]]:
+    return asyncio.run(get_langroid_tools_async(server))
+
+
+async def get_mcp_tool_async(
+    server: str | ClientTransport,
+    name: str,
+) -> Optional[Tool]:
+    async with FastMCPClient(server) as client:
+        return await client.get_mcp_tool_async(name)
+
+
+async def get_mcp_tools_async(
+    server: str | ClientTransport,
+) -> List[Tool]:
+    async with FastMCPClient(server) as client:
+        if not client.client:
+            raise RuntimeError("Client not initialized. Use async with FastMCPClient.")
+        return await client.client.list_tools()

{langroid-0.53.0.dist-info → langroid-0.53.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.53.0
+Version: 0.53.2
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT
@@ -338,6 +338,22 @@ teacher_task.run()
 <details>
 <summary> <b>Click to expand</b></summary>
 
+- **Mar-Apr 2025:**
+  - [0.53.0](https://github.com/langroid/langroid/releases/tag/0.53.0) MCP Tools Support.
+  - [0.52.0](https://github.com/langroid/langroid/releases/tag/0.52.0) Multimodal support, i.e. allow PDF, image 
+    inputs to LLM.
+  - [0.51.0](https://github.com/langroid/langroid/releases/tag/0.51.0) `LLMPdfParser`, generalizing 
+    `GeminiPdfParser` to parse documents directly with LLM.
+  - [0.50.0](https://github.com/langroid/langroid/releases/tag/0.50.0) Structure-aware Markdown chunking with chunks 
+    enriched by section headers.
+  - [0.49.0](https://github.com/langroid/langroid/releases/tag/0.49.0) Enable easy switch to LiteLLM Proxy-server 
+  - [0.48.0](https://github.com/langroid/langroid/releases/tag/0.48.0) Exa Crawler, Markitdown Parser
+  - [0.47.0](https://github.com/langroid/langroid/releases/tag/0.47.0) Support Firecrawl URL scraper/crawler - 
+    thanks @abab-dev
+  - [0.46.0](https://github.com/langroid/langroid/releases/tag/0.46.0) Support LangDB LLM Gateway - thanks @MrunmayS.
+  - [0.45.0](https://github.com/langroid/langroid/releases/tag/0.45.0) Markdown parsing with `Marker` - thanks @abab-dev
+  - [0.44.0](https://github.com/langroid/langroid/releases/tag/0.44.0) Late imports to reduce startup time. Thanks 
+    @abab-dev
 - **Feb 2025:**
   - [0.43.0](https://github.com/langroid/langroid/releases/tag/0.43.0): `GeminiPdfParser` for parsing PDF using 
     Gemini LLMs - Thanks @abab-dev.

{langroid-0.53.0.dist-info → langroid-0.53.2.dist-info}/RECORD

@@ -54,9 +54,9 @@ langroid/agent/tools/retrieval_tool.py,sha256=zcAV20PP_6VzSd-UE-IJcabaBseFL_QNz5
 langroid/agent/tools/rewind_tool.py,sha256=XAXL3BpNhCmBGYq_qi_sZfHJuIw7NY2jp4wnojJ7WRs,5606
 langroid/agent/tools/segment_extract_tool.py,sha256=__srZ_VGYLVOdPrITUM8S0HpmX4q7r5FHWMDdHdEv8w,1440
 langroid/agent/tools/tavily_search_tool.py,sha256=soI-j0HdgVQLf09wRQScaEK4b5RpAX9C4cwOivRFWWI,1903
-langroid/agent/tools/mcp/__init__.py,sha256=aMW4cRepRbE44iCGQu_fQF623bN8Q1HHBbRMGaO22kY,210
-langroid/agent/tools/mcp/decorators.py,sha256=zyV8iYq3dg3taHEkaC5aNncyb4UdNBp-i1tRhMOFkd4,1147
-langroid/agent/tools/mcp/fastmcp_client.py,sha256=goj7GSbez28cFaa-KmQRavw7MY_hHUCYhKP0fUZLDms,9548
+langroid/agent/tools/mcp/__init__.py,sha256=cQb3gYxXk0YZ23QCqbVNMbMeCeWCJj6w3gqGnvyqv7w,459
+langroid/agent/tools/mcp/decorators.py,sha256=mWnlTjyI9PMNi750PWzC_2B6V5K_XdxH0Co9kE2yAj0,1145
+langroid/agent/tools/mcp/fastmcp_client.py,sha256=ffOV0lJOtE3DLfA6y3Fib28jyACySJPgbqjNJpSAEQA,11815
 langroid/cachedb/__init__.py,sha256=G2KyNnk3Qkhv7OKyxTOnpsxfDycx3NY0O_wXkJlalNY,96
 langroid/cachedb/base.py,sha256=ztVjB1DtN6pLCujCWnR6xruHxwVj3XkYniRTYAKKqk0,1354
 langroid/cachedb/redis_cachedb.py,sha256=7kgnbf4b5CKsCrlL97mHWKvdvlLt8zgn7lc528jEpiE,5141
@@ -132,7 +132,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.53.0.dist-info/METADATA,sha256=JohvBH6oCb3ki2nsiIcPT0IiNmmn0dM2eNjQ9lsLn5E,63549
-langroid-0.53.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.53.0.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.53.0.dist-info/RECORD,,
+langroid-0.53.2.dist-info/METADATA,sha256=t3on9Riu1tK0c1icC8e3mhsCFEjTU4a7SkMGI1kV4bY,64823
+langroid-0.53.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.53.2.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.53.2.dist-info/RECORD,,