From bf35193c57d36b7af9df44a9746ad95ab9df9b12 Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Fri, 12 Nov 2021 11:09:13 +0000 Subject: [PATCH 1/3] change directory structure of API --- datagateway_api/{ => src}/common/__init__.py | 0 datagateway_api/{ => src}/common/config.py | 0 datagateway_api/{ => src}/common/constants.py | 0 datagateway_api/{ => src}/common/date_handler.py | 0 datagateway_api/{ => src}/common/exceptions.py | 0 datagateway_api/{ => src}/common/filters.py | 0 datagateway_api/{ => src}/common/helpers.py | 0 datagateway_api/{ => src}/common/logger_setup.py | 0 datagateway_api/{common => src}/datagateway_api/__init__.py | 0 datagateway_api/{common => src}/datagateway_api/backend.py | 0 datagateway_api/{common => src}/datagateway_api/backends.py | 0 .../{common => src}/datagateway_api/database/__init__.py | 0 .../{common => src}/datagateway_api/database/backend.py | 0 .../{common => src}/datagateway_api/database/filters.py | 0 .../{common => src}/datagateway_api/database/helpers.py | 0 .../{common => src}/datagateway_api/database/models.py | 0 .../{common => src}/datagateway_api/filter_order_handler.py | 0 datagateway_api/{common => src}/datagateway_api/icat/__init__.py | 0 datagateway_api/{common => src}/datagateway_api/icat/backend.py | 0 datagateway_api/{common => src}/datagateway_api/icat/filters.py | 0 datagateway_api/{common => src}/datagateway_api/icat/helpers.py | 0 .../{common => src}/datagateway_api/icat/icat_client_pool.py | 0 datagateway_api/{common => src}/datagateway_api/icat/lru_cache.py | 0 datagateway_api/{common => src}/datagateway_api/icat/query.py | 0 .../{common => src}/datagateway_api/query_filter_factory.py | 0 .../{common/search_api => src/resources/entities}/__init__.py | 0 .../resources/{datagateway_api => }/entities/entity_endpoint.py | 0 .../{datagateway_api => }/entities/entity_endpoint_dict.py | 0 .../src/resources/{datagateway_api => }/entities/entity_map.py | 0 .../{datagateway_api/entities => non_entities}/__init__.py | 0 .../resources/{datagateway_api => }/non_entities/ping_endpoint.py | 0 .../{datagateway_api => }/non_entities/sessions_endpoints.py | 0 datagateway_api/src/resources/search_api/__init__.py | 0 .../src/resources/{search_api => }/search_api_endpoints.py | 0 .../{datagateway_api/non_entities => table_endpoints}/__init__.py | 0 .../{datagateway_api => }/table_endpoints/table_endpoints.py | 0 .../datagateway_api/table_endpoints => search_api}/__init__.py | 0 datagateway_api/{common => src}/search_api/filters.py | 0 datagateway_api/{common => src}/search_api/helpers.py | 0 datagateway_api/{common => src}/search_api/models.py | 0 datagateway_api/{common => src}/search_api/session_handler.py | 0 41 files changed, 0 insertions(+), 0 deletions(-) rename datagateway_api/{ => src}/common/__init__.py (100%) rename datagateway_api/{ => src}/common/config.py (100%) rename datagateway_api/{ => src}/common/constants.py (100%) rename datagateway_api/{ => src}/common/date_handler.py (100%) rename datagateway_api/{ => src}/common/exceptions.py (100%) rename datagateway_api/{ => src}/common/filters.py (100%) rename datagateway_api/{ => src}/common/helpers.py (100%) rename datagateway_api/{ => src}/common/logger_setup.py (100%) rename datagateway_api/{common => src}/datagateway_api/__init__.py (100%) rename datagateway_api/{common => src}/datagateway_api/backend.py (100%) rename datagateway_api/{common => src}/datagateway_api/backends.py (100%) rename datagateway_api/{common => src}/datagateway_api/database/__init__.py (100%) rename datagateway_api/{common => src}/datagateway_api/database/backend.py (100%) rename datagateway_api/{common => src}/datagateway_api/database/filters.py (100%) rename datagateway_api/{common => src}/datagateway_api/database/helpers.py (100%) rename datagateway_api/{common => src}/datagateway_api/database/models.py (100%) rename datagateway_api/{common => src}/datagateway_api/filter_order_handler.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/__init__.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/backend.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/filters.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/helpers.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/icat_client_pool.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/lru_cache.py (100%) rename datagateway_api/{common => src}/datagateway_api/icat/query.py (100%) rename datagateway_api/{common => src}/datagateway_api/query_filter_factory.py (100%) rename datagateway_api/{common/search_api => src/resources/entities}/__init__.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/entities/entity_endpoint.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/entities/entity_endpoint_dict.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/entities/entity_map.py (100%) rename datagateway_api/src/resources/{datagateway_api/entities => non_entities}/__init__.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/non_entities/ping_endpoint.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/non_entities/sessions_endpoints.py (100%) delete mode 100644 datagateway_api/src/resources/search_api/__init__.py rename datagateway_api/src/resources/{search_api => }/search_api_endpoints.py (100%) rename datagateway_api/src/resources/{datagateway_api/non_entities => table_endpoints}/__init__.py (100%) rename datagateway_api/src/resources/{datagateway_api => }/table_endpoints/table_endpoints.py (100%) rename datagateway_api/src/{resources/datagateway_api/table_endpoints => search_api}/__init__.py (100%) rename datagateway_api/{common => src}/search_api/filters.py (100%) rename datagateway_api/{common => src}/search_api/helpers.py (100%) rename datagateway_api/{common => src}/search_api/models.py (100%) rename datagateway_api/{common => src}/search_api/session_handler.py (100%) diff --git a/datagateway_api/common/__init__.py b/datagateway_api/src/common/__init__.py similarity index 100% rename from datagateway_api/common/__init__.py rename to datagateway_api/src/common/__init__.py diff --git a/datagateway_api/common/config.py b/datagateway_api/src/common/config.py similarity index 100% rename from datagateway_api/common/config.py rename to datagateway_api/src/common/config.py diff --git a/datagateway_api/common/constants.py b/datagateway_api/src/common/constants.py similarity index 100% rename from datagateway_api/common/constants.py rename to datagateway_api/src/common/constants.py diff --git a/datagateway_api/common/date_handler.py b/datagateway_api/src/common/date_handler.py similarity index 100% rename from datagateway_api/common/date_handler.py rename to datagateway_api/src/common/date_handler.py diff --git a/datagateway_api/common/exceptions.py b/datagateway_api/src/common/exceptions.py similarity index 100% rename from datagateway_api/common/exceptions.py rename to datagateway_api/src/common/exceptions.py diff --git a/datagateway_api/common/filters.py b/datagateway_api/src/common/filters.py similarity index 100% rename from datagateway_api/common/filters.py rename to datagateway_api/src/common/filters.py diff --git a/datagateway_api/common/helpers.py b/datagateway_api/src/common/helpers.py similarity index 100% rename from datagateway_api/common/helpers.py rename to datagateway_api/src/common/helpers.py diff --git a/datagateway_api/common/logger_setup.py b/datagateway_api/src/common/logger_setup.py similarity index 100% rename from datagateway_api/common/logger_setup.py rename to datagateway_api/src/common/logger_setup.py diff --git a/datagateway_api/common/datagateway_api/__init__.py b/datagateway_api/src/datagateway_api/__init__.py similarity index 100% rename from datagateway_api/common/datagateway_api/__init__.py rename to datagateway_api/src/datagateway_api/__init__.py diff --git a/datagateway_api/common/datagateway_api/backend.py b/datagateway_api/src/datagateway_api/backend.py similarity index 100% rename from datagateway_api/common/datagateway_api/backend.py rename to datagateway_api/src/datagateway_api/backend.py diff --git a/datagateway_api/common/datagateway_api/backends.py b/datagateway_api/src/datagateway_api/backends.py similarity index 100% rename from datagateway_api/common/datagateway_api/backends.py rename to datagateway_api/src/datagateway_api/backends.py diff --git a/datagateway_api/common/datagateway_api/database/__init__.py b/datagateway_api/src/datagateway_api/database/__init__.py similarity index 100% rename from datagateway_api/common/datagateway_api/database/__init__.py rename to datagateway_api/src/datagateway_api/database/__init__.py diff --git a/datagateway_api/common/datagateway_api/database/backend.py b/datagateway_api/src/datagateway_api/database/backend.py similarity index 100% rename from datagateway_api/common/datagateway_api/database/backend.py rename to datagateway_api/src/datagateway_api/database/backend.py diff --git a/datagateway_api/common/datagateway_api/database/filters.py b/datagateway_api/src/datagateway_api/database/filters.py similarity index 100% rename from datagateway_api/common/datagateway_api/database/filters.py rename to datagateway_api/src/datagateway_api/database/filters.py diff --git a/datagateway_api/common/datagateway_api/database/helpers.py b/datagateway_api/src/datagateway_api/database/helpers.py similarity index 100% rename from datagateway_api/common/datagateway_api/database/helpers.py rename to datagateway_api/src/datagateway_api/database/helpers.py diff --git a/datagateway_api/common/datagateway_api/database/models.py b/datagateway_api/src/datagateway_api/database/models.py similarity index 100% rename from datagateway_api/common/datagateway_api/database/models.py rename to datagateway_api/src/datagateway_api/database/models.py diff --git a/datagateway_api/common/datagateway_api/filter_order_handler.py b/datagateway_api/src/datagateway_api/filter_order_handler.py similarity index 100% rename from datagateway_api/common/datagateway_api/filter_order_handler.py rename to datagateway_api/src/datagateway_api/filter_order_handler.py diff --git a/datagateway_api/common/datagateway_api/icat/__init__.py b/datagateway_api/src/datagateway_api/icat/__init__.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/__init__.py rename to datagateway_api/src/datagateway_api/icat/__init__.py diff --git a/datagateway_api/common/datagateway_api/icat/backend.py b/datagateway_api/src/datagateway_api/icat/backend.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/backend.py rename to datagateway_api/src/datagateway_api/icat/backend.py diff --git a/datagateway_api/common/datagateway_api/icat/filters.py b/datagateway_api/src/datagateway_api/icat/filters.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/filters.py rename to datagateway_api/src/datagateway_api/icat/filters.py diff --git a/datagateway_api/common/datagateway_api/icat/helpers.py b/datagateway_api/src/datagateway_api/icat/helpers.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/helpers.py rename to datagateway_api/src/datagateway_api/icat/helpers.py diff --git a/datagateway_api/common/datagateway_api/icat/icat_client_pool.py b/datagateway_api/src/datagateway_api/icat/icat_client_pool.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/icat_client_pool.py rename to datagateway_api/src/datagateway_api/icat/icat_client_pool.py diff --git a/datagateway_api/common/datagateway_api/icat/lru_cache.py b/datagateway_api/src/datagateway_api/icat/lru_cache.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/lru_cache.py rename to datagateway_api/src/datagateway_api/icat/lru_cache.py diff --git a/datagateway_api/common/datagateway_api/icat/query.py b/datagateway_api/src/datagateway_api/icat/query.py similarity index 100% rename from datagateway_api/common/datagateway_api/icat/query.py rename to datagateway_api/src/datagateway_api/icat/query.py diff --git a/datagateway_api/common/datagateway_api/query_filter_factory.py b/datagateway_api/src/datagateway_api/query_filter_factory.py similarity index 100% rename from datagateway_api/common/datagateway_api/query_filter_factory.py rename to datagateway_api/src/datagateway_api/query_filter_factory.py diff --git a/datagateway_api/common/search_api/__init__.py b/datagateway_api/src/resources/entities/__init__.py similarity index 100% rename from datagateway_api/common/search_api/__init__.py rename to datagateway_api/src/resources/entities/__init__.py diff --git a/datagateway_api/src/resources/datagateway_api/entities/entity_endpoint.py b/datagateway_api/src/resources/entities/entity_endpoint.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/entities/entity_endpoint.py rename to datagateway_api/src/resources/entities/entity_endpoint.py diff --git a/datagateway_api/src/resources/datagateway_api/entities/entity_endpoint_dict.py b/datagateway_api/src/resources/entities/entity_endpoint_dict.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/entities/entity_endpoint_dict.py rename to datagateway_api/src/resources/entities/entity_endpoint_dict.py diff --git a/datagateway_api/src/resources/datagateway_api/entities/entity_map.py b/datagateway_api/src/resources/entities/entity_map.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/entities/entity_map.py rename to datagateway_api/src/resources/entities/entity_map.py diff --git a/datagateway_api/src/resources/datagateway_api/entities/__init__.py b/datagateway_api/src/resources/non_entities/__init__.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/entities/__init__.py rename to datagateway_api/src/resources/non_entities/__init__.py diff --git a/datagateway_api/src/resources/datagateway_api/non_entities/ping_endpoint.py b/datagateway_api/src/resources/non_entities/ping_endpoint.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/non_entities/ping_endpoint.py rename to datagateway_api/src/resources/non_entities/ping_endpoint.py diff --git a/datagateway_api/src/resources/datagateway_api/non_entities/sessions_endpoints.py b/datagateway_api/src/resources/non_entities/sessions_endpoints.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/non_entities/sessions_endpoints.py rename to datagateway_api/src/resources/non_entities/sessions_endpoints.py diff --git a/datagateway_api/src/resources/search_api/__init__.py b/datagateway_api/src/resources/search_api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/datagateway_api/src/resources/search_api/search_api_endpoints.py b/datagateway_api/src/resources/search_api_endpoints.py similarity index 100% rename from datagateway_api/src/resources/search_api/search_api_endpoints.py rename to datagateway_api/src/resources/search_api_endpoints.py diff --git a/datagateway_api/src/resources/datagateway_api/non_entities/__init__.py b/datagateway_api/src/resources/table_endpoints/__init__.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/non_entities/__init__.py rename to datagateway_api/src/resources/table_endpoints/__init__.py diff --git a/datagateway_api/src/resources/datagateway_api/table_endpoints/table_endpoints.py b/datagateway_api/src/resources/table_endpoints/table_endpoints.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/table_endpoints/table_endpoints.py rename to datagateway_api/src/resources/table_endpoints/table_endpoints.py diff --git a/datagateway_api/src/resources/datagateway_api/table_endpoints/__init__.py b/datagateway_api/src/search_api/__init__.py similarity index 100% rename from datagateway_api/src/resources/datagateway_api/table_endpoints/__init__.py rename to datagateway_api/src/search_api/__init__.py diff --git a/datagateway_api/common/search_api/filters.py b/datagateway_api/src/search_api/filters.py similarity index 100% rename from datagateway_api/common/search_api/filters.py rename to datagateway_api/src/search_api/filters.py diff --git a/datagateway_api/common/search_api/helpers.py b/datagateway_api/src/search_api/helpers.py similarity index 100% rename from datagateway_api/common/search_api/helpers.py rename to datagateway_api/src/search_api/helpers.py diff --git a/datagateway_api/common/search_api/models.py b/datagateway_api/src/search_api/models.py similarity index 100% rename from datagateway_api/common/search_api/models.py rename to datagateway_api/src/search_api/models.py diff --git a/datagateway_api/common/search_api/session_handler.py b/datagateway_api/src/search_api/session_handler.py similarity index 100% rename from datagateway_api/common/search_api/session_handler.py rename to datagateway_api/src/search_api/session_handler.py From 4be29a578f2a4552c6cc3639193da7af6d6522af Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Fri, 12 Nov 2021 16:09:11 +0000 Subject: [PATCH 2/3] refactor: change imports for new directory structure --- datagateway_api/src/api_start_utils.py | 24 +++++++------------ datagateway_api/src/common/config.py | 2 +- datagateway_api/src/common/date_handler.py | 2 +- datagateway_api/src/common/filters.py | 2 +- datagateway_api/src/common/helpers.py | 14 ++++------- datagateway_api/src/common/logger_setup.py | 2 +- .../src/datagateway_api/backends.py | 4 ++-- .../src/datagateway_api/database/backend.py | 15 +++++++----- .../src/datagateway_api/database/filters.py | 6 ++--- .../src/datagateway_api/database/helpers.py | 12 ++++------ .../src/datagateway_api/database/models.py | 4 ++-- .../datagateway_api/filter_order_handler.py | 2 +- .../src/datagateway_api/icat/backend.py | 10 ++++---- .../src/datagateway_api/icat/filters.py | 6 ++--- .../src/datagateway_api/icat/helpers.py | 14 +++++------ .../datagateway_api/icat/icat_client_pool.py | 2 +- .../src/datagateway_api/icat/lru_cache.py | 2 +- .../src/datagateway_api/icat/query.py | 6 ++--- .../datagateway_api/query_filter_factory.py | 8 +++---- datagateway_api/src/main.py | 4 ++-- .../src/resources/entities/entity_endpoint.py | 2 +- .../src/resources/entities/entity_map.py | 6 ++--- .../non_entities/sessions_endpoints.py | 4 ++-- .../table_endpoints/table_endpoints.py | 2 +- datagateway_api/src/search_api/filters.py | 2 +- .../src/swagger/initialise_spec.py | 4 +--- test/conftest.py | 4 ++-- test/datagateway_api/db/conftest.py | 6 ++--- .../db/endpoints/test_get_with_filters.py | 4 ++-- .../db/endpoints/test_ping_db.py | 6 ++--- .../db/test_database_filter_utilities.py | 10 ++++---- test/datagateway_api/db/test_entity_helper.py | 4 ++-- .../db/test_query_filter_factory.py | 6 ++--- test/datagateway_api/icat/conftest.py | 2 +- .../icat/endpoints/test_ping_icat.py | 10 ++++---- .../icat/filters/test_distinct_filter.py | 4 ++-- .../icat/filters/test_include_filter.py | 4 ++-- .../icat/filters/test_limit_filter.py | 8 +++---- .../icat/filters/test_order_filter.py | 8 +++---- .../icat/filters/test_skip_filter.py | 6 ++--- .../icat/filters/test_where_filter.py | 8 +++---- .../icat/test_filter_order_handler.py | 6 ++--- test/datagateway_api/icat/test_helpers.py | 4 ++-- test/datagateway_api/icat/test_icat_client.py | 2 +- test/datagateway_api/icat/test_lru_cache.py | 8 +++---- test/datagateway_api/icat/test_query.py | 8 +++---- .../icat/test_session_handling.py | 14 +++++------ test/datagateway_api/test_backends.py | 8 +++---- test/datagateway_api/test_openapi.py | 4 +--- test/test_config.py | 2 +- test/test_date_handler.py | 4 ++-- test/test_endpoint_rules.py | 2 +- test/test_exceptions.py | 2 +- test/test_get_entity_object.py | 6 ++--- test/test_get_filters_from_query.py | 6 ++--- test/test_get_session_id_from_auth_header.py | 4 ++-- test/test_is_valid_json.py | 2 +- test/test_map_distinct_attrs.py | 2 +- test/test_queries_records.py | 4 ++-- test/test_query_filter.py | 10 ++++---- util/icat_db_generator.py | 4 ++-- 61 files changed, 158 insertions(+), 195 deletions(-) diff --git a/datagateway_api/src/api_start_utils.py b/datagateway_api/src/api_start_utils.py index ea680e95..2311ab33 100644 --- a/datagateway_api/src/api_start_utils.py +++ b/datagateway_api/src/api_start_utils.py @@ -7,28 +7,22 @@ from flask_restful import Api from flask_swagger_ui import get_swaggerui_blueprint -from datagateway_api.common.config import APIConfigOptions, config -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 ( +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.datagateway_api.backends import create_backend +from datagateway_api.src.datagateway_api.database.helpers import db +from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool +from datagateway_api.src.resources.entities.entity_endpoint import ( get_count_endpoint, get_endpoint, get_find_one_endpoint, get_id_endpoint, ) -from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( # noqa: B950 - 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 ( # noqa: B950 +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 ( session_endpoints, ) -from datagateway_api.src.resources.datagateway_api.table_endpoints.table_endpoints import ( # noqa: B950 +from datagateway_api.src.resources.table_endpoints.table_endpoints import ( count_instrument_facility_cycles_endpoint, count_instrument_investigation_endpoint, instrument_facility_cycles_endpoint, diff --git a/datagateway_api/src/common/config.py b/datagateway_api/src/common/config.py index 79746318..c3a49b13 100644 --- a/datagateway_api/src/common/config.py +++ b/datagateway_api/src/common/config.py @@ -35,7 +35,7 @@ class APIConfigOptions(Enum): class Config(object): - def __init__(self, path=Path(__file__).parent.parent / "config.json"): + def __init__(self, path=Path(__file__).parent.parent.parent / "config.json"): self.path = path with open(self.path) as target: self._config = json.load(target) diff --git a/datagateway_api/src/common/date_handler.py b/datagateway_api/src/common/date_handler.py index 097e23e6..729695aa 100644 --- a/datagateway_api/src/common/date_handler.py +++ b/datagateway_api/src/common/date_handler.py @@ -1,7 +1,7 @@ from dateutil.parser import parse from icat import helper -from datagateway_api.common.exceptions import BadRequestError +from datagateway_api.src.common.exceptions import BadRequestError class DateHandler: diff --git a/datagateway_api/src/common/filters.py b/datagateway_api/src/common/filters.py index a7844d46..c99e26eb 100644 --- a/datagateway_api/src/common/filters.py +++ b/datagateway_api/src/common/filters.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod import logging -from datagateway_api.common.exceptions import BadRequestError, FilterError +from datagateway_api.src.common.exceptions import BadRequestError, FilterError log = logging.getLogger() diff --git a/datagateway_api/src/common/helpers.py b/datagateway_api/src/common/helpers.py index a474a3c4..6990113f 100644 --- a/datagateway_api/src/common/helpers.py +++ b/datagateway_api/src/common/helpers.py @@ -8,21 +8,17 @@ from flask_restful import reqparse from sqlalchemy.exc import IntegrityError -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 ( +from datagateway_api.src.datagateway_api.database import models +from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import ( ApiError, AuthenticationError, BadRequestError, FilterError, MissingCredentialsError, ) -from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( # noqa: B950 - endpoints, -) +from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints log = logging.getLogger() diff --git a/datagateway_api/src/common/logger_setup.py b/datagateway_api/src/common/logger_setup.py index e89ab6b8..1da6a576 100644 --- a/datagateway_api/src/common/logger_setup.py +++ b/datagateway_api/src/common/logger_setup.py @@ -1,7 +1,7 @@ import logging.config from pathlib import Path -from datagateway_api.common.config import APIConfigOptions, config +from datagateway_api.src.common.config import APIConfigOptions, config LOG_FILE_NAME = Path(config.get_config_value(APIConfigOptions.LOG_LOCATION)) logger_config = { diff --git a/datagateway_api/src/datagateway_api/backends.py b/datagateway_api/src/datagateway_api/backends.py index f04fa9ca..f97c6d38 100644 --- a/datagateway_api/src/datagateway_api/backends.py +++ b/datagateway_api/src/datagateway_api/backends.py @@ -1,7 +1,7 @@ import sys -from datagateway_api.common.datagateway_api.database.backend import DatabaseBackend -from datagateway_api.common.datagateway_api.icat.backend import PythonICATBackend +from datagateway_api.src.datagateway_api.database.backend import DatabaseBackend +from datagateway_api.src.datagateway_api.icat.backend import PythonICATBackend def create_backend(backend_type): diff --git a/datagateway_api/src/datagateway_api/database/backend.py b/datagateway_api/src/datagateway_api/database/backend.py index c92fc295..513efeb7 100644 --- a/datagateway_api/src/datagateway_api/database/backend.py +++ b/datagateway_api/src/datagateway_api/database/backend.py @@ -5,9 +5,9 @@ from sqlalchemy import inspect from sqlalchemy.exc import SQLAlchemyError -from datagateway_api.common.constants import Constants -from datagateway_api.common.datagateway_api.backend import Backend -from datagateway_api.common.datagateway_api.database.helpers import ( +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.datagateway_api.backend import Backend +from datagateway_api.src.datagateway_api.database.helpers import ( create_rows_from_json, db, delete_row_by_id, @@ -24,9 +24,12 @@ requires_session_id, update_row_from_id, ) -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 +from datagateway_api.src.datagateway_api.database.models import SESSION +from datagateway_api.src.common.exceptions import AuthenticationError, DatabaseError +from datagateway_api.src.common.helpers import ( + get_entity_object_from_name, + queries_records, +) log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/database/filters.py b/datagateway_api/src/datagateway_api/database/filters.py index f37f5e91..e8a9d85b 100644 --- a/datagateway_api/src/datagateway_api/database/filters.py +++ b/datagateway_api/src/datagateway_api/database/filters.py @@ -2,8 +2,8 @@ from sqlalchemy import asc, desc -from datagateway_api.common.exceptions import FilterError, MultipleIncludeError -from datagateway_api.common.filters import ( +from datagateway_api.src.common.exceptions import FilterError, MultipleIncludeError +from datagateway_api.src.common.filters import ( DistinctFieldFilter, IncludeFilter, LimitFilter, @@ -11,7 +11,7 @@ SkipFilter, WhereFilter, ) -from datagateway_api.common.helpers import get_entity_object_from_name +from datagateway_api.src.common.helpers import get_entity_object_from_name log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/database/helpers.py b/datagateway_api/src/datagateway_api/database/helpers.py index 97bad712..7ca468d0 100644 --- a/datagateway_api/src/datagateway_api/database/helpers.py +++ b/datagateway_api/src/datagateway_api/database/helpers.py @@ -6,12 +6,12 @@ from flask_sqlalchemy import SQLAlchemy from sqlalchemy.orm import aliased -from datagateway_api.common.datagateway_api.database.filters import ( +from datagateway_api.src.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter as IncludeFilter, DatabaseWhereFilter as WhereFilter, ) -from datagateway_api.common.datagateway_api.database.models import ( +from datagateway_api.src.datagateway_api.database.models import ( FACILITY, FACILITYCYCLE, INSTRUMENT, @@ -19,15 +19,13 @@ INVESTIGATIONINSTRUMENT, SESSION, ) -from datagateway_api.common.datagateway_api.filter_order_handler import ( - FilterOrderHandler, -) -from datagateway_api.common.exceptions import ( +from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.common.exceptions import ( AuthenticationError, BadRequestError, MissingRecordError, ) -from datagateway_api.common.helpers import map_distinct_attributes_to_results +from datagateway_api.src.common.helpers import map_distinct_attributes_to_results log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/database/models.py b/datagateway_api/src/datagateway_api/database/models.py index 1fe208a3..e0d9136b 100644 --- a/datagateway_api/src/datagateway_api/database/models.py +++ b/datagateway_api/src/datagateway_api/database/models.py @@ -21,8 +21,8 @@ from sqlalchemy.orm import relationship from sqlalchemy.orm.collections import InstrumentedList -from datagateway_api.common.date_handler import DateHandler -from datagateway_api.common.exceptions import DatabaseError, FilterError +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import DatabaseError, FilterError Base = declarative_base() diff --git a/datagateway_api/src/datagateway_api/filter_order_handler.py b/datagateway_api/src/datagateway_api/filter_order_handler.py index c5d44493..7c4615e4 100644 --- a/datagateway_api/src/datagateway_api/filter_order_handler.py +++ b/datagateway_api/src/datagateway_api/filter_order_handler.py @@ -1,6 +1,6 @@ import logging -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATLimitFilter, PythonICATOrderFilter, PythonICATSkipFilter, diff --git a/datagateway_api/src/datagateway_api/icat/backend.py b/datagateway_api/src/datagateway_api/icat/backend.py index 56f4177e..4e5a0c3d 100644 --- a/datagateway_api/src/datagateway_api/icat/backend.py +++ b/datagateway_api/src/datagateway_api/icat/backend.py @@ -2,9 +2,9 @@ from icat.exception import ICATError, ICATSessionError -from datagateway_api.common.constants import Constants -from datagateway_api.common.datagateway_api.backend import Backend -from datagateway_api.common.datagateway_api.icat.helpers import ( +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.datagateway_api.backend import Backend +from datagateway_api.src.datagateway_api.icat.helpers import ( create_entities, delete_entity_by_id, get_cached_client, @@ -23,8 +23,8 @@ update_entities, update_entity_by_id, ) -from datagateway_api.common.exceptions import AuthenticationError, PythonICATError -from datagateway_api.common.helpers import queries_records +from datagateway_api.src.common.exceptions import AuthenticationError, PythonICATError +from datagateway_api.src.common.helpers import queries_records log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/icat/filters.py b/datagateway_api/src/datagateway_api/icat/filters.py index f0f588ee..01bd1529 100644 --- a/datagateway_api/src/datagateway_api/icat/filters.py +++ b/datagateway_api/src/datagateway_api/icat/filters.py @@ -1,8 +1,8 @@ import logging -from datagateway_api.common.config import config -from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.filters import ( +from datagateway_api.src.common.config import config +from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.common.filters import ( DistinctFieldFilter, IncludeFilter, LimitFilter, diff --git a/datagateway_api/src/datagateway_api/icat/helpers.py b/datagateway_api/src/datagateway_api/icat/helpers.py index 45edf46a..a0f37ced 100644 --- a/datagateway_api/src/datagateway_api/icat/helpers.py +++ b/datagateway_api/src/datagateway_api/icat/helpers.py @@ -14,17 +14,15 @@ ICATValidationError, ) -from datagateway_api.common.datagateway_api.filter_order_handler import ( - FilterOrderHandler, -) -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.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 ( +from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache +from datagateway_api.src.datagateway_api.icat.query import ICATQuery +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import ( AuthenticationError, BadRequestError, MissingRecordError, diff --git a/datagateway_api/src/datagateway_api/icat/icat_client_pool.py b/datagateway_api/src/datagateway_api/icat/icat_client_pool.py index cd8c2ff0..5df3ba68 100644 --- a/datagateway_api/src/datagateway_api/icat/icat_client_pool.py +++ b/datagateway_api/src/datagateway_api/icat/icat_client_pool.py @@ -3,7 +3,7 @@ from icat.client import Client from object_pool import ObjectPool -from datagateway_api.common.config import APIConfigOptions, config +from datagateway_api.src.common.config import APIConfigOptions, config log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/icat/lru_cache.py b/datagateway_api/src/datagateway_api/icat/lru_cache.py index 441c9b6e..5bf8a1d7 100644 --- a/datagateway_api/src/datagateway_api/icat/lru_cache.py +++ b/datagateway_api/src/datagateway_api/icat/lru_cache.py @@ -2,7 +2,7 @@ from cachetools.lru import LRUCache -from datagateway_api.common.config import APIConfigOptions, config +from datagateway_api.src.common.config import APIConfigOptions, config log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/icat/query.py b/datagateway_api/src/datagateway_api/icat/query.py index c690c258..2ac43590 100644 --- a/datagateway_api/src/datagateway_api/icat/query.py +++ b/datagateway_api/src/datagateway_api/icat/query.py @@ -5,9 +5,9 @@ from icat.exception import ICATInternalError, ICATValidationError from icat.query import Query -from datagateway_api.common.date_handler import DateHandler -from datagateway_api.common.exceptions import PythonICATError -from datagateway_api.common.helpers import map_distinct_attributes_to_results +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import PythonICATError +from datagateway_api.src.common.helpers import map_distinct_attributes_to_results log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/query_filter_factory.py b/datagateway_api/src/datagateway_api/query_filter_factory.py index f2e58c52..7822fcc7 100644 --- a/datagateway_api/src/datagateway_api/query_filter_factory.py +++ b/datagateway_api/src/datagateway_api/query_filter_factory.py @@ -1,7 +1,7 @@ import logging -from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.exceptions import ( +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.common.exceptions import ( ApiError, FilterError, ) @@ -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.datagateway_api.database.filters import ( + from datagateway_api.src.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.datagateway_api.icat.filters import ( + from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATDistinctFieldFilter as DistinctFieldFilter, PythonICATIncludeFilter as IncludeFilter, PythonICATLimitFilter as LimitFilter, diff --git a/datagateway_api/src/main.py b/datagateway_api/src/main.py index 3814be15..89eb6e65 100644 --- a/datagateway_api/src/main.py +++ b/datagateway_api/src/main.py @@ -2,8 +2,8 @@ from flask import Flask -from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.logger_setup import setup_logger +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.common.logger_setup import setup_logger from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, diff --git a/datagateway_api/src/resources/entities/entity_endpoint.py b/datagateway_api/src/resources/entities/entity_endpoint.py index 5a278e4b..873ebc2e 100644 --- a/datagateway_api/src/resources/entities/entity_endpoint.py +++ b/datagateway_api/src/resources/entities/entity_endpoint.py @@ -1,7 +1,7 @@ from flask import request from flask_restful import Resource -from datagateway_api.common.helpers import ( +from datagateway_api.src.common.helpers import ( get_filters_from_query_string, get_session_id_from_auth_header, ) diff --git a/datagateway_api/src/resources/entities/entity_map.py b/datagateway_api/src/resources/entities/entity_map.py index 53e76f8b..63aa0925 100644 --- a/datagateway_api/src/resources/entities/entity_map.py +++ b/datagateway_api/src/resources/entities/entity_map.py @@ -2,10 +2,8 @@ from sqlalchemy.inspection import inspect -from datagateway_api.common.helpers import get_entity_object_from_name -from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( # noqa: B950 - endpoints, -) +from datagateway_api.src.common.helpers import get_entity_object_from_name +from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints def type_conversion(python_type): diff --git a/datagateway_api/src/resources/non_entities/sessions_endpoints.py b/datagateway_api/src/resources/non_entities/sessions_endpoints.py index 651f5e5c..4e25f988 100644 --- a/datagateway_api/src/resources/non_entities/sessions_endpoints.py +++ b/datagateway_api/src/resources/non_entities/sessions_endpoints.py @@ -3,8 +3,8 @@ from flask import request from flask_restful import Resource -from datagateway_api.common.exceptions import AuthenticationError -from datagateway_api.common.helpers import get_session_id_from_auth_header +from datagateway_api.src.common.exceptions import AuthenticationError +from datagateway_api.src.common.helpers import get_session_id_from_auth_header log = logging.getLogger() diff --git a/datagateway_api/src/resources/table_endpoints/table_endpoints.py b/datagateway_api/src/resources/table_endpoints/table_endpoints.py index ee5819b3..dbd9973c 100644 --- a/datagateway_api/src/resources/table_endpoints/table_endpoints.py +++ b/datagateway_api/src/resources/table_endpoints/table_endpoints.py @@ -1,6 +1,6 @@ from flask_restful import Resource -from datagateway_api.common.helpers import ( +from datagateway_api.src.common.helpers import ( get_filters_from_query_string, get_session_id_from_auth_header, ) diff --git a/datagateway_api/src/search_api/filters.py b/datagateway_api/src/search_api/filters.py index b3ca847d..00249a06 100644 --- a/datagateway_api/src/search_api/filters.py +++ b/datagateway_api/src/search_api/filters.py @@ -1,4 +1,4 @@ -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATIncludeFilter, PythonICATLimitFilter, PythonICATSkipFilter, diff --git a/datagateway_api/src/swagger/initialise_spec.py b/datagateway_api/src/swagger/initialise_spec.py index e987c760..79350077 100644 --- a/datagateway_api/src/swagger/initialise_spec.py +++ b/datagateway_api/src/swagger/initialise_spec.py @@ -1,6 +1,4 @@ -from datagateway_api.src.resources.datagateway_api.entities.entity_map import ( - create_entity_models, -) +from datagateway_api.src.resources.entities.entity_map import create_entity_models def initialise_spec(spec): diff --git a/test/conftest.py b/test/conftest.py index b0fa5352..97b6e592 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,11 +3,11 @@ from flask import Flask import pytest -from datagateway_api.common.datagateway_api.database.helpers import ( +from datagateway_api.src.datagateway_api.database.helpers import ( delete_row_by_id, insert_row_into_table, ) -from datagateway_api.common.datagateway_api.database.models import SESSION +from datagateway_api.src.datagateway_api.database.models import SESSION from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, diff --git a/test/datagateway_api/db/conftest.py b/test/datagateway_api/db/conftest.py index 98381fdf..1fbb4fd5 100644 --- a/test/datagateway_api/db/conftest.py +++ b/test/datagateway_api/db/conftest.py @@ -3,12 +3,12 @@ import pytest -from datagateway_api.common.constants import Constants -from datagateway_api.common.datagateway_api.database.helpers import ( +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.datagateway_api.database.helpers import ( delete_row_by_id, insert_row_into_table, ) -from datagateway_api.common.datagateway_api.database.models import ( +from datagateway_api.src.datagateway_api.database.models import ( FACILITYCYCLE, INSTRUMENT, INVESTIGATION, diff --git a/test/datagateway_api/db/endpoints/test_get_with_filters.py b/test/datagateway_api/db/endpoints/test_get_with_filters.py index e43e6b76..a42d2038 100644 --- a/test/datagateway_api/db/endpoints/test_get_with_filters.py +++ b/test/datagateway_api/db/endpoints/test_get_with_filters.py @@ -1,7 +1,7 @@ import pytest -from datagateway_api.common.constants import Constants -from datagateway_api.common.date_handler import DateHandler +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.common.date_handler import DateHandler class TestDBGetWithFilters: diff --git a/test/datagateway_api/db/endpoints/test_ping_db.py b/test/datagateway_api/db/endpoints/test_ping_db.py index 279d60b1..2b0220bb 100644 --- a/test/datagateway_api/db/endpoints/test_ping_db.py +++ b/test/datagateway_api/db/endpoints/test_ping_db.py @@ -3,9 +3,9 @@ import pytest from sqlalchemy.exc import SQLAlchemyError -from datagateway_api.common.constants import Constants -from datagateway_api.common.datagateway_api.backends import create_backend -from datagateway_api.common.exceptions import DatabaseError +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.datagateway_api.backends import create_backend +from datagateway_api.src.common.exceptions import DatabaseError class TestICATPing: diff --git a/test/datagateway_api/db/test_database_filter_utilities.py b/test/datagateway_api/db/test_database_filter_utilities.py index 80874171..55f1a7ae 100644 --- a/test/datagateway_api/db/test_database_filter_utilities.py +++ b/test/datagateway_api/db/test_database_filter_utilities.py @@ -1,11 +1,9 @@ import pytest -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 +from datagateway_api.src.datagateway_api.database.filters import DatabaseFilterUtilities +from datagateway_api.src.datagateway_api.database.helpers import ReadQuery +from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.common.helpers import get_entity_object_from_name class TestDatabaseFilterUtilities: diff --git a/test/datagateway_api/db/test_entity_helper.py b/test/datagateway_api/db/test_entity_helper.py index a52e5542..4b649d54 100644 --- a/test/datagateway_api/db/test_entity_helper.py +++ b/test/datagateway_api/db/test_entity_helper.py @@ -1,7 +1,7 @@ import pytest -from datagateway_api.common.constants import Constants -from datagateway_api.common.datagateway_api.database.models import ( +from datagateway_api.src.common.constants import Constants +from datagateway_api.src.datagateway_api.database.models import ( DATAFILE, DATAFILEFORMAT, DATASET, diff --git a/test/datagateway_api/db/test_query_filter_factory.py b/test/datagateway_api/db/test_query_filter_factory.py index 7f81d98e..8c5e59b7 100644 --- a/test/datagateway_api/db/test_query_filter_factory.py +++ b/test/datagateway_api/db/test_query_filter_factory.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.common.datagateway_api.database.filters import ( +from datagateway_api.src.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter, DatabaseLimitFilter, @@ -8,9 +8,7 @@ DatabaseSkipFilter, DatabaseWhereFilter, ) -from datagateway_api.common.datagateway_api.query_filter_factory import ( - QueryFilterFactory, -) +from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory class TestQueryFilterFactory: diff --git a/test/datagateway_api/icat/conftest.py b/test/datagateway_api/icat/conftest.py index ba7f2165..ae5f84f9 100644 --- a/test/datagateway_api/icat/conftest.py +++ b/test/datagateway_api/icat/conftest.py @@ -8,7 +8,7 @@ from icat.query import Query import pytest -from datagateway_api.common.config import APIConfigOptions, config +from datagateway_api.src.common.config import APIConfigOptions, config from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, diff --git a/test/datagateway_api/icat/endpoints/test_ping_icat.py b/test/datagateway_api/icat/endpoints/test_ping_icat.py index 27568193..59ac35d4 100644 --- a/test/datagateway_api/icat/endpoints/test_ping_icat.py +++ b/test/datagateway_api/icat/endpoints/test_ping_icat.py @@ -3,12 +3,10 @@ from icat.exception import ICATError import pytest -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.src.common.constants import Constants +from datagateway_api.src.datagateway_api.backends import create_backend +from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool +from datagateway_api.src.common.exceptions import PythonICATError class TestICATPing: diff --git a/test/datagateway_api/icat/filters/test_distinct_filter.py b/test/datagateway_api/icat/filters/test_distinct_filter.py index f7eeced0..e15bb2f6 100644 --- a/test/datagateway_api/icat/filters/test_distinct_filter.py +++ b/test/datagateway_api/icat/filters/test_distinct_filter.py @@ -1,9 +1,9 @@ import pytest -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATDistinctFieldFilter, ) -from datagateway_api.common.exceptions import FilterError +from datagateway_api.src.common.exceptions import FilterError class TestICATDistinctFilter: diff --git a/test/datagateway_api/icat/filters/test_include_filter.py b/test/datagateway_api/icat/filters/test_include_filter.py index 45df7ad0..2ac40a4c 100644 --- a/test/datagateway_api/icat/filters/test_include_filter.py +++ b/test/datagateway_api/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.src.datagateway_api.icat.filters import PythonICATIncludeFilter +from datagateway_api.src.common.exceptions import FilterError class TestICATIncludeFilter: diff --git a/test/datagateway_api/icat/filters/test_limit_filter.py b/test/datagateway_api/icat/filters/test_limit_filter.py index 59f3c8d0..c8cacd97 100644 --- a/test/datagateway_api/icat/filters/test_limit_filter.py +++ b/test/datagateway_api/icat/filters/test_limit_filter.py @@ -2,15 +2,13 @@ import pytest -from datagateway_api.common.datagateway_api.filter_order_handler import ( - FilterOrderHandler, -) -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.datagateway_api.icat.filters import ( icat_set_limit, PythonICATLimitFilter, PythonICATSkipFilter, ) -from datagateway_api.common.exceptions import FilterError +from datagateway_api.src.common.exceptions import FilterError class TestICATLimitFilter: diff --git a/test/datagateway_api/icat/filters/test_order_filter.py b/test/datagateway_api/icat/filters/test_order_filter.py index 2fa66089..db9da6eb 100644 --- a/test/datagateway_api/icat/filters/test_order_filter.py +++ b/test/datagateway_api/icat/filters/test_order_filter.py @@ -1,11 +1,9 @@ import pytest from typing_extensions import OrderedDict -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.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.datagateway_api.icat.filters import PythonICATOrderFilter +from datagateway_api.src.common.exceptions import FilterError class TestICATOrderFilter: diff --git a/test/datagateway_api/icat/filters/test_skip_filter.py b/test/datagateway_api/icat/filters/test_skip_filter.py index 40bb081e..593a8f6a 100644 --- a/test/datagateway_api/icat/filters/test_skip_filter.py +++ b/test/datagateway_api/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.src.common.config import config +from datagateway_api.src.datagateway_api.icat.filters import PythonICATSkipFilter +from datagateway_api.src.common.exceptions import FilterError class TestICATSkipFilter: diff --git a/test/datagateway_api/icat/filters/test_where_filter.py b/test/datagateway_api/icat/filters/test_where_filter.py index 1b0d7776..26ae512f 100644 --- a/test/datagateway_api/icat/filters/test_where_filter.py +++ b/test/datagateway_api/icat/filters/test_where_filter.py @@ -1,10 +1,8 @@ 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.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter +from datagateway_api.src.common.exceptions import BadRequestError, FilterError class TestICATWhereFilter: diff --git a/test/datagateway_api/icat/test_filter_order_handler.py b/test/datagateway_api/icat/test_filter_order_handler.py index ab5eb4b6..6e457741 100644 --- a/test/datagateway_api/icat/test_filter_order_handler.py +++ b/test/datagateway_api/icat/test_filter_order_handler.py @@ -1,9 +1,7 @@ import pytest -from datagateway_api.common.datagateway_api.filter_order_handler import ( - FilterOrderHandler, -) -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATLimitFilter, PythonICATWhereFilter, ) diff --git a/test/datagateway_api/icat/test_helpers.py b/test/datagateway_api/icat/test_helpers.py index 71b8d515..2ed68822 100644 --- a/test/datagateway_api/icat/test_helpers.py +++ b/test/datagateway_api/icat/test_helpers.py @@ -3,11 +3,11 @@ from icat.exception import ICATInternalError import pytest -from datagateway_api.common.datagateway_api.icat.helpers import ( +from datagateway_api.src.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 +from datagateway_api.src.common.exceptions import BadRequestError, PythonICATError class TestICATHelpers: diff --git a/test/datagateway_api/icat/test_icat_client.py b/test/datagateway_api/icat/test_icat_client.py index 286a3ba2..e722f083 100644 --- a/test/datagateway_api/icat/test_icat_client.py +++ b/test/datagateway_api/icat/test_icat_client.py @@ -1,6 +1,6 @@ from icat.client import Client -from datagateway_api.common.datagateway_api.icat.icat_client_pool import ICATClient +from datagateway_api.src.datagateway_api.icat.icat_client_pool import ICATClient class TestICATClient: diff --git a/test/datagateway_api/icat/test_lru_cache.py b/test/datagateway_api/icat/test_lru_cache.py index 4612883b..71366535 100644 --- a/test/datagateway_api/icat/test_lru_cache.py +++ b/test/datagateway_api/icat/test_lru_cache.py @@ -3,11 +3,9 @@ from cachetools import cached from icat.client import Client -from datagateway_api.common.config import APIConfigOptions, config -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 +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool +from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache class TestLRUCache: diff --git a/test/datagateway_api/icat/test_query.py b/test/datagateway_api/icat/test_query.py index 4e76672b..ea661a5f 100644 --- a/test/datagateway_api/icat/test_query.py +++ b/test/datagateway_api/icat/test_query.py @@ -3,13 +3,13 @@ from icat.entity import Entity import pytest -from datagateway_api.common.datagateway_api.icat.filters import ( +from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATSkipFilter, PythonICATWhereFilter, ) -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 +from datagateway_api.src.datagateway_api.icat.query import ICATQuery +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import PythonICATError def prepare_icat_data_for_assertion(data, remove_id=False, remove_visit_id=False): diff --git a/test/datagateway_api/icat/test_session_handling.py b/test/datagateway_api/icat/test_session_handling.py index 9d52210e..9eb2bbf2 100644 --- a/test/datagateway_api/icat/test_session_handling.py +++ b/test/datagateway_api/icat/test_session_handling.py @@ -5,14 +5,12 @@ from icat.client import Client import pytest -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.src.common.config import APIConfigOptions, config +from datagateway_api.src.datagateway_api.backends import create_backend +from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter +from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import AuthenticationError class TestSessionHandling: diff --git a/test/datagateway_api/test_backends.py b/test/datagateway_api/test_backends.py index 6cb25511..333efa93 100644 --- a/test/datagateway_api/test_backends.py +++ b/test/datagateway_api/test_backends.py @@ -1,9 +1,9 @@ import pytest -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 +from datagateway_api.src.datagateway_api.backend import Backend +from datagateway_api.src.datagateway_api.backends import create_backend +from datagateway_api.src.datagateway_api.database.backend import DatabaseBackend +from datagateway_api.src.datagateway_api.icat.backend import PythonICATBackend class TestBackends: diff --git a/test/datagateway_api/test_openapi.py b/test/datagateway_api/test_openapi.py index 1282552f..bbf2cdf3 100644 --- a/test/datagateway_api/test_openapi.py +++ b/test/datagateway_api/test_openapi.py @@ -2,9 +2,7 @@ import pytest -from datagateway_api.src.resources.datagateway_api.entities.entity_map import ( - type_conversion, -) +from datagateway_api.src.resources.entities.entity_map import type_conversion class TestOpenAPI: diff --git a/test/test_config.py b/test/test_config.py index a5fbbcd5..cc7d5ce1 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -3,7 +3,7 @@ import pytest -from datagateway_api.common.config import APIConfigOptions, Config +from datagateway_api.src.common.config import APIConfigOptions, Config @pytest.fixture() diff --git a/test/test_date_handler.py b/test/test_date_handler.py index 8de17fed..7ce818dc 100644 --- a/test/test_date_handler.py +++ b/test/test_date_handler.py @@ -2,8 +2,8 @@ import pytest -from datagateway_api.common.date_handler import DateHandler -from datagateway_api.common.exceptions import BadRequestError +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import BadRequestError class TestIsStrADate: diff --git a/test/test_endpoint_rules.py b/test/test_endpoint_rules.py index 9930228d..3bfc9eec 100644 --- a/test/test_endpoint_rules.py +++ b/test/test_endpoint_rules.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.src.resources.datagateway_api.entities.entity_endpoint_dict import ( # noqa: B950 +from datagateway_api.src.resources.entities.entity_endpoint_dict import ( # noqa: B950 endpoints, ) diff --git a/test/test_exceptions.py b/test/test_exceptions.py index e9b04b6d..211c603b 100644 --- a/test/test_exceptions.py +++ b/test/test_exceptions.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.common.exceptions import ( +from datagateway_api.src.common.exceptions import ( ApiError, AuthenticationError, BadRequestError, diff --git a/test/test_get_entity_object.py b/test/test_get_entity_object.py index 9d6679ed..95144a57 100644 --- a/test/test_get_entity_object.py +++ b/test/test_get_entity_object.py @@ -1,12 +1,12 @@ import pytest -from datagateway_api.common.datagateway_api.database.models import ( +from datagateway_api.src.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 +from datagateway_api.src.common.exceptions import ApiError +from datagateway_api.src.common.helpers import get_entity_object_from_name class TestGetEntityObject: diff --git a/test/test_get_filters_from_query.py b/test/test_get_filters_from_query.py index 0c3cb3a4..62a292b4 100644 --- a/test/test_get_filters_from_query.py +++ b/test/test_get_filters_from_query.py @@ -1,14 +1,14 @@ import pytest -from datagateway_api.common.datagateway_api.database.filters import ( +from datagateway_api.src.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter, DatabaseLimitFilter, DatabaseOrderFilter, DatabaseSkipFilter, ) -from datagateway_api.common.exceptions import FilterError -from datagateway_api.common.helpers import get_filters_from_query_string +from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.common.helpers import get_filters_from_query_string class TestGetFiltersFromQueryString: diff --git a/test/test_get_session_id_from_auth_header.py b/test/test_get_session_id_from_auth_header.py index f28a5ce7..c48460f6 100644 --- a/test/test_get_session_id_from_auth_header.py +++ b/test/test_get_session_id_from_auth_header.py @@ -1,10 +1,10 @@ import pytest -from datagateway_api.common.exceptions import ( +from datagateway_api.src.common.exceptions import ( AuthenticationError, MissingCredentialsError, ) -from datagateway_api.common.helpers import get_session_id_from_auth_header +from datagateway_api.src.common.helpers import get_session_id_from_auth_header class TestGetSessionIDFromAuthHeader: diff --git a/test/test_is_valid_json.py b/test/test_is_valid_json.py index b83f3eec..833d847a 100644 --- a/test/test_is_valid_json.py +++ b/test/test_is_valid_json.py @@ -1,6 +1,6 @@ import pytest -from datagateway_api.common.helpers import is_valid_json +from datagateway_api.src.common.helpers import is_valid_json class TestIsValidJSON: diff --git a/test/test_map_distinct_attrs.py b/test/test_map_distinct_attrs.py index 615bc3f5..6670449d 100644 --- a/test/test_map_distinct_attrs.py +++ b/test/test_map_distinct_attrs.py @@ -3,7 +3,7 @@ from dateutil.tz import tzlocal import pytest -from datagateway_api.common.helpers import map_distinct_attributes_to_results +from datagateway_api.src.common.helpers import map_distinct_attributes_to_results class TestMapDistinctAttrs: diff --git a/test/test_queries_records.py b/test/test_queries_records.py index 6879df45..6e66b858 100644 --- a/test/test_queries_records.py +++ b/test/test_queries_records.py @@ -1,12 +1,12 @@ import pytest from sqlalchemy.exc import IntegrityError -from datagateway_api.common.exceptions import ( +from datagateway_api.src.common.exceptions import ( BadRequestError, FilterError, MissingRecordError, ) -from datagateway_api.common.helpers import queries_records +from datagateway_api.src.common.helpers import queries_records class TestQueriesRecords: diff --git a/test/test_query_filter.py b/test/test_query_filter.py index 3304fa40..7e98abd6 100644 --- a/test/test_query_filter.py +++ b/test/test_query_filter.py @@ -2,11 +2,9 @@ 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.src.datagateway_api.query_filter_factory import QueryFilterFactory +from datagateway_api.src.common.exceptions import ApiError +from datagateway_api.src.common.filters import QueryFilter class TestQueryFilter: @@ -27,7 +25,7 @@ class DummyQueryFilter(QueryFilter): def test_invalid_query_filter_getter(self): with patch( - "datagateway_api.common.config.config.get_config_value", + "datagateway_api.src.common.config.config.get_config_value", return_value="invalid_backend", ): with pytest.raises(ApiError): diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py index 2f361bc3..4de0c839 100644 --- a/util/icat_db_generator.py +++ b/util/icat_db_generator.py @@ -8,8 +8,8 @@ from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.pool import QueuePool -from datagateway_api.common.config import APIConfigOptions, config -from datagateway_api.common.datagateway_api.database import models +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.datagateway_api.database import models parser = argparse.ArgumentParser() parser.add_argument( From c0acd33212e654c7f5fdc42d42915163f0b4ac7b Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Fri, 12 Nov 2021 16:22:12 +0000 Subject: [PATCH 3/3] style: reorder import statements to satisfy flake8 --- .flake8 | 6 +++--- datagateway_api/src/common/helpers.py | 4 ++-- .../src/datagateway_api/database/backend.py | 10 +++++----- .../src/datagateway_api/database/helpers.py | 12 ++++++------ .../src/datagateway_api/icat/backend.py | 4 ++-- .../src/datagateway_api/icat/helpers.py | 14 +++++++------- datagateway_api/src/main.py | 4 ++-- test/conftest.py | 8 ++++---- test/datagateway_api/db/endpoints/test_ping_db.py | 2 +- .../db/test_database_filter_utilities.py | 4 ++-- test/datagateway_api/icat/conftest.py | 2 +- .../icat/endpoints/test_ping_icat.py | 2 +- .../icat/filters/test_distinct_filter.py | 2 +- .../icat/filters/test_include_filter.py | 2 +- .../icat/filters/test_limit_filter.py | 2 +- .../icat/filters/test_order_filter.py | 2 +- .../icat/filters/test_skip_filter.py | 2 +- .../icat/filters/test_where_filter.py | 2 +- test/datagateway_api/icat/test_helpers.py | 2 +- test/datagateway_api/icat/test_query.py | 4 ++-- test/datagateway_api/icat/test_session_handling.py | 4 ++-- test/test_endpoint_rules.py | 4 +--- test/test_get_entity_object.py | 4 ++-- test/test_get_filters_from_query.py | 4 ++-- test/test_query_filter.py | 2 +- 25 files changed, 53 insertions(+), 55 deletions(-) diff --git a/.flake8 b/.flake8 index 9d789e85..13cd02ab 100644 --- a/.flake8 +++ b/.flake8 @@ -10,7 +10,7 @@ per-file-ignores = test/*: S101 util/icat_db_generator.py: S311 datagateway_api/wsgi.py:E402,F401 - datagateway_api/common/datagateway_api/database/models.py: N815,A003 - datagateway_api/common/datagateway_api/icat/filters.py: C901 - datagateway_api/common/search_api/models.py: B950 + datagateway_api/src/datagateway_api/database/models.py: N815,A003 + datagateway_api/src/datagateway_api/icat/filters.py: C901 + datagateway_api/src/search_api/models.py: B950 enable-extensions=G diff --git a/datagateway_api/src/common/helpers.py b/datagateway_api/src/common/helpers.py index 6990113f..53957771 100644 --- a/datagateway_api/src/common/helpers.py +++ b/datagateway_api/src/common/helpers.py @@ -8,8 +8,6 @@ from flask_restful import reqparse from sqlalchemy.exc import IntegrityError -from datagateway_api.src.datagateway_api.database import models -from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory from datagateway_api.src.common.date_handler import DateHandler from datagateway_api.src.common.exceptions import ( ApiError, @@ -18,6 +16,8 @@ FilterError, MissingCredentialsError, ) +from datagateway_api.src.datagateway_api.database import models +from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory from datagateway_api.src.resources.entities.entity_endpoint_dict import endpoints log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/database/backend.py b/datagateway_api/src/datagateway_api/database/backend.py index 513efeb7..299fc903 100644 --- a/datagateway_api/src/datagateway_api/database/backend.py +++ b/datagateway_api/src/datagateway_api/database/backend.py @@ -6,6 +6,11 @@ from sqlalchemy.exc import SQLAlchemyError from datagateway_api.src.common.constants import Constants +from datagateway_api.src.common.exceptions import AuthenticationError, DatabaseError +from datagateway_api.src.common.helpers import ( + get_entity_object_from_name, + queries_records, +) from datagateway_api.src.datagateway_api.backend import Backend from datagateway_api.src.datagateway_api.database.helpers import ( create_rows_from_json, @@ -25,11 +30,6 @@ update_row_from_id, ) from datagateway_api.src.datagateway_api.database.models import SESSION -from datagateway_api.src.common.exceptions import AuthenticationError, DatabaseError -from datagateway_api.src.common.helpers import ( - get_entity_object_from_name, - queries_records, -) log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/database/helpers.py b/datagateway_api/src/datagateway_api/database/helpers.py index 7ca468d0..f6affd85 100644 --- a/datagateway_api/src/datagateway_api/database/helpers.py +++ b/datagateway_api/src/datagateway_api/database/helpers.py @@ -6,6 +6,12 @@ from flask_sqlalchemy import SQLAlchemy from sqlalchemy.orm import aliased +from datagateway_api.src.common.exceptions import ( + AuthenticationError, + BadRequestError, + MissingRecordError, +) +from datagateway_api.src.common.helpers import map_distinct_attributes_to_results from datagateway_api.src.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter as IncludeFilter, @@ -20,12 +26,6 @@ SESSION, ) from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler -from datagateway_api.src.common.exceptions import ( - AuthenticationError, - BadRequestError, - MissingRecordError, -) -from datagateway_api.src.common.helpers import map_distinct_attributes_to_results log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/icat/backend.py b/datagateway_api/src/datagateway_api/icat/backend.py index 4e5a0c3d..73b70c91 100644 --- a/datagateway_api/src/datagateway_api/icat/backend.py +++ b/datagateway_api/src/datagateway_api/icat/backend.py @@ -3,6 +3,8 @@ from icat.exception import ICATError, ICATSessionError from datagateway_api.src.common.constants import Constants +from datagateway_api.src.common.exceptions import AuthenticationError, PythonICATError +from datagateway_api.src.common.helpers import queries_records from datagateway_api.src.datagateway_api.backend import Backend from datagateway_api.src.datagateway_api.icat.helpers import ( create_entities, @@ -23,8 +25,6 @@ update_entities, update_entity_by_id, ) -from datagateway_api.src.common.exceptions import AuthenticationError, PythonICATError -from datagateway_api.src.common.helpers import queries_records log = logging.getLogger() diff --git a/datagateway_api/src/datagateway_api/icat/helpers.py b/datagateway_api/src/datagateway_api/icat/helpers.py index a0f37ced..2df47078 100644 --- a/datagateway_api/src/datagateway_api/icat/helpers.py +++ b/datagateway_api/src/datagateway_api/icat/helpers.py @@ -14,13 +14,6 @@ ICATValidationError, ) -from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler -from datagateway_api.src.datagateway_api.icat.filters import ( - PythonICATLimitFilter, - PythonICATWhereFilter, -) -from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache -from datagateway_api.src.datagateway_api.icat.query import ICATQuery from datagateway_api.src.common.date_handler import DateHandler from datagateway_api.src.common.exceptions import ( AuthenticationError, @@ -28,6 +21,13 @@ MissingRecordError, PythonICATError, ) +from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler +from datagateway_api.src.datagateway_api.icat.filters import ( + PythonICATLimitFilter, + PythonICATWhereFilter, +) +from datagateway_api.src.datagateway_api.icat.lru_cache import ExtendedLRUCache +from datagateway_api.src.datagateway_api.icat.query import ICATQuery log = logging.getLogger() diff --git a/datagateway_api/src/main.py b/datagateway_api/src/main.py index 89eb6e65..ff6fda79 100644 --- a/datagateway_api/src/main.py +++ b/datagateway_api/src/main.py @@ -2,14 +2,14 @@ from flask import Flask -from datagateway_api.src.common.config import APIConfigOptions, config -from datagateway_api.src.common.logger_setup import setup_logger from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, create_openapi_endpoint, openapi_config, ) +from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.common.logger_setup import setup_logger setup_logger() log = logging.getLogger() diff --git a/test/conftest.py b/test/conftest.py index 97b6e592..9bf0fc90 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,15 +3,15 @@ from flask import Flask import pytest +from datagateway_api.src.api_start_utils import ( + create_api_endpoints, + create_app_infrastructure, +) from datagateway_api.src.datagateway_api.database.helpers import ( delete_row_by_id, insert_row_into_table, ) from datagateway_api.src.datagateway_api.database.models import SESSION -from datagateway_api.src.api_start_utils import ( - create_api_endpoints, - create_app_infrastructure, -) @pytest.fixture() diff --git a/test/datagateway_api/db/endpoints/test_ping_db.py b/test/datagateway_api/db/endpoints/test_ping_db.py index 2b0220bb..f200cb4f 100644 --- a/test/datagateway_api/db/endpoints/test_ping_db.py +++ b/test/datagateway_api/db/endpoints/test_ping_db.py @@ -4,8 +4,8 @@ from sqlalchemy.exc import SQLAlchemyError from datagateway_api.src.common.constants import Constants -from datagateway_api.src.datagateway_api.backends import create_backend from datagateway_api.src.common.exceptions import DatabaseError +from datagateway_api.src.datagateway_api.backends import create_backend class TestICATPing: diff --git a/test/datagateway_api/db/test_database_filter_utilities.py b/test/datagateway_api/db/test_database_filter_utilities.py index 55f1a7ae..ed696b60 100644 --- a/test/datagateway_api/db/test_database_filter_utilities.py +++ b/test/datagateway_api/db/test_database_filter_utilities.py @@ -1,9 +1,9 @@ import pytest -from datagateway_api.src.datagateway_api.database.filters import DatabaseFilterUtilities -from datagateway_api.src.datagateway_api.database.helpers import ReadQuery from datagateway_api.src.common.exceptions import FilterError from datagateway_api.src.common.helpers import get_entity_object_from_name +from datagateway_api.src.datagateway_api.database.filters import DatabaseFilterUtilities +from datagateway_api.src.datagateway_api.database.helpers import ReadQuery class TestDatabaseFilterUtilities: diff --git a/test/datagateway_api/icat/conftest.py b/test/datagateway_api/icat/conftest.py index ae5f84f9..cba77957 100644 --- a/test/datagateway_api/icat/conftest.py +++ b/test/datagateway_api/icat/conftest.py @@ -8,11 +8,11 @@ from icat.query import Query import pytest -from datagateway_api.src.common.config import APIConfigOptions, config from datagateway_api.src.api_start_utils import ( create_api_endpoints, create_app_infrastructure, ) +from datagateway_api.src.common.config import APIConfigOptions, config from test.datagateway_api.icat.endpoints.test_create_icat import TestICATCreateData from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion diff --git a/test/datagateway_api/icat/endpoints/test_ping_icat.py b/test/datagateway_api/icat/endpoints/test_ping_icat.py index 59ac35d4..d9030bcc 100644 --- a/test/datagateway_api/icat/endpoints/test_ping_icat.py +++ b/test/datagateway_api/icat/endpoints/test_ping_icat.py @@ -4,9 +4,9 @@ import pytest from datagateway_api.src.common.constants import Constants +from datagateway_api.src.common.exceptions import PythonICATError from datagateway_api.src.datagateway_api.backends import create_backend from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool -from datagateway_api.src.common.exceptions import PythonICATError class TestICATPing: diff --git a/test/datagateway_api/icat/filters/test_distinct_filter.py b/test/datagateway_api/icat/filters/test_distinct_filter.py index e15bb2f6..dc8e2ad5 100644 --- a/test/datagateway_api/icat/filters/test_distinct_filter.py +++ b/test/datagateway_api/icat/filters/test_distinct_filter.py @@ -1,9 +1,9 @@ import pytest +from datagateway_api.src.common.exceptions import FilterError from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATDistinctFieldFilter, ) -from datagateway_api.src.common.exceptions import FilterError class TestICATDistinctFilter: diff --git a/test/datagateway_api/icat/filters/test_include_filter.py b/test/datagateway_api/icat/filters/test_include_filter.py index 2ac40a4c..0d13664b 100644 --- a/test/datagateway_api/icat/filters/test_include_filter.py +++ b/test/datagateway_api/icat/filters/test_include_filter.py @@ -1,7 +1,7 @@ import pytest -from datagateway_api.src.datagateway_api.icat.filters import PythonICATIncludeFilter from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.datagateway_api.icat.filters import PythonICATIncludeFilter class TestICATIncludeFilter: diff --git a/test/datagateway_api/icat/filters/test_limit_filter.py b/test/datagateway_api/icat/filters/test_limit_filter.py index c8cacd97..b5cfbf8c 100644 --- a/test/datagateway_api/icat/filters/test_limit_filter.py +++ b/test/datagateway_api/icat/filters/test_limit_filter.py @@ -2,13 +2,13 @@ import pytest +from datagateway_api.src.common.exceptions import FilterError from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler from datagateway_api.src.datagateway_api.icat.filters import ( icat_set_limit, PythonICATLimitFilter, PythonICATSkipFilter, ) -from datagateway_api.src.common.exceptions import FilterError class TestICATLimitFilter: diff --git a/test/datagateway_api/icat/filters/test_order_filter.py b/test/datagateway_api/icat/filters/test_order_filter.py index db9da6eb..0ab03681 100644 --- a/test/datagateway_api/icat/filters/test_order_filter.py +++ b/test/datagateway_api/icat/filters/test_order_filter.py @@ -1,9 +1,9 @@ import pytest from typing_extensions import OrderedDict +from datagateway_api.src.common.exceptions import FilterError from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler from datagateway_api.src.datagateway_api.icat.filters import PythonICATOrderFilter -from datagateway_api.src.common.exceptions import FilterError class TestICATOrderFilter: diff --git a/test/datagateway_api/icat/filters/test_skip_filter.py b/test/datagateway_api/icat/filters/test_skip_filter.py index 593a8f6a..00eb0253 100644 --- a/test/datagateway_api/icat/filters/test_skip_filter.py +++ b/test/datagateway_api/icat/filters/test_skip_filter.py @@ -1,8 +1,8 @@ import pytest from datagateway_api.src.common.config import config -from datagateway_api.src.datagateway_api.icat.filters import PythonICATSkipFilter from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.datagateway_api.icat.filters import PythonICATSkipFilter class TestICATSkipFilter: diff --git a/test/datagateway_api/icat/filters/test_where_filter.py b/test/datagateway_api/icat/filters/test_where_filter.py index 26ae512f..bc41a5fa 100644 --- a/test/datagateway_api/icat/filters/test_where_filter.py +++ b/test/datagateway_api/icat/filters/test_where_filter.py @@ -1,8 +1,8 @@ import pytest +from datagateway_api.src.common.exceptions import BadRequestError, FilterError from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter -from datagateway_api.src.common.exceptions import BadRequestError, FilterError class TestICATWhereFilter: diff --git a/test/datagateway_api/icat/test_helpers.py b/test/datagateway_api/icat/test_helpers.py index 2ed68822..49dd9370 100644 --- a/test/datagateway_api/icat/test_helpers.py +++ b/test/datagateway_api/icat/test_helpers.py @@ -3,11 +3,11 @@ from icat.exception import ICATInternalError import pytest +from datagateway_api.src.common.exceptions import BadRequestError, PythonICATError from datagateway_api.src.datagateway_api.icat.helpers import ( get_icat_entity_name_as_camel_case, push_data_updates_to_icat, ) -from datagateway_api.src.common.exceptions import BadRequestError, PythonICATError class TestICATHelpers: diff --git a/test/datagateway_api/icat/test_query.py b/test/datagateway_api/icat/test_query.py index ea661a5f..31247005 100644 --- a/test/datagateway_api/icat/test_query.py +++ b/test/datagateway_api/icat/test_query.py @@ -3,13 +3,13 @@ from icat.entity import Entity import pytest +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import PythonICATError from datagateway_api.src.datagateway_api.icat.filters import ( PythonICATSkipFilter, PythonICATWhereFilter, ) from datagateway_api.src.datagateway_api.icat.query import ICATQuery -from datagateway_api.src.common.date_handler import DateHandler -from datagateway_api.src.common.exceptions import PythonICATError def prepare_icat_data_for_assertion(data, remove_id=False, remove_visit_id=False): diff --git a/test/datagateway_api/icat/test_session_handling.py b/test/datagateway_api/icat/test_session_handling.py index 9eb2bbf2..e82dd4cf 100644 --- a/test/datagateway_api/icat/test_session_handling.py +++ b/test/datagateway_api/icat/test_session_handling.py @@ -6,11 +6,11 @@ import pytest from datagateway_api.src.common.config import APIConfigOptions, config +from datagateway_api.src.common.date_handler import DateHandler +from datagateway_api.src.common.exceptions import AuthenticationError from datagateway_api.src.datagateway_api.backends import create_backend from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool -from datagateway_api.src.common.date_handler import DateHandler -from datagateway_api.src.common.exceptions import AuthenticationError class TestSessionHandling: diff --git a/test/test_endpoint_rules.py b/test/test_endpoint_rules.py index 3bfc9eec..cc3c5b14 100644 --- a/test/test_endpoint_rules.py +++ b/test/test_endpoint_rules.py @@ -1,8 +1,6 @@ import pytest -from datagateway_api.src.resources.entities.entity_endpoint_dict import ( # noqa: B950 - endpoints, -) +from datagateway_api.src.resources.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 95144a57..e84bc0b0 100644 --- a/test/test_get_entity_object.py +++ b/test/test_get_entity_object.py @@ -1,12 +1,12 @@ import pytest +from datagateway_api.src.common.exceptions import ApiError +from datagateway_api.src.common.helpers import get_entity_object_from_name from datagateway_api.src.datagateway_api.database.models import ( FACILITY, INVESTIGATION, JOB, ) -from datagateway_api.src.common.exceptions import ApiError -from datagateway_api.src.common.helpers import get_entity_object_from_name class TestGetEntityObject: diff --git a/test/test_get_filters_from_query.py b/test/test_get_filters_from_query.py index 62a292b4..a13796b5 100644 --- a/test/test_get_filters_from_query.py +++ b/test/test_get_filters_from_query.py @@ -1,5 +1,7 @@ import pytest +from datagateway_api.src.common.exceptions import FilterError +from datagateway_api.src.common.helpers import get_filters_from_query_string from datagateway_api.src.datagateway_api.database.filters import ( DatabaseDistinctFieldFilter, DatabaseIncludeFilter, @@ -7,8 +9,6 @@ DatabaseOrderFilter, DatabaseSkipFilter, ) -from datagateway_api.src.common.exceptions import FilterError -from datagateway_api.src.common.helpers import get_filters_from_query_string class TestGetFiltersFromQueryString: diff --git a/test/test_query_filter.py b/test/test_query_filter.py index 7e98abd6..4a2a77fc 100644 --- a/test/test_query_filter.py +++ b/test/test_query_filter.py @@ -2,9 +2,9 @@ import pytest -from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory from datagateway_api.src.common.exceptions import ApiError from datagateway_api.src.common.filters import QueryFilter +from datagateway_api.src.datagateway_api.query_filter_factory import QueryFilterFactory class TestQueryFilter: