From bca8d2294eb459ff5e79bea092dfba0017858e1b Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Tue, 26 Oct 2021 14:27:35 +0000 Subject: [PATCH] Fix imports for new directory structure - Directory structure due to implementation of search API --- .../common/datagateway_api/backends.py | 4 ++-- .../datagateway_api/database/backend.py | 6 ++--- .../datagateway_api/database/filters.py | 4 ++-- .../datagateway_api/database/helpers.py | 8 ++++--- .../datagateway_api/filter_order_handler.py | 2 +- .../common/datagateway_api/icat/backend.py | 8 +++---- .../common/datagateway_api/icat/helpers.py | 17 +++++++------- .../datagateway_api/query_filter_factory.py | 4 ++-- datagateway_api/common/helpers.py | 12 ++++++---- datagateway_api/common/search_api/filters.py | 2 +- datagateway_api/common/search_api/models.py | 2 +- .../common/search_api/session_handler.py | 3 +++ datagateway_api/src/api_start_utils.py | 22 ++++++++++++------- .../datagateway_api/entities/entity_map.py | 4 +++- .../src/swagger/initialise_spec.py | 4 +++- test/conftest.py | 4 ++-- test/db/conftest.py | 4 ++-- test/db/endpoints/test_ping_db.py | 2 +- test/db/test_database_filter_utilities.py | 6 +++-- test/db/test_entity_helper.py | 2 +- test/db/test_query_filter_factory.py | 6 +++-- test/icat/endpoints/test_ping_icat.py | 6 +++-- test/icat/filters/test_distinct_filter.py | 4 +++- test/icat/filters/test_include_filter.py | 2 +- test/icat/filters/test_limit_filter.py | 8 ++++--- test/icat/filters/test_order_filter.py | 6 +++-- test/icat/filters/test_skip_filter.py | 2 +- test/icat/filters/test_where_filter.py | 6 +++-- test/icat/test_filter_order_handler.py | 6 +++-- test/icat/test_helpers.py | 4 ++-- test/icat/test_icat_client.py | 2 +- test/icat/test_lru_cache.py | 6 +++-- test/icat/test_query.py | 8 +++---- test/icat/test_session_handling.py | 8 ++++--- test/test_backends.py | 8 +++---- test/test_endpoint_rules.py | 4 +++- test/test_get_entity_object.py | 6 ++++- test/test_get_filters_from_query.py | 2 +- test/test_openapi.py | 4 +++- test/test_query_filter.py | 4 +++- util/icat_db_generator.py | 2 +- 41 files changed, 137 insertions(+), 87 deletions(-) diff --git a/datagateway_api/common/datagateway_api/backends.py b/datagateway_api/common/datagateway_api/backends.py index 84993b5f..f04fa9ca 100644 --- a/datagateway_api/common/datagateway_api/backends.py +++ b/datagateway_api/common/datagateway_api/backends.py @@ -1,7 +1,7 @@ import sys -from datagateway_api.common.database.backend import DatabaseBackend -from datagateway_api.common.icat.backend import PythonICATBackend +from datagateway_api.common.datagateway_api.database.backend import DatabaseBackend +from datagateway_api.common.datagateway_api.icat.backend import PythonICATBackend def create_backend(backend_type): diff --git a/datagateway_api/common/datagateway_api/database/backend.py b/datagateway_api/common/datagateway_api/database/backend.py index e77b53ef..c92fc295 100644 --- a/datagateway_api/common/datagateway_api/database/backend.py +++ b/datagateway_api/common/datagateway_api/database/backend.py @@ -5,9 +5,9 @@ from sqlalchemy import inspect from sqlalchemy.exc import SQLAlchemyError -from datagateway_api.common.backend import Backend from datagateway_api.common.constants import Constants -from datagateway_api.common.database.helpers import ( +from datagateway_api.common.datagateway_api.backend import Backend +from datagateway_api.common.datagateway_api.database.helpers import ( create_rows_from_json, db, delete_row_by_id, @@ -24,7 +24,7 @@ requires_session_id, update_row_from_id, ) -from datagateway_api.common.database.models import SESSION +from datagateway_api.common.datagateway_api.database.models import SESSION from datagateway_api.common.exceptions import AuthenticationError, DatabaseError from datagateway_api.common.helpers import get_entity_object_from_name, queries_records diff --git a/datagateway_api/common/datagateway_api/database/filters.py b/datagateway_api/common/datagateway_api/database/filters.py index 69d982b6..f37f5e91 100644 --- a/datagateway_api/common/datagateway_api/database/filters.py +++ b/datagateway_api/common/datagateway_api/database/filters.py @@ -73,7 +73,7 @@ def add_query_join(self, query): filter :param query: The query to have filters applied to - :type query: :class:`datagateway_api.common.database.helpers.[QUERY]` + :type query: :class:`.common.datagateway_api.database.helpers.[QUERY]` """ if self.related_related_field: @@ -92,7 +92,7 @@ def get_entity_model_for_filter(self, query): variables of this class :param query: The query to have filters applied to - :type query: :class:`datagateway_api.common.database.helpers.[QUERY]` + :type query: :class:`.common.datagateway_api.database.helpers.[QUERY]` :return: Entity model of the field (usually the field relating to the endpoint the request is coming from) """ diff --git a/datagateway_api/common/datagateway_api/database/helpers.py b/datagateway_api/common/datagateway_api/database/helpers.py index 19cb31f9..97bad712 100644 --- a/datagateway_api/common/datagateway_api/database/helpers.py +++ b/datagateway_api/common/datagateway_api/database/helpers.py @@ -6,12 +6,12 @@ from flask_sqlalchemy import SQLAlchemy from sqlalchemy.orm import aliased -from datagateway_api.common.database.filters import ( +from datagateway_api.common.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter as IncludeFilter, DatabaseWhereFilter as WhereFilter, ) -from datagateway_api.common.database.models import ( +from datagateway_api.common.datagateway_api.database.models import ( FACILITY, FACILITYCYCLE, INSTRUMENT, @@ -19,12 +19,14 @@ INVESTIGATIONINSTRUMENT, SESSION, ) +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) from datagateway_api.common.exceptions import ( AuthenticationError, BadRequestError, MissingRecordError, ) -from datagateway_api.common.filter_order_handler import FilterOrderHandler from datagateway_api.common.helpers import map_distinct_attributes_to_results diff --git a/datagateway_api/common/datagateway_api/filter_order_handler.py b/datagateway_api/common/datagateway_api/filter_order_handler.py index 02f55ccc..c5d44493 100644 --- a/datagateway_api/common/datagateway_api/filter_order_handler.py +++ b/datagateway_api/common/datagateway_api/filter_order_handler.py @@ -1,6 +1,6 @@ import logging -from datagateway_api.common.icat.filters import ( +from datagateway_api.common.datagateway_api.icat.filters import ( PythonICATLimitFilter, PythonICATOrderFilter, PythonICATSkipFilter, diff --git a/datagateway_api/common/datagateway_api/icat/backend.py b/datagateway_api/common/datagateway_api/icat/backend.py index 18866f2b..56f4177e 100644 --- a/datagateway_api/common/datagateway_api/icat/backend.py +++ b/datagateway_api/common/datagateway_api/icat/backend.py @@ -2,11 +2,9 @@ from icat.exception import ICATError, ICATSessionError -from datagateway_api.common.backend import Backend from datagateway_api.common.constants import Constants -from datagateway_api.common.exceptions import AuthenticationError, PythonICATError -from datagateway_api.common.helpers import queries_records -from datagateway_api.common.icat.helpers import ( +from datagateway_api.common.datagateway_api.backend import Backend +from datagateway_api.common.datagateway_api.icat.helpers import ( create_entities, delete_entity_by_id, get_cached_client, @@ -25,6 +23,8 @@ update_entities, update_entity_by_id, ) +from datagateway_api.common.exceptions import AuthenticationError, PythonICATError +from datagateway_api.common.helpers import queries_records log = logging.getLogger() diff --git a/datagateway_api/common/datagateway_api/icat/helpers.py b/datagateway_api/common/datagateway_api/icat/helpers.py index 078da702..45edf46a 100644 --- a/datagateway_api/common/datagateway_api/icat/helpers.py +++ b/datagateway_api/common/datagateway_api/icat/helpers.py @@ -14,6 +14,15 @@ ICATValidationError, ) +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) +from datagateway_api.common.datagateway_api.icat.filters import ( + PythonICATLimitFilter, + PythonICATWhereFilter, +) +from datagateway_api.common.datagateway_api.icat.lru_cache import ExtendedLRUCache +from datagateway_api.common.datagateway_api.icat.query import ICATQuery from datagateway_api.common.date_handler import DateHandler from datagateway_api.common.exceptions import ( AuthenticationError, @@ -21,14 +30,6 @@ MissingRecordError, PythonICATError, ) -from datagateway_api.common.filter_order_handler import FilterOrderHandler -from datagateway_api.common.icat.filters import ( - PythonICATLimitFilter, - PythonICATWhereFilter, -) -from datagateway_api.common.icat.lru_cache import ExtendedLRUCache -from datagateway_api.common.icat.query import ICATQuery - log = logging.getLogger() diff --git a/datagateway_api/common/datagateway_api/query_filter_factory.py b/datagateway_api/common/datagateway_api/query_filter_factory.py index 078becf3..f2e58c52 100644 --- a/datagateway_api/common/datagateway_api/query_filter_factory.py +++ b/datagateway_api/common/datagateway_api/query_filter_factory.py @@ -29,7 +29,7 @@ def get_query_filter(request_filter): backend_type = config.get_config_value(APIConfigOptions.BACKEND) if backend_type == "db": - from datagateway_api.common.database.filters import ( + from datagateway_api.common.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter as DistinctFieldFilter, DatabaseIncludeFilter as IncludeFilter, DatabaseLimitFilter as LimitFilter, @@ -38,7 +38,7 @@ def get_query_filter(request_filter): DatabaseWhereFilter as WhereFilter, ) elif backend_type == "python_icat": - from datagateway_api.common.icat.filters import ( + from datagateway_api.common.datagateway_api.icat.filters import ( PythonICATDistinctFieldFilter as DistinctFieldFilter, PythonICATIncludeFilter as IncludeFilter, PythonICATLimitFilter as LimitFilter, diff --git a/datagateway_api/common/helpers.py b/datagateway_api/common/helpers.py index 88d8f178..aef45023 100644 --- a/datagateway_api/common/helpers.py +++ b/datagateway_api/common/helpers.py @@ -8,7 +8,10 @@ from flask_restful import reqparse from sqlalchemy.exc import IntegrityError -from datagateway_api.common.database import models +from datagateway_api.common.datagateway_api.database import models +from datagateway_api.common.datagateway_api.query_filter_factory import ( + QueryFilterFactory, +) from datagateway_api.common.date_handler import DateHandler from datagateway_api.common.exceptions import ( ApiError, @@ -17,8 +20,9 @@ FilterError, MissingCredentialsError, ) -from datagateway_api.common.query_filter_factory import QueryFilterFactory -from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints +from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( + endpoints, +) log = logging.getLogger() @@ -115,7 +119,7 @@ def get_entity_object_from_name(entity_name): :param entity_name: Name of the entity to fetch a version from this model :type entity_name: :class:`str` :return: Object of the entity requested (e.g. - :class:`datagateway_api.common.database.models.INVESTIGATIONINSTRUMENT`) + :class:`.datagateway_api.database.models.INVESTIGATIONINSTRUMENT`) :raises: KeyError: If an entity model cannot be found as a class in this model """ try: diff --git a/datagateway_api/common/search_api/filters.py b/datagateway_api/common/search_api/filters.py index 25a058fa..b3ca847d 100644 --- a/datagateway_api/common/search_api/filters.py +++ b/datagateway_api/common/search_api/filters.py @@ -1,4 +1,4 @@ -from datagateway_api.common.icat.filters import ( +from datagateway_api.common.datagateway_api.icat.filters import ( PythonICATIncludeFilter, PythonICATLimitFilter, PythonICATSkipFilter, diff --git a/datagateway_api/common/search_api/models.py b/datagateway_api/common/search_api/models.py index 5abfe3b0..425e2b38 100644 --- a/datagateway_api/common/search_api/models.py +++ b/datagateway_api/common/search_api/models.py @@ -9,7 +9,7 @@ class PaNOSCAttribute(ABC): @abstractclassmethod - def from_icat(cls): + def from_icat(self): pass @abstractmethod diff --git a/datagateway_api/common/search_api/session_handler.py b/datagateway_api/common/search_api/session_handler.py index d7f9c51c..5666e40a 100644 --- a/datagateway_api/common/search_api/session_handler.py +++ b/datagateway_api/common/search_api/session_handler.py @@ -9,9 +9,12 @@ def requires_session_id(method): """ TODO """ + pass + """ @wraps(method) def wrapper_requires_session(*args, **kwargs): pass return wrapper_requires_session + """ diff --git a/datagateway_api/src/api_start_utils.py b/datagateway_api/src/api_start_utils.py index 01c4d81c..4589cbeb 100644 --- a/datagateway_api/src/api_start_utils.py +++ b/datagateway_api/src/api_start_utils.py @@ -7,22 +7,28 @@ from flask_restful import Api from flask_swagger_ui import get_swaggerui_blueprint -from datagateway_api.common.backends import create_backend from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.database.helpers import db -from datagateway_api.common.icat.icat_client_pool import create_client_pool -from datagateway_api.src.resources.entities.entity_endpoint import ( +from datagateway_api.common.datagateway_api.backends import create_backend +from datagateway_api.common.datagateway_api.database.helpers import db +from datagateway_api.common.datagateway_api.icat.icat_client_pool import ( + create_client_pool, +) +from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint import ( get_count_endpoint, get_endpoint, get_find_one_endpoint, get_id_endpoint, ) -from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints -from datagateway_api.src.resources.non_entities.ping_endpoint import ping_endpoint -from datagateway_api.src.resources.non_entities.sessions_endpoints import ( +from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( + endpoints, +) +from datagateway_api.src.resources.datagateway_api.non_entities.ping_endpoint import ( + ping_endpoint, +) +from datagateway_api.src.resources.datagateway_api.non_entities.sessions_endpoints import ( session_endpoints, ) -from datagateway_api.src.resources.table_endpoints.table_endpoints import ( +from datagateway_api.src.resources.datagateway_api.table_endpoints.table_endpoints import ( count_instrument_facility_cycles_endpoint, count_instrument_investigation_endpoint, instrument_facility_cycles_endpoint, diff --git a/datagateway_api/src/resources/datagateway_api/entities/entity_map.py b/datagateway_api/src/resources/datagateway_api/entities/entity_map.py index 6bb74659..599e3feb 100644 --- a/datagateway_api/src/resources/datagateway_api/entities/entity_map.py +++ b/datagateway_api/src/resources/datagateway_api/entities/entity_map.py @@ -3,7 +3,9 @@ from sqlalchemy.inspection import inspect from datagateway_api.common.helpers import get_entity_object_from_name -from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints +from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( + endpoints, +) def type_conversion(python_type): diff --git a/datagateway_api/src/swagger/initialise_spec.py b/datagateway_api/src/swagger/initialise_spec.py index 79350077..e987c760 100644 --- a/datagateway_api/src/swagger/initialise_spec.py +++ b/datagateway_api/src/swagger/initialise_spec.py @@ -1,4 +1,6 @@ -from datagateway_api.src.resources.entities.entity_map import create_entity_models +from datagateway_api.src.resources.datagateway_api.entities.entity_map import ( + create_entity_models, +) def initialise_spec(spec): diff --git a/test/conftest.py b/test/conftest.py index c699ce20..b0fa5352 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,11 +3,11 @@ from flask import Flask import pytest -from datagateway_api.common.database.helpers import ( +from datagateway_api.common.datagateway_api.database.helpers import ( delete_row_by_id, insert_row_into_table, ) -from datagateway_api.common.database.models import SESSION +from datagateway_api.common.datagateway_api.database.models import SESSION from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, diff --git a/test/db/conftest.py b/test/db/conftest.py index b7815ed8..98381fdf 100644 --- a/test/db/conftest.py +++ b/test/db/conftest.py @@ -4,11 +4,11 @@ import pytest from datagateway_api.common.constants import Constants -from datagateway_api.common.database.helpers import ( +from datagateway_api.common.datagateway_api.database.helpers import ( delete_row_by_id, insert_row_into_table, ) -from datagateway_api.common.database.models import ( +from datagateway_api.common.datagateway_api.database.models import ( FACILITYCYCLE, INSTRUMENT, INVESTIGATION, diff --git a/test/db/endpoints/test_ping_db.py b/test/db/endpoints/test_ping_db.py index 96c4588b..279d60b1 100644 --- a/test/db/endpoints/test_ping_db.py +++ b/test/db/endpoints/test_ping_db.py @@ -3,8 +3,8 @@ import pytest from sqlalchemy.exc import SQLAlchemyError -from datagateway_api.common.backends import create_backend from datagateway_api.common.constants import Constants +from datagateway_api.common.datagateway_api.backends import create_backend from datagateway_api.common.exceptions import DatabaseError diff --git a/test/db/test_database_filter_utilities.py b/test/db/test_database_filter_utilities.py index 8321bbf8..80874171 100644 --- a/test/db/test_database_filter_utilities.py +++ b/test/db/test_database_filter_utilities.py @@ -1,7 +1,9 @@ import pytest -from datagateway_api.common.database.filters import DatabaseFilterUtilities -from datagateway_api.common.database.helpers import ReadQuery +from datagateway_api.common.datagateway_api.database.filters import ( + DatabaseFilterUtilities, +) +from datagateway_api.common.datagateway_api.database.helpers import ReadQuery from datagateway_api.common.exceptions import FilterError from datagateway_api.common.helpers import get_entity_object_from_name diff --git a/test/db/test_entity_helper.py b/test/db/test_entity_helper.py index 6818b86d..a52e5542 100644 --- a/test/db/test_entity_helper.py +++ b/test/db/test_entity_helper.py @@ -1,7 +1,7 @@ import pytest from datagateway_api.common.constants import Constants -from datagateway_api.common.database.models import ( +from datagateway_api.common.datagateway_api.database.models import ( DATAFILE, DATAFILEFORMAT, DATASET, diff --git a/test/db/test_query_filter_factory.py b/test/db/test_query_filter_factory.py index 16e3394b..7f81d98e 100644 --- a/test/db/test_query_filter_factory.py +++ b/test/db/test_query_filter_factory.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.common.database.filters import ( +from datagateway_api.common.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter, DatabaseLimitFilter, @@ -8,7 +8,9 @@ DatabaseSkipFilter, DatabaseWhereFilter, ) -from datagateway_api.common.query_filter_factory import QueryFilterFactory +from datagateway_api.common.datagateway_api.query_filter_factory import ( + QueryFilterFactory, +) class TestQueryFilterFactory: diff --git a/test/icat/endpoints/test_ping_icat.py b/test/icat/endpoints/test_ping_icat.py index d18d15e1..27568193 100644 --- a/test/icat/endpoints/test_ping_icat.py +++ b/test/icat/endpoints/test_ping_icat.py @@ -3,10 +3,12 @@ from icat.exception import ICATError import pytest -from datagateway_api.common.backends import create_backend from datagateway_api.common.constants import Constants +from datagateway_api.common.datagateway_api.backends import create_backend +from datagateway_api.common.datagateway_api.icat.icat_client_pool import ( + create_client_pool, +) from datagateway_api.common.exceptions import PythonICATError -from datagateway_api.common.icat.icat_client_pool import create_client_pool class TestICATPing: diff --git a/test/icat/filters/test_distinct_filter.py b/test/icat/filters/test_distinct_filter.py index 4adf3ae8..f7eeced0 100644 --- a/test/icat/filters/test_distinct_filter.py +++ b/test/icat/filters/test_distinct_filter.py @@ -1,7 +1,9 @@ import pytest +from datagateway_api.common.datagateway_api.icat.filters import ( + PythonICATDistinctFieldFilter, +) from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.icat.filters import PythonICATDistinctFieldFilter class TestICATDistinctFilter: diff --git a/test/icat/filters/test_include_filter.py b/test/icat/filters/test_include_filter.py index f50bcefe..45df7ad0 100644 --- a/test/icat/filters/test_include_filter.py +++ b/test/icat/filters/test_include_filter.py @@ -1,7 +1,7 @@ import pytest +from datagateway_api.common.datagateway_api.icat.filters import PythonICATIncludeFilter from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.icat.filters import PythonICATIncludeFilter class TestICATIncludeFilter: diff --git a/test/icat/filters/test_limit_filter.py b/test/icat/filters/test_limit_filter.py index c9d02e9d..59f3c8d0 100644 --- a/test/icat/filters/test_limit_filter.py +++ b/test/icat/filters/test_limit_filter.py @@ -2,13 +2,15 @@ import pytest -from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.filter_order_handler import FilterOrderHandler -from datagateway_api.common.icat.filters import ( +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) +from datagateway_api.common.datagateway_api.icat.filters import ( icat_set_limit, PythonICATLimitFilter, PythonICATSkipFilter, ) +from datagateway_api.common.exceptions import FilterError class TestICATLimitFilter: diff --git a/test/icat/filters/test_order_filter.py b/test/icat/filters/test_order_filter.py index 2b45e366..2f60b453 100644 --- a/test/icat/filters/test_order_filter.py +++ b/test/icat/filters/test_order_filter.py @@ -1,9 +1,11 @@ import pytest +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) +from datagateway_api.common.datagateway_api.icat.filters import PythonICATOrderFilter from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.filter_order_handler import FilterOrderHandler -from datagateway_api.common.icat.filters import PythonICATOrderFilter class TestICATOrderFilter: diff --git a/test/icat/filters/test_skip_filter.py b/test/icat/filters/test_skip_filter.py index 995b19bd..40bb081e 100644 --- a/test/icat/filters/test_skip_filter.py +++ b/test/icat/filters/test_skip_filter.py @@ -1,8 +1,8 @@ import pytest from datagateway_api.common.config import config +from datagateway_api.common.datagateway_api.icat.filters import PythonICATSkipFilter from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.icat.filters import PythonICATSkipFilter class TestICATSkipFilter: diff --git a/test/icat/filters/test_where_filter.py b/test/icat/filters/test_where_filter.py index 6fde3665..2e00342e 100644 --- a/test/icat/filters/test_where_filter.py +++ b/test/icat/filters/test_where_filter.py @@ -1,8 +1,10 @@ import pytest +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) +from datagateway_api.common.datagateway_api.icat.filters import PythonICATWhereFilter from datagateway_api.common.exceptions import BadRequestError, FilterError -from datagateway_api.common.filter_order_handler import FilterOrderHandler -from datagateway_api.common.icat.filters import PythonICATWhereFilter class TestICATWhereFilter: diff --git a/test/icat/test_filter_order_handler.py b/test/icat/test_filter_order_handler.py index b31fe13d..bc557877 100644 --- a/test/icat/test_filter_order_handler.py +++ b/test/icat/test_filter_order_handler.py @@ -1,7 +1,9 @@ import pytest -from datagateway_api.common.filter_order_handler import FilterOrderHandler -from datagateway_api.common.icat.filters import ( +from datagateway_api.common.datagateway_api.filter_order_handler import ( + FilterOrderHandler, +) +from datagateway_api.common.datagateway_api.icat.filters import ( PythonICATLimitFilter, PythonICATWhereFilter, ) diff --git a/test/icat/test_helpers.py b/test/icat/test_helpers.py index c1963ca3..71b8d515 100644 --- a/test/icat/test_helpers.py +++ b/test/icat/test_helpers.py @@ -3,11 +3,11 @@ from icat.exception import ICATInternalError import pytest -from datagateway_api.common.exceptions import BadRequestError, PythonICATError -from datagateway_api.common.icat.helpers import ( +from datagateway_api.common.datagateway_api.icat.helpers import ( get_icat_entity_name_as_camel_case, push_data_updates_to_icat, ) +from datagateway_api.common.exceptions import BadRequestError, PythonICATError class TestICATHelpers: diff --git a/test/icat/test_icat_client.py b/test/icat/test_icat_client.py index b68f3e19..286a3ba2 100644 --- a/test/icat/test_icat_client.py +++ b/test/icat/test_icat_client.py @@ -1,6 +1,6 @@ from icat.client import Client -from datagateway_api.common.icat.icat_client_pool import ICATClient +from datagateway_api.common.datagateway_api.icat.icat_client_pool import ICATClient class TestICATClient: diff --git a/test/icat/test_lru_cache.py b/test/icat/test_lru_cache.py index 3f27d603..4612883b 100644 --- a/test/icat/test_lru_cache.py +++ b/test/icat/test_lru_cache.py @@ -4,8 +4,10 @@ from icat.client import Client from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.icat.icat_client_pool import create_client_pool -from datagateway_api.common.icat.lru_cache import ExtendedLRUCache +from datagateway_api.common.datagateway_api.icat.icat_client_pool import ( + create_client_pool, +) +from datagateway_api.common.datagateway_api.icat.lru_cache import ExtendedLRUCache class TestLRUCache: diff --git a/test/icat/test_query.py b/test/icat/test_query.py index c72ae934..7a5334c8 100644 --- a/test/icat/test_query.py +++ b/test/icat/test_query.py @@ -3,13 +3,13 @@ from icat.entity import Entity import pytest -from datagateway_api.common.date_handler import DateHandler -from datagateway_api.common.exceptions import PythonICATError -from datagateway_api.common.icat.filters import ( +from datagateway_api.common.datagateway_api.icat.filters import ( PythonICATSkipFilter, PythonICATWhereFilter, ) -from datagateway_api.common.icat.query import ICATQuery +from datagateway_api.common.datagateway_api.icat.query import ICATQuery +from datagateway_api.common.date_handler import DateHandler +from datagateway_api.common.exceptions import PythonICATError def prepare_icat_data_for_assertion(data, remove_id=False, remove_visit_id=False): diff --git a/test/icat/test_session_handling.py b/test/icat/test_session_handling.py index 1392f962..9d52210e 100644 --- a/test/icat/test_session_handling.py +++ b/test/icat/test_session_handling.py @@ -5,12 +5,14 @@ from icat.client import Client import pytest -from datagateway_api.common.backends import create_backend from datagateway_api.common.config import APIConfigOptions, config +from datagateway_api.common.datagateway_api.backends import create_backend +from datagateway_api.common.datagateway_api.icat.filters import PythonICATWhereFilter +from datagateway_api.common.datagateway_api.icat.icat_client_pool import ( + create_client_pool, +) from datagateway_api.common.date_handler import DateHandler from datagateway_api.common.exceptions import AuthenticationError -from datagateway_api.common.icat.filters import PythonICATWhereFilter -from datagateway_api.common.icat.icat_client_pool import create_client_pool class TestSessionHandling: diff --git a/test/test_backends.py b/test/test_backends.py index d2d82948..6cb25511 100644 --- a/test/test_backends.py +++ b/test/test_backends.py @@ -1,9 +1,9 @@ import pytest -from datagateway_api.common.backend import Backend -from datagateway_api.common.backends import create_backend -from datagateway_api.common.database.backend import DatabaseBackend -from datagateway_api.common.icat.backend import PythonICATBackend +from datagateway_api.common.datagateway_api.backend import Backend +from datagateway_api.common.datagateway_api.backends import create_backend +from datagateway_api.common.datagateway_api.database.backend import DatabaseBackend +from datagateway_api.common.datagateway_api.icat.backend import PythonICATBackend class TestBackends: diff --git a/test/test_endpoint_rules.py b/test/test_endpoint_rules.py index cc3c5b14..e1a09efc 100644 --- a/test/test_endpoint_rules.py +++ b/test/test_endpoint_rules.py @@ -1,6 +1,8 @@ import pytest -from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints +from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( + endpoints, +) class TestEndpointRules: diff --git a/test/test_get_entity_object.py b/test/test_get_entity_object.py index 19834a2f..9d6679ed 100644 --- a/test/test_get_entity_object.py +++ b/test/test_get_entity_object.py @@ -1,6 +1,10 @@ import pytest -from datagateway_api.common.database.models import FACILITY, INVESTIGATION, JOB +from datagateway_api.common.datagateway_api.database.models import ( + FACILITY, + INVESTIGATION, + JOB, +) from datagateway_api.common.exceptions import ApiError from datagateway_api.common.helpers import get_entity_object_from_name diff --git a/test/test_get_filters_from_query.py b/test/test_get_filters_from_query.py index 80dd2608..0c3cb3a4 100644 --- a/test/test_get_filters_from_query.py +++ b/test/test_get_filters_from_query.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.common.database.filters import ( +from datagateway_api.common.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter, DatabaseLimitFilter, diff --git a/test/test_openapi.py b/test/test_openapi.py index bbf2cdf3..1282552f 100644 --- a/test/test_openapi.py +++ b/test/test_openapi.py @@ -2,7 +2,9 @@ import pytest -from datagateway_api.src.resources.entities.entity_map import type_conversion +from datagateway_api.src.resources.datagateway_api.entities.entity_map import ( + type_conversion, +) class TestOpenAPI: diff --git a/test/test_query_filter.py b/test/test_query_filter.py index 7eddfcd1..3304fa40 100644 --- a/test/test_query_filter.py +++ b/test/test_query_filter.py @@ -2,9 +2,11 @@ import pytest +from datagateway_api.common.datagateway_api.query_filter_factory import ( + QueryFilterFactory, +) from datagateway_api.common.exceptions import ApiError from datagateway_api.common.filters import QueryFilter -from datagateway_api.common.query_filter_factory import QueryFilterFactory class TestQueryFilter: diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py index 64972dfe..2f361bc3 100644 --- a/util/icat_db_generator.py +++ b/util/icat_db_generator.py @@ -9,7 +9,7 @@ from sqlalchemy.pool import QueuePool from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.database import models +from datagateway_api.common.datagateway_api.database import models parser = argparse.ArgumentParser() parser.add_argument(