Drop black

.pre-commit-config.yaml

@@ -13,16 +13,13 @@ repos:
       - id: end-of-file-fixer
       - id: check-added-large-files
 
-  - repo: https://github.com/psf/black
-    rev: 23.12.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.3
     hooks:
-      - id: black
-        name: "Black: The uncompromising Python code formatter"
-        args: ["--line-length", "99"]
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        name: "Sort Imports"
-        args: ["--profile", "black", "--py", "310"]
+# ToDo: re-introduce ruff linter later
+#      - id: ruff
+#        types_or: [ python, pyi ]
+#        args: [ --fix ]
+      - id: ruff-format
+        types_or: [ python, pyi ]
+        args: [ --line-length=99 ]

pyproject.toml

@@ -44,8 +44,8 @@ coverage = "^6.3.3"
 pytest-asyncio = "^0.21.0"
 pytest-timeout = "^2.1.0"
 autoflake = "^2.2.1"
-isort = "5.13.2"
-black = "23.12.1"
+ruff = "0.4.3"
+
 
 [tool.poetry.group.docs.dependencies]
 sphinx = "^4.5.0"

qdrant_client/async_client_base.py

@@ -10,7 +10,6 @@
 # ******  WARNING: THIS FILE IS AUTOGENERATED  ******
 
 from typing import Any, Dict, Iterable, List, Mapping, Optional, Sequence, Tuple, Union
-
 from qdrant_client.conversions import common_types as types
 from qdrant_client.http import models
 

qdrant_client/async_qdrant_client.py

@@ -23,14 +23,13 @@
     Tuple,
     Union,
 )
-
 from qdrant_client import grpc as grpc
 from qdrant_client.async_client_base import AsyncQdrantBase
-from qdrant_client.async_qdrant_fastembed import AsyncQdrantFastembedMixin
-from qdrant_client.async_qdrant_remote import AsyncQdrantRemote
 from qdrant_client.conversions import common_types as types
 from qdrant_client.http import AsyncApiClient, AsyncApis
 from qdrant_client.local.async_qdrant_local import AsyncQdrantLocal
+from qdrant_client.async_qdrant_fastembed import AsyncQdrantFastembedMixin
+from qdrant_client.async_qdrant_remote import AsyncQdrantRemote
 
 
 class AsyncQdrantClient(AsyncQdrantFastembedMixin):

qdrant_client/async_qdrant_fastembed.py

@@ -13,7 +13,6 @@
 import warnings
 from itertools import tee
 from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union
-
 from qdrant_client.async_client_base import AsyncQdrantBase
 from qdrant_client.conversions import common_types as types
 from qdrant_client.fastembed_common import QueryResponse
@@ -54,6 +53,8 @@ def __init__(self, **kwargs: Any):
         try:
             from fastembed import SparseTextEmbedding, TextEmbedding
 
+            assert len(SparseTextEmbedding.list_supported_models()) > 0
+            assert len(TextEmbedding.list_supported_models()) > 0
             self.__class__._FASTEMBED_INSTALLED = True
         except ImportError:
             self.__class__._FASTEMBED_INSTALLED = False

qdrant_client/async_qdrant_remote.py

@@ -28,16 +28,14 @@
     Union,
     get_args,
 )
-
 import httpx
 import numpy as np
 from grpc import Compression
 from urllib3.util import Url, parse_url
-
 from qdrant_client import grpc as grpc
 from qdrant_client._pydantic_compat import construct
-from qdrant_client.async_client_base import AsyncQdrantBase
 from qdrant_client.auth import BearerAuth
+from qdrant_client.async_client_base import AsyncQdrantBase
 from qdrant_client.connection import get_async_channel as get_channel
 from qdrant_client.conversions import common_types as types
 from qdrant_client.conversions.common_types import get_args_subscribed

qdrant_client/local/async_qdrant_local.py

@@ -15,23 +15,10 @@
 import os
 import shutil
 from io import TextIOWrapper
-from typing import (
-    Any,
-    Dict,
-    Generator,
-    Iterable,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-    Union,
-)
+from typing import Any, Dict, Generator, Iterable, List, Mapping, Optional, Sequence, Tuple, Union
 from uuid import uuid4
-
 import numpy as np
 import portalocker
-
 from qdrant_client._pydantic_compat import to_dict
 from qdrant_client.async_client_base import AsyncQdrantBase
 from qdrant_client.conversions import common_types as types
@@ -540,9 +527,9 @@ async def update_collection_aliases(
         for operation in change_aliases_operations:
             if isinstance(operation, rest_models.CreateAliasOperation):
                 self._get_collection(operation.create_alias.collection_name)
-                self.aliases[
-                    operation.create_alias.alias_name
-                ] = operation.create_alias.collection_name
+                self.aliases[operation.create_alias.alias_name] = (
+                    operation.create_alias.collection_name
+                )
             elif isinstance(operation, rest_models.DeleteAliasOperation):
                 self.aliases.pop(operation.delete_alias.alias_name, None)
             elif isinstance(operation, rest_models.RenameAliasOperation):

qdrant_client/qdrant_fastembed.py

@@ -46,7 +46,10 @@ def __init__(self, **kwargs: Any):
         self._embedding_model_name: Optional[str] = None
         self._sparse_embedding_model_name: Optional[str] = None
         try:
-            from fastembed import SparseTextEmbedding, TextEmbedding  # noqa: F401
+            from fastembed import SparseTextEmbedding, TextEmbedding
+
+            assert len(SparseTextEmbedding.list_supported_models()) > 0
+            assert len(TextEmbedding.list_supported_models()) > 0
 
             self.__class__._FASTEMBED_INSTALLED = True
         except ImportError:

tools/generate_async_client.sh

@@ -23,7 +23,6 @@ mv async_qdrant_local.py $ABSOLUTE_PROJECT_ROOT/qdrant_client/async_qdrant_local
 cd $ABSOLUTE_PROJECT_ROOT/qdrant_client
 
 ls -1 async*.py | autoflake --recursive --imports qdrant_client --remove-unused-variables --in-place async*.py
-ls -1 async*.py | xargs -I {} isort --profile black --py 310 {}
-ls -1 async*.py | xargs -I {} black -l 99 --target-version py310 {}
+ls -1 async*.py | xargs -I {} ruff format --line-length 99 {}
 
 mv async_qdrant_local.py local/async_qdrant_local.py