llama-index-vector-stores-opensearch 0.1.10__tar.gz → 0.1.12__tar.gz

{llama_index_vector_stores_opensearch-0.1.10 → llama_index_vector_stores_opensearch-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-index-vector-stores-opensearch
-Version: 0.1.10
+Version: 0.1.12
 Summary: llama-index vector_stores opensearch integration
 License: MIT
 Author: Your Name
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: llama-index-core (>=0.10.1,<0.11.0)
 Requires-Dist: opensearch-py[async] (>=2.4.2,<3.0.0)
 Description-Content-Type: text/markdown

{llama_index_vector_stores_opensearch-0.1.10 → llama_index_vector_stores_opensearch-0.1.12}/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()
@@ -265,17 +270,34 @@ class OpensearchVectorClient:
         k: int,
         filters: Optional[MetadataFilters] = None,
     ) -> Dict:
-        knn_query = self._knn_search_query(
-            embedding_field, query_embedding, k, filters
-        )["query"]
-        lexical_query = {"must": {"match": {text_field: {"query": query_str}}}}
+        knn_query = self._knn_search_query(embedding_field, query_embedding, k, filters)
+        lexical_query = self._lexical_search_query(text_field, query_str, k, filters)
+
+        return {
+            "size": k,
+            "query": {
+                "hybrid": {"queries": [lexical_query["query"], knn_query["query"]]}
+            },
+        }
+
+    def _lexical_search_query(
+        self,
+        text_field: str,
+        query_str: str,
+        k: int,
+        filters: Optional[MetadataFilters] = None,
+    ) -> Dict:
+        lexical_query = {
+            "bool": {"must": {"match": {text_field: {"query": query_str}}}}
+        }
 
         parsed_filters = self._parse_filters(filters)
         if len(parsed_filters) > 0:
-            lexical_query["filter"] = parsed_filters
+            lexical_query["bool"]["filter"] = parsed_filters
+
         return {
             "size": k,
-            "query": {"hybrid": {"queries": [{"bool": lexical_query}, knn_query]}},
+            "query": lexical_query,
         }
 
     def __get_painless_scripting_source(
@@ -389,6 +411,11 @@ class OpensearchVectorClient:
             params = {
                 "search_pipeline": self._search_pipeline,
             }
+        elif query_mode == VectorStoreQueryMode.TEXT_SEARCH:
+            search_query = self._lexical_search_query(
+                self._text_field, query_str, k, filters=filters
+            )
+            params = None
         else:
             search_query = self._knn_search_query(
                 self._embedding_field, query_embedding, k, filters=filters

{llama_index_vector_stores_opensearch-0.1.10 → llama_index_vector_stores_opensearch-0.1.12}/pyproject.toml

@@ -27,7 +27,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-vector-stores-opensearch"
 readme = "README.md"
-version = "0.1.10"
+version = "0.1.12"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"