langroid 0.1.144__py3-none-any.whl → 0.1.145__py3-none-any.whl

langroid/agent/chat_agent.py

@@ -789,12 +789,14 @@ class ChatAgent(Agent):
         """
         # explicitly call THIS class's respond method,
         # not a derived class's (or else there would be infinite recursion!)
+        n_msgs = len(self.message_history)
         with StreamingIfAllowed(self.llm, self.llm.get_stream()):  # type: ignore
             response = cast(ChatDocument, ChatAgent.llm_response(self, message))
-        # clear the last two messages, which are the
-        # user message and the assistant response
-        self.message_history.pop()
-        self.message_history.pop()
+        # If there is a response, then we will have two additional
+        # messages in the message history, i.e. the user message and the
+        # assistant response. We want to (carefully) remove these two messages.
+        self.message_history.pop() if len(self.message_history) > n_msgs else None
+        self.message_history.pop() if len(self.message_history) > n_msgs else None
         return response
 
     async def llm_response_forget_async(self, message: str) -> ChatDocument:
@@ -803,14 +805,16 @@ class ChatAgent(Agent):
         """
         # explicitly call THIS class's respond method,
         # not a derived class's (or else there would be infinite recursion!)
+        n_msgs = len(self.message_history)
         with StreamingIfAllowed(self.llm, self.llm.get_stream()):  # type: ignore
             response = cast(
                 ChatDocument, await ChatAgent.llm_response_async(self, message)
             )
-        # clear the last two messages, which are the
-        # user message and the assistant response
-        self.message_history.pop()
-        self.message_history.pop()
+        # If there is a response, then we will have two additional
+        # messages in the message history, i.e. the user message and the
+        # assistant response. We want to (carefully) remove these two messages.
+        self.message_history.pop() if len(self.message_history) > n_msgs else None
+        self.message_history.pop() if len(self.message_history) > n_msgs else None
         return response
 
     def chat_num_tokens(self, messages: Optional[List[LLMMessage]] = None) -> int:

langroid/agent/special/retriever_agent.py

@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 
 
 class RecordMetadata(DocMetaData):
-    id: None | str = None
+    id: str = ""
 
 
 class RecordDoc(Document):

langroid/language_models/openai_gpt.py

@@ -469,6 +469,7 @@ class OpenAIGPT(LanguageModel):
             return True, has_function, function_name, function_args, completion
         return False, has_function, function_name, function_args, completion
 
+    @retry_with_exponential_backoff
     def _stream_response(  # type: ignore
         self, response, chat: bool = False
     ) -> Tuple[LLMResponse, Dict[str, Any]]:
@@ -520,6 +521,7 @@ class OpenAIGPT(LanguageModel):
             is_async=False,
         )
 
+    @async_retry_with_exponential_backoff
     async def _stream_response_async(  # type: ignore
         self, response, chat: bool = False
     ) -> Tuple[LLMResponse, Dict[str, Any]]:
@@ -1084,7 +1086,7 @@ class OpenAIGPT(LanguageModel):
         if self.get_stream() and not cached:
             llm_response, openai_response = self._stream_response(response, chat=True)
             self._cache_store(hashed_key, openai_response)
-            return llm_response
+            return llm_response  # type: ignore
         if isinstance(response, dict):
             response_dict = response
         else:
@@ -1115,7 +1117,7 @@ class OpenAIGPT(LanguageModel):
                 response, chat=True
             )
             self._cache_store(hashed_key, openai_response)
-            return llm_response
+            return llm_response  # type: ignore
         if isinstance(response, dict):
             response_dict = response
         else:

langroid/mytypes.py

@@ -27,12 +27,12 @@ class DocMetaData(BaseModel):
 
     source: str = "context"
     is_chunk: bool = False  # if it is a chunk, don't split
-    id: str | None = None  # unique id for the document
+    id: str = ""  # unique id for the document
     window_ids: List[str] = []  # for RAG: ids of chunks around this one
 
-    def dict(self, *args: Any, **kwargs: Any) -> Dict[str, Any]:
+    def dict_bool_int(self, *args: Any, **kwargs: Any) -> Dict[str, Any]:
         """
-        Override dict method to convert bool fields to int, to appease some
+        Special dict method to convert bool fields to int, to appease some
         downstream libraries,  e.g. Chroma which complains about bool fields in
         metadata.
         """

langroid/parsing/parser.py

@@ -65,8 +65,8 @@ class Parser:
         orig_id_to_ids: Dict[str, List[str]] = {}
         for orig_id, id in zip(orig_ids, ids):
             if orig_id not in orig_id_to_ids:
