langroid 0.19.4__py3-none-any.whl → 0.20.0__py3-none-any.whl

langroid/agent/special/sql/sql_chat_agent.py

@@ -14,7 +14,7 @@ from rich import print
 from rich.console import Console
 
 from langroid.exceptions import LangroidImportError
-from langroid.utils.constants import DONE
+from langroid.utils.constants import DONE, SEND_TO
 
 try:
     from sqlalchemy import MetaData, Row, create_engine, inspect, text
@@ -96,7 +96,7 @@ class SQLChatAgentConfig(ChatAgentConfig):
     context_descriptions: Dict[str, Dict[str, Union[str, Dict[str, str]]]] = {}
     use_schema_tools: bool = False
     multi_schema: bool = False
-    addressing_prefix: str = ""
+    addressing_prefix: str = SEND_TO
 
     """
     Optional, but strongly recommended, context descriptions for tables, columns, 
@@ -257,6 +257,7 @@ class SQLChatAgent(ChatAgent):
         self, message: Optional[str | ChatDocument] = None
     ) -> Optional[ChatDocument]:
         self.llm_responded = True
+        self.used_run_query = False
         return super().llm_response(message)
 
     def user_response(
@@ -270,7 +271,11 @@ class SQLChatAgent(ChatAgent):
     def handle_message_fallback(
         self, msg: str | ChatDocument
     ) -> str | ChatDocument | None:
-
+        """
+        Handle the scenario where current msg is not a tool.
+        Special handling is only needed if the message was from the LLM
+        (as indicated by self.llm_responded).
+        """
         if not self.llm_responded:
             return None
         if self.used_run_query:

langroid/agent/task.py

@@ -1226,8 +1226,22 @@ class Task:
             # reset stuck counter since we made progress
             self.n_stalled_steps = 0
 
-        # update counters for infinite loop detection
         if self.pending_message is not None:
+            if (
+                self._is_done_response(result, r)
+                and self._level == 0
+                and self.only_user_quits_root
+                and self._user_can_respond()
+            ):
+                # We're ignoring the DoneTools (if any) in this case,
+                # so remove them from the pending msg, to ensure
+                # they don't affect the next step.
+                self.pending_message.tool_messages = [
+                    t
+                    for t in self.pending_message.tool_messages
+                    if not isinstance(t, (DoneTool, AgentDoneTool))
+                ]
+            # update counters for infinite loop detection
             hashed_msg = hash(str(self.pending_message))
             self.message_counter.update([hashed_msg])
             self.history.append(hashed_msg)
@@ -1520,6 +1534,7 @@ class Task:
                 content = to_string(t.content)
                 content_any = t.content
                 if isinstance(t, AgentDoneTool):
+                    # AgentDoneTool may have tools, unlike DoneTool
                     tool_messages = t.tools
                 break
         # drop the "Done" tools since they should not be part of the task result,
@@ -1890,6 +1905,7 @@ class Task:
             # user, then wait for user response
             self.pending_message is not None
             and self.pending_message.metadata.recipient == Entity.USER
+            and not self.agent.has_tool_message_attempt(self.pending_message)
         )
 
     def _can_respond(self, e: Responder) -> bool:

langroid/agent/tools/orchestration.py

@@ -115,7 +115,7 @@ class FinalResultTool(ToolMessage):
     Note:
         - when defining a tool handler or agent_response, you can directly return
             FinalResultTool(field1 = val1, ...),
-            where the values can be aribitrary data structures, including nested
+            where the values can be arbitrary data structures, including nested
             Pydantic objs, or you can define a subclass of FinalResultTool with the
             fields you want to return.
         - This is a special ToolMessage that is NOT meant to be used or handled

langroid/agent/tools/recipient_tool.py

@@ -6,6 +6,15 @@ the method `_get_tool_list()`).
 
 See usage examples in `tests/main/test_multi_agent_complex.py` and
 `tests/main/test_recipient_tool.py`.
+
+A simpler alternative to this tool is `SendTool`, see here:
+https://github.com/langroid/langroid/blob/main/langroid/agent/tools/orchestration.py
+
+You can also define your own XML-based variant of this tool:
+https://github.com/langroid/langroid/blob/main/examples/basic/xml-tool.py
+which uses XML rather than JSON, and can be more reliable than JSON,
+especially with weaker LLMs.
+
 """
 
 from typing import List, Type

