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

langroid/agent/callbacks/chainlit.py

@@ -579,17 +579,18 @@ class ChainlitTaskCallbacks(ChainlitAgentCallbacks):
         top-level agent"""
 
         super().__init__(task.agent, msg, config)
-        ChainlitTaskCallbacks._inject_callbacks(task)
+        self._inject_callbacks(task)
         self.task = task
         self.task.callbacks.show_subtask_response = self.show_subtask_response
 
-    @staticmethod
+    @classmethod
     def _inject_callbacks(
-        task: lr.Task, config: ChainlitCallbackConfig = ChainlitCallbackConfig()
+        cls, task: lr.Task, config: ChainlitCallbackConfig = ChainlitCallbackConfig()
     ) -> None:
         # recursively apply ChainlitAgentCallbacks to agents of sub-tasks
         for t in task.sub_tasks:
-            ChainlitTaskCallbacks(t, config=config)
+            cls(t, config=config)
+            # ChainlitTaskCallbacks(t, config=config)
 
     def show_subtask_response(
         self, task: lr.Task, content: str, is_tool: bool = False

langroid/agent/chat_document.py

@@ -167,10 +167,15 @@ class ChatDocument(Document):
         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.
+            # Sometimes an OpenAI LLM (esp gpt-4o) may generate a function-call
+            # with odditities:
+            # (a) the `name` is set, as well as `arugments.request` is set,
+            #  and in langroid we use the `request` value as the `name`.
+            #  In this case we override the `name` with the `request` value.
+            # (b) the `name` looks like "functions blah" or just "functions"
+            #   In this case we strip the "functions" part.
             fc = response.function_call
+            fc.name = fc.name.replace("functions", "").strip()
             if fc.arguments is not None:
                 request = fc.arguments.get("request")
                 if request is not None and request != "":

langroid/agent/special/lance_rag/critic_agent.py

@@ -50,10 +50,10 @@ class QueryPlanCriticConfig(LanceQueryPlanAgentConfig):
       In general the REPHRASED QUERY should be relied upon to match the CONTENT 
       of the docs. Thus the REPHRASED QUERY itself acts like a 
       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, which must be a SINGLE LINE calculation, and 
-    - ANSWER recieved from an assistant that used this QUERY PLAN.
+      the CONTENT of the docs in various ways (semantic, lexical, fuzzy, etc.).         
+    - DATAFRAME CALCULATION, which must be a SINGLE LINE calculation (or empty),
+        [NOTE ==> This calculation is applied AFTER the FILTER and REPHRASED QUERY.],
+    - ANSWER received from an assistant that used this QUERY PLAN.
 
     In addition to the above SCHEMA fields there is a `content` field which:
     - CANNOT appear in a FILTER, 
@@ -88,6 +88,10 @@ class QueryPlanCriticConfig(LanceQueryPlanAgentConfig):
       - If the REPHRASED QUERY looks correct, then check if the FILTER makes sense.
         REMEMBER: A filter should ONLY be used if EXPLICITLY REQUIRED BY THE QUERY.
      
+     
+     IMPORTANT!! The DATAFRAME CALCULATION is done AFTER applying the 
+         FILTER and REPHRASED QUERY! Keep this in mind when evaluating 
+         the correctness of the DATAFRAME CALCULATION.
     
     ALWAYS use `query_plan_feedback` tool/fn to present your feedback
     in the `feedback` field, and if any fix is suggested,

langroid/agent/special/lance_rag/query_planner_agent.py

@@ -67,6 +67,9 @@ class LanceQueryPlanAgentConfig(ChatAgentConfig):
         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.
+        
+        IMPORTANT: The DataFrame `df` in this calculation is the result of 
+        applying the FILTER AND REPHRASED QUERY to the documents.
     
     
     EXAMPLE:
@@ -87,7 +90,9 @@ class LanceQueryPlanAgentConfig(ChatAgentConfig):
          ASSISTANT does not know about them and only uses the query to 
          match the CONTENT of the docs.]
     DATAFRAME CALCULATION: "df["num_deaths"].sum()"
-
+        NOTE!!! The DataFrame `df` in this calculation is the result of
+        applying the FILTER AND REPHRASED QUERY to the documents, 
+        hence this computation will give the total deaths in shoplifting crimes.
     ------------- END OF EXAMPLE ----------------
     
     The FILTER must be a SQL-like condition, e.g. 

langroid/agent/special/table_chat_agent.py

@@ -143,6 +143,13 @@ class PandasEvalTool(ToolMessage):
             cls(expression="df[(df['gender'] == 'Male')]['income'].mean()"),
         ]
 
+    @classmethod
+    def instructions(cls) -> str:
+        return """
+            Use the `pandas_eval` tool/function to evaluate a pandas expression
+            involving the dataframe 'df' to answer the user's question.
+            """
+
 
 class TableChatAgent(ChatAgent):
     """

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

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

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

