Relocate handler files in dataset search

bento-platform · Jul 22, 2020 · 86ebd42 · 86ebd42
1 parent 0f47bd8
commit 86ebd42
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/bento_federation_service/app.py b/bento_federation_service/app.py
@@ -20,8 +20,8 @@
 from .db import peer_db
 from .peers.handlers import PeerHandler, PeerRefreshHandler
 from .peers.manager import PeerManager
-from .search.dataset_search.private_search_handler import PrivateDatasetSearchHandler
-from .search.dataset_search.search_handler import DatasetsSearchHandler
+from .search.dataset_search.handlers.datasets import DatasetsSearchHandler
+from .search.dataset_search.handlers.private_dataset import PrivateDatasetSearchHandler
 from .search.federated_dataset_search import FederatedDatasetsSearchHandler
 from .search.search import SearchHandler
 

diff --git a/bento_federation_service/search/dataset_search/handlers/__init__.py b/bento_federation_service/search/dataset_search/handlers/__init__.py
diff --git a/...e/search/dataset_search/search_handler.py → ...earch/dataset_search/handlers/datasets.py b/...e/search/dataset_search/search_handler.py → ...earch/dataset_search/handlers/datasets.py
@@ -14,10 +14,10 @@
 from bento_federation_service.constants import CHORD_URL, SERVICE_NAME, WORKERS
 from bento_federation_service.utils import peer_fetch, get_auth_header
 
-from .constants import DATASET_SEARCH_HEADERS
-from .dataset_search import run_search_on_dataset
-from .process_dataset_results import process_dataset_results
-from .query_utils import get_query_parts, test_queries
+from ..constants import DATASET_SEARCH_HEADERS
+from ..dataset_search import run_search_on_dataset
+from ..process_dataset_results import process_dataset_results
+from ..query_utils import get_query_parts, test_queries
 
 
 __all__ = [

diff --git a/.../dataset_search/private_search_handler.py → ...ataset_search/handlers/private_dataset.py b/.../dataset_search/private_search_handler.py → ...ataset_search/handlers/private_dataset.py
@@ -8,10 +8,11 @@
 
 from bento_federation_service.constants import CHORD_URL, SERVICE_NAME
 from bento_federation_service.utils import peer_fetch, get_auth_header
-from .constants import DATASET_SEARCH_HEADERS
-from .dataset_search import run_search_on_dataset
-from .process_dataset_results import process_dataset_results
-from .query_utils import get_query_parts, test_queries
+
+from ..constants import DATASET_SEARCH_HEADERS
+from ..dataset_search import run_search_on_dataset
+from ..process_dataset_results import process_dataset_results
+from ..query_utils import get_query_parts, test_queries
 
 
 # noinspection PyAbstractClass