langroid/parsing/parser.py

@@ -66,6 +66,12 @@ class Parser:
         tokens = self.tokenizer.encode(text)
         return len(tokens)
 
+    def truncate_tokens(self, text: str, max_tokens: int) -> str:
+        tokens = self.tokenizer.encode(text)
+        if len(tokens) <= max_tokens:
+            return text
+        return self.tokenizer.decode(tokens[:max_tokens])
+
     def add_window_ids(self, chunks: List[Document]) -> None:
         """Chunks may belong to multiple docs, but for each doc,
         they appear consecutively. Add window_ids in metadata"""

{langroid-0.19.4.dist-info → langroid-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.19.4
+Version: 0.20.0
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
+Provides-Extra: arango
 Provides-Extra: chainlit
 Provides-Extra: chromadb
 Provides-Extra: db
@@ -35,7 +36,9 @@ Provides-Extra: sql
 Provides-Extra: transformers
 Provides-Extra: unstructured
 Provides-Extra: vecdbs
+Requires-Dist: adb-cloud-connector (>=1.0.2,<2.0.0)
 Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
+Requires-Dist: arango-datasets (>=1.2.2,<2.0.0) ; extra == "all" or extra == "arango"
 Requires-Dist: async-generator (>=1.10,<2.0)
 Requires-Dist: bs4 (>=0.0.1,<0.0.2)
 Requires-Dist: cerebras-cloud-sdk (>=1.1.0,<2.0.0)
@@ -82,6 +85,7 @@ Requires-Dist: pymysql (>=1.1.0,<2.0.0) ; extra == "db" or extra == "all" or ext
 Requires-Dist: pyparsing (>=3.0.9,<4.0.0)
 Requires-Dist: pypdf (>=3.12.2,<4.0.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
 Requires-Dist: pytesseract (>=0.3.10,<0.4.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
+Requires-Dist: python-arango (>=8.1.2,<9.0.0) ; extra == "all" or extra == "arango"
 Requires-Dist: python-docx (>=1.1.0,<2.0.0) ; extra == "doc-chat" or extra == "all" or extra == "docx"
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-magic (>=0.4.27,<0.5.0)

{langroid-0.19.4.dist-info → langroid-0.20.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 langroid/__init__.py,sha256=z_fCOLQJPOw3LLRPBlFB5-2HyCjpPgQa4m4iY5Fvb8Y,1800
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=swttuRRJKdDt-GUFsBNKHn1MQRj29b2f2U7Tuw5V5pk,64793
+langroid/agent/base.py,sha256=uCjFJ0Mjm6hu4MSCsz7vzGwzpbkrxddDIduhxS24jps,65034
 langroid/agent/batch.py,sha256=QZdlt1563hx4l3AXrCaGovE-PNG93M3DsvQAbDzdiS8,13705
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=JJXI3UGTyTDg2FFath4rqY1GyUo_0pbVBt8CZpvdtn4,23289
@@ -10,6 +10,10 @@ langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
 langroid/agent/openai_assistant.py,sha256=2rjCZw45ysNBEGNzQM4uf0bTC4KkatGYAWcVcW4xcek,34337
 langroid/agent/special/__init__.py,sha256=gik_Xtm_zV7U9s30Mn8UX3Gyuy4jTjQe9zjiE3HWmEo,1273
+langroid/agent/special/arangodb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+langroid/agent/special/arangodb/arangodb_agent.py,sha256=5X8yQr1MdTLchNK6L7g3gArFYVEiql4g35YPMw_4TIU,19579
+langroid/agent/special/arangodb/system_messages.py,sha256=j-vNz4SLKzE6-1a31ZFw7NHMD_uBepS8vxJ_bsjgMC4,5801
+langroid/agent/special/arangodb/tools.py,sha256=3CW2HsLqcM0JGemHsmihm8F5zZwwbFvAwyHzzaJ2S90,1319
 langroid/agent/special/doc_chat_agent.py,sha256=xIqBOyLax_jMU0UevxqXf_aQUrRkW6MQUKpKnKvaqkQ,59281
 langroid/agent/special/lance_doc_chat_agent.py,sha256=s8xoRs0gGaFtDYFUSIRchsgDVbS5Q3C2b2mr3V1Fd-Q,10419
 langroid/agent/special/lance_rag/__init__.py,sha256=QTbs0IVE2ZgDg8JJy1zN97rUUg4uEPH7SLGctFNumk4,174
@@ -19,13 +23,13 @@ langroid/agent/special/lance_rag/query_planner_agent.py,sha256=5YPeliCjlRk1LEDe5
 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
-langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=2r9kZ1AH3AxvJ6BZn0BZLhz-Bw8b7xUBlRv86gSEE8s,13542
-langroid/agent/special/neo4j/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-langroid/agent/special/neo4j/utils/system_message.py,sha256=_2NKX2Sx_7nLGNk_0rUyDkgTHZJuKm_DgtG7M_BFPkY,2920
+langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=1RMKupJra0KZ-hA7AiiR662STJyYDZi8ZnAnnXF8oCA,16726
+langroid/agent/special/neo4j/system_messages.py,sha256=m2jsVayey6E_88F5B_gW2WbWKBJvIeDUoVCRBbNs97o,4522
+langroid/agent/special/neo4j/tools.py,sha256=Vw3HvtDfG2c4_bUHgt4_ZbJq48lpIQstbjjwhh1BjrQ,905
 langroid/agent/special/relevance_extractor_agent.py,sha256=zIx8GUdVo1aGW6ASla0NPQjYYIpmriK_TYMijqAx3F8,4796
 langroid/agent/special/retriever_agent.py,sha256=lvMvf-u9rSosg4YASuFdUbGLgkzLPknXAbJZfZ1LZCc,1868
 langroid/agent/special/sql/__init__.py,sha256=mWfmm1QpXCezpFOS2eI57M0L_Ok3q5_ukG8tXBnBrEA,319
-langroid/agent/special/sql/sql_chat_agent.py,sha256=PArNz9up0atw0cJet1LOfWlpW6xgofVBDR7Z3xvpzHk,16592
+langroid/agent/special/sql/sql_chat_agent.py,sha256=LVTuOlaY6m5DpsMFLFv00eOz04y6vKeO4mfGLIUp6AY,16844
 langroid/agent/special/sql/utils/__init__.py,sha256=JFif6CRTrN-bc91uuAI4K9fe2ndIWSNMVxJ0WA68--M,446
 langroid/agent/special/sql/utils/description_extractors.py,sha256=cX8TIpmTPXZXQTMpIi3OUFwFsPywxFFdurpx717Kq0I,6529
 langroid/agent/special/sql/utils/populate_metadata.py,sha256=1J22UsyEPKzwK0XlJZtYn9r6kYc0FXIr8-lZrndYlhc,3131
@@ -33,15 +37,15 @@ 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=GDnP24wsoXSZbwlG0g-OmKWM_pY-G4KGUgnCEbCsrYM,84660
+langroid/agent/task.py,sha256=p7YsccpRIZcX0dFo5ll9EAaetWUcxZnCZal0i7Xsl1Y,85433
 langroid/agent/tool_message.py,sha256=jkN7uq7YwUC_wBcSCNUYjrB_His2YCfQay_lqIa4Tww,10498
 langroid/agent/tools/__init__.py,sha256=IMgCte-_ZIvCkozGQmvMqxIw7_nKLKzD78ccJL1bnQU,804
 langroid/agent/tools/duckduckgo_search_tool.py,sha256=NhsCaGZkdv28nja7yveAhSK_w6l_Ftym8agbrdzqgfo,1935
 langroid/agent/tools/file_tools.py,sha256=GjPB5YDILucYapElnvvoYpGJuZQ25ecLs2REv7edPEo,7292
 langroid/agent/tools/google_search_tool.py,sha256=y7b-3FtgXf0lfF4AYxrZ3K5pH2dhidvibUOAGBE--WI,1456
 langroid/agent/tools/metaphor_search_tool.py,sha256=qj4gt453cLEX3EGW7nVzVu6X7LCdrwjSlcNY0qJW104,2489
-langroid/agent/tools/orchestration.py,sha256=u_iQDwD5L9JgE39pCemmIRG3MxyrBsw6KpQYf7pH-Ek,10881
-langroid/agent/tools/recipient_tool.py,sha256=0m2kQhYKTeGujAxhSPqH5z6hSAhVB_Dqour6uul2U30,9427
+langroid/agent/tools/orchestration.py,sha256=vp2Qx-DYPtDnACosxKqwHGy6DeD1QnEllWz0Ht81Cyc,10880
+langroid/agent/tools/recipient_tool.py,sha256=dr0yTxgNEIoxUYxH6TtaExC4G_8WdJ0xGohIa4dFLhY,9808
 langroid/agent/tools/retrieval_tool.py,sha256=2q2pfoYbZNfbWQ0McxrtmfF0ekGglIgRl-6uF26pa-E,871
 langroid/agent/tools/rewind_tool.py,sha256=XAXL3BpNhCmBGYq_qi_sZfHJuIw7NY2jp4wnojJ7WRs,5606
 langroid/agent/tools/segment_extract_tool.py,sha256=__srZ_VGYLVOdPrITUM8S0HpmX4q7r5FHWMDdHdEv8w,1440
@@ -86,7 +90,7 @@ langroid/parsing/document_parser.py,sha256=ZGxgG4ytnCIah4HWk3ZrK3EGAMXDjAzI9KaPE
 langroid/parsing/image_text.py,sha256=sbLIQ5nHe2UnYUksBaQsmZGaX-X0qgEpPd7CEzi_z5M,910
 langroid/parsing/para_sentence_split.py,sha256=AJBzZojP3zpB-_IMiiHismhqcvkrVBQ3ZINoQyx_bE4,2000
 langroid/parsing/parse_json.py,sha256=aADo38bAHQhC8on4aWZZzVzSDy-dK35vRLZsFI2ewh8,4756
-langroid/parsing/parser.py,sha256=AgtmlVUvrkSG1l7-YZPX8rlldgXjh_HqXAMqpXkBxUo,11746
+langroid/parsing/parser.py,sha256=bTG5TO2CEwGdLf9979j9_dFntKX5FloGF8vhts6ObU0,11978
 langroid/parsing/repo_loader.py,sha256=3GjvPJS6Vf5L6gV2zOU8s-Tf1oq_fZm-IB_RL_7CTsY,29373
 langroid/parsing/routing.py,sha256=-FcnlqldzL4ZoxuDwXjQPNHgBe9F9-F4R6q7b_z9CvI,1232
 langroid/parsing/search.py,sha256=0i_r0ESb5HEQfagA2g7_uMQyxYPADWVbdcN9ixZhS4E,8992
@@ -137,8 +141,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=lidhX-USXT61UtttKdG0y4Y7pZhnfJCliByisRnsGD0,7251
-langroid-0.19.4.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.19.4.dist-info/METADATA,sha256=abQ0VzdRQdcxtXfZ9KnexfvOeqKLC8jTl8vEl3Wpz1s,56513
-langroid-0.19.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-langroid-0.19.4.dist-info/RECORD,,
+pyproject.toml,sha256=DQbq0Xo4Bc3sJYF2-1qA9qnnKT0X-x5BzC99OrxcTNg,7488
+langroid-0.20.0.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.20.0.dist-info/METADATA,sha256=5uni8xDGH809QGehHz0YfMguGFtvKDSJ9A7CfbduDnE,56758
+langroid-0.20.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+langroid-0.20.0.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.19.4"
+version = "0.20.0"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -90,6 +90,9 @@ python-magic = "^0.4.27"
 json-repair = "^0.29.9"
 cerebras-cloud-sdk = "^1.1.0"
 gitpython = "^3.1.43"
+python-arango = {version="^8.1.2", optional=true}
+arango-datasets = {version="^1.2.2", optional=true}
+adb-cloud-connector = "^1.0.2"
 
 
 [tool.poetry.extras]
@@ -113,6 +116,7 @@ all = [
 #    "lancedb", "tantivy", "pyarrow",
     "chromadb",
     "metaphor-python", "neo4j",
+    "python-arango", "arango-datasets",
     "litellm",
     "chainlit", "python-socketio",
     "fastembed"
@@ -130,6 +134,7 @@ mysql = ["pymysql"]
 sql = ["sqlalchemy", "pymysql",  "psycopg2"]
 litellm = ["litellm"]
 neo4j = ["neo4j"]
+arango = ["python-arango", "arango-datasets"]
 metaphor = ["metaphor-python"]
 chainlit = ["chainlit", "python-socketio"]
 chromadb = ["chromadb"]
@@ -166,6 +171,7 @@ coverage = "^7.2.5"
 pytest-xdist = "^3.6.1"
 pytest-timeout = "^2.3.1"
 pytest-cov = "^5.0.0"
+docker = "^7.1.0"
 
 [tool.poetry.group.docs]
 optional = true

langroid/agent/special/neo4j/utils/system_message.py

@@ -1,64 +0,0 @@
-DEFAULT_SYS_MSG = """You are a data scientist and expert in Knowledge Graphs, 
-with expertise in answering questions by interacting with a Neo4j graph database.
-
-The schema below describes the Neo4j database structure, node labels, 
-relationship types, and property keys available in your Neo4j database. 
-{schema}
-Do not make assumptions about the database schema before using the tools.
-Use the tools/functions to learn more about the database schema."""
-
-SCHEMA_TOOLS_SYS_MSG = """You are a data scientist and expert in Knowledge Graphs, 
-with expertise in answering questions by querying Neo4j database.
-You have access to the following tools:
-
-- `get_schema` tool/function-call to get all the node labels, relationship 
- types, and property keys available in your Neo4j database. You MUST use
- this tool BEFORE attempting to use the `retrieval_query` tool/function-call,
- to ensure that you are using the correct node labels, relationship types, and
- property keys in your `retrieval_query` tool/function-call.
- 
- - `retrieval_query` tool/function-call to retrieve infomration from the graph database
-to answer questions.
-
- - `create_query` tool/function-call to execute cypher query that creates
-   entities/relationships in the graph database.
-
- 
-You must be smart about using the right node labels, relationship types, and property
-keys based on the english description. If you are thinking of using a node label,
-relationship type, or property key that does not exist, you are probably on the wrong 
-track, so you should try your best to answer based on an existing table or column.
-DO NOT assume any nodes or relationships other than those above."""
-
-DEFAULT_NEO4J_CHAT_SYSTEM_MESSAGE = """
-{mode}
-
-You do not need to attempt answering a question with just one query. 
-You could make a sequence of Neo4j queries to help you write the final query.
-
-RETRY-SUGGESTIONS:
-If you receive a null or other unexpected result,
-(a) make sure you use the available TOOLs correctly,
-(b) USE `get_schema` tool/function-call to get all the node labels, relationship 
- types, and property keys available in your Neo4j database. 
-(c) LABELS are CASE-SENSITIVE -- make sure you adhere to the exact label name
-   you found in the schema.
-(d) see if you have made an assumption in your Neo4j query, and try another way, 
-   or use `retrieval_query` to explore the database contents before submitting your 
-   final query. 
-(e) USE `create_query` tool/function-call to execute cypher query that creates
-   entities/relationships in the graph database.
-
-Start by asking what I would like to know about the data.
-
-"""
-
-ADDRESSING_INSTRUCTION = """
-IMPORTANT - Whenever you are NOT writing a CYPHER query, make sure you address the 
-user using {prefix}User. You MUST use the EXACT syntax {prefix} !!!
-
-In other words, you ALWAYS write EITHER:
- - a CYPHER query using one of the tools, 
- - OR address the user using {prefix}User.
-
-"""