langroid 0.52.4__py3-none-any.whl → 0.52.6__py3-none-any.whl

langroid/agent/chat_agent.py

@@ -735,7 +735,11 @@ class ChatAgent(Agent):
                 self.llm_tools_usable.discard(t)
                 self.llm_functions_usable.discard(t)
 
-        # Set tool instructions and JSON format instructions
+        self._update_tool_instructions()
+
+    def _update_tool_instructions(self) -> None:
+        # Set tool instructions and JSON format instructions,
+        # in case Tools have been enabled/disabled.
         if self.config.use_tools:
             self.system_tool_format_instructions = self.tool_format_rules()
         self.system_tool_instructions = self.tool_instructions()
@@ -977,6 +981,8 @@ class ChatAgent(Agent):
             self.llm_tools_usable.discard(t)
             self.llm_functions_usable.discard(t)
 
+        self._update_tool_instructions()
+
     def disable_message_use_except(self, message_class: Type[ToolMessage]) -> None:
         """
         Disable this agent from USING ALL messages EXCEPT a message class (Tool)
@@ -988,6 +994,7 @@ class ChatAgent(Agent):
         for r in to_remove:
             self.llm_tools_usable.discard(r)
             self.llm_functions_usable.discard(r)
+        self._update_tool_instructions()
 
     def _load_output_format(self, message: ChatDocument) -> None:
         """

langroid/agent/special/doc_chat_agent.py

@@ -123,6 +123,9 @@ class DocChatAgentConfig(ChatAgentConfig):
         None  # filter condition for various lexical/semantic search fns
     )
     conversation_mode: bool = True  # accumulate message history?
+    # retain retrieved context? Setting to True increases token consumption, but
+    # helps LLM fix citation errors and improve accuracy of follow-up questions.
+    retain_context: bool = False
     # In assistant mode, DocChatAgent receives questions from another Agent,
     # and those will already be in stand-alone form, so in this mode
     # there is no need to convert them to stand-alone form.
@@ -861,8 +864,11 @@ class DocChatAgent(ChatAgent):
         # one for `final_prompt`, and one for the LLM response
 
         if self.config.conversation_mode:
-            # respond with temporary context
-            answer_doc = super()._llm_response_temp_context(question, final_prompt)
+            if self.config.retain_context:
+                answer_doc = super().llm_response(final_prompt)
+            else:
+                # respond with temporary context
+                answer_doc = super()._llm_response_temp_context(question, final_prompt)
         else:
             answer_doc = super().llm_response_forget(final_prompt)
 

langroid/cachedb/__init__.py

@@ -6,12 +6,3 @@ __all__ = [
     "base",
     "redis_cachedb",
 ]
-
-
-try:
-    from . import momento_cachedb
-
-    momento_cachedb
-    __all__.append("momento_cachedb")
-except ImportError:
-    pass

langroid/language_models/openai_gpt.py

@@ -627,20 +627,7 @@ class OpenAIGPT(LanguageModel):
 
         self.cache: CacheDB | None = None
         use_cache = self.config.cache_config is not None
