langroid 0.50.4__py3-none-any.whl → 0.50.6__py3-none-any.whl

langroid/agent/chat_document.py

@@ -215,9 +215,17 @@ class ChatDocument(Document):
         """
         tool_type = ""  # FUNC or TOOL
         tool = ""  # tool name or function name
+        oai_tools = (
+            []
+            if self.oai_tool_calls is None
+            else [t for t in self.oai_tool_calls if t.function is not None]
+        )
         if self.function_call is not None:
             tool_type = "FUNC"
             tool = self.function_call.name
+        elif len(oai_tools) > 0:
+            tool_type = "OAI_TOOL"
+            tool = ",".join(t.function.name for t in oai_tools)  # type: ignore
         else:
             try:
                 json_tools = self.get_tool_names()
@@ -354,90 +362,88 @@ class ChatDocument(Document):
         oai_tool_calls = None
         tool_id = ""  # for OpenAI Assistant
         chat_document_id: str = ""
-        if isinstance(message, ChatDocument):
-            content = message.content or to_string(message.content_any) or ""
-            fun_call = message.function_call
-            oai_tool_calls = message.oai_tool_calls
-            if message.metadata.sender == Entity.USER and fun_call is not None:
-                # This may happen when a (parent agent's) LLM generates a
-                # a Function-call, and it ends up being sent to the current task's
-                # LLM (possibly because the function-call is mis-named or has other
-                # issues and couldn't be handled by handler methods).
-                # But a function-call can only be generated by an entity with
-                # Role.ASSISTANT, so we instead put the content of the function-call
-                # in the content of the message.
-                content += " " + str(fun_call)
-                fun_call = None
-            if message.metadata.sender == Entity.USER and oai_tool_calls is not None:
-                # same reasoning as for function-call above
-                content += " " + "\n\n".join(str(tc) for tc in oai_tool_calls)
-                oai_tool_calls = None
-            sender_name = message.metadata.sender_name
-            tool_ids = message.metadata.tool_ids
-            tool_id = tool_ids[-1] if len(tool_ids) > 0 else ""
-            chat_document_id = message.id()
-            if message.metadata.sender == Entity.SYSTEM:
-                sender_role = Role.SYSTEM
-            if (
-                message.metadata.parent is not None
-                and message.metadata.parent.function_call is not None
+        if isinstance(message, str):
+            message = ChatDocument.from_str(message)
+        content = message.content or to_string(message.content_any) or ""
+        fun_call = message.function_call
+        oai_tool_calls = message.oai_tool_calls
+        if message.metadata.sender == Entity.USER and fun_call is not None:
+            # This may happen when a (parent agent's) LLM generates a
+            # a Function-call, and it ends up being sent to the current task's
+            # LLM (possibly because the function-call is mis-named or has other
+            # issues and couldn't be handled by handler methods).
+            # But a function-call can only be generated by an entity with
+            # Role.ASSISTANT, so we instead put the content of the function-call
+            # in the content of the message.
+            content += " " + str(fun_call)
+            fun_call = None
+        if message.metadata.sender == Entity.USER and oai_tool_calls is not None:
+            # same reasoning as for function-call above
+            content += " " + "\n\n".join(str(tc) for tc in oai_tool_calls)
+            oai_tool_calls = None
+        sender_name = message.metadata.sender_name
+        tool_ids = message.metadata.tool_ids
+        tool_id = tool_ids[-1] if len(tool_ids) > 0 else ""
+        chat_document_id = message.id()
+        if message.metadata.sender == Entity.SYSTEM:
+            sender_role = Role.SYSTEM
+        if (
+            message.metadata.parent is not None
+            and message.metadata.parent.function_call is not None
+        ):
+            # This is a response to a function call, so set the role to FUNCTION.
+            sender_role = Role.FUNCTION
+            sender_name = message.metadata.parent.function_call.name
+        elif oai_tools is not None and len(oai_tools) > 0:
+            pending_tool_ids = [tc.id for tc in oai_tools]
+            # The ChatAgent has pending OpenAI tool-call(s),
+            # so the current ChatDocument contains
+            # results for some/all/none of them.
+
+            if len(oai_tools) == 1:
+                # Case 1:
+                # There was exactly 1 pending tool-call, and in this case
+                # the result would be a plain string in `content`
+                return [
+                    LLMMessage(
+                        role=Role.TOOL,
+                        tool_call_id=oai_tools[0].id,
+                        content=content,
+                        chat_document_id=chat_document_id,
+                    )
+                ]
+
+            elif (
+                message.metadata.oai_tool_id is not None
+                and message.metadata.oai_tool_id in pending_tool_ids
             ):
-                # This is a response to a function call, so set the role to FUNCTION.
-                sender_role = Role.FUNCTION
-                sender_name = message.metadata.parent.function_call.name
-            elif oai_tools is not None and len(oai_tools) > 0:
-                pending_tool_ids = [tc.id for tc in oai_tools]
-                # The ChatAgent has pending OpenAI tool-call(s),
-                # so the current ChatDocument contains
-                # results for some/all/none of them.
-
-                if len(oai_tools) == 1:
-                    # Case 1:
-                    # There was exactly 1 pending tool-call, and in this case
-                    # the result would be a plain string in `content`
-                    return [
-                        LLMMessage(
-                            role=Role.TOOL,
-                            tool_call_id=oai_tools[0].id,
-                            content=content,
-                            chat_document_id=chat_document_id,
-                        )
-                    ]
-
-                elif (
-                    message.metadata.oai_tool_id is not None
-                    and message.metadata.oai_tool_id in pending_tool_ids
-                ):
-                    # Case 2:
-                    # ChatDocument.content has result of a single tool-call
-                    return [
-                        LLMMessage(
-                            role=Role.TOOL,
-                            tool_call_id=message.metadata.oai_tool_id,
-                            content=content,
-                            chat_document_id=chat_document_id,
-                        )
-                    ]
-                elif message.oai_tool_id2result is not None:
-                    # Case 2:
-                    # There were > 1 tool-calls awaiting response,
-                    assert (
-                        len(message.oai_tool_id2result) > 1
-                    ), "oai_tool_id2result must have more than 1 item."
-                    return [
-                        LLMMessage(
-                            role=Role.TOOL,
-                            tool_call_id=tool_id,
-                            content=result,
-                            chat_document_id=chat_document_id,
-                        )
-                        for tool_id, result in message.oai_tool_id2result.items()
-                    ]
-            elif message.metadata.sender == Entity.LLM:
-                sender_role = Role.ASSISTANT
-        else:
-            # LLM can only respond to text content, so extract it
-            content = message
+                # Case 2:
+                # ChatDocument.content has result of a single tool-call
+                return [
+                    LLMMessage(
+                        role=Role.TOOL,
+                        tool_call_id=message.metadata.oai_tool_id,
+                        content=content,
+                        chat_document_id=chat_document_id,
+                    )
+                ]
+            elif message.oai_tool_id2result is not None:
+                # Case 2:
+                # There were > 1 tool-calls awaiting response,
+                assert (
+                    len(message.oai_tool_id2result) > 1
+                ), "oai_tool_id2result must have more than 1 item."
+                return [
+                    LLMMessage(
+                        role=Role.TOOL,
+                        tool_call_id=tool_id,
+                        content=result,
+                        chat_document_id=chat_document_id,
+                    )
+                    for tool_id, result in message.oai_tool_id2result.items()
+                ]
+        elif message.metadata.sender == Entity.LLM:
+            sender_role = Role.ASSISTANT
 
         return [
             LLMMessage(

{langroid-0.50.4.dist-info → langroid-0.50.6.dist-info}/METADATA

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

{langroid-0.50.4.dist-info → langroid-0.50.6.dist-info}/RECORD

@@ -6,7 +6,7 @@ langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,78
 langroid/agent/base.py,sha256=bs5OLCf534mhsdR7Rgf27GqVNuSV2bOVbD46Y86mGFA,79829
 langroid/agent/batch.py,sha256=vi1r5i1-vN80WfqHDSwjEym_KfGsqPGUtwktmiK1nuk,20635
 langroid/agent/chat_agent.py,sha256=m1alf-KNJSU6PeFF6ocwTHSG0cmTE-iy1o7UYAvRGQE,85081
-langroid/agent/chat_document.py,sha256=xzMtrPbaW-Y-BnF7kuhr2dorsD-D5rMWzfOqJ8HAoo8,17885
+langroid/agent/chat_document.py,sha256=gWceR8mcggyGbJePJQgVvqzVivYlfPlFp8pUZ7yUZvg,17821
 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
@@ -129,7 +129,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.50.4.dist-info/METADATA,sha256=3HQH6x3pAFIDSUIt8TLI912CA-8EN_Jl_nKpQ09oli0,63641
-langroid-0.50.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.50.4.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.50.4.dist-info/RECORD,,
+langroid-0.50.6.dist-info/METADATA,sha256=JsIZE0WSSPm0jpB-5UX2Bfdvk6-txTtUo4J49ryyQIw,63641
+langroid-0.50.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.50.6.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.50.6.dist-info/RECORD,,