langroid 0.1.226__py3-none-any.whl → 0.1.228__py3-none-any.whl

langroid/agent/openai_assistant.py

@@ -8,6 +8,10 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Type, cast, no_type_check
 
 from openai.types.beta import Assistant, Thread
+from openai.types.beta.assistant_update_params import (
+    ToolResources,
+    ToolResourcesCodeInterpreter,
+)
 from openai.types.beta.threads import Message, Run
 from openai.types.beta.threads.runs import RunStep
 from pydantic import BaseModel
@@ -29,7 +33,7 @@ logger = logging.getLogger(__name__)
 
 
 class ToolType(str, Enum):
-    RETRIEVAL = "retrieval"
+    RETRIEVAL = "file_search"
     CODE_INTERPRETER = "code_interpreter"
     FUNCTION = "function"
 
@@ -127,7 +131,11 @@ class OpenAIAssistant(ChatAgent):
         self.config.files = list(set(self.config.files + files))
         self.assistant = self.assistants.update(
             self.assistant.id,
-            file_ids=[f.id for f in self.files],
+            tool_resources=ToolResources(
+                code_interpreter=ToolResourcesCodeInterpreter(
+                    file_ids=[f.id for f in self.files],
+                ),
+            ),
         )
 
     def add_assistant_tools(self, tools: List[AssistantTool]) -> None:

langroid/agent/special/doc_chat_agent.py

@@ -169,7 +169,8 @@ class DocChatAgentConfig(ChatAgentConfig):
         dims=1536,
     )
 