-        if settings.cache_type == "momento" and use_cache:
-            from langroid.cachedb.momento_cachedb import (
-                MomentoCache,
-                MomentoCacheConfig,
-            )
-
-            if config.cache_config is None or not isinstance(
-                config.cache_config,
-                MomentoCacheConfig,
-            ):
-                # switch to fresh momento config if needed
-                config.cache_config = MomentoCacheConfig()
-            self.cache = MomentoCache(config.cache_config)
-        elif "redis" in settings.cache_type and use_cache:
+        if "redis" in settings.cache_type and use_cache:
             if config.cache_config is None or not isinstance(
                 config.cache_config,
                 RedisCacheConfig,
@@ -656,7 +643,7 @@ class OpenAIGPT(LanguageModel):
         elif settings.cache_type != "none" and use_cache:
             raise ValueError(
                 f"Invalid cache type {settings.cache_type}. "
-                "Valid types are momento, redis, fakeredis, none"
+                "Valid types are redis, fakeredis, none"
             )
 
         self.config._validate_litellm()

langroid/utils/configuration.py

@@ -17,7 +17,7 @@ class Settings(BaseSettings):
     progress: bool = False  # show progress spinners/bars?
     stream: bool = True  # stream output?
     cache: bool = True  # use cache?
-    cache_type: Literal["redis", "fakeredis", "momento", "none"] = "redis"  # cache type
+    cache_type: Literal["redis", "fakeredis", "none"] = "redis"  # cache type
     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.52.4.dist-info → langroid-0.52.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.52.4
+Version: 0.52.6
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT
@@ -151,8 +151,6 @@ Provides-Extra: meilisearch
 Requires-Dist: meilisearch-python-sdk<3.0.0,>=2.2.3; extra == 'meilisearch'
 Provides-Extra: metaphor
 Requires-Dist: metaphor-python<0.2.0,>=0.1.23; extra == 'metaphor'
-Provides-Extra: momento
-Requires-Dist: momento<1.21.0,>=1.10.2; extra == 'momento'
 Provides-Extra: mysql
 Requires-Dist: pymysql<2.0.0,>=1.1.0; extra == 'mysql'
 Provides-Extra: neo4j
@@ -617,9 +615,8 @@ section above)
 providers ([local/open](https://langroid.github.io/langroid/tutorials/local-llm-setup/) or [remote/commercial](https://langroid.github.io/langroid/tutorials/non-openai-llms/)) via proxy libraries and local model servers
 such as [ollama](https://github.com/ollama), [oobabooga](https://github.com/oobabooga/text-generation-webui), 
   [LiteLLM](https://docs.litellm.ai/docs/providers) that in effect mimic the OpenAI API. See the [supported LLMs](https://langroid.github.io/langroid/tutorials/supported-models/). 
-- **Caching of LLM responses:** Langroid supports [Redis](https://redis.com/try-free/) and 
-  [Momento](https://www.gomomento.com/) to cache LLM responses.
-- **Vector-stores**: [LanceDB](https://github.com/lancedb/lancedb), [Qdrant](https://qdrant.tech/), [Chroma](https://www.trychroma.com/) are currently supported.
+- **Caching of LLM responses:** Langroid supports [Redis](https://redis.com/try-free/) to cache LLM responses.
+- **Vector-stores**: [Qdrant](https://qdrant.tech/), [Chroma](https://www.trychroma.com/), LanceDB, Pinecone, PostgresDB (PGVector), Weaviate are currently supported.
   Vector stores allow for Retrieval-Augmented-Generation (RAG).
 - **Grounding and source-citation:** Access to external documents via vector-stores 
    allows for grounding and source-citation.

{langroid-0.52.4.dist-info → langroid-0.52.6.dist-info}/RECORD

@@ -5,7 +5,7 @@ langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
 langroid/agent/base.py,sha256=lWR4ivX_elTFejpknLhkO-DlAGT3aG6ojQAVkzDOqMc,80090
 langroid/agent/batch.py,sha256=vi1r5i1-vN80WfqHDSwjEym_KfGsqPGUtwktmiK1nuk,20635
-langroid/agent/chat_agent.py,sha256=mIkf3kq5m1RPXeBb6U52pXB9itum0ChcpXABC_g-Xfs,85082
+langroid/agent/chat_agent.py,sha256=nsFSARSANCVByL4fAl_DhyWm9gM7s_6waqNsmePXJMA,85309
 langroid/agent/chat_document.py,sha256=6O20Fp4QrquykaF2jFtwNHkvcoDte1LLwVZNk9mVH9c,18057
 langroid/agent/openai_assistant.py,sha256=JkAcs02bIrgPNVvUWVR06VCthc5-ulla2QMBzux_q6o,34340
 langroid/agent/task.py,sha256=HB6N-Jn80HFqCf0ZYOC1v3Bn3oO7NLjShHQJJFwW0q4,90557
@@ -14,7 +14,7 @@ langroid/agent/xml_tool_message.py,sha256=6SshYZJKIfi4mkE-gIoSwjkEYekQ8GwcSiCv7a
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=UHB6P_J40vsVnssosqkpkOVWRf9NK4TOY0_G2g_Arsg,20900
 langroid/agent/special/__init__.py,sha256=gik_Xtm_zV7U9s30Mn8UX3Gyuy4jTjQe9zjiE3HWmEo,1273
-langroid/agent/special/doc_chat_agent.py,sha256=ALp2rv12J-ChRCxVtflDwz6n0qIbUAymldIy8qpsvrg,65236
+langroid/agent/special/doc_chat_agent.py,sha256=-ABgZiaIowFVqYMYlU1Nf8WfOqXOTmlMCEnafEXucPo,65564
 langroid/agent/special/doc_chat_task.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/lance_doc_chat_agent.py,sha256=s8xoRs0gGaFtDYFUSIRchsgDVbS5Q3C2b2mr3V1Fd-Q,10419
 langroid/agent/special/lance_tools.py,sha256=qS8x4wi8mrqfbYV2ztFzrcxyhHQ0ZWOc-zkYiH7awj0,2105
@@ -54,9 +54,8 @@ langroid/agent/tools/retrieval_tool.py,sha256=zcAV20PP_6VzSd-UE-IJcabaBseFL_QNz5
 langroid/agent/tools/rewind_tool.py,sha256=XAXL3BpNhCmBGYq_qi_sZfHJuIw7NY2jp4wnojJ7WRs,5606
 langroid/agent/tools/segment_extract_tool.py,sha256=__srZ_VGYLVOdPrITUM8S0HpmX4q7r5FHWMDdHdEv8w,1440
 langroid/agent/tools/tavily_search_tool.py,sha256=soI-j0HdgVQLf09wRQScaEK4b5RpAX9C4cwOivRFWWI,1903
-langroid/cachedb/__init__.py,sha256=icAT2s7Vhf-ZGUeqpDQGNU6ob6o0aFEyjwcxxUGRFjg,225
+langroid/cachedb/__init__.py,sha256=G2KyNnk3Qkhv7OKyxTOnpsxfDycx3NY0O_wXkJlalNY,96
 langroid/cachedb/base.py,sha256=ztVjB1DtN6pLCujCWnR6xruHxwVj3XkYniRTYAKKqk0,1354
-langroid/cachedb/momento_cachedb.py,sha256=YEOJ62hEcV6iIeMr5aGgRYgWQqFYaej9gEDEcY0sm7M,3172
 langroid/cachedb/redis_cachedb.py,sha256=7kgnbf4b5CKsCrlL97mHWKvdvlLt8zgn7lc528jEpiE,5141
 langroid/embedding_models/__init__.py,sha256=KyYxR3jDFUCfYjSuCL86qjAmrq6mXXjOT4lFNOKVj6Y,955
 langroid/embedding_models/base.py,sha256=Ml7oA6PzQm0wZmIYn3fhF7dvZCi-amviWUwOeBegH3A,2562
@@ -73,7 +72,7 @@ langroid/language_models/base.py,sha256=pfN3t-BktKmN_4K8pwmpjC9OdcHxsytM5s5TmsJ-
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=5BgHKDVRWFbUwDT_PFgTZXz9-k8wJSA2e3PZmyDgQ1k,4022
 langroid/language_models/model_info.py,sha256=vOaTi-XFKnz-BvHUvgjnt0XfOtl21Apev3Zy7Rhckbw,14458
-langroid/language_models/openai_gpt.py,sha256=KFbG6q143CYt6SP8rU1UEFX2mffn8yXfVOdEyuA5IaY,85854
+langroid/language_models/openai_gpt.py,sha256=Hw4llY9Dbox7L0sVP06q10ayoem8FOfXSfbLm3u55v4,85317
 langroid/language_models/utils.py,sha256=hC5p61P_Qlrowkm5wMap1A1b5ZUCwK_XhPIzAQk1T1s,5483
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
@@ -105,7 +104,7 @@ langroid/prompts/templates.py,sha256=VV84HVf_amOx6xdWQyIsN9i5dNfrbl8rsfFp6hyfOss
 langroid/pydantic_v1/__init__.py,sha256=HxPGVERapVueRUORgSpj2JX_vTZxVlVbWvhpQlpjygE,283
 langroid/pydantic_v1/main.py,sha256=p_k7kDY9eDrsA5dxNNqXusKLgx7mS_icGnS7fu4goqY,147
 langroid/utils/__init__.py,sha256=Sruos2tB4G7Tn0vlblvYlX9PEGR0plI2uE0PJ4d_EC4,353
-langroid/utils/configuration.py,sha256=FJVoseN3mkqx5vzpmtkzCLuQEYlWZEK_11YJ-Ge-L5o,4812
+langroid/utils/configuration.py,sha256=ZkHHkEeWuS-o3_S4g0SE0wz-UK_of23NOWve1kpQiNY,4801
 langroid/utils/constants.py,sha256=CK09kda9bNDEhnwClq7ZTWZOh38guJlfcZ5hKUS1Ijo,1075
 langroid/utils/git_utils.py,sha256=WnflJ3R3owhlD0LNdSJakcKhExcEehE1UW5jYVQl8JY,7955
 langroid/utils/globals.py,sha256=Az9dOFqR6n9CoTYSqa2kLikQWS0oCQ9DFQIQAnG-2q8,1355
@@ -130,7 +129,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.52.4.dist-info/METADATA,sha256=8q70bM9X5i9DkmZ9jg3zAEn5Lk-vUKaJRF46A2EnSvA,63642
-langroid-0.52.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.52.4.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.52.4.dist-info/RECORD,,
+langroid-0.52.6.dist-info/METADATA,sha256=fOf2NTPNfbS1F9rSfa7oLtYHB66xFiN65MnRWybC9sU,63519
+langroid-0.52.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.52.6.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.52.6.dist-info/RECORD,,

langroid/cachedb/momento_cachedb.py

@@ -1,108 +0,0 @@
-import json
-import logging
-import os
-from datetime import timedelta
-from typing import Any, Dict, List
-
-from langroid.cachedb.base import CacheDBConfig
-from langroid.exceptions import LangroidImportError
-
-try:
-    import momento
-    from momento.responses import CacheGet
-except ImportError:
-    raise LangroidImportError(package="momento", extra="momento")
-
-from dotenv import load_dotenv
-
-from langroid.cachedb.base import CacheDB
-
-logger = logging.getLogger(__name__)
-
-
-class MomentoCacheConfig(CacheDBConfig):
-    """Configuration model for Momento Cache."""
-
-    ttl: int = 60 * 60 * 24 * 7  # 1 week
-    cachename: str = "langroid_momento_cache"
-
-
-class MomentoCache(CacheDB):
-    """Momento implementation of the CacheDB."""
-
-    def __init__(self, config: MomentoCacheConfig):
-        """
-        Initialize a MomentoCache with the given config.
-
-        Args:
-            config (MomentoCacheConfig): The configuration to use.
-        """
-        self.config = config
-        load_dotenv()
-
-        momento_token = os.getenv("MOMENTO_AUTH_TOKEN")
-        if momento_token is None:
-            raise ValueError("""MOMENTO_AUTH_TOKEN not set in .env file""")
-        else:
-            self.client = momento.CacheClient(
-                configuration=momento.Configurations.Laptop.v1(),
-                credential_provider=momento.CredentialProvider.from_environment_variable(
-                    "MOMENTO_AUTH_TOKEN"
-                ),
-                default_ttl=timedelta(seconds=self.config.ttl),
-            )
-            self.client.create_cache(self.config.cachename)
-
-    def clear(self) -> None:
-        """Clear keys from current db."""
-        self.client.flush_cache(self.config.cachename)
-
-    def store(self, key: str, value: Any) -> None:
-        """
-        Store a value associated with a key.
-
-        Args:
-            key (str): The key under which to store the value.
-            value (Any): The value to store.
-        """
-        self.client.set(self.config.cachename, key, json.dumps(value))
-
-    def retrieve(self, key: str) -> Dict[str, Any] | str | None:
-        """
-        Retrieve the value associated with a key.
-
-        Args:
-            key (str): The key to retrieve the value for.
-
-        Returns:
-            dict: The value associated with the key.
-        """
-        value = self.client.get(self.config.cachename, key)
-        if isinstance(value, CacheGet.Hit):
-            return json.loads(value.value_string)  # type: ignore
-        else:
-            return None
-
-    def delete_keys(self, keys: List[str]) -> None:
-        """
-        Delete the keys from the cache.
-
-        Args:
-            keys (List[str]): The keys to delete.
-        """
-        for key in keys:
-            self.client.delete(self.config.cachename, key)
-
-    def delete_keys_pattern(self, pattern: str) -> None:
-        """
-        Delete the keys from the cache with the given pattern.
-
-        Args:
-            prefix (str): The pattern to match.
-        """
-        raise NotImplementedError(
-            """
-            MomentoCache does not support delete_keys_pattern.
-            Please use RedisCache instead.
-            """
-        )