llama-index-vector-stores-opensearch 0.5.2__tar.gz → 0.5.4__tar.gz

llama_index_vector_stores_opensearch-0.5.4/.gitignore

@@ -0,0 +1,153 @@
+llama_index/_static
+.DS_Store
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+bin/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+etc/
+include/
+lib/
+lib64/
+parts/
+sdist/
+share/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+.ruff_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+notebooks/
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+pyvenv.cfg
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Jetbrains
+.idea
+modules/
+*.swp
+
+# VsCode
+.vscode
+
+# pipenv
+Pipfile
+Pipfile.lock
+
+# pyright
+pyrightconfig.json

llama_index_vector_stores_opensearch-0.5.4/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) Jerry Liu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

llama_index_vector_stores_opensearch-0.5.4/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.4
+Name: llama-index-vector-stores-opensearch
+Version: 0.5.4
+Summary: llama-index vector_stores opensearch integration
+Author-email: Your Name <you@example.com>
+License-Expression: MIT
+License-File: LICENSE
+Requires-Python: <4.0,>=3.9
+Requires-Dist: llama-index-core<0.13,>=0.12.0
+Requires-Dist: opensearch-py[async]<3,>=2.4.2
+Description-Content-Type: text/markdown
+
+# LlamaIndex Vector_Stores Integration: Opensearch

{llama_index_vector_stores_opensearch-0.5.2 → llama_index_vector_stores_opensearch-0.5.4}/llama_index/vector_stores/opensearch/base.py

@@ -138,10 +138,18 @@ class OpensearchVectorClient:
                         index=self._index, body=idx_conf
                     )
                 )
-                asyncio_run(self._os_async_client.indices.refresh(index=self._index))
+                if self.is_aoss:
+                    asyncio_run(self._os_async_client.indices.exists(index=self._index))
+                else:
+                    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)
+            if self.is_aoss:
+                self._os_client.indices.exists(index=self._index)
+            else:
+                self._os_client.indices.refresh(index=self._index)
 
     def _import_opensearch(self) -> Any:
         """Import OpenSearch if available, otherwise raise error."""
@@ -340,7 +348,8 @@ class OpensearchVectorClient:
         return query
 
     def _is_text_field(self, value: Any) -> bool:
-        """Check if value is a string and keyword filtering needs to be performed.
+        """
+        Check if value is a string and keyword filtering needs to be performed.
 
         Not applied to datetime strings.
         """
@@ -354,7 +363,8 @@ class OpensearchVectorClient:
             return False
 
     def _parse_filter(self, filter: MetadataFilter) -> dict:
-        """Parse a single MetadataFilter to equivalent OpenSearch expression.
+        """
+        Parse a single MetadataFilter to equivalent OpenSearch expression.
 
         As Opensearch does not differentiate between scalar/array keyword fields, IN and ANY are equivalent.
         """
@@ -456,6 +466,7 @@ class OpensearchVectorClient:
 
         Returns:
             Dict: Up to k documents closest to query_embedding.
+
         """
         filters = self._parse_filters(filters)
 
@@ -545,7 +556,8 @@ class OpensearchVectorClient:
     def __get_painless_scripting_source(
         self, space_type: str, vector_field: str = "embedding"
     ) -> str:
-        """For Painless Scripting, it returns the script source based on space type.
+        """
+        For Painless Scripting, it returns the script source based on space type.
         This does not work with Opensearch Serverless currently.
         """
         source_value = (
@@ -586,7 +598,8 @@ class OpensearchVectorClient:
         pre_filter: Optional[Union[Dict, List]] = None,
         vector_field: str = "embedding",
     ) -> Dict:
