langroid 0.1.258__py3-none-any.whl → 0.1.260__py3-none-any.whl

langroid/agent/callbacks/chainlit.py

@@ -214,6 +214,7 @@ def wrap_text_preserving_structure(text: str, width: int = 90) -> str:
 
 class ChainlitCallbackConfig(BaseSettings):
     user_has_agent_name: bool = True  # show agent name in front of "YOU" ?
+    show_subtask_response: bool = True  # show sub-task response as a step?
 
 
 class ChainlitAgentCallbacks:
@@ -277,12 +278,6 @@ class ChainlitAgentCallbacks:
 
     def start_llm_stream(self) -> Callable[[str], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
-        logger.info(
-            f"""
-            Starting LLM stream for {self.agent.config.name} 
-            under parent {self._get_parent_id()}
-        """
-        )
         self.stream = cl.Step(
             id=self.curr_step.id if self.curr_step is not None else None,
             name=self._entity_name("llm"),
@@ -291,6 +286,13 @@ class ChainlitAgentCallbacks:
         )
         self.last_step = self.stream
         self.curr_step = None
+        logger.info(
+            f"""
+            Starting LLM stream for {self.agent.config.name}
+            id = {self.stream.id} 
+            under parent {self._get_parent_id()}
+        """
+        )
         run_sync(self.stream.send())  # type: ignore
 
         def stream_token(t: str) -> None:
@@ -323,6 +325,13 @@ class ChainlitAgentCallbacks:
             language="json" if is_tool else None,
         )
         step.output = textwrap.dedent(content) or NO_ANSWER