-                orig_id_to_ids[orig_id] = []  # type: ignore
-            orig_id_to_ids[orig_id].append(id)  # type: ignore
+                orig_id_to_ids[orig_id] = []
+            orig_id_to_ids[orig_id].append(id)
 
         # now each orig_id maps to a sequence of ids within a single doc
 

langroid/vector_store/chromadb.py

@@ -114,7 +114,9 @@ class ChromaDB(VectorStore):
             return
         contents: List[str] = [document.content for document in documents]
         # convert metadatas to dicts so chroma can handle them
-        metadata_dicts: List[dict[str, Any]] = [d.metadata.dict() for d in documents]
+        metadata_dicts: List[dict[str, Any]] = [
+            d.metadata.dict_bool_int() for d in documents
+        ]
         for m in metadata_dicts:
             # chroma does not handle non-atomic types in metadata
             m["window_ids"] = ",".join(m["window_ids"])

langroid/vector_store/lancedb.py

@@ -14,9 +14,7 @@ from langroid.embedding_models.models import OpenAIEmbeddingsConfig
 from langroid.mytypes import Document, EmbeddingFunction
 from langroid.utils.configuration import settings
 from langroid.utils.pydantic_utils import (
-    flatten_pydantic_instance,
     flatten_pydantic_model,
-    nested_dict_from_flat,
 )
 from langroid.vector_store.base import VectorStore, VectorStoreConfig
 
@@ -191,7 +189,7 @@ class LanceDB(VectorStore):
                 else:
                     logger.warning("Recreating fresh collection")
         tbl = self.client.create_table(
-            collection_name, schema=self.flat_schema, mode="overwrite"
+            collection_name, schema=self.schema, mode="overwrite"
         )
         if settings.debug:
             level = logger.getEffectiveLevel()
@@ -217,12 +215,10 @@ class LanceDB(VectorStore):
         def make_batches() -> Generator[List[Dict[str, Any]], None, None]:
             for i in range(0, len(ids), b):
                 yield [
-                    flatten_pydantic_instance(
-                        self.schema(
-                            id=ids[i],
-                            vector=embedding_vecs[i],
-                            payload=doc,
-                        )
+                    self.schema(  # type: ignore
+                        id=ids[i],
+                        vector=embedding_vecs[i],
+                        payload=doc,
                     )
                     for i, doc in enumerate(documents[i : i + b])
                 ]
@@ -238,12 +234,8 @@ class LanceDB(VectorStore):
             raise ValueError("No collection name set, cannot retrieve docs")
         tbl = self.client.open_table(self.config.collection_name)
         records = tbl.search(None).to_arrow().to_pylist()
-        docs = [
-            self.config.document_class(
-                **(nested_dict_from_flat(rec, sub_dict="payload"))
-            )
-            for rec in records
-        ]
+        doc_cls = self.config.document_class
+        docs = [doc_cls(**rec["payload"]) for rec in records]
         return docs
 
     def get_documents_by_ids(self, ids: List[str]) -> List[Document]:
@@ -256,10 +248,7 @@ class LanceDB(VectorStore):
             for _id in _ids
         ]
         doc_cls = self.config.document_class
