langroid 0.33.10__py3-none-any.whl → 0.33.11__py3-none-any.whl

langroid/agent/base.py

@@ -1039,6 +1039,11 @@ class Agent(ABC):
         """
         if msg is None:
             return False
+        if isinstance(msg, ChatDocument):
+            if len(msg.tool_messages) > 0:
+                return True
+            if msg.metadata.sender != Entity.LLM:
+                return False
         try:
             tools = self.get_tool_messages(msg)
             return len(tools) > 0

langroid/agent/chat_agent.py

@@ -1063,18 +1063,20 @@ class ChatAgent(Agent):
 
         return tools
 
-    def _get_any_tool_message(self, optional: bool = True) -> type[ToolMessage]:
+    def _get_any_tool_message(self, optional: bool = True) -> type[ToolMessage] | None:
         """
         Returns a `ToolMessage` which wraps all enabled tools, excluding those
         where strict recovery is disabled. Used in strict recovery.
         """
-        any_tool_type = Union[  # type: ignore
-            *(
-                self.llm_tools_map[t]
-                for t in self.llm_tools_usable
-                if t not in self.disable_strict_tools_set
-            )
-        ]
+        possible_tools = tuple(
+            self.llm_tools_map[t]
+            for t in self.llm_tools_usable
+            if t not in self.disable_strict_tools_set
+        )
+        if len(possible_tools) == 0:
+            return None
+        any_tool_type = Union.__getitem__(possible_tools)  # type ignore
+
         maybe_optional_type = Optional[any_tool_type] if optional else any_tool_type
 
         class AnyTool(ToolMessage):
@@ -1225,6 +1227,8 @@ class ChatAgent(Agent):
             and self.config.strict_recovery
         ):
             AnyTool = self._get_any_tool_message()
+            if AnyTool is None:
+                return None
             self.set_output_format(
                 AnyTool,
                 force_tools=True,

langroid/agent/task.py

@@ -1429,8 +1429,15 @@ class Task:
         else:
             response_fn = self._entity_responder_map[cast(Entity, e)]
             result = response_fn(self.pending_message)
-            # update result.tool_messages if any
-            if isinstance(result, ChatDocument):
+            # update result.tool_messages if any.
+            # Do this only if sender is LLM, since this could be
+            # a tool-call result from the Agent responder, which may
+            # contain strings that look like tools, and we don't want to
+            # trigger strict tool recovery due to that.
+            if (
+                isinstance(result, ChatDocument)
+                and result.metadata.sender == Entity.LLM
+            ):
                 self.agent.try_get_tool_messages(result)
 
         result_chat_doc = self.agent.to_ChatDocument(

{langroid-0.33.10.dist-info → langroid-0.33.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.33.10
+Version: 0.33.11
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT

{langroid-0.33.10.dist-info → langroid-0.33.11.dist-info}/RECORD

@@ -3,12 +3,12 @@ langroid/exceptions.py,sha256=gp6ku4ZLdXXCUQIwUNVFojJNGTzGnkevi2PLvG7HOhc,2555
 langroid/mytypes.py,sha256=ptAFxEAtiwmIfUnGisNotTe8wT9LKBf22lOfPgZoQIY,2368
 langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=-wColF3AGsbIm-uiTLfu8cyGUqMRCzZETVirvgZgYGQ,77642
+langroid/agent/base.py,sha256=oThlrYygKDu1-bKjAfygldJ511gMKT8Z0qCrD52DdDM,77834
 langroid/agent/batch.py,sha256=qK3ph6VNj_1sOhfXCZY4r6gh035DglDKU751p8BU0tY,14665
-langroid/agent/chat_agent.py,sha256=X-XhVpUKd-O4K8Q-5Kc0x97l-Ry-fUgPEg9D0oM6U98,81949
+langroid/agent/chat_agent.py,sha256=cxamUgqQkr6_W3mqCPz3L7rJnXIkD4hemR7X7uhlBvI,82095
 langroid/agent/chat_document.py,sha256=xPUMGzR83rn4iAEXIw2jy5LQ6YJ6Y0TiZ78XRQeDnJQ,17778
 langroid/agent/openai_assistant.py,sha256=JkAcs02bIrgPNVvUWVR06VCthc5-ulla2QMBzux_q6o,34340
-langroid/agent/task.py,sha256=c_Ih0Cc_iiyFKBmKMSdirHcW4RX_35JkCFp05jDAEiM,89994
+langroid/agent/task.py,sha256=XrXUbSoiFasvpIsZPn_cBpdWaTCKljJPRimtLMrSZrs,90347
 langroid/agent/tool_message.py,sha256=BhjP-_TfQ2tgxuY4Yo_JHLOwwt0mJ4BwjPnREvEY4vk,14744
 langroid/agent/xml_tool_message.py,sha256=6SshYZJKIfi4mkE-gIoSwjkEYekQ8GwcSiCv7a5uO9E,15054
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -121,7 +121,7 @@ langroid/vector_store/lancedb.py,sha256=b3_vWkTjG8mweZ7ZNlUD-NjmQP_rLBZfyKWcxt2v
 langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3HmhHQICXLs,11663
 langroid/vector_store/momento.py,sha256=UNHGT6jXuQtqY9f6MdqGU14bVnS0zHgIJUa30ULpUJo,10474
 langroid/vector_store/qdrantdb.py,sha256=HRLCt-FG8y4718omwpFaQZnWeYxPj0XCwS4tjokI1sU,18116
-langroid-0.33.10.dist-info/METADATA,sha256=GhNSgQ8V-bQdSE0FF66MgZklXy83UusYlwmwnAfBUyA,59016
-langroid-0.33.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.33.10.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.33.10.dist-info/RECORD,,
+langroid-0.33.11.dist-info/METADATA,sha256=A-tOfJCvDuYvM96q3zqx6NnATzEflj7mdfoEX64XV4A,59016
+langroid-0.33.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.33.11.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.33.11.dist-info/RECORD,,