langroid 0.33.10__py3-none-any.whl → 0.33.12__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/callbacks/chainlit.py

@@ -20,6 +20,7 @@ from chainlit.logger import logger
 
 import langroid as lr
 import langroid.language_models as lm
+from langroid.language_models import StreamEventType
 from langroid.utils.configuration import settings
 from langroid.utils.constants import NO_ANSWER
 
@@ -276,7 +277,7 @@ class ChainlitAgentCallbacks:
     def get_last_step(self) -> Optional[cl.Step]:
         return self.last_step
 
-    def start_llm_stream(self) -> Callable[[str], None]:
+    def start_llm_stream(self) -> Callable[[str, StreamEventType], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
         self.stream = cl.Message(
             content="",
@@ -295,14 +296,14 @@ class ChainlitAgentCallbacks:
         """
         )
 
-        def stream_token(t: str) -> None:
+        def stream_token(t: str, e: StreamEventType) -> None:
             if self.stream is None:
                 raise ValueError("Stream not initialized")
             run_sync(self.stream.stream_token(t))
 
         return stream_token
 
-    async def start_llm_stream_async(self) -> Callable[[str], None]:
+    async def start_llm_stream_async(self) -> Callable[[str, StreamEventType], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
         self.stream = cl.Message(
             content="",
@@ -321,7 +322,7 @@ class ChainlitAgentCallbacks:
             """
         )
 
-        async def stream_token(t: str) -> None:
+        async def stream_token(t: str, e: StreamEventType) -> None:
             if self.stream is None:
                 raise ValueError("Stream not initialized")
             await self.stream.stream_token(t)

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/language_models/__init__.py

@@ -6,6 +6,7 @@ from . import azure_openai
 from . import prompt_formatter
 
 from .base import (
+    StreamEventType,
     LLMConfig,
     LLMMessage,
     LLMFunctionCall,
@@ -33,6 +34,7 @@ __all__ = [
     "openai_gpt",
     "azure_openai",
     "prompt_formatter",
+    "StreamEventType",
     "LLMConfig",
     "LLMMessage",
     "LLMFunctionCall",

langroid/language_models/base.py

@@ -42,6 +42,14 @@ ToolChoiceTypes = Literal["none", "auto", "required"]
 ToolTypes = Literal["function"]
 
 
+class StreamEventType(Enum):
+    TEXT = 1
+    FUNC_NAME = 2
+    FUNC_ARGS = 3
+    TOOL_NAME = 4
+    TOOL_ARGS = 5
+
+
 class LLMConfig(BaseSettings):
     """
     Common configuration for all language models.

langroid/language_models/openai_gpt.py

@@ -43,6 +43,7 @@ from langroid.language_models.base import (
     OpenAIToolCall,
     OpenAIToolSpec,
     Role,
+    StreamEventType,
     ToolChoiceTypes,
 )
 from langroid.language_models.config import HFPromptFormatterConfig
@@ -875,19 +876,19 @@ class OpenAIGPT(LanguageModel):
             completion += event_text
             sys.stdout.write(Colors().GREEN + event_text)
             sys.stdout.flush()
-            self.config.streamer(event_text)
+            self.config.streamer(event_text, StreamEventType.TEXT)
         if event_fn_name:
             function_name = event_fn_name
             has_function = True
             sys.stdout.write(Colors().GREEN + "FUNC: " + event_fn_name + ": ")
             sys.stdout.flush()
-            self.config.streamer(event_fn_name)
+            self.config.streamer(event_fn_name, StreamEventType.FUNC_NAME)
 
         if event_args:
             function_args += event_args
             sys.stdout.write(Colors().GREEN + event_args)
             sys.stdout.flush()
-            self.config.streamer(event_args)
+            self.config.streamer(event_args, StreamEventType.FUNC_ARGS)
 
         if event_tool_deltas is not None:
             # print out streaming tool calls, if not async
@@ -898,12 +899,12 @@ class OpenAIGPT(LanguageModel):
                         Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
                     )
                     sys.stdout.flush()
-                    self.config.streamer(tool_fn_name)
+                    self.config.streamer(tool_fn_name, StreamEventType.TOOL_NAME)
                 if td["function"]["arguments"] != "":
                     tool_fn_args = td["function"]["arguments"]
                     sys.stdout.write(Colors().GREEN + tool_fn_args)
                     sys.stdout.flush()
-                    self.config.streamer(tool_fn_args)
+                    self.config.streamer(tool_fn_args, StreamEventType.TOOL_ARGS)
 
         # show this delta in the stream
         if finish_reason in [
@@ -968,21 +969,23 @@ class OpenAIGPT(LanguageModel):
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_text)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_text)
+                await self.config.streamer_async(event_text, StreamEventType.TEXT)
         if event_fn_name:
             function_name = event_fn_name
             has_function = True
             if not silent:
                 sys.stdout.write(Colors().GREEN + "FUNC: " + event_fn_name + ": ")
                 sys.stdout.flush()
-                await self.config.streamer_async(event_fn_name)
+                await self.config.streamer_async(
+                    event_fn_name, StreamEventType.FUNC_NAME
+                )
 
         if event_args:
             function_args += event_args
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_args)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_args)
+                await self.config.streamer_async(event_args, StreamEventType.FUNC_ARGS)
 
         if event_tool_deltas is not None and not silent:
             # print out streaming tool calls, if not async
@@ -993,12 +996,16 @@ class OpenAIGPT(LanguageModel):
                         Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
                     )
                     sys.stdout.flush()
-                    await self.config.streamer_async(tool_fn_name)
+                    await self.config.streamer_async(
+                        tool_fn_name, StreamEventType.TOOL_NAME
+                    )
                 if td["function"]["arguments"] != "":
                     tool_fn_args = td["function"]["arguments"]
                     sys.stdout.write(Colors().GREEN + tool_fn_args)
                     sys.stdout.flush()
-                    await self.config.streamer_async(tool_fn_args)
+                    await self.config.streamer_async(
+                        tool_fn_args, StreamEventType.TOOL_ARGS
+                    )
 
         # show this delta in the stream
         if choices[0].get("finish_reason", "") in [

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.33.10
+Version: 0.33.12
 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.12.dist-info}/RECORD

@@ -3,16 +3,16 @@ 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
-langroid/agent/callbacks/chainlit.py,sha256=C6zzzYC30qC4eMA7al7eFpRoTgoe3475kaMKyXgQM0Q,20695
+langroid/agent/callbacks/chainlit.py,sha256=RH8qUXaZE5o2WQz3WJQ1SdFtASGlxWCA6_HYz_3meDQ,20822
 langroid/agent/special/__init__.py,sha256=gik_Xtm_zV7U9s30Mn8UX3Gyuy4jTjQe9zjiE3HWmEo,1273
 langroid/agent/special/doc_chat_agent.py,sha256=zw2MvdCWRPH93d73PKh27KFiQ8sUCFPxAfLDdkxvdZQ,59301
 langroid/agent/special/lance_doc_chat_agent.py,sha256=s8xoRs0gGaFtDYFUSIRchsgDVbS5Q3C2b2mr3V1Fd-Q,10419
@@ -64,12 +64,12 @@ langroid/embedding_models/protoc/embeddings.proto,sha256=_O-SgFpTaylQeOTgSpxhEJ7
 langroid/embedding_models/protoc/embeddings_pb2.py,sha256=4Q57PhOunv-uZNJrxYrWBXAI0ZtfnVZXFRhRj5JuRSg,1662
 langroid/embedding_models/protoc/embeddings_pb2.pyi,sha256=UkNy7BrNsmQm0vLb3NtGXy8jVtz-kPWwwFsX-QbQBhQ,1475
 langroid/embedding_models/protoc/embeddings_pb2_grpc.py,sha256=9dYQqkW3JPyBpSEjeGXTNpSqAkC-6FPtBHyteVob2Y8,2452
-langroid/language_models/__init__.py,sha256=8o8D8Lxaq961_oxVpB_bC2iEJ1GXJqYXMlwUcn6OJb8,976
+langroid/language_models/__init__.py,sha256=ps8nhRavCu2-Bv7IQ5hrzody6lzKjHkivJsblDZZIQ8,1020
 langroid/language_models/azure_openai.py,sha256=zNQzzsERxNestq-hFfQZbvTzK43G2vjRWnTV3ktm1DQ,5845
-langroid/language_models/base.py,sha256=6hXR-bclyPif-BvFbyXevP-gEwiawQAJHX3N1AKNei0,23786
+langroid/language_models/base.py,sha256=MbxfR-10KbhoN0BBkPKqQdEcE7iiPhcFI1zuWvAkvG0,23902
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=5BgHKDVRWFbUwDT_PFgTZXz9-k8wJSA2e3PZmyDgQ1k,4022
-langroid/language_models/openai_gpt.py,sha256=I-GAksKeth960YPq9E7V5cU97SflWZVTrjQsZZ9CADo,76941
+langroid/language_models/openai_gpt.py,sha256=FhpoE75LqWX4BvOo3fgJUPt-QFQDu6eJAuEAv_mTgnc,77352
 langroid/language_models/utils.py,sha256=L4_CbihDMTGcsg0TOG1Yd5JFEto46--h7CX_14m89sQ,5016
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
@@ -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.12.dist-info/METADATA,sha256=tUh6elP7kcHfPS2dUXBE-gZ6vLoBfFzYsmg7nr2oCrg,59016
+langroid-0.33.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.33.12.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.33.12.dist-info/RECORD,,