feat(indexer): clean up indexers

jina-ai · Apr 10, 2020 · 063152d · 063152d
1 parent 4b130f2
commit 063152d
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 12 deletions.
diff --git a/extra-requirements.txt b/extra-requirements.txt
@@ -33,3 +33,4 @@ onnx:                       framework, py37
 onnxruntime:                framework, py37
 annoy:                      index
 sklearn:                    framework
+plyvel:                     index
diff --git a/jina/executors/indexers/keyvalue/leveldb.py b/jina/executors/indexers/keyvalue/leveldb.py
@@ -1,7 +1,7 @@
-from ..proto import BasePbIndexer
+from jina.executors.indexers.keyvalue.proto import BasePbIndexer
 import json
-from typing import Tuple, List, Union
-from ..proto import jina_pb2
+from typing import Union
+from jina.executors.indexers.keyvalue.proto import jina_pb2
 from google.protobuf.json_format import Parse
 
 

diff --git a/jina/executors/indexers/proto.py → jina/executors/indexers/keyvalue/proto.py b/jina/executors/indexers/proto.py → jina/executors/indexers/keyvalue/proto.py
@@ -4,8 +4,8 @@
 
 from google.protobuf.json_format import Parse
 
-from . import BaseKVIndexer
-from ...proto import jina_pb2
+from jina.executors.indexers import BaseKVIndexer
+from jina.proto import jina_pb2
 
 
 class BasePbIndexer(BaseKVIndexer):

diff --git a/jina/executors/indexers/vector/__init__.py b/jina/executors/indexers/vector/__init__.py
diff --git a/jina/executors/indexers/annoy.py → jina/executors/indexers/vector/annoy.py b/jina/executors/indexers/annoy.py → jina/executors/indexers/vector/annoy.py
diff --git a/jina/executors/indexers/faiss.py → jina/executors/indexers/vector/faiss.py b/jina/executors/indexers/faiss.py → jina/executors/indexers/vector/faiss.py
diff --git a/jina/executors/indexers/nmslib.py → jina/executors/indexers/vector/nmslib.py b/jina/executors/indexers/nmslib.py → jina/executors/indexers/vector/nmslib.py
diff --git a/jina/executors/indexers/numpy.py → jina/executors/indexers/vector/numpy.py b/jina/executors/indexers/numpy.py → jina/executors/indexers/vector/numpy.py
@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from . import BaseVecIndexer
+from jina.executors.indexers import BaseVecIndexer
 
 
 class NumpyIndexer(BaseVecIndexer):

diff --git a/jina/executors/indexers/sptag.py → jina/executors/indexers/vector/sptag.py b/jina/executors/indexers/sptag.py → jina/executors/indexers/vector/sptag.py
diff --git a/tests/executors/indexer/vector/__init__.py b/tests/executors/indexer/vector/__init__.py
diff --git a/tests/executors/indexer/test_annoy.py → tests/executors/indexer/vector/test_annoy.py b/tests/executors/indexer/test_annoy.py → tests/executors/indexer/vector/test_annoy.py
@@ -4,9 +4,9 @@
 import numpy as np
 
 from jina.executors.indexers import BaseIndexer
-from jina.executors.indexers.annoy import AnnoyIndexer
-from jina.executors.indexers.nmslib import NmslibIndexer
-from jina.executors.indexers.numpy import NumpyIndexer
+from jina.executors.indexers.vector.annoy import AnnoyIndexer
+from jina.executors.indexers.vector.nmslib import NmslibIndexer
+from jina.executors.indexers.vector.numpy import NumpyIndexer
 from tests import JinaTestCase
 
 # fix the seed here

diff --git a/tests/test_index.py b/tests/test_index.py
@@ -6,7 +6,7 @@
 import numpy as np
 from jina.drivers.helper import array2blob
 from jina.enums import FlowOptimizeLevel
-from jina.executors.indexers.numpy import NumpyIndexer
+from jina.executors.indexers.vector.numpy import NumpyIndexer
 from jina.flow import Flow
 from jina.main.parser import set_flow_parser
 from jina.proto import jina_pb2

diff --git a/tests/test_index_remote.py b/tests/test_index_remote.py
@@ -6,7 +6,7 @@
 import numpy as np
 from jina.drivers.helper import array2blob
 from jina.enums import FlowOptimizeLevel
-from jina.executors.indexers.numpy import NumpyIndexer
+from jina.executors.indexers.vector.numpy import NumpyIndexer
 from jina.flow import Flow
 from jina.main.parser import set_gateway_parser
 from jina.peapods.pod import GatewayPod

diff --git a/tests/test_load_yaml.py b/tests/test_load_yaml.py
@@ -10,7 +10,7 @@
 class MyTestCase(JinaTestCase):
 
     def test_load_yaml1(self):
-        from jina.executors.indexers.numpy import NumpyIndexer
+        from jina.executors.indexers.vector.numpy import NumpyIndexer
         NumpyIndexer.load_config('yaml/dummy_exec1.yml')
         self.add_tmpfile('test.gzip')