-        """For Scoring Script Search, this is the default query. Has to account for Opensearch Service
+        """
+        For Scoring Script Search, this is the default query. Has to account for Opensearch Service
         Serverless which does not support painless scripting functions so defaults to knn_score.
         """
         if not pre_filter:
@@ -617,13 +630,7 @@ class OpensearchVectorClient:
 
     def _is_aoss_enabled(self, http_auth: Any) -> bool:
         """Check if the service is http_auth is set as `aoss`."""
-        if (
-            http_auth is not None
-            and hasattr(http_auth, "service")
-            and http_auth.service == "aoss"
-        ):
-            return True
-        return False
+        return http_auth is not None and hasattr(http_auth, "service") and http_auth.service == "aoss"
 
     def _is_efficient_filtering_enabled(self) -> bool:
         """Check if kNN with efficient filtering is enabled."""
@@ -696,6 +703,7 @@ class OpensearchVectorClient:
 
         Args:
             doc_id (str): a LlamaIndex `Document` id
+
         """
         search_query = {
             "query": {"term": {"metadata.doc_id.keyword": {"value": doc_id}}}
@@ -710,6 +718,7 @@ class OpensearchVectorClient:
 
         Args:
             doc_id (str): a LlamaIndex `Document` id
+
         """
         search_query = {
             "query": {"term": {"metadata.doc_id.keyword": {"value": doc_id}}}
@@ -724,11 +733,13 @@ class OpensearchVectorClient:
         filters: Optional[MetadataFilters] = None,
         **delete_kwargs: Any,
     ) -> None:
-        """Deletes nodes.
+        """
+        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
@@ -748,11 +759,13 @@ class OpensearchVectorClient:
         filters: Optional[MetadataFilters] = None,
         **delete_kwargs: Any,
     ) -> None:
-        """Deletes nodes.
+        """
+        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
@@ -888,7 +901,6 @@ class OpensearchVectorClient:
                     start_char_idx=start_char_idx,
                     end_char_idx=end_char_idx,
                     relationships=relationships,
-                    extra_info=source,
                 )
             ids.append(node_id)
             nodes.append(node)
@@ -933,6 +945,7 @@ class OpensearchVectorStore(BasePydanticVectorStore):
         # initialize vector store
         vector_store = OpensearchVectorStore(client)
         ```
+
     """
 
     stores_text: bool = True
@@ -1007,11 +1020,13 @@ class OpensearchVectorStore(BasePydanticVectorStore):
         filters: Optional[MetadataFilters] = None,
         **delete_kwargs: Any,
     ) -> None:
-        """Deletes nodes async.
+        """
+        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.
+
         """
         self._client.delete_nodes(node_ids, filters, **delete_kwargs)
 
@@ -1021,11 +1036,13 @@ class OpensearchVectorStore(BasePydanticVectorStore):
         filters: Optional[MetadataFilters] = None,
         **delete_kwargs: Any,
     ) -> None:
-        """Async deletes nodes async.
+        """
+        Async 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.adelete_nodes(node_ids, filters, **delete_kwargs)
 

llama_index_vector_stores_opensearch-0.5.4/pyproject.toml

@@ -0,0 +1,65 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[dependency-groups]
+dev = [
+    "ipython==8.10.0",
+    "jupyter>=1.0.0,<2",
+    "mypy==0.991",
+    "pre-commit==3.2.0",
+    "pylint==2.15.10",
+    "pytest==7.2.1",
+    "pytest-asyncio==0.21.0",
+    "pytest-mock==3.11.1",
+    "ruff==0.0.292",
+    "types-Deprecated>=0.1.0",
+    "types-PyYAML>=6.0.12.12,<7",
+    "types-protobuf>=4.24.0.4,<5",
+    "types-redis==4.5.5.0",
+    "types-requests==2.28.11.8",
+    "types-setuptools==67.1.0.0",
+    "black[jupyter]<=23.9.1,>=23.7.0",
+    "codespell[toml]>=v2.2.6",
+    "diff-cover>=9.2.0",
+    "pytest-cov>=6.1.1",
+]
+
+[project]
+name = "llama-index-vector-stores-opensearch"
+version = "0.5.4"
+description = "llama-index vector_stores opensearch integration"
+authors = [{name = "Your Name", email = "you@example.com"}]
+requires-python = ">=3.9,<4.0"
+readme = "README.md"
+license = "MIT"
+dependencies = [
+    "llama-index-core>=0.12.0,<0.13",
+    "opensearch-py[async]>=2.4.2,<3",
+]
+
+[tool.codespell]
+check-filenames = true
+check-hidden = true
+skip = "*.csv,*.html,*.json,*.jsonl,*.pdf,*.txt,*.ipynb"
+
+[tool.hatch.build.targets.sdist]
+include = ["llama_index/"]
+exclude = ["**/BUILD"]
+
+[tool.hatch.build.targets.wheel]
+include = ["llama_index/"]
+exclude = ["**/BUILD"]
+
+[tool.llamahub]
+contains_example = false
+import_path = "llama_index.vector_stores.opensearch"
+
+[tool.llamahub.class_authors]
+OpensearchVectorStore = "llama-index"
+
+[tool.mypy]
+disallow_untyped_defs = true
+exclude = ["_static", "build", "examples", "notebooks", "venv"]
+ignore_missing_imports = true
+python_version = "3.8"

llama_index_vector_stores_opensearch-0.5.2/PKG-INFO

@@ -1,20 +0,0 @@
-Metadata-Version: 2.1
-Name: llama-index-vector-stores-opensearch
-Version: 0.5.2
-Summary: llama-index vector_stores opensearch integration
-License: MIT
-Author: Your Name
-Author-email: you@example.com
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-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.12.0,<0.13.0)
-Requires-Dist: opensearch-py[async] (>=2.4.2,<3.0.0)
-Description-Content-Type: text/markdown
-
-# LlamaIndex Vector_Stores Integration: Opensearch
-

llama_index_vector_stores_opensearch-0.5.2/pyproject.toml

@@ -1,66 +0,0 @@
-[build-system]
-build-backend = "poetry.core.masonry.api"
-requires = ["poetry-core"]
-
-[tool.codespell]
-check-filenames = true
-check-hidden = true
-skip = "*.csv,*.html,*.json,*.jsonl,*.pdf,*.txt,*.ipynb"
-
-[tool.llamahub]
-contains_example = false
-import_path = "llama_index.vector_stores.opensearch"
-
-[tool.llamahub.class_authors]
-OpensearchVectorStore = "llama-index"
-
-[tool.mypy]
-disallow_untyped_defs = true
-exclude = ["_static", "build", "examples", "notebooks", "venv"]
-ignore_missing_imports = true
-python_version = "3.8"
-
-[tool.poetry]
-authors = ["Your Name <you@example.com>"]
-description = "llama-index vector_stores opensearch integration"
-exclude = ["**/BUILD"]
-license = "MIT"
-name = "llama-index-vector-stores-opensearch"
-readme = "README.md"
-version = "0.5.2"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-llama-index-core = "^0.12.0"
-
-[tool.poetry.dependencies.opensearch-py]
-extras = ["async"]
-version = "^2.4.2"
-
-[tool.poetry.group.dev.dependencies]
-ipython = "8.10.0"
-jupyter = "^1.0.0"
-mypy = "0.991"
-pre-commit = "3.2.0"
-pylint = "2.15.10"
-pytest = "7.2.1"
-pytest-mock = "3.11.1"
-ruff = "0.0.292"
-tree-sitter-languages = "^1.8.0"
-types-Deprecated = ">=0.1.0"
-types-PyYAML = "^6.0.12.12"
-types-protobuf = "^4.24.0.4"
-types-redis = "4.5.5.0"
-types-requests = "2.28.11.8"
-types-setuptools = "67.1.0.0"
-
-[tool.poetry.group.dev.dependencies.black]
-extras = ["jupyter"]
-version = "<=23.9.1,>=23.7.0"
-
-[tool.poetry.group.dev.dependencies.codespell]
-extras = ["toml"]
-version = ">=v2.2.6"
-
-[[tool.poetry.packages]]
-include = "llama_index/"