#184: Reorder import statements

datagateway_api/common/backends.py

@@ -1,8 +1,10 @@
-from datagateway_api.common.database.backend import DatabaseBackend
-from datagateway_api.common.icat.backend import PythonICATBackend
+import sys
+
 from datagateway_api.common.backend import Backend
 from datagateway_api.common.config import config
-import sys
+from datagateway_api.common.database.backend import DatabaseBackend
+from datagateway_api.common.icat.backend import PythonICATBackend
+
 
 backend_type = config.get_backend_type()
 

datagateway_api/common/config.py

@@ -1,8 +1,10 @@
 import json
-import sys
+import logging
 from pathlib import Path
+import sys
+
 import requests
-import logging
+
 
 log = logging.getLogger()
 

datagateway_api/common/database/backend.py

@@ -1,27 +1,28 @@
+import datetime
+import logging
+import uuid
+
 from datagateway_api.common.backend import Backend
 from datagateway_api.common.database.helpers import (
+    create_rows_from_json,
+    delete_row_by_id,
     get_facility_cycles_for_instrument,
     get_facility_cycles_for_instrument_count,
+    get_filtered_row_count,
+    get_first_filtered_row,
     get_investigations_for_instrument_in_facility_cycle,
     get_investigations_for_instrument_in_facility_cycle_count,
-    get_rows_by_filter,
-    create_rows_from_json,
-    patch_entities,
     get_row_by_id,
+    get_rows_by_filter,
     insert_row_into_table,
-    delete_row_by_id,
-    update_row_from_id,
-    get_filtered_row_count,
-    get_first_filtered_row,
+    patch_entities,
     requires_session_id,
+    update_row_from_id,
 )
-from datagateway_api.common.helpers import queries_records
 from datagateway_api.common.database.models import EntityHelper, SESSION
-import uuid
 from datagateway_api.common.exceptions import AuthenticationError
-import datetime
+from datagateway_api.common.helpers import queries_records
 
-import logging
 
 log = logging.getLogger()
 

datagateway_api/common/database/filters.py

@@ -1,16 +1,18 @@
+import logging
+
+from sqlalchemy import asc, desc
+
+from datagateway_api.common.database import models
+from datagateway_api.common.exceptions import FilterError, MultipleIncludeError
 from datagateway_api.common.filters import (
-    WhereFilter,
     DistinctFieldFilter,
+    IncludeFilter,
+    LimitFilter,
     OrderFilter,
     SkipFilter,
-    LimitFilter,
-    IncludeFilter,
+    WhereFilter,
 )
-from datagateway_api.common.exceptions import FilterError, MultipleIncludeError
-from datagateway_api.common.database import models
 
-from sqlalchemy import asc, desc
-import logging
 
 log = logging.getLogger()
 

datagateway_api/common/database/helpers.py

@@ -1,48 +1,48 @@
-import datetime
-import logging
 from abc import ABC, abstractmethod
+import datetime
 from functools import wraps
+import logging
 
 from sqlalchemy.orm import aliased
 
-from datagateway_api.common.exceptions import (
-    ApiError,
-    AuthenticationError,
-    MissingRecordError,
-    FilterError,
-    BadRequestError,
-    MultipleIncludeError,
-)
+from datagateway_api.common.config import config
 from datagateway_api.common.database.models import (
-    INVESTIGATION,
-    INSTRUMENT,
+    FACILITY,
     FACILITYCYCLE,
+    INSTRUMENT,
+    INVESTIGATION,
     INVESTIGATIONINSTRUMENT,
-    FACILITY,
     SESSION,
 )
 from datagateway_api.common.database.session_manager import session_manager
+from datagateway_api.common.exceptions import (
+    ApiError,
+    AuthenticationError,
+    BadRequestError,
+    FilterError,
+    MissingRecordError,
+)
 from datagateway_api.common.filter_order_handler import FilterOrderHandler
