qdrant-haystack 0.0.2__tar.gz → 0.0.3__tar.gz

qdrant_haystack-0.0.3/PKG-INFO

@@ -0,0 +1,57 @@
+Metadata-Version: 2.1
+Name: qdrant-haystack
+Version: 0.0.3
+Summary: An integration of Qdrant ANN vector database backend with Haystack
+License: Apache 2.0
+Author: Kacper Łukawski
+Author-email: kacper.lukawski@qdrant.com
+Requires-Python: >=3.8.1,<=3.11
+Classifier: License :: Other/Proprietary License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Dist: farm-haystack (>=1.13.0,<2.0.0)
+Requires-Dist: qdrant-client (>=1.0.2,<2.0.0)
+Description-Content-Type: text/markdown
+
+# qdrant-haystack
+
+An integration of [Qdrant](https://qdrant.tech) vector database with [Haystack](https://haystack.deepset.ai/)
+by [deepset](https://www.deepset.ai).
+
+The library finally allows using Qdrant as a document store, and provides an in-place replacement
+for any other vector embeddings store. Thus, you should expect any kind of application to be working
+smoothly just by changing the provider to `QdrantDocumentStore`.
+
+## Installation
+
+`qdrant-haystack` might be installed as any other Python library, using pip or poetry:
+
+```bash
+pip install qdrant-haystack
+```
+
+```bash
+poetry add qdrant-haystack
+```
+
+## Usage
+
+Once installed, you can already start using `QdrantDocumentStore` as any other store that supports
+embeddings.
+
+```python
+from qdrant_haystack import QdrantDocumentStore
+
+document_store = QdrantDocumentStore(
+    host="localhost",
+    index="Document",
+    embedding_dim=512,
+    recreate_index=True,
+)
+```
+
+The list of parameters accepted by `QdrantDocumentStore` is complementary to those used in the
+official [Python Qdrant client](https://github.com/qdrant/qdrant_client).
+

qdrant_haystack-0.0.3/README.md

@@ -0,0 +1,39 @@
+# qdrant-haystack
+
+An integration of [Qdrant](https://qdrant.tech) vector database with [Haystack](https://haystack.deepset.ai/)
+by [deepset](https://www.deepset.ai).
+
+The library finally allows using Qdrant as a document store, and provides an in-place replacement
+for any other vector embeddings store. Thus, you should expect any kind of application to be working
+smoothly just by changing the provider to `QdrantDocumentStore`.
+
+## Installation
+
+`qdrant-haystack` might be installed as any other Python library, using pip or poetry:
+
+```bash
+pip install qdrant-haystack
+```
+
+```bash
+poetry add qdrant-haystack
+```
+
+## Usage
+
+Once installed, you can already start using `QdrantDocumentStore` as any other store that supports
+embeddings.
+
+```python
+from qdrant_haystack import QdrantDocumentStore
+
+document_store = QdrantDocumentStore(
+    host="localhost",
+    index="Document",
+    embedding_dim=512,
+    recreate_index=True,
+)
+```
+
+The list of parameters accepted by `QdrantDocumentStore` is complementary to those used in the
+official [Python Qdrant client](https://github.com/qdrant/qdrant_client).

{qdrant_haystack-0.0.2 → qdrant_haystack-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qdrant-haystack"
-version = "0.0.2"
+version = "0.0.3"
 description = "An integration of Qdrant ANN vector database backend with Haystack"
 authors = ["Kacper Łukawski <kacper.lukawski@qdrant.com>"]
 packages = [
@@ -11,12 +11,12 @@ license = "Apache 2.0"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<=3.11"
-qdrant-client = "^1.0.1"
+qdrant-client = "^1.0.2"
 farm-haystack = "^1.13.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1"
-pre-commit = "^2.20.0"
+pre-commit = "^3.1.0"
 black = "^23.1.0"
 isort = "^5.12.0"
 mypy = "^1.0.1"

qdrant_haystack-0.0.3/setup.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from setuptools import setup
+
+package_dir = \
+{'': 'src'}
+
+packages = \
+['qdrant_haystack', 'qdrant_haystack.document_stores']
+
+package_data = \
+{'': ['*']}
+
+install_requires = \
+['farm-haystack>=1.13.0,<2.0.0', 'qdrant-client>=1.0.2,<2.0.0']
+
+setup_kwargs = {
+    'name': 'qdrant-haystack',
+    'version': '0.0.3',
+    'description': 'An integration of Qdrant ANN vector database backend with Haystack',
+    'long_description': '# qdrant-haystack\n\nAn integration of [Qdrant](https://qdrant.tech) vector database with [Haystack](https://haystack.deepset.ai/)\nby [deepset](https://www.deepset.ai).\n\nThe library finally allows using Qdrant as a document store, and provides an in-place replacement\nfor any other vector embeddings store. Thus, you should expect any kind of application to be working\nsmoothly just by changing the provider to `QdrantDocumentStore`.\n\n## Installation\n\n`qdrant-haystack` might be installed as any other Python library, using pip or poetry:\n\n```bash\npip install qdrant-haystack\n```\n\n```bash\npoetry add qdrant-haystack\n```\n\n## Usage\n\nOnce installed, you can already start using `QdrantDocumentStore` as any other store that supports\nembeddings.\n\n```python\nfrom qdrant_haystack import QdrantDocumentStore\n\ndocument_store = QdrantDocumentStore(\n    host="localhost",\n    index="Document",\n    embedding_dim=512,\n    recreate_index=True,\n)\n```\n\nThe list of parameters accepted by `QdrantDocumentStore` is complementary to those used in the\nofficial [Python Qdrant client](https://github.com/qdrant/qdrant_client).\n',
+    'author': 'Kacper Łukawski',
+    'author_email': 'kacper.lukawski@qdrant.com',
+    'maintainer': 'None',
+    'maintainer_email': 'None',
+    'url': 'None',
+    'package_dir': package_dir,
+    'packages': packages,
+    'package_data': package_data,
+    'install_requires': install_requires,
+    'python_requires': '>=3.8.1,<=3.11',
+}
+
+
+setup(**setup_kwargs)

{qdrant_haystack-0.0.2 → qdrant_haystack-0.0.3}/src/qdrant_haystack/document_stores/qdrant.py

@@ -3,18 +3,22 @@ from typing import Any, Dict, Generator, List, Optional, Union, cast
 
 import numpy as np
 import qdrant_client
+from grpc._channel import _InactiveRpcError
 from haystack import Document, Label
 from haystack.document_stores import BaseDocumentStore
 from haystack.document_stores.base import get_batches_from_generator
 from haystack.errors import DocumentStoreError
 from haystack.nodes import DenseRetriever
 from haystack.schema import FilterType
+from qdrant_client import grpc
 from qdrant_client.http import models as rest
 from qdrant_client.http.exceptions import UnexpectedResponse
 from tqdm import tqdm
 
-from qdrant_haystack.document_stores.converters import (HaystackToQdrant,
-                                                        QdrantToHaystack)
+from qdrant_haystack.document_stores.converters import (
+    HaystackToQdrant,
+    QdrantToHaystack,
+)
 from qdrant_haystack.document_stores.filters import QdrantFilterConverter
 
 logger = logging.getLogger(__name__)
@@ -114,17 +118,21 @@ class QdrantDocumentStore(BaseDocumentStore):
         qdrant_filters = self.qdrant_filter_converter.convert(filters)
 
         next_offset = None
-        continue_scroll = True
-        while continue_scroll:
+        stop_scrolling = False
+        while not stop_scrolling:
             records, next_offset = self.client.scroll(
                 collection_name=index,
                 scroll_filter=qdrant_filters,
                 limit=batch_size,
                 offset=next_offset,
                 with_payload=True,
-                with_vectors=False,
+                with_vectors=True,
+            )
+            stop_scrolling = next_offset is None or (
+                isinstance(next_offset, grpc.PointId)
+                and next_offset.num == 0
+                and next_offset.uuid == ""
             )
-            continue_scroll = next_offset is not None
 
             for record in records:
                 yield self.qdrant_to_haystack.point_to_document(record)
@@ -149,19 +157,24 @@ class QdrantDocumentStore(BaseDocumentStore):
     ) -> List[Document]:
         index = index or self.index
 
-        next_offset = None
-        continue_scroll = True
         documents: List[Document] = []
-        while continue_scroll:
+
+        next_offset = None
+        stop_scrolling = False
+        while not stop_scrolling:
             records, next_offset = self.client.scroll(
                 collection_name=index,
                 scroll_filter=self.qdrant_filter_converter.convert(None, ids),
                 limit=batch_size,
                 offset=next_offset,
                 with_payload=True,
-                with_vectors=False,
+                with_vectors=True,
+            )
+            stop_scrolling = next_offset is None or (
+                isinstance(next_offset, grpc.PointId)
+                and next_offset.num == 0
+                and next_offset.uuid == ""
             )
-            continue_scroll = next_offset is not None
 
             for record in records:
                 documents.append(self.qdrant_to_haystack.point_to_document(record))
@@ -338,7 +351,7 @@ class QdrantDocumentStore(BaseDocumentStore):
                     embedding_dim=self.embedding_dim,
                     field_map=self._create_document_field_map(),
                 )
-                self.client.upsert(
+                response = self.client.upsert(
                     collection_name=index,
                     points=batch,
                 )
@@ -486,7 +499,7 @@ class QdrantDocumentStore(BaseDocumentStore):
                     f"If you want to use that collection, but with a different "
                     f"vector size, please set `recreate_collection=True` argument."
                 )
-        except UnexpectedResponse:
+        except (UnexpectedResponse, _InactiveRpcError):
             # That indicates the collection does not exist, so it can be
             # safely created with any configuration.
             self._recreate_collection(collection_name, distance, embedding_dim)

qdrant_haystack-0.0.2/PKG-INFO

@@ -1,21 +0,0 @@
-Metadata-Version: 2.1
-Name: qdrant-haystack
-Version: 0.0.2
-Summary: An integration of Qdrant ANN vector database backend with Haystack
-License: Apache 2.0
-Author: Kacper Łukawski
-Author-email: kacper.lukawski@qdrant.com
-Requires-Python: >=3.8.1,<=3.11
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: farm-haystack (>=1.13.0,<2.0.0)
-Requires-Dist: qdrant-client (>=1.0.1,<2.0.0)
-Description-Content-Type: text/markdown
-
-# qdrant-haystack
-
-An integration of Qdrant ANN vector database backend with Haystack 
-

qdrant_haystack-0.0.2/README.md

@@ -1,3 +0,0 @@
-# qdrant-haystack
-
-An integration of Qdrant ANN vector database backend with Haystack 

qdrant_haystack-0.0.2/setup.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-package_dir = \
-{'': 'src'}
-
-packages = \
-['qdrant_haystack', 'qdrant_haystack.document_stores']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['farm-haystack>=1.13.0,<2.0.0', 'qdrant-client>=1.0.1,<2.0.0']
-
-setup_kwargs = {
-    'name': 'qdrant-haystack',
-    'version': '0.0.2',
-    'description': 'An integration of Qdrant ANN vector database backend with Haystack',
-    'long_description': '# qdrant-haystack\n\nAn integration of Qdrant ANN vector database backend with Haystack \n',
-    'author': 'Kacper Łukawski',
-    'author_email': 'kacper.lukawski@qdrant.com',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'None',
-    'package_dir': package_dir,
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.8.1,<=3.11',
-}
-
-
-setup(**setup_kwargs)