langroid 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

langroid/agent/base.py

@@ -150,7 +150,6 @@ class Agent(ABC):
             show_start_response=noop_fn,
         )
         Agent.init_state(self)
-        self.init_state()
 
     def init_state(self) -> None:
         """Initialize all state vars. Called by Task.run() if restart is True"""
@@ -1069,9 +1068,12 @@ class Agent(ABC):
             return None
         if len(tools) == 0:
             fallback_result = self.handle_message_fallback(msg)
-            if fallback_result is not None and isinstance(fallback_result, ToolMessage):
-                return self.create_agent_response(tool_messages=[fallback_result])
-            return fallback_result
+            if fallback_result is None:
+                return None
+            return self._process_handle_message_result(
+                fallback_result,
+                chat_doc=msg if isinstance(msg, ChatDocument) else None,
+            )
         has_ids = all([t.id != "" for t in tools])
         chat_doc = msg if isinstance(msg, ChatDocument) else None
 
@@ -1162,9 +1164,7 @@ class Agent(ABC):
         final = "\n\n".join(str_results)
         return final
 
-    def handle_message_fallback(
-        self, msg: str | ChatDocument
-    ) -> str | ChatDocument | None:
+    def handle_message_fallback(self, msg: str | ChatDocument) -> Any:
         """
         Fallback method for the "no-tools" scenario.
         This method can be overridden by subclasses, e.g.,
@@ -1174,8 +1174,7 @@ class Agent(ABC):
         Args:
             msg (str | ChatDocument): The input msg to handle
         Returns:
-            str: The result of the handler method in string form so it can
-                be handled by LLM
+            Any: The result of the handler method
         """
         return None
 
@@ -1261,6 +1260,52 @@ class Agent(ABC):
             raise ve
         return message
 
