docarray · AnneYang720 · Apr 13, 2023 · Mar 17, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -225,7 +225,38 @@ jobs:
       - name: Test
         id: test
         run: |
-          poetry run pytest -m 'index' tests
+          poetry run pytest -m 'index and not elasticv8' tests
+        timeout-minutes: 30
+
+
+  docarray-elastic-v8:
+    needs: [lint-ruff, check-black, import-test]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.7]
+    steps:
+      - uses: actions/[email protected]
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Prepare environment
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install poetry
+          poetry install --all-extras
+          poetry run pip install protobuf==3.19.0
+          poetry run pip install tensorflow==2.11.0
+          poetry run pip install elasticsearch==8.6.2
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends ffmpeg
+
+      - name: Test
+        id: test
+        run: |
+          poetry run pytest -m 'index and elasticv8' tests
         timeout-minutes: 30
 
   docarray-test-tensorflow:
@@ -284,7 +315,7 @@ jobs:
 
   # just for blocking the merge until all parallel core-test are successful
   success-all-test:
-    needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff]
+    needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff]
     if: always()
     runs-on: ubuntu-latest
     steps:

diff --git a/docarray/index/__init__.py b/docarray/index/__init__.py
@@ -7,7 +7,8 @@
 )
 
 if TYPE_CHECKING:
-    from docarray.index.backends.elastic import ElasticV7DocIndex  # noqa: F401
+    from docarray.index.backends.elastic import ElasticDocIndex  # noqa: F401
+    from docarray.index.backends.elasticv7 import ElasticV7DocIndex  # noqa: F401
     from docarray.index.backends.hnswlib import HnswDocumentIndex  # noqa: F401
 
 __all__ = []
@@ -18,9 +19,13 @@ def __getattr__(name: str):
     if name == 'HnswDocumentIndex':
         import_library('hnswlib', raise_error=True)
         import docarray.index.backends.hnswlib as lib
-    elif name == 'ElasticV7DocIndex':
+    elif name == 'ElasticDocIndex':
         import_library('elasticsearch', raise_error=True)
         import docarray.index.backends.elastic as lib
+    elif name == 'ElasticV7DocIndex':
+        import_library('elasticsearch', raise_error=True)
+        import docarray.index.backends.elasticv7 as lib
+
     else:
         raise ImportError(
             f'cannot import name \'{name}\' from \'{_get_path_from_docarray_root_level(__file__)}\''