+        logger.info(
+            f"""
+            Finish STREAM LLM response for {self.agent.config.name}
+            id = {step.id} 
+            under parent {self._get_parent_id()}
+            """
+        )
         run_sync(step.update())  # type: ignore
 
     def show_llm_response(
@@ -343,6 +352,13 @@ class ChainlitAgentCallbacks:
         self.last_step = step
         self.curr_step = None
         step.output = textwrap.dedent(content) or NO_ANSWER
+        logger.info(
+            f"""
+            Showing NON-STREAM LLM response for {self.agent.config.name}
+            id = {step.id} 
+            under parent {self._get_parent_id()}
+            """
+        )
         run_sync(step.send())  # type: ignore
 
     def show_error_message(self, error: str) -> None:
@@ -374,6 +390,13 @@ class ChainlitAgentCallbacks:
         self.last_step = step
         self.curr_step = None
         step.output = content
+        logger.info(
+            f"""
+            Showing AGENT response for {self.agent.config.name}
+            id = {step.id} 
+            under parent {self._get_parent_id()}
+            """
+        )
         run_sync(step.send())  # type: ignore
 
     def show_start_response(self, entity: str) -> None:
@@ -390,6 +413,13 @@ class ChainlitAgentCallbacks:
         step.output = ""
         self.last_step = step
         self.curr_step = step
+        logger.info(
+            f"""
+            Showing START response for {self.agent.config.name} ({entity})
+            id = {step.id} 
+            under parent {self._get_parent_id()}
+            """
+        )
         run_sync(step.send())  # type: ignore
 
     def _entity_name(
@@ -459,6 +489,13 @@ class ChainlitAgentCallbacks:
             parent_id=self._get_parent_id(),
         )
         step.output = message
+        logger.info(
+            f"""
+            Showing USER response for {self.agent.config.name}
+            id = {step.id} 
+            under parent {self._get_parent_id()}
+            """
+        )
         run_sync(step.send())
 
     def show_first_user_message(self, msg: cl.Message):
@@ -575,7 +612,8 @@ class ChainlitTaskCallbacks(ChainlitAgentCallbacks):
         super().__init__(task.agent, msg, config)
         self._inject_callbacks(task)
         self.task = task
-        self.task.callbacks.show_subtask_response = self.show_subtask_response
+        if config.show_subtask_response:
+            self.task.callbacks.show_subtask_response = self.show_subtask_response
 
     @classmethod
     def _inject_callbacks(

langroid/agent/task.py

@@ -156,6 +156,11 @@ class Task:
             interactive (bool): if true, wait for human input after each non-human
                 response (prevents infinite loop of non-human responses).
                 Default is true. If false, then `default_human_response` is set to ""
+                Note: When interactive = False, the one exception is when the user
+                is explicitly addressed, via "@user" or using RecipientTool, in which
+                case the system will wait for a user response. In other words, use
+                `interactive=False` when you want a "largely non-interactive"
+                run, with the exception of explicit user addressing.
             only_user_quits_root (bool): if true, only user can quit the root task.
                 [This param is ignored & deprecated; Keeping for backward compatibility.
                 Instead of this, setting `interactive` suffices]
@@ -912,7 +917,11 @@ class Task:
             parent (ChatDocument|None): parent message of the current message
         """
         self.n_stalled_steps += 1
-        if (not self.task_progress or self.allow_null_result) and not self.is_pass_thru:
+        user_dummy_response = self.pending_sender != Entity.USER and self.interactive
+        if (not self.is_pass_thru) and (
+            not self.task_progress or self.allow_null_result or user_dummy_response
+        ):
+
             # There has been no progress at all in this task, so we
             # update the pending_message to a dummy NO_ANSWER msg
             # from the entity 'opposite' to the current pending_sender,
@@ -1375,9 +1384,18 @@ class Task:
         )
 
     def _can_respond(self, e: Responder) -> bool:
-        if self.pending_sender == e:
-            # Responder cannot respond to its own message
+        user_can_respond = self.interactive or (
+            # regardless of self.interactive, if a msg is explicitly addressed to
+            # user, then wait for user response
+            self.pending_message is not None
+            and self.pending_message.metadata.recipient == Entity.USER
+        )
+
+        if self.pending_sender == e or (e == Entity.USER and not user_can_respond):
+            # sender is same as e (an entity cannot respond to its own msg),
+            # or user cannot respond
             return False
+
         if self.pending_message is None:
             return True
         if self._recipient_mismatch(e):

langroid/language_models/openai_gpt.py

@@ -421,7 +421,9 @@ class OpenAIGPT(LanguageModel):
                 self.api_base = "http://" + self.api_base
         elif self.config.chat_model.startswith("ollama/"):
             self.config.ollama = True
-            self.api_base = OLLAMA_BASE_URL
+
+            # use api_base from config if set, else fall back on OLLAMA_BASE_URL
+            self.api_base = self.config.api_base or OLLAMA_BASE_URL
             self.api_key = OLLAMA_API_KEY
             self.config.chat_model = self.config.chat_model.replace("ollama/", "")
         else:

langroid/vector_store/qdrantdb.py

@@ -68,7 +68,7 @@ class QdrantDBConfig(VectorStoreConfig):
     embedding: EmbeddingModelsConfig = OpenAIEmbeddingsConfig()
     distance: str = Distance.COSINE
     use_sparse_embeddings: bool = False
-    sparse_embedding_model: str = ""
+    sparse_embedding_model: str = "naver/splade-v3-distilbert"
     sparse_limit: int = 3
 
 

{langroid-0.1.258.dist-info → langroid-0.1.260.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.258
+Version: 0.1.260
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -110,6 +110,7 @@ Description-Content-Type: text/markdown
 <div align="center">
 
 [![PyPI - Version](https://img.shields.io/pypi/v/langroid)](https://pypi.org/project/langroid/)
+[![Downloads](https://img.shields.io/pypi/dm/langroid)](https://pypi.org/project/langroid/)
 [![Pytest](https://github.com/langroid/langroid/actions/workflows/pytest.yml/badge.svg)](https://github.com/langroid/langroid/actions/workflows/pytest.yml)
 [![codecov](https://codecov.io/gh/langroid/langroid/branch/main/graph/badge.svg?token=H94BX5F0TE)](https://codecov.io/gh/langroid/langroid)
 [![Multi-Architecture DockerHub](https://github.com/langroid/langroid/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/langroid/langroid/actions/workflows/docker-publish.yml)
@@ -436,7 +437,7 @@ section above)
   a task of an agent can delegate to other sub-tasks: from the point of view of a Task,
   sub-tasks are simply additional responders, to be used in a round-robin fashion 
   after the agent's own responders.
-- **Modularity, Reusabilily, Loose coupling:** The `Agent` and `Task` abstractions allow users to design
+- **Modularity, Reusability, Loose coupling:** The `Agent` and `Task` abstractions allow users to design
   Agents with specific skills, wrap them in Tasks, and combine tasks in a flexible way.
 - **LLM Support**: Langroid supports OpenAI LLMs as well as LLMs from hundreds of 
 providers (local/open or remote/commercial) via proxy libraries and local model servers

{langroid-0.1.258.dist-info → langroid-0.1.260.dist-info}/RECORD

@@ -3,7 +3,7 @@ langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,78
 langroid/agent/base.py,sha256=aSwWmOBg0d3QQHUSauscMNfnl8Wkv6nrk2nngKa9DjM,37183
 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=XWih3UkHsYgPIaBQ1cZ-8H2VU_URh-sSfw8fcq1hfMo,20841
+langroid/agent/callbacks/chainlit.py,sha256=6gkk9Qf_i4fOD13w8ZdUfMcgKYPzLMw30hzFUN60AIc,22044
 langroid/agent/chat_agent.py,sha256=hnmeOxdi4i5w8WaL2kPjQOEpenoRW_hG5EfeMWuuVsQ,39478
 langroid/agent/chat_document.py,sha256=uwCq53SHRyxQw6qyhjzPYuJG48VHBgOf2122Ew3fk6c,9316
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ langroid/agent/special/sql/utils/populate_metadata.py,sha256=1J22UsyEPKzwK0XlJZt
 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=d9v2wsblaRx7oMnKhLV7uO_ujvk9gh59pSGvBXyeyNc,9659
-langroid/agent/task.py,sha256=8f65p79ID17mCT8l2F7VuldL7uEWOavLTOkX0B29sbo,59465
+langroid/agent/task.py,sha256=Su1TpEmt3aPVTzXnTvJdyjSqZsXmUUcHN12KAs-gMY0,60408
 langroid/agent/tool_message.py,sha256=7t-UGEbykosKHAvaLI0Rm59sgxvN31IO3-P7bg7gLug,9730
 langroid/agent/tools/__init__.py,sha256=8Pc9BlGCB5FQ2IDGKS_WPpHCoWp5jblMU8EHJwwikAY,303
 langroid/agent/tools/duckduckgo_search_tool.py,sha256=NhsCaGZkdv28nja7yveAhSK_w6l_Ftym8agbrdzqgfo,1935
@@ -65,7 +65,7 @@ langroid/language_models/azure_openai.py,sha256=ncRCbKooqLVOY-PWQUIo9C3yTuKEFbAw
 langroid/language_models/base.py,sha256=8FTvWtOmIrz6K78kzyrVqf2uJk03dBc0AUnVY-l9ucg,21031
 langroid/language_models/config.py,sha256=5UF3DzO1a-Dfsc3vghE0XGq7g9t_xDsRCsuRiU4dgBg,366
 langroid/language_models/openai_assistants.py,sha256=9K-DEAL2aSWHeXj2hwCo2RAlK9_1oCPtqX2u1wISCj8,36
-langroid/language_models/openai_gpt.py,sha256=SSLBYb41ITLegdinFHL2u9Hm5v2bNgBDF8q0BsznY8A,50596
+langroid/language_models/openai_gpt.py,sha256=OZcFAtVI8JPGOPPRozWI1PfkdE450hS16RChaUc2uFM,50702
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
 langroid/language_models/prompt_formatter/hf_formatter.py,sha256=TFL6ppmeQWnzr6CKQzRZFYY810zE1mr8DZnhw6i85ok,5217
@@ -125,9 +125,9 @@ langroid/vector_store/lancedb.py,sha256=nC5pcrFoUOOO941Y7XiPZONUO4LuoZIAR1aR4Pec
 langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3HmhHQICXLs,11663
 langroid/vector_store/momento.py,sha256=QaPzUnTwlswoawGB-paLtUPyLRvckFXLfLDfvbTzjNQ,10505
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
-langroid/vector_store/qdrantdb.py,sha256=sk5Qb2ZNbooi0rorsMuqIMokF7WADw6PJ0D6goM2XBw,16802
-pyproject.toml,sha256=fDctkmdTjKOSWnSdsYxFKf-Ud0ESk7f4DI_0vE47dpk,7026
-langroid-0.1.258.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.258.dist-info/METADATA,sha256=vtecA1CocyelLpV30tpccSfGuwVCRtW8nMAIxH2Vkyg,52414
-langroid-0.1.258.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.258.dist-info/RECORD,,
+langroid/vector_store/qdrantdb.py,sha256=wYOuu5c2vIKn9ZgvTXcAiZXMpV8AOXEWFAzI8S8UP-0,16828
+pyproject.toml,sha256=6Vqvoq2dWP_JzMKXoKVlTteWCZGmWPW4tFQV0KfRtVQ,7026
+langroid-0.1.260.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.260.dist-info/METADATA,sha256=ftMLe9Jwmp1GkP9bsiO4kdxABtcgFuR1hsOdaXrKNkI,52506
+langroid-0.1.260.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.260.dist-info/RECORD,,

pyproject.toml

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