+    def _process_handle_message_result(
+        self,
+        msg: Any,
+        orig_tool_name: str | None = None,
+        chat_doc: Optional[ChatDocument] = None,
+    ) -> None | str | ChatDocument:
+        """
+        Process result of agent_response or tool handler, or handle_message_fallback.
+        """
+        if isinstance(msg, ToolMessage):
+            # result is a ToolMessage, so...
+            result_tool_name = msg.default_value("request")
+            if result_tool_name in self.llm_tools_handled and (
+                orig_tool_name is None or orig_tool_name != result_tool_name
+            ):
+                # TODO: do we need to remove the tool message from the chat_doc?
+                # if (chat_doc is not None and
+                #     msg in chat_doc.tool_messages):
+                #    chat_doc.tool_messages.remove(msg)
+                # if we can handle it, do so
+                result = self.handle_tool_message(msg, chat_doc=chat_doc)
+            else:
+                # else wrap it in an agent response and return it so
+                # orchestrator can find a respondent
+                result = self.create_agent_response(tool_messages=[msg])
+        elif isinstance(msg, (ChatDocument, str)):
+            result = msg
+        elif isinstance(msg, BaseModel):
+            result = msg.json()
+        else:
+            # last resort: use json.dumps() or str() to make it a str
+            try:
+                result = json.dumps(msg)
+            except Exception:
+                try:
+                    result = str(msg)
+                except Exception as e:
+                    logger.error(
+                        f"""
+                            Error converting msg handler result to str: {e}", 
+                            """,
+                        exc_info=True,
+                    )
+                    result = None
+        return result
+
     def handle_tool_message(
         self,
         tool: ToolMessage,
@@ -1290,42 +1335,9 @@ class Agent(ABC):
                 maybe_result = handler_method(tool, chat_doc=chat_doc)
             else:
                 maybe_result = handler_method(tool)
-            if isinstance(maybe_result, ToolMessage):
-                # result is a ToolMessage, so...
-                result_tool_name = maybe_result.default_value("request")
-                if (
-                    result_tool_name in self.llm_tools_handled
-                    and tool_name != result_tool_name
-                ):
-                    # TODO: do we need to remove the tool message from the chat_doc?
-                    # if (chat_doc is not None and
-                    #     maybe_result in chat_doc.tool_messages):
-                    #    chat_doc.tool_messages.remove(maybe_result)
-                    # if we can handle it, do so
-                    result = self.handle_tool_message(maybe_result, chat_doc=chat_doc)
-                else:
-                    # else wrap it in an agent response and return it so
-                    # orchestrator can find a respondent
-                    result = self.create_agent_response(tool_messages=[maybe_result])
-            elif isinstance(maybe_result, (ChatDocument, str)):
-                result = maybe_result
-            elif isinstance(maybe_result, BaseModel):
-                result = maybe_result.json()
-            else:
-                # last resort: use json.dumps() or str() to make it a str
-                try:
-                    result = json.dumps(maybe_result)
-                except Exception:
-                    try:
-                        result = str(maybe_result)
-                    except Exception as e:
-                        logger.error(
-                            f"""
-                            Error converting result of {tool_name} to str: {e}", 
-                            """,
-                            exc_info=True,
-                        )
-                        result = None
+            result = self._process_handle_message_result(
+                maybe_result, tool_name, chat_doc
+            )
         except Exception as e:
             # raise the error here since we are sure it's
             # not a pydantic validation error,

langroid/agent/chat_agent.py

@@ -118,7 +118,7 @@ class ChatAgent(Agent):
         self.config: ChatAgentConfig = config
         self.config._set_fn_or_tools(self._fn_call_available())
         self.message_history: List[LLMMessage] = []
-        self.tool_instructions_added: bool = False
+        self.init_state()
         # An agent's "task" is defined by a system msg and an optional user msg;
         # These are "priming" messages that kick off the agent's conversation.
         self.system_message: str = self.config.system_message
@@ -172,6 +172,15 @@ class ChatAgent(Agent):
             self.enable_message(SendTool, use=False, handle=True)
             self.enable_message(AgentSendTool, use=False, handle=True)
 
+    def init_state(self) -> None:
+        """
+        Initialize the state of the agent. Just conversation state here,
+        but subclasses can override this to initialize other state.
+        """
+        super().init_state()
+        self.clear_history(0)
+        self.clear_dialog()
+
     @staticmethod
     def from_id(id: str) -> "ChatAgent":
         """

langroid/agent/special/lance_rag/critic_agent.py

@@ -169,6 +169,7 @@ class QueryPlanCritic(ChatAgent):
         self.enable_message(AgentDoneTool, use=False, handle=True)
 
     def init_state(self) -> None:
+        super().init_state()
         self.expecting_feedback_tool = False
 
     def query_plan_answer(self, msg: QueryPlanAnswerTool) -> str:

langroid/agent/special/lance_rag/lance_rag_task.py

@@ -51,11 +51,13 @@ class LanceRAGTaskCreator:
             critic_name=critic_name,
             doc_agent_name=doc_agent_name,
             doc_schema=agent._get_clean_vecdb_schema(),
+            llm=agent.config.llm,
         )
         query_plan_agent_config.set_system_message()
 
         critic_config = QueryPlanCriticConfig(
             doc_schema=agent._get_clean_vecdb_schema(),
+            llm=agent.config.llm,
         )
         critic_config.set_system_message()
 

langroid/agent/special/lance_rag/query_planner_agent.py

@@ -144,6 +144,7 @@ class LanceQueryPlanAgent(ChatAgent):
         self.enable_message(AgentDoneTool, use=False, handle=True)
 
     def init_state(self) -> None:
+        super().init_state()
         self.curr_query_plan: QueryPlan | None = None
         self.expecting_query_plan: bool = False
         # how many times re-trying query plan in response to feedback:

langroid/agent/task.py

@@ -259,8 +259,7 @@ class Task:
         agent = cast(ChatAgent, agent)
         self.agent: ChatAgent = agent
         if isinstance(agent, ChatAgent) and len(agent.message_history) == 0 or restart:
-            self.agent.clear_history(0)
-            self.agent.clear_dialog()
+            self.agent.init_state()
             # possibly change the system and user messages
             if system_message:
                 # we always have at least 1 task_message
@@ -579,8 +578,6 @@ class Task:
         Recursively reset message history & state of own agent and
         those of all sub-tasks.
         """
-        self.agent.clear_history(0)
-        self.agent.clear_dialog()
         self.agent.init_state()
         for t in self.sub_tasks:
             t.reset_all_sub_tasks()

langroid/agent/tool_message.py

@@ -296,6 +296,17 @@ class FinalResultTool(ToolMessage):
 
     request: str = ""
     purpose: str = "Ignored; Wrapper for a structured message"
+    id: str = ""  # placeholder for OpenAI-API tool_call_id
+
+    _handle_only: bool = False  # only allow handling, but not use (LLM-generation)?
 
     class Config:
         extra = Extra.allow
+        # only HANDLING allowed, NOT "use" (i.e LLM generation)
+        handle_only: bool = False
+        arbitrary_types_allowed = False
+        validate_all = True
+        validate_assignment = True
+        # do not include these fields in the generated schema
+        # since we don't require the LLM to specify them
+        schema_extra = {"exclude": {"purpose", "id"}}

langroid/parsing/code_parser.py

@@ -115,5 +115,7 @@ class CodeParser:
             for d in docs
             if d.metadata.language in self.config.extensions  # type: ignore
         ]
+        if len(chunked_docs) == 0:
+            return []
         # collapse the list of lists into a single list
         return reduce(lambda x, y: x + y, chunked_docs)

