langroid 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

langroid/agent/special/neo4j/neo4j_chat_agent.py

@@ -11,10 +11,10 @@ from langroid.pydantic_v1 import BaseModel, BaseSettings
 if TYPE_CHECKING:
     import neo4j
 
-
 from langroid.agent.chat_agent import ChatAgent, ChatAgentConfig
-from langroid.agent.chat_document import ChatDocMetaData, ChatDocument
+from langroid.agent.chat_document import ChatDocument
 from langroid.agent.special.neo4j.utils.system_message import (
+    ADDRESSING_INSTRUCTION,
     DEFAULT_NEO4J_CHAT_SYSTEM_MESSAGE,
     DEFAULT_SYS_MSG,
     SCHEMA_TOOLS_SYS_MSG,
@@ -76,6 +76,7 @@ class Neo4jChatAgentConfig(ChatAgentConfig):
     use_schema_tools: bool = True
     use_functions_api: bool = True
     use_tools: bool = False
+    addressing_prefix: str = ""
 
 
 class Neo4jChatAgent(ChatAgent):
@@ -85,12 +86,21 @@ class Neo4jChatAgent(ChatAgent):
         Raises:
             ValueError: If database information is not provided in the config.
         """
-        self.config = config
+        self.config: Neo4jChatAgentConfig = config
         self._validate_config()
         self._import_neo4j()
         self._initialize_connection()
         self._init_tool_messages()
 
+    def handle_message_fallback(
+        self, msg: str | ChatDocument
+    ) -> str | ChatDocument | None:
+        """When LLM sends a no-tool msg, assume user is the intended recipient."""
+        if isinstance(msg, ChatDocument) and msg.metadata.sender == Entity.LLM:
+            msg.metadata.recipient = Entity.USER
+            return msg
+        return None
+
     def _validate_config(self) -> None:
         """Validate the configuration to ensure all necessary fields are present."""
         assert isinstance(self.config, Neo4jChatAgentConfig)
@@ -318,6 +328,10 @@ class Neo4jChatAgent(ChatAgent):
         """Initialize message tools used for chatting."""
         message = self._format_message()
         self.config.system_message = self.config.system_message.format(mode=message)
+        if self.config.addressing_prefix != "":
+            self.config.system_message += ADDRESSING_INSTRUCTION.format(
+                prefix=self.config.addressing_prefix
+            )
         super().__init__(self.config)
         self.enable_message(CypherRetrievalTool)
         self.enable_message(CypherCreationTool)
@@ -332,39 +346,3 @@ class Neo4jChatAgent(ChatAgent):
             if self.config.use_schema_tools
             else DEFAULT_SYS_MSG.format(schema=self.get_schema(None))
         )
-
-    def agent_response(
-        self,
-        msg: Optional[str | ChatDocument] = None,
-    ) -> Optional[ChatDocument]:
-        if msg is None:
-            return None
-
-        results = self.handle_message(msg)
-        if results is None:
-            return None
-
-        output = results
-        if NEO4J_ERROR_MSG in output:
-            output = "There was an error in the Cypher Query. Press enter to retry."
-
-        console.print(f"[red]{self.indent}", end="")
-        print(f"[red]Agent: {output}")
-        sender_name = self.config.name
-        if isinstance(msg, ChatDocument) and msg.function_call is not None:
-            sender_name = msg.function_call.name
-
-        content = results.content if isinstance(results, ChatDocument) else results
-        recipient = (
-            results.metadata.recipient if isinstance(results, ChatDocument) else ""
-        )
-
-        return ChatDocument(
-            content=content,
-            metadata=ChatDocMetaData(
-                # source=Entity.AGENT,
-                sender=Entity.AGENT,
-                sender_name=sender_name,
-                recipient=recipient,
-            ),
-        )

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

@@ -44,3 +44,13 @@ Also if you receive a null or other unexpected result,
 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.
+
+"""

{langroid-0.6.0.dist-info → langroid-0.6.1.dist-info}/METADATA

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

{langroid-0.6.0.dist-info → langroid-0.6.1.dist-info}/RECORD

@@ -23,9 +23,9 @@ langroid/agent/special/lance_rag_new/query_planner_agent.py,sha256=JqO_5fKW8HPn-
 langroid/agent/special/lance_tools.py,sha256=BznV_r3LAFyybvBRa9KQ0oU7mPM3uQVfri7PFp7M_qc,1894
 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=ryXFx2-ddlNzip8Zssrg0bCyNcFyIu4vax_z3WBXkyI,13106
+langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=B5y4he__9QjNrjNyngv4rlfVx7QezQ4Turom-l_zjCg,12572
 langroid/agent/special/neo4j/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-langroid/agent/special/neo4j/utils/system_message.py,sha256=vRpz1P-OYLLiC6OGYYoK6x77yxVzDxMTCEJSsYUIuG4,2242
+langroid/agent/special/neo4j/utils/system_message.py,sha256=OvYuBSlnLhav4HAiwcYiJJSrpbGxqOqs4RAvnlwAvRI,2557
 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
@@ -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=vAHemSLDsg6ert_9QdViNp2RmhqKnRdPXrQwalvgttI,7063
-langroid-0.6.0.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.6.0.dist-info/METADATA,sha256=ccWZpBVCmS7qIuqJY_rNBwTzC8D3zXuTXWRsuwyaD-I,54402
-langroid-0.6.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.6.0.dist-info/RECORD,,
+pyproject.toml,sha256=b3vqi_BvwKi-CRtturkQMIR9BjcuLOxbmAAFEMhz9DI,7063
+langroid-0.6.1.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.6.1.dist-info/METADATA,sha256=o5zXQBol5AfCAVK6sd1vNMwG3Qhrsie8QDo7-1C4yXY,54402
+langroid-0.6.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.6.1.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.6.0"
+version = "0.6.1"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"