langroid 0.53.1__py3-none-any.whl → 0.53.4__py3-none-any.whl

langroid/agent/base.py

@@ -124,13 +124,8 @@ async def async_lambda_noop_fn() -> Callable[..., Coroutine[Any, Any, None]]:
 
 class Agent(ABC):
     """
-    An Agent is an abstraction that encapsulates mainly two components:
-
-    - a language model (LLM)
-    - a vector store (vecdb)
-
-    plus associated components such as a parser, and variables that hold
-    information about any tool/function-calling messages that have been defined.
+    An Agent is an abstraction that typically (but not necessarily)
+    encapsulates an LLM.
     """
 
     id: str = Field(default_factory=lambda: ObjectRegistry.new_id())
@@ -1087,8 +1082,9 @@ class Agent(ABC):
         return False
 
     def _tool_recipient_match(self, tool: ToolMessage) -> bool:
-        """Is tool is handled by this agent
-        and an explicit `recipient` field doesn't preclude this agent from handling it?
+        """Is tool enabled for handling by this agent and intended for this
+        agent to handle (i.e. if there's any explicit `recipient` field exists in
+        tool, then it matches this agent's name)?
         """
         if tool.default_value("request") not in self.llm_tools_handled:
             return False
@@ -1098,8 +1094,8 @@ class Agent(ABC):
 
     def has_only_unhandled_tools(self, msg: str | ChatDocument) -> bool:
         """
-        Does the msg have at least one tool, and ALL tools are
-        disabled for handling by this agent?
+        Does the msg have at least one tool, and none of the tools in the msg are
+        handleable by this agent?
         """
         if msg is None:
             return False
@@ -1535,7 +1531,8 @@ class Agent(ABC):
 
     def handle_message_fallback(self, msg: str | ChatDocument) -> Any:
         """
-        Fallback method for the "no-tools" scenario.
+        Fallback method for the case where the msg has no tools that
+        can be handled by this agent.
         This method can be overridden by subclasses, e.g.,
         to create a "reminder" message when a tool is expected but the LLM "forgot"
         to generate one.

langroid/agent/chat_agent.py

@@ -574,8 +574,14 @@ class ChatAgent(Agent):
 
     def handle_message_fallback(self, msg: str | ChatDocument) -> Any:
         """
-        Fallback method for the "no-tools" scenario.
-        Users the self.config.non_tool_routing to determine the action to take.
+        Fallback method for the "no-tools" scenario, i.e., the current `msg`
+        (presumably emitted by the LLM) does not have any tool that the agent
+        can handle.
+        NOTE: The `msg` may contain tools but either (a) the agent is not
+        enabled to handle them, or (b) there's an explicit `recipient` field
+        in the tool that doesn't match the agent's name.
+
+        Uses the self.config.non_tool_routing to determine the action to take.
 
         This method can be overridden by subclasses, e.g.,
         to create a "reminder" message when a tool is expected but the LLM "forgot"
@@ -586,27 +592,31 @@ class ChatAgent(Agent):
         Returns:
             Any: The result of the handler method
         """
-        if self.config.handle_llm_no_tool is None:
+        if (
+            isinstance(msg, str)
+            or msg.metadata.sender != Entity.LLM
+            or self.config.handle_llm_no_tool is None
+            or self.has_only_unhandled_tools(msg)
+        ):
             return None
-        if isinstance(msg, ChatDocument) and msg.metadata.sender == Entity.LLM:
-            from langroid.agent.tools.orchestration import AgentDoneTool, ForwardTool
-
-            no_tool_option = self.config.handle_llm_no_tool
-            if no_tool_option in list(NonToolAction):
-                # in case the `no_tool_option` is one of the special NonToolAction vals
-                match self.config.handle_llm_no_tool:
-                    case NonToolAction.FORWARD_USER:
-                        return ForwardTool(agent="User")
-                    case NonToolAction.DONE:
-                        return AgentDoneTool(
-                            content=msg.content, tools=msg.tool_messages
-                        )
-            elif is_callable(no_tool_option):
-                return no_tool_option(msg)
-            # Otherwise just return `no_tool_option` as is:
-            # This can be any string, such as a specific nudge/reminder to the LLM,
-            # or even something like ResultTool etc.
-            return no_tool_option
+        # we ONLY use the `handle_llm_no_tool` config option when
+        # the msg is from LLM and does not contain ANY tools at all.
+        from langroid.agent.tools.orchestration import AgentDoneTool, ForwardTool
+
+        no_tool_option = self.config.handle_llm_no_tool
+        if no_tool_option in list(NonToolAction):
+            # in case the `no_tool_option` is one of the special NonToolAction vals
+            match self.config.handle_llm_no_tool:
+                case NonToolAction.FORWARD_USER:
+                    return ForwardTool(agent="User")
+                case NonToolAction.DONE:
+                    return AgentDoneTool(content=msg.content, tools=msg.tool_messages)
+        elif is_callable(no_tool_option):
+            return no_tool_option(msg)
+        # Otherwise just return `no_tool_option` as is:
+        # This can be any string, such as a specific nudge/reminder to the LLM,
+        # or even something like ResultTool etc.
+        return no_tool_option
 
     def unhandled_tools(self) -> set[str]:
         """The set of tools that are known but not handled.

langroid/agent/special/table_chat_agent.py

@@ -211,9 +211,11 @@ class TableChatAgent(ChatAgent):
         # Temporarily redirect standard output to our string-based I/O stream
         sys.stdout = code_out
 
-        # Evaluate the last line and get the result
+        # Evaluate the last line and get the result;
+        # SECURITY: eval only with empty globals and {"df": df} in locals to
+        # prevent arbitrary Python code execution.
         try:
-            eval_result = pd.eval(exprn, local_dict=local_vars)
+            eval_result = eval(exprn, {}, local_vars)
         except Exception as e:
             eval_result = f"ERROR: {type(e)}: {e}"
 

langroid/agent/tools/mcp/fastmcp_client.py

@@ -134,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],
@@ -146,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:
@@ -153,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)
@@ -185,7 +210,8 @@ class FastMCPClient:
 
     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.
+         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.

langroid/agent/xml_tool_message.py

@@ -49,7 +49,17 @@ class XMLToolMessage(ToolMessage):
         Raises:
             etree.XMLSyntaxError: If the input string is not valid XML.
         """
-        parser = etree.XMLParser(strip_cdata=False)
+        # SECURITY: Initialize XMLParser with flags to prevent 
+        # XML External Entity (XXE), billion laughs, and external DTD attacks by 
+        # disabling entity resolution, DTD loading, and network access;
+        # `strip_cdata=False` is needed to preserve
+        # content within CDATA sections (e.g., for code).        
+        parser = etree.XMLParser(
+            strip_cdata=False,
+            resolve_entities=False,
+            load_dtd=False,
+            no_network=True,
+        )
         root = etree.fromstring(formatted_string.encode("utf-8"), parser=parser)
 
         def parse_element(element: etree._Element) -> Any:

{langroid-0.53.1.dist-info → langroid-0.53.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.53.1
+Version: 0.53.4
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT
@@ -27,7 +27,7 @@ Requires-Dist: grpcio<2.0.0,>=1.62.1
 Requires-Dist: halo<1.0.0,>=0.0.31
 Requires-Dist: jinja2<4.0.0,>=3.1.2
 Requires-Dist: json-repair<1.0.0,>=0.29.9
-Requires-Dist: lxml<5.0.0,>=4.9.3
+Requires-Dist: lxml<6.0.0,>=5.4.0
 Requires-Dist: markdownify>=0.13.1
 Requires-Dist: nest-asyncio<2.0.0,>=1.6.0
 Requires-Dist: nltk<4.0.0,>=3.8.2
@@ -216,6 +216,8 @@ Description-Content-Type: text/markdown
 [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/langroid/langroid/blob/main/examples/Langroid_quick_start.ipynb)
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=flat&logo=discord&logoColor=white)](https://discord.gg/ZU36McDgDs)
 [![Substack](https://img.shields.io/badge/Substack-%23006f5c.svg?style=flat&logo=substack&logoColor=FF6719)](https://langroid.substack.com/p/langroid-harness-llms-with-multi-agent-programming)
+
+[![GitMCP](https://img.shields.io/endpoint?url=https://gitmcp.io/badge/OWNER/REPO)](https://gitmcp.io/langroid/langroid)
 </div>
 
 <h3 align="center">
@@ -338,6 +340,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.1.dist-info → langroid-0.53.4.dist-info}/RECORD

@@ -3,14 +3,14 @@ langroid/exceptions.py,sha256=OPjece_8cwg94DLPcOGA1ddzy5bGh65pxzcHMnssTz8,2995
 langroid/mytypes.py,sha256=HIcYAqGeA9OK0Hlscym2FI5Oax9QFljDZoVgRlomhRk,4014
 langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=lWR4ivX_elTFejpknLhkO-DlAGT3aG6ojQAVkzDOqMc,80090
+langroid/agent/base.py,sha256=zHwhNU403H-ZvogH4QhKTzaZn5_jt0ZdPHzSEmycDoc,80035
 langroid/agent/batch.py,sha256=vi1r5i1-vN80WfqHDSwjEym_KfGsqPGUtwktmiK1nuk,20635
-langroid/agent/chat_agent.py,sha256=nsFSARSANCVByL4fAl_DhyWm9gM7s_6waqNsmePXJMA,85309
+langroid/agent/chat_agent.py,sha256=igo7wl3tOig7yae8NokEEqXS5AYuAeWJGq1YZhpzOho,85739
 langroid/agent/chat_document.py,sha256=6O20Fp4QrquykaF2jFtwNHkvcoDte1LLwVZNk9mVH9c,18057
 langroid/agent/openai_assistant.py,sha256=JkAcs02bIrgPNVvUWVR06VCthc5-ulla2QMBzux_q6o,34340
 langroid/agent/task.py,sha256=HB6N-Jn80HFqCf0ZYOC1v3Bn3oO7NLjShHQJJFwW0q4,90557
 langroid/agent/tool_message.py,sha256=BhjP-_TfQ2tgxuY4Yo_JHLOwwt0mJ4BwjPnREvEY4vk,14744
-langroid/agent/xml_tool_message.py,sha256=6SshYZJKIfi4mkE-gIoSwjkEYekQ8GwcSiCv7a5uO9E,15054
+langroid/agent/xml_tool_message.py,sha256=Yf-OsqO6z17qgQbfcTX4dxmPMtwYZVfgcWjcWI8nJzE,15506
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=UHB6P_J40vsVnssosqkpkOVWRf9NK4TOY0_G2g_Arsg,20900
 langroid/agent/special/__init__.py,sha256=gik_Xtm_zV7U9s30Mn8UX3Gyuy4jTjQe9zjiE3HWmEo,1273
@@ -20,7 +20,7 @@ langroid/agent/special/lance_doc_chat_agent.py,sha256=s8xoRs0gGaFtDYFUSIRchsgDVb
 langroid/agent/special/lance_tools.py,sha256=qS8x4wi8mrqfbYV2ztFzrcxyhHQ0ZWOc-zkYiH7awj0,2105
 langroid/agent/special/relevance_extractor_agent.py,sha256=zIx8GUdVo1aGW6ASla0NPQjYYIpmriK_TYMijqAx3F8,4796
 langroid/agent/special/retriever_agent.py,sha256=o2UfqiCGME0t85SZ6qjK041_WZYqXSuV1SeH_3KtVuc,1931
-langroid/agent/special/table_chat_agent.py,sha256=ii-xd7pRLLfRhamFZ04zpSkRO4xPn6Rm5qmA4z4N0HA,9661
+langroid/agent/special/table_chat_agent.py,sha256=wC4DWRVMAGfVY33JqP8cNR4kO0dqD8ryjWzAkMFT5j0,9780
 langroid/agent/special/arangodb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/arangodb/arangodb_agent.py,sha256=12Y54c84c9qXV-YXRBcI5HaqyiY75JR4TmqlURYKJAM,25851
 langroid/agent/special/arangodb/system_messages.py,sha256=udwfLleTdyz_DuxHuoiv2wHEZoAPBPbwdF_ivjIfP5c,6867
@@ -56,7 +56,7 @@ langroid/agent/tools/segment_extract_tool.py,sha256=__srZ_VGYLVOdPrITUM8S0HpmX4q
 langroid/agent/tools/tavily_search_tool.py,sha256=soI-j0HdgVQLf09wRQScaEK4b5RpAX9C4cwOivRFWWI,1903
 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=KUe73yqyKMTT7PxZfUaC0x23aRai0O09bbuyhHZfVo0,10630
+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.1.dist-info/METADATA,sha256=A36mOdb9KvdWGTTWAxCzr0jLyLU4IGoXUk8bO7CmCnc,63549
-langroid-0.53.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.53.1.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.53.1.dist-info/RECORD,,
+langroid-0.53.4.dist-info/METADATA,sha256=mJijMq7-4U64bl-XA2rQiGdgW6A3TxdMMx60sa-E1Fc,64945
+langroid-0.53.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.53.4.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.53.4.dist-info/RECORD,,