qdrant-haystack 8.0.0__py3-none-any.whl → 9.0.0__py3-none-any.whl

haystack_integrations/document_stores/qdrant/converters.py

@@ -1,7 +1,7 @@
-import logging
 import uuid
 from typing import List, Union
 
+from haystack import logging
 from haystack.dataclasses import Document
 from qdrant_client.http import models as rest
 
@@ -23,14 +23,6 @@ def convert_haystack_documents_to_qdrant_points(
     for document in documents:
         payload = document.to_dict(flatten=False)
 
-        if payload.pop("dataframe", None):
-            logger.warning(
-                "Document %s has the `dataframe` field set,"
-                "QdrantDocumentStore no longer supports dataframes and this field will be ignored. "
-                "The `dataframe` field will soon be removed from Haystack Document.",
-                document.id,
-            )
-
         if use_sparse_embeddings:
             vector = {}
 
@@ -73,14 +65,6 @@ def convert_qdrant_point_to_haystack_document(point: QdrantPoint, use_sparse_emb
     payload = {**point.payload}
     payload["score"] = point.score if hasattr(point, "score") else None
 
-    if payload.pop("dataframe", None):
-        logger.warning(
-            "Document %s has the `dataframe` field set,"
-            "QdrantDocumentStore no longer supports dataframes and this field will be ignored. "
-            "The `dataframe` field will soon be removed from Haystack Document.",
-            payload["id"],
-        )
-
     if not use_sparse_embeddings:
         payload["embedding"] = point.vector if hasattr(point, "vector") else None
     elif hasattr(point, "vector") and point.vector is not None:

haystack_integrations/document_stores/qdrant/document_store.py

@@ -1,11 +1,10 @@
 import inspect
-import logging
 from itertools import islice
 from typing import Any, ClassVar, Dict, Generator, List, Optional, Set, Union
 
 import numpy as np
 import qdrant_client
-from haystack import default_from_dict, default_to_dict
+from haystack import default_from_dict, default_to_dict, logging
 from haystack.dataclasses import Document
 from haystack.dataclasses.sparse_embedding import SparseEmbedding
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
@@ -48,8 +47,8 @@ def get_batches_from_generator(iterable, n):
 
 class QdrantDocumentStore:
     """
-    QdrantDocumentStore is a Document Store for Qdrant.
-    It can be used with any Qdrant instance: in-memory, disk-persisted, Docker-based,
+    A QdrantDocumentStore implementation that you
+    can use with any Qdrant instance: in-memory, disk-persisted, Docker-based,
     and Qdrant Cloud Cluster deployments.
 
     Usage example by creating an in-memory instance:
@@ -866,10 +865,18 @@ class QdrantDocumentStore:
 
         collection_info = self.client.get_collection(collection_name)
 
-        has_named_vectors = (
-            isinstance(collection_info.config.params.vectors, dict)
-            and DENSE_VECTORS_NAME in collection_info.config.params.vectors
-        )
+        has_named_vectors = isinstance(collection_info.config.params.vectors, dict)
+
+        if has_named_vectors and DENSE_VECTORS_NAME not in collection_info.config.params.vectors:
+            msg = (
+                f"Collection '{collection_name}' already exists in Qdrant, "
+                f"but it has been originally created outside of Haystack and is not supported. "
+                f"If possible, you should create a new Document Store with Haystack. "
+                f"In case you want to migrate the existing collection, see an example script in "
+                f"https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/qdrant/src/"
+                f"haystack_integrations/document_stores/qdrant/migrate_to_sparse.py."
+            )
+            raise QdrantStoreError(msg)
 
         if self.use_sparse_embeddings and not has_named_vectors:
             msg = (
@@ -882,7 +889,7 @@ class QdrantDocumentStore:
             )
             raise QdrantStoreError(msg)
 
-        elif not self.use_sparse_embeddings and has_named_vectors:
+        if not self.use_sparse_embeddings and has_named_vectors:
             msg = (
                 f"Collection '{collection_name}' already exists in Qdrant, "
                 f"but it has been originally created with sparse embedding vectors."

haystack_integrations/document_stores/qdrant/migrate_to_sparse.py

@@ -1,13 +1,14 @@
-import logging
+import logging as python_logging
 import time
 
+from haystack import logging
 from qdrant_client.http import models
 
 from haystack_integrations.document_stores.qdrant import QdrantDocumentStore
 
 logger = logging.getLogger(__name__)
-logger.addHandler(logging.StreamHandler())
-logger.setLevel(logging.INFO)
+logger.addHandler(python_logging.StreamHandler())
+logger.setLevel(python_logging.INFO)
 
 
 def migrate_to_sparse_embeddings_support(old_document_store: QdrantDocumentStore, new_index: str):

{qdrant_haystack-8.0.0.dist-info → qdrant_haystack-9.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qdrant-haystack
-Version: 8.0.0
+Version: 9.0.0
 Summary: An integration of Qdrant ANN vector database backend with Haystack
 Project-URL: Source, https://github.com/deepset-ai/haystack-core-integrations
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/qdrant/README.md
@@ -11,14 +11,14 @@ License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8
-Requires-Dist: haystack-ai
+Requires-Python: >=3.9
+Requires-Dist: haystack-ai>=2.11.0
 Requires-Dist: qdrant-client>=1.10.0
 Description-Content-Type: text/markdown
 

{qdrant_haystack-8.0.0.dist-info → qdrant_haystack-9.0.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 haystack_integrations/components/retrievers/qdrant/__init__.py,sha256=AE1hdw4sqb0rTSqfAxKCRUOZVE8gbHdQ1wDccdN86hc,313
 haystack_integrations/components/retrievers/qdrant/retriever.py,sha256=VsQVsvf79imTCdWUKikUxpjczl5oxOV64a91aGXZwpE,21997
 haystack_integrations/document_stores/qdrant/__init__.py,sha256=kUGc5uewqArhmVR-JqB_NmJ4kNkTIQIvYDNSoO2ELn0,302
-haystack_integrations/document_stores/qdrant/converters.py,sha256=ndFZjMjweJJDyC_994zDX4BGhGcW1SfLf79zBeyUits,3192
-haystack_integrations/document_stores/qdrant/document_store.py,sha256=pcVuU9pNdjwROISG19vaj2Zpkl4_N2k_3UOi2XO7b00,42246
+haystack_integrations/document_stores/qdrant/converters.py,sha256=iVhAZ7wdRxRjfLVMHB1JdAhn7LpU5bwza1obGmEePWU,2506
+haystack_integrations/document_stores/qdrant/document_store.py,sha256=Ym7pFQOAw-cxb4dv6JIgfeIhw5cp_Mivj9eKfPsvs-8,42854
 haystack_integrations/document_stores/qdrant/filters.py,sha256=Nv_eKIYKwUWvldJfa0omfFQ0kgqi6L3DUFeMuIWziOY,11751
-haystack_integrations/document_stores/qdrant/migrate_to_sparse.py,sha256=yhZr4GB6N1S-Ikzl52hpuZt2aHNIb4leqFDhVMU3Uho,4910
-qdrant_haystack-8.0.0.dist-info/METADATA,sha256=PorUoQRLkK0yhoMEifdBakszFFneNjT7KEkKIxvJ6Fg,1863
-qdrant_haystack-8.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qdrant_haystack-8.0.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-qdrant_haystack-8.0.0.dist-info/RECORD,,
+haystack_integrations/document_stores/qdrant/migrate_to_sparse.py,sha256=2xyet1fhy2lpVTs3E75f7oR521zcjT6U2jHd4pLLgKM,4971
+qdrant_haystack-9.0.0.dist-info/METADATA,sha256=f7P4nD4mHWZ-NJNxalq83tw5GmmYfLGZ-l_6e-TAZas,1872
+qdrant_haystack-9.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qdrant_haystack-9.0.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+qdrant_haystack-9.0.0.dist-info/RECORD,,