{langroid-0.10.0.dist-info → langroid-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.10.0
+Version: 0.10.2
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -162,6 +162,9 @@ into simplifying the developer experience; it does not use `Langchain`.
 :fire: See this [Intro to Langroid](https://lancedb.substack.com/p/langoid-multi-agent-programming-framework)
 blog post from the LanceDB team
 
+:fire: Just published in ML for Healthcare (2024): a Langroid-based Multi-Agent RAG system for 
+pharmacovigilance, see [blog post](https://langroid.github.io/langroid/blog/2024/08/12/malade-multi-agent-architecture-for-pharmacovigilance/)
+
 
 We welcome contributions -- See the [contributions](./CONTRIBUTING.md) document
 for ideas on what to contribute.

{langroid-0.10.0.dist-info → langroid-0.10.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 langroid/__init__.py,sha256=z_fCOLQJPOw3LLRPBlFB5-2HyCjpPgQa4m4iY5Fvb8Y,1800
 langroid/agent/__init__.py,sha256=CFjjVvXVEV4ac0PdNPHVQHREV2HbbHCF6wj42v5MpJ4,826
-langroid/agent/base.py,sha256=c5RYAKotgJH1vfqZvnMBt10RCino26jJv3thEMKYyy0,59067
+langroid/agent/base.py,sha256=PAMTnYefsDiXBXrj-b9XuBBxj8woqssxOf_0HeXiZsE,59206
 langroid/agent/batch.py,sha256=feRA_yRG768ElOQjrKEefcRv6Aefd_yY7qktuYUQDwc,10040
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=Qedk1-CBCgo9PdaIa7AboLBFCTgAMg9q5nGmoqpZ378,22050
-langroid/agent/chat_agent.py,sha256=q39Taek6yhinGWDYP7Uze6p8jP5v5nvn-Y1k-yJB8TQ,48116
+langroid/agent/chat_agent.py,sha256=nGikT3OYQsB4avePxBo4QCY3HV_BJpIItwR_ebOySE8,48378
 langroid/agent/chat_document.py,sha256=DnmRLma0zud0XsN_wm-F0fnQv3fjQghv3t8Ahudq238,16799
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
@@ -13,9 +13,9 @@ langroid/agent/special/__init__.py,sha256=gik_Xtm_zV7U9s30Mn8UX3Gyuy4jTjQe9zjiE3
 langroid/agent/special/doc_chat_agent.py,sha256=8NPAhMnHkFUolQ8EHos40tz5Vwuz_m33NjUfjheXWXY,54569
 langroid/agent/special/lance_doc_chat_agent.py,sha256=s8xoRs0gGaFtDYFUSIRchsgDVbS5Q3C2b2mr3V1Fd-Q,10419
 langroid/agent/special/lance_rag/__init__.py,sha256=QTbs0IVE2ZgDg8JJy1zN97rUUg4uEPH7SLGctFNumk4,174
-langroid/agent/special/lance_rag/critic_agent.py,sha256=lRHLBU9TWo4ixm_wEPUP9bCjW0iSIw7ZRe6u4D4v7jk,9519
-langroid/agent/special/lance_rag/lance_rag_task.py,sha256=l_HQgrYY-CX2FwIsS961aEF3bYog3GDYo98fj0C0mSk,2889
-langroid/agent/special/lance_rag/query_planner_agent.py,sha256=-ZKareApPQD0EbwB1ABeZdhYAA2lJbwSVkfSuhMcKMk,11480
+langroid/agent/special/lance_rag/critic_agent.py,sha256=OtFuHthKQLkdVkvuZ2m0GNq1qOYLqHkm1pfLRFnSg5c,9548
+langroid/agent/special/lance_rag/lance_rag_task.py,sha256=qDouwz-Yi8aSIAVb2Jx6buTKwO2L7PSvUY604Eu0uIM,2957
+langroid/agent/special/lance_rag/query_planner_agent.py,sha256=5YPeliCjlRk1LEDe5eFyqfkq9RjDfa4usjBsNmT9GsQ,11509
 langroid/agent/special/lance_tools.py,sha256=qS8x4wi8mrqfbYV2ztFzrcxyhHQ0ZWOc-zkYiH7awj0,2105
 langroid/agent/special/neo4j/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/neo4j/csv_kg_chat.py,sha256=dRsAgMBa1H_EMI2YYgJR2Xyv1D7e4o3G9M64mTewq_c,6409
@@ -33,8 +33,8 @@ langroid/agent/special/sql/utils/system_message.py,sha256=qKLHkvQWRQodTtPLPxr1GS
 langroid/agent/special/sql/utils/tools.py,sha256=vFYysk6Vi7HJjII8B4RitA3pt_z3gkSglDNdhNVMiFc,1332
 langroid/agent/special/table_chat_agent.py,sha256=d9v2wsblaRx7oMnKhLV7uO_ujvk9gh59pSGvBXyeyNc,9659
 langroid/agent/structured_message.py,sha256=y7pud1EgRNeTFZlJmBkLmwME3yQJ_IYik-Xds9kdZbY,282
-langroid/agent/task.py,sha256=y4FXXLSJv_8LIox4-E48MG_VQl1558WCLR9w35-KBJ4,80560
-langroid/agent/tool_message.py,sha256=EcWsi3LS7SGENO1V8DpM8UFdc5pwlcqelt1UL6KgLwA,11195
+langroid/agent/task.py,sha256=3Shs5PFDTrKgbt6kyYyyHXIDc0V9z8wCubwCWKcuvmU,80448
+langroid/agent/tool_message.py,sha256=OiShCp8NwG7p3fVxwLhHCxhaRp2chuzEL7FBWOqoxg4,11715
 langroid/agent/tools/__init__.py,sha256=lgWAWsPgMx-NdDPVX6tXO_U0cIQX7dwzhUC0G4IfUgk,726
 langroid/agent/tools/duckduckgo_search_tool.py,sha256=NhsCaGZkdv28nja7yveAhSK_w6l_Ftym8agbrdzqgfo,1935
 langroid/agent/tools/extract_tool.py,sha256=u5lL9rKBzaLBOrRyLnTAZ97pQ1uxyLP39XsWMnpaZpw,3789
@@ -82,7 +82,7 @@ langroid/mytypes.py,sha256=ptAFxEAtiwmIfUnGisNotTe8wT9LKBf22lOfPgZoQIY,2368
 langroid/parsing/__init__.py,sha256=ZgSAfgTC6VsTLFlRSWT-TwYco7SQeRMeZG-49MnKYGY,936
 langroid/parsing/agent_chats.py,sha256=sbZRV9ujdM5QXvvuHVjIi2ysYSYlap-uqfMMUKulrW0,1068
 langroid/parsing/code-parsing.md,sha256=--cyyNiSZSDlIwcjAV4-shKrSiRe2ytF3AdSoS_hD2g,3294
-langroid/parsing/code_parser.py,sha256=Fwa8MWY5EGk7Ekr8II5c-o9vBf4m1HfB5_K7e_EDYzo,3739
+langroid/parsing/code_parser.py,sha256=AOxb3xbYpTBPP3goOm5dKfJdh5hS_2BhLVCEkifWZN8,3796
 langroid/parsing/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/parsing/document_parser.py,sha256=WGnA5ADwMHliGJt6WW9rc4RiFXQcKU33b5zdPiGrtEY,24265
 langroid/parsing/image_text.py,sha256=sbLIQ5nHe2UnYUksBaQsmZGaX-X0qgEpPd7CEzi_z5M,910
@@ -134,8 +134,8 @@ langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3Hmh
 langroid/vector_store/momento.py,sha256=qR-zBF1RKVHQZPZQYW_7g-XpTwr46p8HJuYPCkfJbM4,10534
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=v88lqFkepADvlN6lByUj9I4NEKa9X9lWH16uTPPbYrE,17457
-pyproject.toml,sha256=WE_GhHAyFWSrzXRv6PO2Fz7Vz-JGL_Md8QPI5bKqYrw,7088
-langroid-0.10.0.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.10.0.dist-info/METADATA,sha256=PDxK3LArvELAz8HNVfwwLK2o9Uk5kGKJfpwcd-ev9uY,54752
-langroid-0.10.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.10.0.dist-info/RECORD,,
+pyproject.toml,sha256=pfB7YUZ95hBPldXjKSFUJcyE2smbS67EpJx-glYg20U,7106
+langroid-0.10.2.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.10.2.dist-info/METADATA,sha256=kKD4a_WwpLHCOffm6vwnHpOcWEgL64uDePVAd2ku83Q,54992
+langroid-0.10.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.10.2.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.10.0"
+version = "0.10.2"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -90,6 +90,7 @@ async-generator = "^1.10"
 python-magic = "^0.4.27"
 json-repair = "^0.27.0"
 
+
 [tool.poetry.extras]
 # install these using, e.g.,
 # `poetry install -E [...]` where [...] is one of the extras below
@@ -169,14 +170,14 @@ optional = true
 
 mkdocs = "^1.4.2"
 mkdocs-material = "^9.1.5"
-mkdocstrings = {extras = ["python"], version = "^0.21.2"}
+mkdocstrings = {extras = ["python"], version = "^0.25.2"}
 mkdocs-awesome-pages-plugin = "^2.8.0"
 mkdocs-rss-plugin = "^1.8.0"
 mkdocs-gen-files = "^0.4.0"
 mkdocs-literate-nav = "^0.6.0"
 mkdocs-section-index = "^0.3.5"
 mkdocs-jupyter = "^0.24.1"
-
+griffe = "<1.0.0"
 
 
 # ========================================