-    vecdb: VectorStoreConfig = LanceDBConfig(
+    # Allow vecdb to be None in case we want to explicitly set it later
+    vecdb: Optional[VectorStoreConfig] = LanceDBConfig(
         collection_name="doc-chat-lancedb",
         replace_collection=True,
         storage_path=".lancedb/data/",
@@ -209,12 +210,13 @@ class DocChatAgent(ChatAgent):
 
     def clear(self) -> None:
         """Clear the document collection and the specific collection in vecdb"""
-        if self.vecdb is None:
-            raise ValueError("VecDB not set")
         self.original_docs = []
         self.original_docs_length = 0
         self.chunked_docs = []
         self.chunked_docs_clean = []
+        if self.vecdb is None:
+            logger.warning("Attempting to clear VecDB, but VecDB not set.")
+            return
         collection_name = self.vecdb.config.collection_name
         if collection_name is None:
             return

langroid/language_models/openai_gpt.py

@@ -69,7 +69,7 @@ class OpenAIChatModel(str, Enum):
     GPT3_5_TURBO = "gpt-3.5-turbo-1106"
     GPT4 = "gpt-4"
     GPT4_32K = "gpt-4-32k"
-    GPT4_TURBO = "gpt-4-turbo-preview"
+    GPT4_TURBO = "gpt-4-turbo"
 
 
 class OpenAICompletionModel(str, Enum):

langroid/vector_store/qdrantdb.py

@@ -192,8 +192,7 @@ class QdrantDB(VectorStore):
                 with the same name. Defaults to False.
         """
         self.config.collection_name = collection_name
-        collections = self.list_collections()
-        if collection_name in collections:
+        if self.client.collection_exists(collection_name=collection_name):
             coll = self.client.get_collection(collection_name=collection_name)
             if (
                 coll.status == CollectionStatus.GREEN
@@ -205,7 +204,8 @@ class QdrantDB(VectorStore):
                     return
                 else:
                     logger.warning("Recreating fresh collection")
-        self.client.recreate_collection(
+            self.client.delete_collection(collection_name=collection_name)
+        self.client.create_collection(
             collection_name=collection_name,
             vectors_config=VectorParams(
                 size=self.embedding_dim,
@@ -214,7 +214,7 @@ class QdrantDB(VectorStore):
         )
         collection_info = self.client.get_collection(collection_name=collection_name)
         assert collection_info.status == CollectionStatus.GREEN
-        assert collection_info.vectors_count == 0
+        assert collection_info.vectors_count in [0, None]
         if settings.debug:
             level = logger.getEffectiveLevel()
             logger.setLevel(logging.INFO)

{langroid-0.1.226.dist-info → langroid-0.1.228.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.226
+Version: 0.1.228
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
 Author-email: pchalasani@gmail.com
-Requires-Python: >=3.9.1,<3.12
+Requires-Python: >=3.11,<3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: chainlit
 Provides-Extra: chromadb
@@ -19,10 +18,8 @@ Provides-Extra: mkdocs
 Provides-Extra: mysql
 Provides-Extra: neo4j
 Provides-Extra: postgres
-Provides-Extra: sciphi
 Provides-Extra: transformers
 Provides-Extra: unstructured
-Requires-Dist: agent-search (>=0.0.7,<0.0.8) ; extra == "sciphi"
 Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
 Requires-Dist: async-generator (>=1.10,<2.0)
 Requires-Dist: autopep8 (>=2.0.2,<3.0.0)

{langroid-0.1.226.dist-info → langroid-0.1.228.dist-info}/RECORD

@@ -8,9 +8,9 @@ langroid/agent/chat_agent.py,sha256=X5uVMm9qdw3j-FRf4hbN8k8ByaSdtQCTuU8olKE0sbs,
 langroid/agent/chat_document.py,sha256=PL8iA1ZYjXNFVa3kMO8T4sbbM3rzHWpRAY6PN_7n5LQ,7969
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
-langroid/agent/openai_assistant.py,sha256=QTLBgnH6Btf2GWzN-WApvra-vPQWvYcXcAOULuIy4Ig,32702
+langroid/agent/openai_assistant.py,sha256=xWSDR4SyMcZhCUkgaM4-mu77rbEDF_xpt7N8m8CkiA4,32962
 langroid/agent/special/__init__.py,sha256=XPE076zD-roskxNBn-A1hnh4AHoMiQN9gk1UDjPaBaU,1201
-langroid/agent/special/doc_chat_agent.py,sha256=OpPWLFHBi3C5V6H0xRgmXUubmvy80EJRTgS6YkYfBJA,53242
+langroid/agent/special/doc_chat_agent.py,sha256=Ur57J3xolTaoTgzr2DfP8TY7BViIMNFGNEmmRfHbkL4,53373
 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
@@ -42,7 +42,6 @@ langroid/agent/tools/google_search_tool.py,sha256=cQxcNtb8XCNpOo_yCeYRwG_y-OATjP
 langroid/agent/tools/metaphor_search_tool.py,sha256=NKHss-AkI942_XhfMgUctAwHjIHpqp5NfYIebKV4UcE,2454
 langroid/agent/tools/recipient_tool.py,sha256=61vdKv06qgVdtnE3gxjzV8RvUEy8JhbC9eWa0J0BPdw,9171
 langroid/agent/tools/run_python_code.py,sha256=V3mHdHQYn0M0PAtyoHxjNvk6KvWWcQ4ugo0TOKc8HyI,1752
-langroid/agent/tools/sciphi_search_rag_tool.py,sha256=IAEgZY5-euQh8MndMzZnn1XVxaItvWYB2VF9-YHfunk,2496
 langroid/agent/tools/segment_extract_tool.py,sha256=W39poS7Av2EuJ34tGKhLhzgj3zEyZnBplpSt2goRAp4,1285
 langroid/agent_config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/cachedb/__init__.py,sha256=ygx42MS7fvh2UwRMjukTk3dWBkzv_rACebTBRYa_MkU,148
@@ -63,7 +62,7 @@ langroid/language_models/azure_openai.py,sha256=ncRCbKooqLVOY-PWQUIo9C3yTuKEFbAw
 langroid/language_models/base.py,sha256=4ybrbvOnoWzEVzVuZ3AStsl8ELoljiKtgtdykUzRSxg,21014
 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=6CE6I_hmnHfRIMJMh4qhVeKijgKEm_LNcWNn3vLMLlM,49680
+langroid/language_models/openai_gpt.py,sha256=3W0gi7_Ja0c0vuT8SDv8ioOWXyUKs7zJORx8BV-QT2g,49672
 langroid/language_models/prompt_formatter/__init__.py,sha256=9JXFF22QNMmbQV1q4nrIeQVTtA3Tx8tEZABLtLBdFyc,352
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
 langroid/language_models/prompt_formatter/hf_formatter.py,sha256=TFL6ppmeQWnzr6CKQzRZFYY810zE1mr8DZnhw6i85ok,5217
@@ -120,8 +119,8 @@ langroid/vector_store/lancedb.py,sha256=lbl8wZuV6GNw0LnIwOSriSNwoMEba90umQTcQHtM
 langroid/vector_store/meilisearch.py,sha256=d2huA9P-NoYRuAQ9ZeXJmMKr7ry8u90RUSR28k2ecQg,11340
 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=_egbsP9SWBwmI827EDYSSOqfIQSmwNsmJfFTxrLpWYE,13457
-langroid-0.1.226.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.226.dist-info/METADATA,sha256=Dssqa7k6VMEBWxwulUiub5XM9TyreczBTC-xrNGXeK4,48003
-langroid-0.1.226.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.226.dist-info/RECORD,,
+langroid/vector_store/qdrantdb.py,sha256=foKRxRv0BBony6S4Vt0Vav9Rn9HMxZvcIh1cE7nosFE,13524
+langroid-0.1.228.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.228.dist-info/METADATA,sha256=ZineIvSkpCMJ-NqtqT_24P8Y3pbBZwP1ntP5myCKaBU,47863
+langroid-0.1.228.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.228.dist-info/RECORD,,

langroid/agent/tools/sciphi_search_rag_tool.py

@@ -1,79 +0,0 @@
-"""
-A tool which returns a Search RAG response from the SciPhi API.
-their titles, links, summaries. Since the tool is stateless (i.e. does not need
-access to agent state), it can be enabled for any agent, without having to define a
-special method inside the agent: `agent.enable_message(SciPhiSearchRAGTool)`
-
-Example return output appears as follows below:
-
-<-- Query -->
-```
-Find 3 results on the internet about the LK-99 superconducting material.
-``
-
-<-- Response (compressed for this example)-->
-```
-[ result1 ]
-
-[ result2 ]
-
-[ result3 ]
-
-```
-
-NOTE: Using this tool requires getting an API key from sciphi.ai.
-Setup is as simple as shown below
-# Get a free API key at https://www.sciphi.ai/account
-# export SCIPHI_API_KEY=$MY_SCIPHI_API_KEY before running the agent
-# OR add SCIPHI_API_KEY=$MY_SCIPHI_API_KEY to your .env file
-
-This tool requires installing langroid with the `sciphi` extra, e.g.
-`pip install langroid[sciphi]` or `poetry add langroid[sciphi]`
-(it installs the `agent-search` package from pypi).
-
-For more information, please refer to the official docs:
-https://agent-search.readthedocs.io/en/latest/
-"""
-
-from typing import List
-
-try:
-    from agent_search import SciPhi
-except ImportError:
-    raise ImportError(
-        "You are attempting to use the `agent-search` library;"
-        "To use it, please install langroid with the `sciphi` extra, e.g. "
-        "`pip install langroid[sciphi]` or `poetry add langroid[sciphi]` "
-        "(it installs the `agent-search` package from pypi)."
-    )
-
-from langroid.agent.tool_message import ToolMessage
-
-
-class SciPhiSearchRAGTool(ToolMessage):
-    request: str = "web_search_rag"
-    purpose: str = """
-            To search the web with provider <search_provider> and 
-            return a response summary with llm model <llm_model> the given <query>. 
-            """
-    query: str
-
-    def handle(self) -> str:
-        rag_response = SciPhi().get_search_rag_response(
-            query=self.query, search_provider="bing", llm_model="SciPhi/Sensei-7B-V1"
-        )
-        result = rag_response["response"]
-        result = (
-            f"### RAG Response:\n{result}\n\n"
-            + "### Related Queries:\n"
-            + "\n".join(rag_response["related_queries"])
-        )
-        return result  # type: ignore
-
-    @classmethod
-    def examples(cls) -> List["ToolMessage"]:
-        return [
-            cls(
-                query="When was the Llama2 Large Language Model (LLM) released?",
-            ),
-        ]