Adapt to vector store, instead of vector DB API

Author: luis5tb

src/app/endpoints/query.py

@@ -675,10 +675,10 @@ async def retrieve_response(  # pylint: disable=too-many-locals,too-many-branche
             ),
         }
 
-        vector_db_ids = [
-            vector_db.identifier for vector_db in await client.vector_dbs.list()
+        vector_store_ids = [
+            vector_store.id for vector_store in (await client.vector_stores.list()).data
         ]
-        toolgroups = (get_rag_toolgroups(vector_db_ids) or []) + [
+        toolgroups = (get_rag_toolgroups(vector_store_ids) or []) + [
             mcp_server.name for mcp_server in configuration.mcp_servers
         ]
         # Convert empty list to None for consistency with existing behavior
@@ -764,30 +764,30 @@ def validate_attachments_metadata(attachments: list[Attachment]) -> None:
 
 
 def get_rag_toolgroups(
-    vector_db_ids: list[str],
+    vector_store_ids: list[str],
 ) -> list[Toolgroup] | None:
     """
-    Return a list of RAG Tool groups if the given vector DB list is not empty.
+    Return a list of RAG Tool groups if the given vector store list is not empty.
 
     Generate a list containing a RAG knowledge search toolgroup if
-    vector database IDs are provided.
+    vector store IDs are provided.
 
     Parameters:
-        vector_db_ids (list[str]): List of vector database identifiers to include in the toolgroup.
+        vector_store_ids (list[str]): List of vector store identifiers to include in the toolgroup.
 
     Returns:
         list[Toolgroup] | None: A list with a single RAG toolgroup if
-        vector_db_ids is non-empty; otherwise, None.
+        vector_store_ids is non-empty; otherwise, None.
     """
     return (
         [
             ToolgroupAgentToolGroupWithArgs(
                 name="builtin::rag/knowledge_search",
                 args={
-                    "vector_db_ids": vector_db_ids,
+                    "vector_store_ids": vector_store_ids,
                 },
             )
         ]
-        if vector_db_ids
+        if vector_store_ids
         else None
     )

src/app/endpoints/query_v2.py

@@ -193,13 +193,13 @@ async def retrieve_response(  # pylint: disable=too-many-locals,too-many-branche
     # Prepare tools for responses API
     tools: list[dict[str, Any]] = []
     if not query_request.no_tools:
-        # Get vector databases for RAG tools
-        vector_db_ids = [
-            vector_db.identifier for vector_db in await client.vector_dbs.list()
+        # Get vector stores for RAG tools
+        vector_store_ids = [
+            vector_store.id for vector_store in (await client.vector_stores.list()).data
         ]
 
-        # Add RAG tools if vector databases are available
-        rag_tools = get_rag_tools(vector_db_ids)
+        # Add RAG tools if vector stores are available
+        rag_tools = get_rag_tools(vector_store_ids)
         if rag_tools:
             tools.extend(rag_tools)
 
@@ -326,15 +326,15 @@ async def retrieve_response(  # pylint: disable=too-many-locals,too-many-branche
     return summary, conversation_id
 
 
-def get_rag_tools(vector_db_ids: list[str]) -> list[dict[str, Any]] | None:
-    """Convert vector DB IDs to tools format for responses API."""
-    if not vector_db_ids:
+def get_rag_tools(vector_store_ids: list[str]) -> list[dict[str, Any]] | None:
+    """Convert vector store IDs to tools format for responses API."""
+    if not vector_store_ids:
         return None
 
     return [
         {
             "type": "file_search",
-            "vector_store_ids": vector_db_ids,
+            "vector_store_ids": vector_store_ids,
             "max_num_results": 10,
         }
     ]

src/app/endpoints/streaming_query.py

@@ -1015,10 +1015,10 @@ async def retrieve_response(
             ),
         }
 
-        vector_db_ids = [
-            vector_db.identifier for vector_db in await client.vector_dbs.list()
+        vector_store_ids = [
+            vector_store.id for vector_store in (await client.vector_stores.list()).data
         ]
-        toolgroups = (get_rag_toolgroups(vector_db_ids) or []) + [
+        toolgroups = (get_rag_toolgroups(vector_store_ids) or []) + [
             mcp_server.name for mcp_server in configuration.mcp_servers
         ]
         # Convert empty list to None for consistency with existing behavior

src/app/endpoints/streaming_query_v2.py

@@ -365,13 +365,13 @@ async def retrieve_response(
     # Prepare tools for responses API
     tools: list[dict[str, Any]] = []
     if not query_request.no_tools:
-        # Get vector databases for RAG tools
-        vector_db_ids = [
-            vector_db.identifier for vector_db in await client.vector_dbs.list()
+        # Get vector stores for RAG tools
+        vector_store_ids = [
+            vector_store.id for vector_store in (await client.vector_stores.list()).data
         ]
 
-        # Add RAG tools if vector databases are available
-        rag_tools = get_rag_tools(vector_db_ids)
+        # Add RAG tools if vector stores are available
+        rag_tools = get_rag_tools(vector_store_ids)
         if rag_tools:
             tools.extend(rag_tools)