llama-index-vector-stores-opensearch 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

llama_index/vector_stores/opensearch/base.py

@@ -20,6 +20,7 @@ from llama_index.core.vector_stores.utils import (
     node_to_metadata_dict,
 )
 from opensearchpy import AsyncOpenSearch
+from opensearchpy.client import Client as OSClient
 from opensearchpy.exceptions import NotFoundError
 from opensearchpy.helpers import async_bulk
 
@@ -64,8 +65,10 @@ class OpensearchVectorClient:
         embedding_field: str = "embedding",
         text_field: str = "content",
         method: Optional[dict] = None,
+        engine: Optional[str] = "nmslib",
         max_chunk_bytes: int = 1 * 1024 * 1024,
         search_pipeline: Optional[str] = None,
+        os_client: Optional[OSClient] = None,
         **kwargs: Any,
     ):
         """Init params."""
@@ -73,7 +76,7 @@ class OpensearchVectorClient:
             method = {
                 "name": "hnsw",
                 "space_type": "l2",
-                "engine": "nmslib",
+                "engine": engine,
                 "parameters": {"ef_construction": 256, "m": 48},
             }
         if embedding_field is None:
@@ -102,7 +105,9 @@ class OpensearchVectorClient:
                 }
             },
         }
-        self._os_client = self._get_async_opensearch_client(self._endpoint, **kwargs)
+        self._os_client = os_client or self._get_async_opensearch_client(
+            self._endpoint, **kwargs
+        )
         not_found_error = self._import_not_found_error()
 
         event_loop = asyncio.get_event_loop()
@@ -209,7 +214,10 @@ class OpensearchVectorClient:
         pre_filter = []
         if filters is not None:
             for f in filters.legacy_filters():
-                pre_filter.append({f.key: json.loads(str(f.value))})
+                if isinstance(f.value, str):
+                    pre_filter.append({f.key: f.value})
+                else:
+                    pre_filter.append({f.key: json.loads(str(f.value))})
 
         return pre_filter
 
@@ -384,6 +392,41 @@ class OpensearchVectorClient:
         }
         await self._os_client.delete_by_query(index=self._index, body=search_query)
 
+    async def delete_nodes(
+        self,
+        node_ids: Optional[List[str]] = None,
+        filters: Optional[MetadataFilters] = None,
+        **delete_kwargs: Any,
+    ) -> None:
+        """Deletes nodes.
+
+        Args:
+            node_ids (Optional[List[str]], optional): IDs of nodes to delete. Defaults to None.
+            filters (Optional[MetadataFilters], optional): Metadata filters. Defaults to None.
+        """
+        if not node_ids and not filters:
+            return
+
+        query = {"query": {"bool": {"filter": []}}}
+        if node_ids:
+            query["query"]["bool"]["filter"].append({"terms": {"_id": node_ids or []}})
+
+        if filters:
+            for filter in self._parse_filters(filters):
+                newfilter = {}
+
+                for key in filter:
+                    newfilter[f"metadata.{key}.keyword"] = filter[key]
+
+                query["query"]["bool"]["filter"].append({"term": newfilter})
+
+        await self._os_client.delete_by_query(index=self._index, body=query)
+
+    async def clear(self) -> None:
+        """Clears index."""
+        query = {"query": {"bool": {"filter": []}}}
+        await self._os_client.delete_by_query(index=self._index, body=query)
+
     async def aquery(
         self,
         query_mode: VectorStoreQueryMode,
@@ -569,6 +612,44 @@ class OpensearchVectorStore(BasePydanticVectorStore):
         """
         await self._client.delete_by_doc_id(ref_doc_id)
 
+    async def adelete_nodes(
+        self,
+        node_ids: Optional[List[str]] = None,
+        filters: Optional[MetadataFilters] = None,
+        **delete_kwargs: Any,
+    ) -> None:
+        """Deletes nodes async.
+
+        Args:
+            node_ids (Optional[List[str]], optional): IDs of nodes to delete. Defaults to None.
+            filters (Optional[MetadataFilters], optional): Metadata filters. Defaults to None.
+        """
+        await self._client.delete_nodes(node_ids, filters, **delete_kwargs)
+
+    def delete_nodes(
+        self,
+        node_ids: Optional[List[str]] = None,
+        filters: Optional[MetadataFilters] = None,
+        **delete_kwargs: Any,
+    ) -> None:
+        """Deletes nodes.
+
+        Args:
+            node_ids (Optional[List[str]], optional): IDs of nodes to delete. Defaults to None.
+            filters (Optional[MetadataFilters], optional): Metadata filters. Defaults to None.
+        """
+        asyncio.get_event_loop().run_until_complete(
+            self.adelete_nodes(node_ids, filters, **delete_kwargs)
+        )
+
+    async def aclear(self) -> None:
+        """Clears index."""
+        await self._client.clear()
+
+    def clear(self) -> None:
+        """Clears index."""
+        asyncio.get_event_loop().run_until_complete(self.aclear())
+
     def query(self, query: VectorStoreQuery, **kwargs: Any) -> VectorStoreQueryResult:
         """
         Query index for top k most similar nodes.

{llama_index_vector_stores_opensearch-0.1.11.dist-info → llama_index_vector_stores_opensearch-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-vector-stores-opensearch
-Version: 0.1.11
+Version: 0.1.13
 Summary: llama-index vector_stores opensearch integration
 License: MIT
 Author: Your Name

llama_index_vector_stores_opensearch-0.1.13.dist-info/RECORD

@@ -0,0 +1,5 @@
+llama_index/vector_stores/opensearch/__init__.py,sha256=U1_XAkZb6zcskOk4s10NB8Tjs9AZRGdRQLzOGpbWdBA,176
+llama_index/vector_stores/opensearch/base.py,sha256=YShOE7dzy3L5G8N9iobA6aenZLF_dJACs1aCBrQIPyg,22584
+llama_index_vector_stores_opensearch-0.1.13.dist-info/METADATA,sha256=X2CxNuyUSEoChYA5Rss4QThW0HarjyC3UQpWE24reOU,729
+llama_index_vector_stores_opensearch-0.1.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_vector_stores_opensearch-0.1.13.dist-info/RECORD,,

llama_index_vector_stores_opensearch-0.1.11.dist-info/RECORD

@@ -1,5 +0,0 @@
-llama_index/vector_stores/opensearch/__init__.py,sha256=U1_XAkZb6zcskOk4s10NB8Tjs9AZRGdRQLzOGpbWdBA,176
-llama_index/vector_stores/opensearch/base.py,sha256=bHE7FV-CLU-x_ChG9CdoE4WzT1YkkZyIg23PYB7Eg30,19780
-llama_index_vector_stores_opensearch-0.1.11.dist-info/METADATA,sha256=JrqjHpIkrncELU0t2pNIKbbYaAahVnFP8r9Tz0LeYrE,729
-llama_index_vector_stores_opensearch-0.1.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_vector_stores_opensearch-0.1.11.dist-info/RECORD,,