langroid 0.1.167__py3-none-any.whl → 0.1.169__py3-none-any.whl

langroid/agent/base.py

@@ -21,6 +21,7 @@ from typing import (
 from pydantic import BaseSettings, ValidationError
 from rich import print
 from rich.console import Console
+from rich.markup import escape
 from rich.prompt import Prompt
 
 from langroid.agent.chat_document import ChatDocMetaData, ChatDocument
@@ -449,7 +450,7 @@ class Agent(ABC):
             # streaming was enabled, AND we did not find a cached response.
             # If we are here, it means the response has not yet been displayed.
             cached = f"[red]{self.indent}(cached)[/red]" if response.cached else ""
-            print(cached + "[green]" + response.message)
+            print(cached + "[green]" + escape(response.message))
         async with self.lock:
             self.update_token_usage(
                 response,
@@ -522,7 +523,7 @@ class Agent(ABC):
             # If we are here, it means the response has not yet been displayed.
             cached = f"[red]{self.indent}(cached)[/red]" if response.cached else ""
             console.print(f"[green]{self.indent}", end="")
-            print(cached + "[green]" + response.message)
+            print(cached + "[green]" + escape(response.message))
         self.update_token_usage(
             response,
             prompt,

langroid/agent/chat_agent.py

@@ -6,6 +6,7 @@ from typing import Dict, List, Optional, Set, Tuple, Type, cast
 
 from rich import print
 from rich.console import Console
+from rich.markup import escape
 
 from langroid.agent.base import Agent, AgentConfig
 from langroid.agent.chat_document import ChatDocument
@@ -570,7 +571,10 @@ class ChatAgent(Agent):
                         raise ValueError(
                             """
                         The message history is longer than the max chat context 
-                        length allowed, and we have run out of messages to drop."""
+                        length allowed, and we have run out of messages to drop.
+                        HINT: In your `OpenAIGPTConfig` object, try increasing
+                        `chat_context_length` or decreasing `max_output_tokens`.
+                        """
                         )
                     # drop the second message, i.e. first msg after the sys msg
                     # (typically user msg).
@@ -663,7 +667,7 @@ class ChatAgent(Agent):
             else:
                 response_str = response.message
             if not settings.quiet:
-                print(cached + "[green]" + response_str)
+                print(cached + "[green]" + escape(response_str))
         self.update_token_usage(
             response,
             messages,
@@ -706,7 +710,7 @@ class ChatAgent(Agent):
             else:
                 response_str = response.message
             if not settings.quiet:
-                print(cached + "[green]" + response_str)
+                print(cached + "[green]" + escape(response_str))
 
         self.update_token_usage(
             response,

langroid/agent/chat_document.py

@@ -144,6 +144,9 @@ class ChatDocument(Document):
             ChatDocument: ChatDocument representation of this LLMResponse.
         """
         recipient, message = response.get_recipient_and_message()
+        message = message.strip()
+        if message in ["''", '""']:
+            message = ""
         return ChatDocument(
             content=message,
             function_call=response.function_call,

langroid/agent/special/neo4j/neo4j_chat_agent.py

@@ -17,8 +17,8 @@ from langroid.agent.special.neo4j.utils.system_message import (
     SCHEMA_TOOLS_SYS_MSG,
 )
 from langroid.agent.special.neo4j.utils.tools import (
-    GenerateCypherQueries,
-    GraphDatabaseSchema,
+    CypherQueryTool,
+    GraphSchemaTool,
 )
 from langroid.mytypes import Entity
 
@@ -226,12 +226,12 @@ class Neo4jChatAgent(ChatAgent):
         else:
             print("[red]Database is not deleted!")
 
-    def make_query(self, msg: GenerateCypherQueries) -> str:
+    def make_query(self, msg: CypherQueryTool) -> str:
         """ "
         Handle a GenerateCypherQueries message by executing a Cypher query and
         returning the result.
         Args:
-            msg (GenerateCypherQueries): The tool-message to handle.
+            msg (CypherQueryTool): The tool-message to handle.
 
         Returns:
             str: The result of executing the Cypherquery.
@@ -247,12 +247,12 @@ class Neo4jChatAgent(ChatAgent):
     # The current query works well. But we could use the queries here:
     # https://github.com/neo4j/NaLLM/blob/1af09cd117ba0777d81075c597a5081583568f9f/api/
     # src/driver/neo4j.py#L30
-    def get_schema(self, msg: GraphDatabaseSchema | None) -> str:
+    def get_schema(self, msg: GraphSchemaTool | None) -> str:
         """
         Retrieves the schema of a Neo4j graph database.
 
         Args:
-            msg (GraphDatabaseSchema): An instance of GraphDatabaseSchema, typically
+            msg (GraphSchemaTool): An instance of GraphDatabaseSchema, typically
             containing information or parameters needed for the database query.
 
         Returns:
@@ -275,8 +275,8 @@ class Neo4jChatAgent(ChatAgent):
         message = self._format_message()
         self.config.system_message = self.config.system_message.format(mode=message)
         super().__init__(self.config)
-        self.enable_message(GenerateCypherQueries)
-        self.enable_message(GraphDatabaseSchema)
+        self.enable_message(CypherQueryTool)
+        self.enable_message(GraphSchemaTool)
 
     def _format_message(self) -> str:
         if self.driver is None:

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

@@ -1,13 +1,13 @@
 from langroid.agent.tool_message import ToolMessage
 
 
-class GenerateCypherQueries(ToolMessage):
+class CypherQueryTool(ToolMessage):
     request: str = "make_query"
     purpose: str = """Use this tool to send me the Generated Cypher query based on 
     text description and schema that I will provide you."""
     cypherQuery: str
 
 
-class GraphDatabaseSchema(ToolMessage):
+class GraphSchemaTool(ToolMessage):
     request: str = "get_schema"
     purpose: str = """Use this tool to get me the schema of the graph database."""

langroid/agent/task.py

@@ -1013,11 +1013,7 @@ class Task:
         return (
             result is not None
             and not self._is_empty_message(result)
-            # and (  # if NO_ANSWER is from controller, then it means
-            #     # controller is stuck and we are done with task loop
-            #     NO_ANSWER not in result.content
-            #     or result.metadata.sender == self.controller
-            # )
+            and NO_ANSWER not in result.content
         )
 
     def log_message(

langroid/utils/logging.py

@@ -4,6 +4,7 @@ from typing import no_type_check
 
 import colorlog
 from rich.console import Console
+from rich.markup import escape
 
 
 # Define a function to set up the colored logger
@@ -125,6 +126,6 @@ class RichFileLogger:
         with open(self.log_file, "a") as f:
             if self.color:
                 console = Console(file=f, force_terminal=True, width=200)
-                console.print(message)
+                console.print(escape(message))
             else:
                 print(message, file=f)

{langroid-0.1.167.dist-info → langroid-0.1.169.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.167
+Version: 0.1.169
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani

{langroid-0.1.167.dist-info → langroid-0.1.169.dist-info}/RECORD

@@ -1,9 +1,9 @@
 langroid/__init__.py,sha256=I9edNDkpmfd5C4WvTONaGaTFzIlvFyp5GpFEaMCAKMk,778
 langroid/agent/__init__.py,sha256=w2pap-rHrp41gMzdtzur2YY_m62LqQhF2Du-AmoIQi4,752
-langroid/agent/base.py,sha256=ZMZvrNsYPmOYUxuaDTGGP3I9sZUYpIl6QZ-n3bceAoQ,33238
+langroid/agent/base.py,sha256=X_B9WxTwRfTNTkDwNGzGU-tvgdwJ6AnW22vL0kl_97g,33285
 langroid/agent/batch.py,sha256=Cg7Qv1yGi_M9rMl38_4-hjXPsoLlZrOSXDhbOFqUcKY,5593
-langroid/agent/chat_agent.py,sha256=yi6Vyh94fXnOQ2nmHvLaTOEV_k7esFs2K0vCpDdg2vs,35029
-langroid/agent/chat_document.py,sha256=4BQADxqj7Gbn8dr5NeTB5EObzosOJ5eF0azvHKoHUog,7863
+langroid/agent/chat_agent.py,sha256=vLHFUPzOVQlGfeXCOMxLi5gtTGOHX7q6JKf_926TFmg,35261
+langroid/agent/chat_document.py,sha256=MRp2YCy5f3Q_yPoFXVyr1vGu48wz33UGxAUtMn7MJpo,7958
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
 langroid/agent/openai_assistant.py,sha256=yBtxis64XOnxtJzlkwUoTm-wCyvKr4DGo9-laXYMok0,32654
@@ -15,9 +15,11 @@ langroid/agent/special/lance_rag/critic_agent.py,sha256=9izW4keCxVZEqrFOgyVUHD7N
 langroid/agent/special/lance_rag/lance_rag_task.py,sha256=l_HQgrYY-CX2FwIsS961aEF3bYog3GDYo98fj0C0mSk,2889
 langroid/agent/special/lance_rag/lance_tools.py,sha256=WypIS-3ZMDqY_PZEGB2K80-o4RfS43_OnER0dyFlsDY,1339
 langroid/agent/special/lance_rag/query_planner_agent.py,sha256=dZXVano2NbRZy91nBcEW6LrvedsHfxL1oNCgMQEHZ-U,8016
-langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=LowGbQyaKlU7DCn6zwAVe_VmuhbPWArhVuh3Flls6dU,11435
+langroid/agent/special/neo4j/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=XGAUft3IxzwuRze8rFJKuaJHhLVJxT478HCY3QYXC_4,11395
+langroid/agent/special/neo4j/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/neo4j/utils/system_message.py,sha256=7rwq4CYpb1-1AvGLJBI6-X8UIu5RP5LiWU9re-umXxs,1959
-langroid/agent/special/neo4j/utils/tools.py,sha256=0iRiYbh-tSM9l6UolkKhbL3y_NIdArmBN6JRtjB_4gk,450
+langroid/agent/special/neo4j/utils/tools.py,sha256=mZWrfh-OMY96S947_sazwZuYPEYULKhnUkynHYtrdc0,440
 langroid/agent/special/relevance_extractor_agent.py,sha256=lychVpSEhMzi_CdeLN1yO-O2AVOe2W0F3Ha8aC3nd9M,4624
 langroid/agent/special/retriever_agent.py,sha256=uu6vqFg85uCVM-_DrXesYe2gH_-WcoHhlsKRlLuZPXk,1867
 langroid/agent/special/sql/__init__.py,sha256=qUM-b4FfvIt0gYWP7_niyqR3OwVMMkuK2SyqUYWjyxs,207
@@ -28,7 +30,7 @@ langroid/agent/special/sql/utils/populate_metadata.py,sha256=zRjw31a1ZXvpx9bcmbt
 langroid/agent/special/sql/utils/system_message.py,sha256=qKLHkvQWRQodTtPLPxr1GSLUYUFASZU8x-ybV67cB68,1885
 langroid/agent/special/sql/utils/tools.py,sha256=6uB2424SLtmapui9ggcEr0ZTiB6_dL1-JRGgN8RK9Js,1332
 langroid/agent/special/table_chat_agent.py,sha256=Gj_Iuq21_Ldyvzc8qhgsVuBLKqt0VIqivxCw_tH9Cu4,7772
-langroid/agent/task.py,sha256=mrZz4LZuCBpurm7j4BvyvKzEpJS5XhTisRQhkPa8j5M,46576
+langroid/agent/task.py,sha256=MU7IEY7131Q5I1BQmBl_7aTW2hGMu8TeqhMPBnEqdRo,46354
 langroid/agent/tool_message.py,sha256=ngmWdiqMYbjF4Am0hsLyA9zK0Q9QF2ziec6FW0lPD90,7399
 langroid/agent/tools/__init__.py,sha256=q-maq3k2BXhPAU99G0H6-j_ozoRvx15I1RFpPVicQIU,304
 langroid/agent/tools/extract_tool.py,sha256=u5lL9rKBzaLBOrRyLnTAZ97pQ1uxyLP39XsWMnpaZpw,3789
@@ -90,7 +92,7 @@ langroid/utils/docker.py,sha256=kJQOLTgM0x9j9pgIIqp0dZNZCTvoUDhp6i8tYBq1Jr0,1105
 langroid/utils/globals.py,sha256=VkTHhlqSz86oOPq65sjul0XU8I52UNaFC5vwybMQ74w,1343
 langroid/utils/llms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/utils/llms/strings.py,sha256=CSAX9Z6FQOLXOzbLMe_Opqtc3ruDAKTTk7cPqc6Blh0,263
-langroid/utils/logging.py,sha256=R8TN-FqVpwZ4Ajgls9TDMthLvPpQd0QVNXK-PJDj1Z8,3917
+langroid/utils/logging.py,sha256=CXe8w2gjFhhvgyGr1iwU--Je916H2rOrDNJosv5Tl3Y,3956
 langroid/utils/output/__init__.py,sha256=Z58-2ZKnGpGNaKw_nEjHV_CHTzjMz-WRSRQnazTLrWU,289
 langroid/utils/output/printing.py,sha256=5EsYB1O4qKhocW19aebOUzK82RD9U5nygbY21yo8gfg,2872
 langroid/utils/pandas_utils.py,sha256=nSA1tIgOUTkRDn-IKq7HP8XGJcL6bA110LcPfRF7h8I,707
@@ -107,7 +109,7 @@ langroid/vector_store/meilisearch.py,sha256=d2huA9P-NoYRuAQ9ZeXJmMKr7ry8u90RUSR2
 langroid/vector_store/momento.py,sha256=j6Eo6oIDN2fe7lsBOlCXJn3uvvERHHTFL5QJfeREeOM,10044
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=qt7Dye6rcgoe0551WzmOxRGIlJfL87D4MX7HdqxuEok,13393
-langroid-0.1.167.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.167.dist-info/METADATA,sha256=rvYS1MJQd2Btl9vWDBwM6jOaovQQ5YZ1mfLE0zMJWP0,43613
-langroid-0.1.167.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.167.dist-info/RECORD,,
+langroid-0.1.169.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.169.dist-info/METADATA,sha256=tSniCcftzCMGcRzoLTV51kw7hGdTTM2afbNernwwl70,43613
+langroid-0.1.169.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.169.dist-info/RECORD,,