langroid 0.22.4__tar.gz → 0.22.6__tar.gz

{langroid-0.22.4 → langroid-0.22.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.22.4
+Version: 0.22.6
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -68,7 +68,7 @@ Requires-Dist: metaphor-python (>=0.1.23,<0.2.0) ; extra == "all" or extra == "m
 Requires-Dist: momento (>=1.10.2,<1.21) ; extra == "momento"
 Requires-Dist: neo4j (>=5.14.1,<6.0.0) ; extra == "all" or extra == "neo4j"
 Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
-Requires-Dist: nltk (>=3.8.1,<4.0.0)
+Requires-Dist: nltk (>=3.8.2,<4.0.0)
 Requires-Dist: onnxruntime (>=1.16.1,<2.0.0)
 Requires-Dist: openai (>=1.45.0,<2.0.0)
 Requires-Dist: pandas (>=2.0.3,<3.0.0)

{langroid-0.22.4 → langroid-0.22.6}/langroid/agent/base.py

@@ -142,7 +142,7 @@ class Agent(ABC):
         self.llm_tools_handled: Set[str] = set()
         self.llm_tools_usable: Set[str] = set()
         self.llm_tools_known: Set[str] = set()  # all known tools, handled/used or not
-        self.interactive: bool | None = None
+        self.interactive: bool = True  # may be modified by Task wrapper
         self.token_stats_str = ""
         self.default_human_response: Optional[str] = None
         self._indent = ""
@@ -645,10 +645,11 @@ class Agent(ABC):
         need_human_response = (
             isinstance(msg, ChatDocument) and msg.metadata.recipient == Entity.USER
         )
+        default_user_msg = (
+            (self.default_human_response or "null") if need_human_response else ""
+        )
 
-        interactive = self.interactive or settings.interactive
-
-        if not interactive and not need_human_response:
+        if not self.interactive and not need_human_response:
             return None
         elif self.default_human_response is not None:
             user_msg = self.default_human_response
@@ -669,6 +670,8 @@ class Agent(ABC):
         tool_ids = []
         if msg is not None and isinstance(msg, ChatDocument):
             tool_ids = msg.metadata.tool_ids
+
+        user_msg = user_msg.strip() or default_user_msg.strip()
         # only return non-None result if user_msg not empty
         if not user_msg:
             return None

{langroid-0.22.4 → langroid-0.22.6}/langroid/agent/special/sql/sql_chat_agent.py

@@ -362,6 +362,17 @@ class SQLChatAgent(ChatAgent):
 
         return error_message_template
 
+    def _available_tool_names(self) -> str:
+        return ",".join(
+            tool.name()  # type: ignore
+            for tool in [
+                RunQueryTool,
+                GetTableNamesTool,
+                GetTableSchemaTool,
+                GetColumnDescriptionsTool,
+            ]
+        )
+
     def run_query(self, msg: RunQueryTool) -> str:
         """
         Handle a RunQueryTool message by executing a SQL query and returning the result.
@@ -399,7 +410,20 @@ class SQLChatAgent(ChatAgent):
         finally:
             session.close()
 
-        return response_message
+        final_message = f"""
+        Below is the result from your use of the TOOL `{RunQueryTool.name()}`:
+        ==== result ====
+        {response_message}
+        ================
+        
+        If you are READY to ANSWER the ORIGINAL QUERY:
+             use the `{DoneTool.name()}` tool to send the result to the user,
+             with the `content` set to the answer or result
+        OTHERWISE:
+             continue using one of your available TOOLs:
+             {self._available_tool_names()}
+        """
+        return final_message
 
     def _format_rows(self, rows: Sequence[Row[Any]]) -> str:
         """

{langroid-0.22.4 → langroid-0.22.6}/langroid/agent/special/sql/utils/tools.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Tuple
 
 from langroid.agent.tool_message import ToolMessage
 
@@ -11,6 +11,20 @@ class RunQueryTool(ToolMessage):
             """
     query: str
 
+    @classmethod
+    def examples(cls) -> List["ToolMessage" | Tuple[str, "ToolMessage"]]:
+        return [
+            cls(
+                query="SELECT * FROM movies WHERE genre = 'comedy'",
+            ),
+            (
+                "Find all movies with a rating of 5",
+                cls(
+                    query="SELECT * FROM movies WHERE rating = 5",
+                ),
+            ),
+        ]
+
 
 class GetTableNamesTool(ToolMessage):
     request: str = "get_table_names"

{langroid-0.22.4 → langroid-0.22.6}/langroid/agent/task.py

@@ -1023,9 +1023,11 @@ class Task:
         found_response = False
         # (responder, result) from a responder who explicitly said NO_ANSWER
         no_answer_response: None | Tuple[Responder, ChatDocument] = None
+        n_non_responders = 0
         for r in responders:
             self.is_pass_thru = False
             if not self._can_respond(r):
+                n_non_responders += 1
                 # create dummy msg for logging
                 log_doc = ChatDocument(
                     content="[CANNOT RESPOND]",
@@ -1038,6 +1040,9 @@ class Task:
                 # no need to register this dummy msg in ObjectRegistry
                 ChatDocument.delete_id(log_doc.id())
                 self.log_message(r, log_doc)
+                if n_non_responders == len(responders):
+                    # don't stay in this "non-response" loop forever
+                    break
                 continue
             self.human_tried = r == Entity.USER
             result = self.response(r, turns)

{langroid-0.22.4 → langroid-0.22.6}/langroid/parsing/utils.py

@@ -31,6 +31,10 @@ def download_nltk_resource(resource: str) -> None:
         nltk.download(resource, quiet=True)
 
 
+# Download punkt_tab resource at module import
+download_nltk_resource("punkt_tab")
+download_nltk_resource("gutenberg")
+
 T = TypeVar("T")
 
 
@@ -46,7 +50,6 @@ def batched(iterable: Iterable[T], n: int) -> Iterable[Sequence[T]]:
 
 def generate_random_sentences(k: int) -> str:
     # Load the sample text
-    download_nltk_resource("gutenberg")
 
     from nltk.corpus import gutenberg
 

{langroid-0.22.4 → langroid-0.22.6}/langroid/utils/configuration.py

@@ -17,8 +17,6 @@ class Settings(BaseSettings):
     stream: bool = True  # stream output?
     cache: bool = True  # use cache?
     cache_type: Literal["redis", "fakeredis", "momento", "none"] = "redis"  # cache type
-    interactive: bool = True  # interactive mode?
-    gpt3_5: bool = True  # use GPT-3.5?
     chat_model: str = ""  # language model name, e.g. litellm/ollama/llama2
     quiet: bool = False  # quiet mode (i.e. suppress all output)?
     notebook: bool = False  # running in a notebook?

{langroid-0.22.4 → langroid-0.22.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.22.4"
+version = "0.22.6"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -62,7 +62,7 @@ fakeredis = "^2.12.1"
 faker = "^18.9.0"
 requests = "^2.31.0"
 pyparsing = "^3.0.9"
-nltk = "^3.8.1"
+nltk = "^3.8.2"
 qdrant-client = "^1.8.0"
 pydantic = ">=1,<3"
 pandas = "^2.0.3"