-        docs = [
-            doc_cls(**(nested_dict_from_flat(rec, sub_dict="payload")))
-            for rec in records
-        ]
+        docs = [doc_cls(**rec["payload"]) for rec in records]
         return docs
 
     def similar_texts_with_scores(
@@ -281,12 +270,7 @@ class LanceDB(VectorStore):
 
         # note _distance is 1 - cosine
         scores = [1 - rec["_distance"] for rec in records]
-        docs = [
-            self.config.document_class(
-                **(nested_dict_from_flat(rec, sub_dict="payload"))
-            )
-            for rec in records
-        ]
+        docs = [self.config.document_class(**rec["payload"]) for rec in records]
         if len(docs) == 0:
             logger.warning(f"No matches found for {text}")
             return []

{langroid-0.1.144.dist-info → langroid-0.1.145.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.144
+Version: 0.1.145
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -29,7 +29,7 @@ Requires-Dist: flake8 (>=6.0.0,<7.0.0)
 Requires-Dist: google-api-python-client (>=2.95.0,<3.0.0)
 Requires-Dist: halo (>=0.0.31,<0.0.32)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
-Requires-Dist: lancedb (>=0.3.0,<0.4.0)
+Requires-Dist: lancedb (>=0.3.6,<0.4.0)
 Requires-Dist: litellm (>=1.0.0,<2.0.0) ; extra == "litellm"
 Requires-Dist: lxml (>=4.9.3,<5.0.0)
 Requires-Dist: meilisearch (>=0.28.3,<0.29.0)

{langroid-0.1.144.dist-info → langroid-0.1.145.dist-info}/RECORD

@@ -2,7 +2,7 @@ langroid/__init__.py,sha256=-T6zCLCy-0U_h4iDmC2d6OUXjqopFe0XGrclYgbnBZk,465
 langroid/agent/__init__.py,sha256=ZqDw3Ktw7XGDl6mC8DN61F71V4ckf0rBoEOydH9l6C4,428
 langroid/agent/base.py,sha256=2xnNig9pRv5IJR-_up5QwRrX7UYMeP56BYf1MDDY0n0,31982
 langroid/agent/batch.py,sha256=Cg7Qv1yGi_M9rMl38_4-hjXPsoLlZrOSXDhbOFqUcKY,5593
-langroid/agent/chat_agent.py,sha256=B9DPToPXyDdGf2MUK4ahCkqsawPjNGwoiyZXH8TTFYQ,35114
+langroid/agent/chat_agent.py,sha256=yK56EAuT-RxRWBbfVaevl0qW1h8neWL0lktPQc34uUc,35626
 langroid/agent/chat_document.py,sha256=dw0m_00qJgOhbzCkEsVBAiktM6BJ62mV8_piu5GruXM,7008
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
@@ -11,7 +11,7 @@ langroid/agent/special/__init__.py,sha256=Iex-fxO7sTM2LKAOk-JQLzovk-zlzqi5PwxiMB
 langroid/agent/special/doc_chat_agent.py,sha256=ERZs1phXGA_18114d7qv_Zl4-TPte-z2v6dgA75RAq0,37264
 langroid/agent/special/recipient_validator_agent.py,sha256=WmLnQUdkrvWLDfFeS3Q7CnrfkDk0-trQxitQSuR7fpE,6315
 langroid/agent/special/relevance_extractor_agent.py,sha256=19LwSZ09q8LyiU-iKrOOuG0uboyoUBVL3zXeteHKiLs,4162
-langroid/agent/special/retriever_agent.py,sha256=ze8jXJW9A_twsrRXVECAQCYicfjm8-a6qv1vDk41AAc,6573
+langroid/agent/special/retriever_agent.py,sha256=wUCm0PAzHNn4aGb2Q-7dwYIAxX2_RwrZQenwDeGxOIg,6564
 langroid/agent/special/sql/__init__.py,sha256=3kR5nC0wnYIzmMrr9L8RJa7JAJpbwBLx7KKygiwz0v0,111
 langroid/agent/special/sql/sql_chat_agent.py,sha256=Ua_gfK_1k5ct59Zkbe78bzs-2jabtFkEVx76a0pGs9Y,12867
 langroid/agent/special/sql/utils/__init__.py,sha256=_IBHt3iNXvPqxvDrs5_T86qdj0gPugVGnGNi6Cx7F-I,238
@@ -43,12 +43,12 @@ langroid/language_models/azure_openai.py,sha256=_OOEoZOziI3NDOH_8t3qmh8IDWoHESQe
 langroid/language_models/base.py,sha256=jUEUqDWJBVxIxmG6U4Ysg2QKGOnP_CLmRuEMicsSwUw,20596
 langroid/language_models/config.py,sha256=PXcmEUq52GCDj2sekt8F9E1flWyyNjP2S0LTRs7T6Kg,269
 langroid/language_models/openai_assistants.py,sha256=9K-DEAL2aSWHeXj2hwCo2RAlK9_1oCPtqX2u1wISCj8,36
-langroid/language_models/openai_gpt.py,sha256=QBOtB0gqIMRs5rjb9H8qjetYXWFMgvQkCcxeWBh5w6g,42094
+langroid/language_models/openai_gpt.py,sha256=K3UtPVrd6OdpsGnYfb2EwMiS6XqpHFivwb3oATbus8k,42204
 langroid/language_models/prompt_formatter/__init__.py,sha256=wj2e6j7R9d3m63HCbSDY1vosjFuhHLQVlgBrq8iqF38,197
 langroid/language_models/prompt_formatter/base.py,sha256=2y_GcwhstvB5ih3haS7l5Fv79jVnFJ_vEw1jqWJzB9k,1247
 langroid/language_models/prompt_formatter/llama2_formatter.py,sha256=YdcO88qyBeuMENVIVvVqSYuEpvYSTndUe_jd6hVTko4,2899
 langroid/language_models/utils.py,sha256=3stQOt3sAdbGT70thurlxfnQ4xPxH75YjFm-jaRuXlg,4474
-langroid/mytypes.py,sha256=n43j4bmJLJybhvq6SIQm65Dfgbz2gOgru4Zj9zNEWYI,2502
+langroid/mytypes.py,sha256=-0q-SyicLbdjFSIEcwt5u-EwhRcMWllSoWYE3OWk78M,2501
 langroid/parsing/__init__.py,sha256=_EZ8iuixxU39zuaydtfjyap8g9C_c1dnrCQ0QR81U2E,340
 langroid/parsing/agent_chats.py,sha256=sbZRV9ujdM5QXvvuHVjIi2ysYSYlap-uqfMMUKulrW0,1068
 langroid/parsing/code-parsing.md,sha256=--cyyNiSZSDlIwcjAV4-shKrSiRe2ytF3AdSoS_hD2g,3294
@@ -57,7 +57,7 @@ langroid/parsing/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/parsing/document_parser.py,sha256=YC3IXQ9ErpBGBZh6Be9gfJWHcTwGTSMfNQMT5ARrj5g,14615
 langroid/parsing/json.py,sha256=MVqBUfInALQm1QKbcfEvLzWxBz_UztCIyGk7AK5uFPo,1650
 langroid/parsing/para_sentence_split.py,sha256=AJBzZojP3zpB-_IMiiHismhqcvkrVBQ3ZINoQyx_bE4,2000
-langroid/parsing/parser.py,sha256=qbIsXS62s_JbzwVjyG6g4ly_Y4GHao6k2gykCY214P4,10283
+langroid/parsing/parser.py,sha256=BwVJboobG71N08w5LC7Tu36LI4pEJoSgAdiBSLChWGY,10251
 langroid/parsing/repo_loader.py,sha256=4qCyRRHCKIYd8F1ghT-D8ko1C2sXpF7UYP1L5Im1hRE,27705
 langroid/parsing/search.py,sha256=xmQdAdTIwZ0REEUeQVFlGZlqf7k8Poah7-ALuyW7Ov0,8440
 langroid/parsing/spider.py,sha256=w_mHR1B4KOmxsBLoVI8kMkMTEbwTzeK3ath9fOMJrTk,3043
@@ -91,13 +91,13 @@ langroid/utils/web/login.py,sha256=1iz9eUAHa87vpKIkzwkmFa00avwFWivDSAr7QUhK7U0,2
 langroid/utils/web/selenium_login.py,sha256=mYI6EvVmne34N9RajlsxxRqJQJvV-WG4LGp6sEECHPw,1156
 langroid/vector_store/__init__.py,sha256=NhAXOCKX_x2whfghOn44e0O3-vV0nJRz6ZLsCBqYFyQ,242
 langroid/vector_store/base.py,sha256=60XkAcX7OLkseYE66p3XOcXs7KB9udJbOV5IBfzNBDs,12188
-langroid/vector_store/chromadb.py,sha256=5v9fbj5exHRrCayo4Qlw1wF8QnfMd3ubtwbOXcYydIs,7094
-langroid/vector_store/lancedb.py,sha256=2ckggSZnX-FI5-dV7KgIqeufDTtEFlnfTKKsuEKAOZo,11293
+langroid/vector_store/chromadb.py,sha256=tQ_qNWgboLpZs4MG21za9QYIUc6fNQe2XmTBjSn6_ak,7125
+langroid/vector_store/lancedb.py,sha256=NWG2OS51jL141ATu6L4AVPECShBiR4GD2BW0ZQVnzf0,10919
 langroid/vector_store/meilisearch.py,sha256=kxPtvZ3_fM8NxILps1nI50YbpJP6KqhAfY3idwcblh8,11238
 langroid/vector_store/momento.py,sha256=91Ep3OVkGzDM60aPT1Y_Da5SS1_1lrR9no-CNzHrBoY,10027
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=CcIAGale7LO7V_4CeRihIUKqlwi4LxUldtwPKVOvgUg,11848
-langroid-0.1.144.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.144.dist-info/METADATA,sha256=O9QT2pGCot6fETr6xOBG5dw-YpFv0Vs9BDmn0LrSel4,41526
-langroid-0.1.144.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.144.dist-info/RECORD,,
+langroid-0.1.145.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.145.dist-info/METADATA,sha256=YNfr4Ceiwock4mAgZorQouU6oUhPgxczKleXWn36GnY,41526
+langroid-0.1.145.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.145.dist-info/RECORD,,