fix: merge conflicts

Signed-off-by: jupyterjazz <[email protected]>
docarray · JoanFM · Jul 19, 2023 · Jul 2, 2023 · Jul 2, 2023 · Jul 13, 2023
commit 2113cdd2d31a729d55c548db2362e3433b1453e9
diff --git a/docarray/index/__init__.py b/docarray/index/__init__.py
@@ -14,6 +14,7 @@
     from docarray.index.backends.qdrant import QdrantDocumentIndex  # noqa: F401
     from docarray.index.backends.weaviate import WeaviateDocumentIndex  # noqa: F401
     from docarray.index.backends.redis import RedisDocumentIndex  # noqa: F401
+    from docarray.index.backends.milvus import MilvusDocumentIndex  # noqa: F401
 
 __all__ = ['InMemoryExactNNIndex']
 
@@ -38,6 +39,9 @@ def __getattr__(name: str):
     elif name == 'MilvusDocumentIndex':
         import_library('pymilvus', raise_error=True)
         import docarray.index.backends.milvus as lib
+    elif name == 'RedisDocumentIndex':
+        import_library('redis', raise_error=True)
+        import docarray.index.backends.redis as lib
     else:
         raise ImportError(
             f'cannot import name \'{name}\' from \'{_get_path_from_docarray_root_level(__file__)}\''

diff --git a/docarray/utils/_internal/_typing.py b/docarray/utils/_internal/_typing.py
@@ -51,7 +51,6 @@ def safe_issubclass(x: type, a_tuple: type) -> bool:
         or is_typevar(x)
         or (type(x) == ForwardRef)
         or is_typevar(x)
-        or x is ID
     ):
         return False
     return issubclass(x, a_tuple)