Removing Indexers from forte (asyml#467)

* remove indexers * remove dep * Remove elastic dependency * Fix docs.
webclinic017 · Jun 2, 2021 · 400cd82 · 400cd82
1 parent f8d5d77
commit 400cd82
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 1,045 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,12 +73,6 @@ jobs:
       - name: Build ontology
         run: |
           ./scripts/build_ontology_specs.sh
-      - name: Start Elastic Server
-        run: |
-          wget -q https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.4.2-linux-x86_64.tar.gz
-          tar -zxf elasticsearch-7.4.2-linux-x86_64.tar.gz
-          rm -rf elasticsearch-7.4.2-linux-x86_64.tar.gz
-          elasticsearch-7.4.2/bin/elasticsearch -d
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names

diff --git a/docs/code/data_aug.rst b/docs/code/data_aug.rst
@@ -17,11 +17,6 @@ Data Augmentation Processors
 .. autoclass:: forte.processors.base.data_selector_for_da.BaseElasticSearchDataSelector
     :members:
 
-.. autoclass:: forte.processors.data_augment.selector_index_processor.DataSelectorIndexProcessor
-    :members:
-
-.. autoclass:: forte.processors.ir.elastic_search_index_processor.ElasticSearchPackIndexProcessor
-    :members:
 
 :hidden:`UDAIterator`
 ---------------------------------------------

diff --git a/docs/code/indexers.rst b/docs/code/indexers.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -26,4 +26,3 @@ API
    code/training_system.rst
    code/data_aug.rst
    code/vocabulary.rst
-   code/indexers.rst
diff --git a/examples/chatbot/create_index.py b/examples/chatbot/create_index.py
@@ -25,7 +25,7 @@
 import texar.torch as tx
 
 from forte.common.configuration import Config
-from forte.indexers.embedding_based_indexer import EmbeddingBasedIndexer
+from forte_wrapper.faiss import EmbeddingBasedIndexer
 
 logging.basicConfig(level=logging.INFO)
 

diff --git a/examples/clinical_pipeline/utterance_searcher.py b/examples/clinical_pipeline/utterance_searcher.py
@@ -3,12 +3,13 @@
 import sqlite3
 from typing import Dict, Any, Optional, List
 
+from forte_wrapper.elastic import ElasticSearchIndexer
+
 from forte.common import Resources, ProcessorConfigError
 from forte.common.configuration import Config
 from forte.data.common_entry_utils import create_utterance, \
     get_last_utterance
 from forte.data.data_pack import DataPack
-from forte.indexers.elastic_indexer import ElasticSearchIndexer
 from forte.processors.base import PackProcessor
 from ft.onto.base_ontology import Utterance
 

diff --git a/examples/data_augmentation/data_select/data_select_index_pipeline.py b/examples/data_augmentation/data_select/data_select_index_pipeline.py
@@ -26,12 +26,12 @@
 from typing import Dict, Any
 import logging
 
+from forte_wrapper.elastic import ElasticSearchIndexer
+from forte_wrapper.elastic import ElasticSearchPackIndexProcessor
+
 from forte.common.configuration import Config
 from forte.data.data_pack import DataPack
-from forte.indexers.elastic_indexer import ElasticSearchIndexer
 from forte.pipeline import Pipeline
-from forte.processors.data_augment.selector_index_processor import \
-    DataSelectorIndexProcessor
 
 __all__ = [
     "CreateIndexerPipeline",
@@ -52,7 +52,7 @@ def create_pipeline(self):
         # pylint: disable=attribute-defined-outside-init
         self.nlp: Pipeline[DataPack] = Pipeline()
         self.nlp.set_reader(reader=self.reader, config=self.reader_config)
-        self.nlp.add(DataSelectorIndexProcessor(), config=self.config)
+        self.nlp.add(ElasticSearchPackIndexProcessor(), config=self.config)
         self.nlp.initialize()
 
     def create_index(self, datapath):

diff --git a/forte/indexers/__init__.py b/forte/indexers/__init__.py
diff --git a/forte/indexers/elastic_indexer.py b/forte/indexers/elastic_indexer.py