langroid 0.1.243__py3-none-any.whl → 0.1.245__py3-none-any.whl

langroid/agent/base.py

@@ -812,12 +812,14 @@ class Agent(ABC):
             llm_model = (
                 "no-LLM" if self.config.llm is None else self.llm.config.chat_model
             )
-
+            # tot cost across all LLMs, agents
+            all_cost = format(self.llm.tot_tokens_cost()[1], ".4f")
             return (
                 f"[bold]Stats:[/bold] [magenta]N_MSG={chat_length}, "
                 f"TOKENS: in={in_tokens}, out={out_tokens}, "
                 f"max={max_out}, ctx={context_length}, "
-                f"COST: now=${llm_response_cost}, cumul=${cumul_cost} "
+                f"COST: now=${llm_response_cost}, cumul=${cumul_cost}, "
+                f"tot=${all_cost} "
                 f"[bold]({llm_model})[/bold][/magenta]"
             )
         return ""

langroid/agent/chat_document.py

@@ -166,6 +166,16 @@ class ChatDocument(Document):
         message = message.strip()
         if message in ["''", '""']:
             message = ""
+        if response.function_call is not None:
+            # Sometimes an OpenAI LLM may generate a function-call
+            # where the `name` is set, as well as `arugments.request` is set.
+            # In this case we override the `name` with the `request` value.
+            fc = response.function_call
+            if fc.arguments is not None:
+                request = fc.arguments.get("request")
+                if request is not None and request != "":
+                    fc.name = request
+                    fc.arguments.pop("request")
         return ChatDocument(
             content=message,
             function_call=response.function_call,

langroid/agent/special/lance_rag/critic_agent.py

@@ -52,7 +52,7 @@ class QueryPlanCriticConfig(LanceQueryPlanAgentConfig):
       SEMANTIC/LEXICAL/FUZZY FILTER since the Assistant is able to use it to match 
       the CONTENT of the docs in various ways (semantic, lexical, fuzzy, etc.).
          
-    - DATAFRAME CALCULATION, and 
+    - DATAFRAME CALCULATION, which must be a SINGLE LINE calculation, and 
     - ANSWER recieved from an assistant that used this QUERY PLAN.
 
     In addition to the above SCHEMA fields there is a `content` field which:
@@ -64,8 +64,14 @@ class QueryPlanCriticConfig(LanceQueryPlanAgentConfig):
     ONLY using the `query_plan_feedback` tool, and DO NOT SAY ANYTHING ELSE.
     
     Here is how you must examine the QUERY PLAN + ANSWER:
+    - ALL filtering conditions in the original query must be EXPLICITLY 
+      mentioned in the FILTER, and the QUERY field should not be used for filtering.
+    - If the ANSWER contains an ERROR message, then this means that the query
+      plan execution FAILED, and your feedback should say INVALID along 
+      with the ERROR message, `suggested_fix` that aims to help the assistant 
+      fix the problem (or simply equals "address the the error shown in feedback")
     - If the ANSWER is in the expected form, then the QUERY PLAN is likely VALID,
-      and your feedback should be EMPTY.
+      and your feedback should say VALID, with empty `suggested_fix`.
     - If the ANSWER is {NO_ANSWER} or of the wrong form, 
       then try to DIAGNOSE the problem IN THE FOLLOWING ORDER:
       - DATAFRAME CALCULATION -- is it doing the right thing?
@@ -83,11 +89,13 @@ class QueryPlanCriticConfig(LanceQueryPlanAgentConfig):
         REMEMBER: A filter should ONLY be used if EXPLICITLY REQUIRED BY THE QUERY.
      
     
-    ALWAYS use `query_plan_feedback` tool/fn to present your feedback!
-    and DO NOT SAY ANYTHING ELSE OUTSIDE THE TOOL/FN.
-    IF NO REVISION NEEDED, simply give EMPTY FEEBACK, SAY NOTHING ELSE
-    and DO NOT EXPLAIN YOURSELF.
-        
+    ALWAYS use `query_plan_feedback` tool/fn to present your feedback
+    in the `feedback` field, and if any fix is suggested,
+    present it in the `suggested_fix` field.
+    DO NOT SAY ANYTHING ELSE OUTSIDE THE TOOL/FN.
+    IF NO REVISION NEEDED, simply leave the `suggested_fix` field EMPTY,
+    and SAY NOTHING ELSE
+    and DO NOT EXPLAIN YOURSELF.        
     """
 
 
@@ -95,7 +103,7 @@ def plain_text_query_plan(msg: QueryPlanAnswerTool) -> str:
     plan = f"""
     OriginalQuery: {msg.plan.original_query}
     Filter: {msg.plan.filter}
-    Query: {msg.plan.query}
+    Rephrased Query: {msg.plan.query}
     DataframeCalc: {msg.plan.dataframe_calc}
     Answer: {msg.answer}
     """
@@ -126,11 +134,12 @@ class QueryPlanCritic(ChatAgent):
     def handle_message_fallback(
         self, msg: str | ChatDocument
     ) -> str | ChatDocument | None:
-        """Create QueryPlanFeedbackTool since LLM forgot"""
+        """Remind the LLM to use QueryPlanFeedbackTool since it forgot"""
         if isinstance(msg, ChatDocument) and msg.metadata.sender == Entity.LLM:
-            # our LLM forgot to use the QueryPlanFeedbackTool
-            feedback = QueryPlanFeedbackTool(feedback=msg.content)
-            msg.tool_messages = [feedback]
-            msg.content = DONE
-            return msg
+            return """
+            You forgot to use the `query_plan_feedback` tool/function.
+            Re-try your response using the `query_plan_feedback` tool/function,
+            remember to provide feedback in the `feedback` field,
+            and if any fix is suggested, provide it in the `suggested_fix` field.
+            """
         return None

langroid/agent/special/lance_rag/query_planner_agent.py

@@ -16,6 +16,7 @@ This agent has access to two tools:
 
 import logging
 
+import langroid as lr
 from langroid.agent.chat_agent import ChatAgent, ChatAgentConfig
 from langroid.agent.chat_document import ChatDocument
 from langroid.agent.special.lance_tools import (
@@ -35,6 +36,7 @@ class LanceQueryPlanAgentConfig(ChatAgentConfig):
     doc_agent_name: str = "LanceRAG"
     doc_schema: str = ""
     use_tools = False
+    max_retries: int = 5  # max number of retries for query plan
     use_functions_api = True
 
     system_message = f"""
@@ -58,10 +60,13 @@ class LanceQueryPlanAgentConfig(ChatAgentConfig):
         so the REPHRASED QUERY should NOT mention ANY FILTER fields.
         The answer will answer based on documents whose CONTENTS match the QUERY, 
         possibly REPHRASED. 
-    - a Pandas-dataframe calculation/aggregation string that can be used to calculate
-        the answer to the original query, e.g. "df["rating"].mean()",
-        or "df.groupby("director").mean()["rating"]", etc, or empty string if no calc
-        is needed. The dataframe calc CAN refer to the `content` field. 
+    - an OPTIONAL SINGLE-LINE Pandas-dataframe calculation/aggregation string 
+        that can be used to calculate the answer to the original query, 
+        e.g. "df["rating"].mean()",
+        or "df.groupby("director").mean()["rating"]", 
+        or EMPTY string if no calc is needed. 
+        The dataframe calc CAN refer to the `content` field.
+        If a DataFrame calculation is NOT needed, leave this field EMPTY.
     
     
     EXAMPLE:
@@ -116,6 +121,8 @@ class LanceQueryPlanAgent(ChatAgent):
         super().__init__(config)
         self.config: LanceQueryPlanAgentConfig = config
         self.curr_query_plan: QueryPlan | None = None
+        # how many times re-trying query plan in response to feedback:
+        self.n_retries: int = 0
         self.result: str = ""  # answer received from LanceRAG
         # This agent should generate the QueryPlanTool
         # as well as handle it for validation
@@ -125,6 +132,8 @@ class LanceQueryPlanAgent(ChatAgent):
     def query_plan(self, msg: QueryPlanTool) -> str:
         """Valid, forward to RAG Agent"""
         # save, to be used to assemble QueryPlanResultTool
+        if len(msg.plan.dataframe_calc.split("\n")) > 1:
+            return "DATAFRAME CALCULATION must be a SINGLE LINE; Retry the `query_plan`"
         self.curr_query_plan = msg.plan
         return PASS_TO + self.config.doc_agent_name
 
@@ -132,7 +141,8 @@ class LanceQueryPlanAgent(ChatAgent):
         """Process Critic feedback on QueryPlan + Answer from RAG Agent"""
         # We should have saved answer in self.result by this time,
         # since this Agent seeks feedback only after receiving RAG answer.
-        if msg.feedback == "":
+        if msg.suggested_fix == "":
+            self.n_retries = 0
             # This means the Query Plan or Result is good, as judged by Critic
             if self.result == "":
                 # This was feedback for query with no result
@@ -141,9 +151,16 @@ class LanceQueryPlanAgent(ChatAgent):
                 return NO_ANSWER
             else:  # non-empty and non-null answer
                 return DONE + " " + self.result
+        self.n_retries += 1
+        if self.n_retries >= self.config.max_retries:
+            # bail out to avoid infinite loop
+            self.n_retries = 0
+            return DONE + " " + NO_ANSWER
         return f"""
-        here is FEEDBACK about your QUERY PLAN. Modify it if needed:
-        {msg.feedback}
+        here is FEEDBACK about your QUERY PLAN, and a SUGGESTED FIX.
+        Modify the QUERY PLAN if needed:
+        FEEDBACK: {msg.feedback}
+        SUGGESTED FIX: {msg.suggested_fix}
         """
 
     def handle_message_fallback(
@@ -177,4 +194,14 @@ class LanceQueryPlanAgent(ChatAgent):
             response_tmpl.metadata.recipient = self.config.critic_name
             self.curr_query_plan = None  # reset
             return response_tmpl
+        if (
+            isinstance(msg, ChatDocument)
+            and not self.has_tool_message_attempt(msg)
+            and msg.metadata.sender == lr.Entity.LLM
+        ):
+            # remind LLM to use the QueryPlanFeedbackTool
+            return """
+            You forgot to use the `query_plan` tool/function.
+            Re-try your response using the `query_plan` tool/function.
+            """
         return None

langroid/agent/special/lance_tools.py

@@ -40,5 +40,9 @@ class QueryPlanAnswerTool(ToolMessage):
 
 class QueryPlanFeedbackTool(ToolMessage):
     request = "query_plan_feedback"
-    purpose = "To give <feedback> regarding the query plan."
+    purpose = """
+    To give <feedback> regarding the query plan, 
+    along with a <suggested_fix> if any (empty string if no fix is suggested).
+    """
     feedback: str
+    suggested_fix: str

{langroid-0.1.243.dist-info → langroid-0.1.245.dist-info}/METADATA

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

{langroid-0.1.243.dist-info → langroid-0.1.245.dist-info}/RECORD

@@ -1,11 +1,11 @@
 langroid/__init__.py,sha256=zsYpGiAUsvyzZzjm964NUamsJImrXSJPVGz9a2jE_uY,1679
 langroid/agent/__init__.py,sha256=_D8dxnfdr92ch1CIrUkKjrB5HVvsQdn62b1Fb2kBxV8,785
-langroid/agent/base.py,sha256=jyGFmojrFuOy81lUkNsJlR6mLIOY6kOD20P9dhEcEuw,35059
+langroid/agent/base.py,sha256=H1Fk9kJKr-7I1GgbmaflumG7so6yGmwl7AVTgU7PyeM,35210
 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=aYuJ8M4VDHr5oymoXL2bpThM7p6P9L45fgJf3MLdkWo,20997
 langroid/agent/chat_agent.py,sha256=X5uVMm9qdw3j-FRf4hbN8k8ByaSdtQCTuU8olKE0sbs,38750
-langroid/agent/chat_document.py,sha256=NGr5FEWasPUQZ7cJnqrkVYYTi5fOqplSoCU-z5tTONA,8422
+langroid/agent/chat_document.py,sha256=qUadrl2hiahWnvLemWCCsaCesBrfwQtOIiz2IOhUCbM,8969
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
 langroid/agent/openai_assistant.py,sha256=kIVDI4r-xGvplLU5s0nShPVHs6Jq-wOsfWE0kcMhAdQ,33056
@@ -13,10 +13,10 @@ langroid/agent/special/__init__.py,sha256=NG0JkB5y4K0bgnd9Q9UIvFExun3uTfVOWEVLVy
 langroid/agent/special/doc_chat_agent.py,sha256=LwWNb_1s5n9rOk9OpOFPuuY1VnVX5DjzQmPwBanKRrM,53763
 langroid/agent/special/lance_doc_chat_agent.py,sha256=USp0U3eTaJzwF_3bdqE7CedSLbaqAi2tm-VzygcyLaA,10175
 langroid/agent/special/lance_rag/__init__.py,sha256=QTbs0IVE2ZgDg8JJy1zN97rUUg4uEPH7SLGctFNumk4,174
-langroid/agent/special/lance_rag/critic_agent.py,sha256=pi_9eMBxEycbWTddtq_yz-mOb2V4SgGm3zfsOH1HU-Q,5775
+langroid/agent/special/lance_rag/critic_agent.py,sha256=Xe5pCqZAnVoM-dC9_8FW5U7s2dFkPPYZ4O41BDOyHT4,6576
 langroid/agent/special/lance_rag/lance_rag_task.py,sha256=l_HQgrYY-CX2FwIsS961aEF3bYog3GDYo98fj0C0mSk,2889
-langroid/agent/special/lance_rag/query_planner_agent.py,sha256=_8AwZsuEaoHGjrOrkLU2Lvxuqi4h8PkxBRcPmWPOSHk,8033
-langroid/agent/special/lance_tools.py,sha256=WypIS-3ZMDqY_PZEGB2K80-o4RfS43_OnER0dyFlsDY,1339
+langroid/agent/special/lance_rag/query_planner_agent.py,sha256=EdkCwwx4FpM9yGlk79dd8pQx3XozUT39ss77fhDo_cU,9214
+langroid/agent/special/lance_tools.py,sha256=btMwKdcT8RdwAjmzbtN1xxm3s1H7ipO9GSpUamryYx8,1456
 langroid/agent/special/neo4j/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/neo4j/csv_kg_chat.py,sha256=koL3sKtHm3aRkLTiARs54ngrcU3lOR1WaLLc_i8rWOU,6374
 langroid/agent/special/neo4j/neo4j_chat_agent.py,sha256=vBr6EQ_eJCYAtqDe-gTSvWHT-jRE_fZOPsGWxuDJe4w,13092
@@ -121,7 +121,7 @@ langroid/vector_store/meilisearch.py,sha256=d2huA9P-NoYRuAQ9ZeXJmMKr7ry8u90RUSR2
 langroid/vector_store/momento.py,sha256=9cui31TTrILid2KIzUpBkN2Ey3g_CZWOQVdaFsA4Ors,10045
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=sk5Qb2ZNbooi0rorsMuqIMokF7WADw6PJ0D6goM2XBw,16802
-langroid-0.1.243.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.243.dist-info/METADATA,sha256=ifxBHFsiI6V469lHlmNq18a6ZDcItx6JvA9KKhRVTyc,49163
-langroid-0.1.243.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.243.dist-info/RECORD,,
+langroid-0.1.245.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.245.dist-info/METADATA,sha256=Ucs49kPOL14MeUc2eKubI-mdxY0dfBaQlEPGKnoAy4U,49163
+langroid-0.1.245.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.245.dist-info/RECORD,,