make api names consistent with grpc + fix a BUG (#805)

qdrant · Oct 7, 2024 · 2cd8214 · 2cd8214
1 parent 4bcdedd
commit 2cd8214
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 130 deletions.
diff --git a/qdrant_client/async_client_base.py b/qdrant_client/async_client_base.py
@@ -67,7 +67,7 @@ async def search_groups(
     ) -> types.GroupsResult:
         raise NotImplementedError()
 
-    async def search_distance_matrix_offsets(
+    async def search_matrix_offsets(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -78,7 +78,7 @@ async def search_distance_matrix_offsets(
     ) -> types.SearchMatrixOffsetsResponse:
         raise NotImplementedError()
 
-    async def search_distance_matrix_pairs(
+    async def search_matrix_pairs(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,

diff --git a/qdrant_client/async_qdrant_client.py b/qdrant_client/async_qdrant_client.py
@@ -912,7 +912,7 @@ async def recommend(
             **kwargs,
         )
 
-    async def search_distance_matrix_pairs(
+    async def search_matrix_pairs(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -946,7 +946,7 @@ async def search_distance_matrix_pairs(
             Return distance matrix using a pair-based encoding.
         """
         assert len(kwargs) == 0, f"Unknown arguments: {list(kwargs.keys())}"
-        return await self._client.search_distance_matrix_pairs(
+        return await self._client.search_matrix_pairs(
             collection_name=collection_name,
             query_filter=query_filter,
             limit=limit,
@@ -958,7 +958,7 @@ async def search_distance_matrix_pairs(
             **kwargs,
         )
 
-    async def search_distance_matrix_offsets(
+    async def search_matrix_offsets(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -992,7 +992,7 @@ async def search_distance_matrix_offsets(
             Return distance matrix using an offset-based encoding.
         """
         assert len(kwargs) == 0, f"Unknown arguments: {list(kwargs.keys())}"
-        return await self._client.search_distance_matrix_offsets(
+        return await self._client.search_matrix_offsets(
             collection_name=collection_name,
             query_filter=query_filter,
             limit=limit,

diff --git a/qdrant_client/async_qdrant_remote.py b/qdrant_client/async_qdrant_remote.py
@@ -829,7 +829,7 @@ async def search_groups(
                 )
             ).result
 
-    async def search_distance_matrix_pairs(
+    async def search_matrix_pairs(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -863,9 +863,9 @@ async def search_distance_matrix_pairs(
             )
             return GrpcToRest.convert_search_matrix_pairs(response.result)
         if isinstance(query_filter, grpc.Filter):
-            search_filter = GrpcToRest.convert_filter(model=query_filter)
+            query_filter = GrpcToRest.convert_filter(model=query_filter)
         search_matrix_result = (
-            await self.openapi_client.points_api.search_points_matrix_pairs(
+            await self.openapi_client.points_api.search_matrix_pairs(
                 collection_name=collection_name,
                 consistency=consistency,
                 timeout=timeout,
@@ -881,7 +881,7 @@ async def search_distance_matrix_pairs(
         assert search_matrix_result is not None, "Search matrix pairs returned None result"
         return search_matrix_result
 
-    async def search_distance_matrix_offsets(
+    async def search_matrix_offsets(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -915,9 +915,9 @@ async def search_distance_matrix_offsets(
             )
             return GrpcToRest.convert_search_matrix_offsets(response.result)
         if isinstance(query_filter, grpc.Filter):
-            search_filter = GrpcToRest.convert_filter(model=query_filter)
+            query_filter = GrpcToRest.convert_filter(model=query_filter)
         search_matrix_result = (
-            await self.openapi_client.points_api.search_points_matrix_offsets(
+            await self.openapi_client.points_api.search_matrix_offsets(
                 collection_name=collection_name,
                 consistency=consistency,
                 timeout=timeout,

diff --git a/qdrant_client/client_base.py b/qdrant_client/client_base.py
@@ -60,7 +60,7 @@ def search_groups(
     ) -> types.GroupsResult:
         raise NotImplementedError()
 
-    def search_distance_matrix_offsets(
+    def search_matrix_offsets(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -69,9 +69,9 @@ def search_distance_matrix_offsets(
         using: Optional[str] = None,
         **kwargs: Any,
     ) -> types.SearchMatrixOffsetsResponse:
-     raise NotImplementedError()
+        raise NotImplementedError()
 
-    def search_distance_matrix_pairs(
+    def search_matrix_pairs(
         self,
         collection_name: str,
         query_filter: Optional[types.Filter] = None,
@@ -80,7 +80,7 @@ def search_distance_matrix_pairs(
         using: Optional[str] = None,
         **kwargs: Any,
     ) -> types.SearchMatrixPairsResponse:
-     raise NotImplementedError()
+        raise NotImplementedError()
 
     def query_batch_points(
         self,