@@ -3,9 +3,9 @@ langroid/agent/__init__.py,sha256=_D8dxnfdr92ch1CIrUkKjrB5HVvsQdn62b1Fb2kBxV8,78
 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/callbacks/chainlit.py,sha256=uIfdmoOKIfzBVeM2ce0V5SCfHjcvYyaz13dfjFXCEN4,21020
 langroid/agent/chat_agent.py,sha256=X5uVMm9qdw3j-FRf4hbN8k8ByaSdtQCTuU8olKE0sbs,38750
-langroid/agent/chat_document.py,sha256=qUadrl2hiahWnvLemWCCsaCesBrfwQtOIiz2IOhUCbM,8969
+langroid/agent/chat_document.py,sha256=1ug58JXV3PEGjzRU9vQPjdZbRtza73ZFZksNwWBPziQ,9285
 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,9 +13,9 @@ 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=Xe5pCqZAnVoM-dC9_8FW5U7s2dFkPPYZ4O41BDOyHT4,6576
+langroid/agent/special/lance_rag/critic_agent.py,sha256=OsOcpcU_AmU2MagpZ5X5yxFeXyteKN9QJMzJGqIITig,6871
 langroid/agent/special/lance_rag/lance_rag_task.py,sha256=l_HQgrYY-CX2FwIsS961aEF3bYog3GDYo98fj0C0mSk,2889
-langroid/agent/special/lance_rag/query_planner_agent.py,sha256=EdkCwwx4FpM9yGlk79dd8pQx3XozUT39ss77fhDo_cU,9214
+langroid/agent/special/lance_rag/query_planner_agent.py,sha256=M2ry4PL_UkAzDNFvdl_Kqb6YtOnWqqA9Qz361AAb_b4,9584
 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
@@ -31,7 +31,7 @@ langroid/agent/special/sql/utils/description_extractors.py,sha256=RZ2R3DmASxB1ij
 langroid/agent/special/sql/utils/populate_metadata.py,sha256=x2OMKfmIBnJESBG3qKt6gvr3H3L4ZQcoxHfNdWfHjZs,2987
 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=coEvEWL9UJJSeDu8JcOxR4qCyzH7HuTdre7-3pMfGjo,8785
+langroid/agent/special/table_chat_agent.py,sha256=v8gRYj5frhYgfCSzmwL1DMmvyC5Qb5z_Ira_fwld5vk,9024
 langroid/agent/task.py,sha256=b_d46txohISETxXJoWpmIX0hinvt1wjHbK08LZRBEz8,54020
 langroid/agent/tool_message.py,sha256=2kPsQUwi3ZzINTUNj10huKnZLjLp5SXmefacTHx8QDc,8304
 langroid/agent/tools/__init__.py,sha256=q-maq3k2BXhPAU99G0H6-j_ozoRvx15I1RFpPVicQIU,304
@@ -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.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,,
+langroid-0.1.246.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.246.dist-info/METADATA,sha256=ZG2s9al3tSU4jkDPkjCySISHeNrThigZxy0jZ5vQlIs,49163
+langroid-0.1.246.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.246.dist-info/RECORD,,