llama-index-vector-stores-opensearch 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

llama_index/vector_stores/opensearch/base.py

@@ -4,8 +4,8 @@ import uuid
 from datetime import datetime
 from typing import Any, Dict, Iterable, List, Optional, Union, cast
 
+from llama_index.core.async_utils import asyncio_run
 from llama_index.core.bridge.pydantic import PrivateAttr
-
 from llama_index.core.schema import BaseNode, MetadataMode, TextNode
 from llama_index.core.vector_stores.types import (
     FilterCondition,
@@ -123,14 +123,22 @@ class OpensearchVectorClient:
         self._os_async_client = os_async_client or self._get_async_opensearch_client(
             self._endpoint, **kwargs
         )
-        self._os_version = self._get_opensearch_version()
-        self._efficient_filtering_enabled = self._is_efficient_filtering_enabled(
-            self._os_version
-        )
+        self._efficient_filtering_enabled = self._is_efficient_filtering_enabled()
         not_found_error = self._import_not_found_error()
 
         try:
             self._os_client.indices.get(index=self._index)
+        except TypeError:
+            # Probably using async so switch to async client
+            try:
+                asyncio_run(self._os_async_client.indices.get(index=self._index))
+            except not_found_error:
+                asyncio_run(
+                    self._os_async_client.indices.create(
+                        index=self._index, body=idx_conf
+                    )
+                )
+                asyncio_run(self._os_async_client.indices.refresh(index=self._index))
         except not_found_error:
             self._os_client.indices.create(index=self._index, body=idx_conf)
             self._os_client.indices.refresh(index=self._index)
@@ -617,10 +625,18 @@ class OpensearchVectorClient:
             return True
         return False
 
-    def _is_efficient_filtering_enabled(self, os_version: str) -> bool:
+    def _is_efficient_filtering_enabled(self) -> bool:
         """Check if kNN with efficient filtering is enabled."""
-        major, minor, patch = os_version.split(".")
-        return int(major) >= 2 and int(minor) >= 9
+        # Technically, AOSS supports efficient filtering,
+        # but we can't check the version number using .info(); AOSS doesn't support 'GET /'
+        #  so we must skip and disable by default.
+        if self.is_aoss:
+            ef_enabled = False
+        else:
+            self._os_version = self._get_opensearch_version()
+            major, minor, patch = self._os_version.split(".")
+            ef_enabled = int(major) >= 2 and int(minor) >= 9
+        return ef_enabled
 
     def index_results(self, nodes: List[BaseNode], **kwargs: Any) -> List[str]:
         """Store results in the index."""

{llama_index_vector_stores_opensearch-0.5.0.dist-info → llama_index_vector_stores_opensearch-0.5.2.dist-info}/METADATA

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

llama_index_vector_stores_opensearch-0.5.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+llama_index/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+llama_index/vector_stores/opensearch/__init__.py,sha256=U1_XAkZb6zcskOk4s10NB8Tjs9AZRGdRQLzOGpbWdBA,176
+llama_index/vector_stores/opensearch/base.py,sha256=r6Ru-FjOrlLGo5klJnJxNdhz8F5SpVbRQr6ic8d_o70,37951
+llama_index_vector_stores_opensearch-0.5.2.dist-info/METADATA,sha256=liN4ebro3xeiq7is5dpYP29gEOQYeUVes5ZjWrnSWZg,726
+llama_index_vector_stores_opensearch-0.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+llama_index_vector_stores_opensearch-0.5.2.dist-info/RECORD,,

llama_index_vector_stores_opensearch-0.5.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-llama_index/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llama_index/vector_stores/opensearch/__init__.py,sha256=U1_XAkZb6zcskOk4s10NB8Tjs9AZRGdRQLzOGpbWdBA,176
-llama_index/vector_stores/opensearch/base.py,sha256=H_5DUMn8q4E9iY7_LIQcdpfT8dZRjLfnml3OTjoVM2Q,37141
-llama_index_vector_stores_opensearch-0.5.0.dist-info/METADATA,sha256=n9PwzBPMOet5qPVyywZaWNu9HEHd6A6g6EoVi7D4b0M,726
-llama_index_vector_stores_opensearch-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-llama_index_vector_stores_opensearch-0.5.0.dist-info/RECORD,,