-from datagateway_api.common.config import config
+
 
 backend_type = config.get_backend_type()
 if backend_type == "db":
     from datagateway_api.common.database.filters import (
-        DatabaseWhereFilter as WhereFilter,
         DatabaseDistinctFieldFilter as DistinctFieldFilter,
+        DatabaseIncludeFilter as IncludeFilter,
+        DatabaseLimitFilter as LimitFilter,
         DatabaseOrderFilter as OrderFilter,
         DatabaseSkipFilter as SkipFilter,
-        DatabaseLimitFilter as LimitFilter,
-        DatabaseIncludeFilter as IncludeFilter,
+        DatabaseWhereFilter as WhereFilter,
     )
 elif backend_type == "python_icat":
     from datagateway_api.common.icat.filters import (
-        PythonICATWhereFilter as WhereFilter,
         PythonICATDistinctFieldFilter as DistinctFieldFilter,
+        PythonICATIncludeFilter as IncludeFilter,
+        PythonICATLimitFilter as LimitFilter,
         PythonICATOrderFilter as OrderFilter,
         PythonICATSkipFilter as SkipFilter,
-        PythonICATLimitFilter as LimitFilter,
-        PythonICATIncludeFilter as IncludeFilter,
+        PythonICATWhereFilter as WhereFilter,
     )
 else:
     raise ApiError(

datagateway_api/common/database/models.py

@@ -1,26 +1,25 @@
-import enum
-
 from datetime import datetime
 from decimal import Decimal
+import enum
 
 from sqlalchemy import (
-    Index,
-    Column,
     BigInteger,
-    String,
+    Boolean,
+    Column,
     DateTime,
+    FetchedValue,
+    Float,
     ForeignKey,
+    Index,
     Integer,
-    Float,
-    FetchedValue,
+    String,
     TypeDecorator,
-    Boolean,
 )
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm.collections import InstrumentedList
 
-from datagateway_api.common.exceptions import FilterError, DatabaseError, ApiError
+from datagateway_api.common.exceptions import ApiError, DatabaseError, FilterError
 
 Base = declarative_base()
 

datagateway_api/common/database/session_manager.py

@@ -1,5 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
+from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.pool import QueuePool
 
 from datagateway_api.common.constants import Constants

datagateway_api/common/date_handler.py

@@ -1,8 +1,9 @@
 from datetime import datetime
+
 from dateutil.parser import parse
 
-from datagateway_api.common.exceptions import BadRequestError
 from datagateway_api.common.constants import Constants
+from datagateway_api.common.exceptions import BadRequestError
 
 
 class DateHandler:

datagateway_api/common/exceptions.py

@@ -1,6 +1,3 @@
-import werkzeug
-
-
 class ApiError(Exception):
     status_code = 500
 

datagateway_api/common/filter_order_handler.py

@@ -2,8 +2,8 @@
 
 from datagateway_api.common.icat.filters import (
     PythonICATLimitFilter,
-    PythonICATSkipFilter,
     PythonICATOrderFilter,
+    PythonICATSkipFilter,
 )
 
 log = logging.getLogger()

datagateway_api/common/helpers.py

@@ -1,6 +1,6 @@
+from functools import wraps
 import json
 import logging
-from functools import wraps
 
 from flask import request
 from flask_restful import reqparse
@@ -10,11 +10,9 @@
 from datagateway_api.common.exceptions import (
     ApiError,
     AuthenticationError,
-    FilterError,
     BadRequestError,
+    FilterError,
     MissingCredentialsError,
-    MissingRecordError,
-    MultipleIncludeError,
 )
 
 log = logging.getLogger()

datagateway_api/common/icat/backend.py

@@ -4,28 +4,28 @@
 from icat.exception import ICATSessionError
 
 from datagateway_api.common.backend import Backend
+from datagateway_api.common.config import config
+from datagateway_api.common.exceptions import AuthenticationError
 from datagateway_api.common.helpers import queries_records
 from datagateway_api.common.icat.helpers import (
-    requires_session_id,
-    get_session_details_helper,
-    logout_icat_client,
-    refresh_client_session,
-    get_entity_by_id,
-    update_entity_by_id,
+    create_entities,
     delete_entity_by_id,
-    get_entity_with_filters,
     get_count_with_filters,
-    get_first_result_with_filters,
-    update_entities,
-    create_entities,
+    get_entity_by_id,
+    get_entity_with_filters,
     get_facility_cycles_for_instrument,
     get_facility_cycles_for_instrument_count,
+    get_first_result_with_filters,
     get_investigations_for_instrument_in_facility_cycle,
     get_investigations_for_instrument_in_facility_cycle_count,
+    get_session_details_helper,
+    logout_icat_client,
+    refresh_client_session,
+    requires_session_id,
+    update_entities,
+    update_entity_by_id,
 )
 
-from datagateway_api.common.config import config
-from datagateway_api.common.exceptions import AuthenticationError
 
 log = logging.getLogger()
 

datagateway_api/common/icat/filters.py

@@ -1,16 +1,16 @@
 import logging
 
+from datagateway_api.common.constants import Constants
+from datagateway_api.common.exceptions import FilterError
 from datagateway_api.common.filters import (
-    WhereFilter,
     DistinctFieldFilter,
+    IncludeFilter,
+    LimitFilter,
     OrderFilter,
     SkipFilter,
-    LimitFilter,
-    IncludeFilter,
+    WhereFilter,
 )
-from datagateway_api.common.exceptions import FilterError
-from datagateway_api.common.config import config
-from datagateway_api.common.constants import Constants
+
 
 log = logging.getLogger()
 

datagateway_api/common/icat/helpers.py

@@ -1,25 +1,26 @@
+from datetime import datetime, timedelta
 from functools import wraps
 import logging
-from datetime import datetime, timedelta
+
 
 from icat.entities import getTypeMap
 from icat.exception import (
-    ICATSessionError,
-    ICATValidationError,
     ICATInternalError,
-    ICATObjectExistsError,
     ICATNoObjectError,
+    ICATObjectExistsError,
     ICATParameterError,
+    ICATSessionError,
+    ICATValidationError,
 )
+
+from datagateway_api.common.date_handler import DateHandler
 from datagateway_api.common.exceptions import (
     AuthenticationError,
     BadRequestError,
     MissingRecordError,
     PythonICATError,
 )
 from datagateway_api.common.filter_order_handler import FilterOrderHandler
-from datagateway_api.common.date_handler import DateHandler
-from datagateway_api.common.constants import Constants
 from datagateway_api.common.icat.filters import (
     PythonICATLimitFilter,
     PythonICATWhereFilter,

datagateway_api/common/icat/query.py

@@ -1,14 +1,14 @@
-import logging
 from datetime import datetime
+import logging
 
 from icat.entity import Entity, EntityList
-from icat.entities import getTypeMap
+from icat.exception import ICATInternalError, ICATValidationError
 from icat.query import Query
-from icat.exception import ICATValidationError, ICATInternalError
 
-from datagateway_api.common.exceptions import PythonICATError, FilterError
-from datagateway_api.common.date_handler import DateHandler
 from datagateway_api.common.constants import Constants
+from datagateway_api.common.date_handler import DateHandler
+from datagateway_api.common.exceptions import FilterError, PythonICATError
+
 
 log = logging.getLogger()