superduper-qdrant 0.7.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

superduper_qdrant/__init__.py

@@ -1,5 +1,5 @@
 from .qdrant import QdrantVectorSearcher as VectorSearcher
 
-__version__ = "0.7.0"
+__version__ = "0.9.1"
 
 __all__ = ['VectorSearcher']

superduper_qdrant/qdrant.py

@@ -28,31 +28,48 @@ class QdrantVectorSearcher(BaseVectorSearcher):
 
     def __init__(
         self,
-        uuid: str,
+        identifier: str,
         dimensions: int,
         measure: t.Optional[str] = None,
+        component: str = 'VectorIndex',
     ):
         config_dict = deepcopy(CFG.vector_search_kwargs)
-        self.vector_name: t.Optional[str] = config_dict.pop("vector_name", None)
+        try:
+            plugin, uri = CFG.vector_search_engine.split("://")
+            if not uri.startswith("http"):
+                uri = f"http://{uri}"
+            if uri:
+                config_dict['location'] = uri
+        except ValueError as e:
+            if 'not enough values to unpack' in str(e):
+                plugin = CFG.vector_search_engine
+            else:
+                raise e
+
+        assert (
+            plugin == "qdrant"
+        ), "Only 'qdrant' vector search engine is supported in QdrantVectorSearcher."
+
         # Use an in-memory instance by default
         # https://github.com/qdrant/qdrant-client#local-mode
         config_dict = config_dict or {"location": ":memory:"}
         self.client = QdrantClient(**config_dict)
-        self.collection_name = uuid
+        self.identifier = identifier
         self.measure = measure
 
-        self.collection_name = re.sub("\W+", "", uuid)
-        if not self.client.collection_exists(self.collection_name):
+        self.identifier = re.sub("\W+", "", identifier)
+        if not self.client.collection_exists(self.identifier):
             measure = (
                 measure.name if isinstance(measure, VectorIndexMeasureType) else measure
             )
             distance = self._distance_mapping(measure)
             self.client.create_collection(
-                collection_name=self.collection_name,
+                collection_name=self.identifier,
                 vectors_config=models.VectorParams(size=dimensions, distance=distance),
             )
+        self.component = component
 
-    def initialize(self, db):
+    def initialize(self):
         """Initialize the vector index.
 
         :param db: Datalayer instance
@@ -60,7 +77,7 @@ class QdrantVectorSearcher(BaseVectorSearcher):
         pass
 
     def __len__(self):
-        return self.client.get_collection(self.collection_name).vectors_count
+        return self.client.get_collection(self.identifier).vectors_count
 
     def _create_collection(self):
         measure = (
@@ -70,7 +87,7 @@ class QdrantVectorSearcher(BaseVectorSearcher):
         )
         distance = self._distance_mapping(measure)
         self.client.create_collection(
-            collection_name=self.collection_name,
+            collection_name=self.identifier,
             vectors_config=models.VectorParams(size=self.dimensions, distance=distance),
         )
 
@@ -82,22 +99,22 @@ class QdrantVectorSearcher(BaseVectorSearcher):
         """
         points = []
         for item in items:
+            if hasattr(item.vector, "tolist"):
+                vector = item.vector.tolist()
+            else:
+                vector = item.vector
             point = models.PointStruct(
                 id=self._convert_id(item.id),
-                vector=(
-                    {self.vector_name: item.vector.tolist()}
-                    if self.vector_name
-                    else item.vector.tolist()
-                ),
+                vector=vector,
                 payload={ID_PAYLOAD_KEY: item.id},
             )
             points.append(point)
-        self.client.upsert(collection_name=self.collection_name, points=points)
+        self.client.upsert(collection_name=self.identifier, points=points)
 
     def drop(self):
         """Drop the vector index."""
-        if self.client.collection_exists(self.collection_name):
-            self.client.delete_collection(self.collection_name)
+        if self.client.collection_exists(self.identifier):
+            self.client.delete_collection(self.identifier)
 
     def delete(self, ids: t.Sequence[str]) -> None:
         """Delete vectors from the index.
@@ -105,7 +122,7 @@ class QdrantVectorSearcher(BaseVectorSearcher):
         :param ids: List of IDs to delete
         """
         self.client.delete(
-            collection_name=self.collection_name,
+            collection_name=self.identifier,
             points_selector=models.Filter(
                 must=[
                     models.FieldCondition(
@@ -160,12 +177,12 @@ class QdrantVectorSearcher(BaseVectorSearcher):
             )
 
         search_result = self.client.query_points(
-            collection_name=self.collection_name,
+            collection_name=self.identifier,
             query=query,
             limit=n,
             query_filter=query_filter,
             with_payload=[ID_PAYLOAD_KEY],
-            using=self.vector_name,
+            using=None,
         ).points
 
         ids = [hit.payload[ID_PAYLOAD_KEY] for hit in search_result if hit.payload]

{superduper_qdrant-0.7.0.dist-info → superduper_qdrant-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superduper_qdrant
-Version: 0.7.0
+Version: 0.9.1
 Summary: SuperDuper Lance is a Python library that provides a high-level API for working with Lance vector search database.
 Maintainer-email: "superduper.io, Inc." <opensource@superduper.io>
 License: 

superduper_qdrant-0.9.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+superduper_qdrant/__init__.py,sha256=FgAGJy3NEKJSNEVB0VHJEXdTqfUk7NngxovQWwycXTc,112
+superduper_qdrant/qdrant.py,sha256=qlWOcbO3ZT7GPuGpoYvf5VYDVWvYcWW7TQsccq4wXsw,6909
+superduper_qdrant-0.9.1.dist-info/licenses/LICENSE,sha256=fq2WxmjewRN4VfDClVl-6CiVFZedp4y5_iGqQiXHBN8,11353
+superduper_qdrant-0.9.1.dist-info/METADATA,sha256=R4EJDetZJrMFvnR2z7F8yewxbN1_A-3AQq3NLOJmoDI,13638
+superduper_qdrant-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+superduper_qdrant-0.9.1.dist-info/top_level.txt,sha256=sq-9pdkTJIhMAzMoSI_UlucyRUrPk4Da78PFG_hPcd8,18
+superduper_qdrant-0.9.1.dist-info/RECORD,,

{superduper_qdrant-0.7.0.dist-info → superduper_qdrant-0.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

superduper_qdrant-0.7.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-superduper_qdrant/__init__.py,sha256=42MYMwS_4ytzPgI3s1BqB6j8adwNC7wxi_vl5OmTxHM,112
-superduper_qdrant/qdrant.py,sha256=l61OUQB6WNHwh-sJny5D0NdsfHbRImaw_T-RyUjU-C0,6440
-superduper_qdrant-0.7.0.dist-info/licenses/LICENSE,sha256=fq2WxmjewRN4VfDClVl-6CiVFZedp4y5_iGqQiXHBN8,11353
-superduper_qdrant-0.7.0.dist-info/METADATA,sha256=G_f-oVYWi7irDXyEAns-uLs0o_q-Jtc-Tiojhk0DABo,13638
-superduper_qdrant-0.7.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-superduper_qdrant-0.7.0.dist-info/top_level.txt,sha256=sq-9pdkTJIhMAzMoSI_UlucyRUrPk4Da78PFG_hPcd8,18
-superduper_qdrant-0.7.0.dist-info/RECORD,,