Merge branch 'master' into implement-limit-and-skip-filters

ral-facilities · Dec 6, 2021 · a01072c · a01072c
2 parents a474cfa + b3b797c
commit a01072c
Show file tree

Hide file tree

Showing 43 changed files with 397 additions and 266 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 <!--next-version-placeholder-->
 
+## v3.1.0 (2021-12-06)
+### Feature
+* Implement session/client handling for search API #258 ([`46a1539`](https://github.com/ral-facilities/datagateway-api/commit/46a1539398f63e9c8a6539d703a164dd7c8749e7))
+
 ## v3.0.1 (2021-11-24)
 ### Fix
 * Allow blank extensions and slash extension to be valid ([`70ddb7a`](https://github.com/ral-facilities/datagateway-api/commit/70ddb7a4fd89ba10b06cd71c3ab2a98648cfb773))

diff --git a/datagateway_api/config.json.example b/datagateway_api/config.json.example
@@ -12,9 +12,7 @@
     "search_api": {
         "extension": "/search-api",
         "icat_url": "https://localhost:8181",
-        "icat_check_cert": false,
-        "client_pool_init_size": 2,
-        "client_pool_max_size": 5
+        "icat_check_cert": false
     },
     "flask_reloader": false,
     "log_level": "WARN",

diff --git a/datagateway_api/src/api_start_utils.py b/datagateway_api/src/api_start_utils.py
@@ -7,12 +7,12 @@
 from flask_restful import Api
 from flask_swagger_ui import get_swaggerui_blueprint
 
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 
 # Only attempt to create a DataGateway API backend if the datagateway_api object
 # is present in the config. This ensures that the API does not error on startup
 # due to an AttributeError exception being thrown if the object is missing.
-if config.datagateway_api is not None:
+if Config.config.datagateway_api is not None:
     from datagateway_api.src.datagateway_api.backends import create_backend
 from datagateway_api.src.datagateway_api.database.helpers import db  # noqa: I202
 from datagateway_api.src.datagateway_api.icat.icat_client_pool import create_client_pool
@@ -73,15 +73,17 @@ def create_app_infrastructure(flask_app):
     flask_app.url_map.strict_slashes = False
     api = CustomErrorHandledApi(flask_app)
 
-    if config.datagateway_api is not None:
+    if Config.config.datagateway_api is not None:
         try:
             backend_type = flask_app.config["TEST_BACKEND"]
-            config.datagateway_api.set_backend_type(backend_type)
+            Config.config.datagateway_api.set_backend_type(backend_type)
         except KeyError:
-            backend_type = config.datagateway_api.backend
+            backend_type = Config.config.datagateway_api.backend
 
         if backend_type == "db":
-            flask_app.config["SQLALCHEMY_DATABASE_URI"] = config.datagateway_api.db_url
+            flask_app.config[
+                "SQLALCHEMY_DATABASE_URI"
+            ] = Config.config.datagateway_api.db_url
             flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
             db.init_app(flask_app)
 
@@ -92,12 +94,12 @@ def create_app_infrastructure(flask_app):
 
 def create_api_endpoints(flask_app, api, spec):
     # DataGateway API endpoints
-    if config.datagateway_api is not None:
+    if Config.config.datagateway_api is not None:
         try:
             backend_type = flask_app.config["TEST_BACKEND"]
-            config.datagateway_api.set_backend_type(backend_type)
+            Config.config.datagateway_api.set_backend_type(backend_type)
         except KeyError:
-            backend_type = config.datagateway_api.backend
+            backend_type = Config.config.datagateway_api.backend
 
         backend = create_backend(backend_type)
 
@@ -106,7 +108,7 @@ def create_api_endpoints(flask_app, api, spec):
             # Create client pool
             icat_client_pool = create_client_pool()
 
-        datagateway_api_extension = config.datagateway_api.extension
+        datagateway_api_extension = Config.config.datagateway_api.extension
         for entity_name in endpoints:
             get_endpoint_resource = get_endpoint(
                 entity_name,
@@ -220,8 +222,8 @@ def create_api_endpoints(flask_app, api, spec):
         spec.path(resource=ping_resource, api=api)
 
     # Search API endpoints
-    if config.search_api is not None:
-        search_api_extension = config.search_api.extension
+    if Config.config.search_api is not None:
+        search_api_extension = Config.config.search_api.extension
         search_api_entity_endpoints = ["datasets", "documents", "instruments"]
 
         for entity_name in search_api_entity_endpoints:
@@ -271,7 +273,7 @@ def create_api_endpoints(flask_app, api, spec):
 def openapi_config(spec):
     # Reorder paths (e.g. get, patch, post) so openapi.yaml only changes when there's a
     # change to the Swagger docs, rather than changing on each startup
-    if config.generate_swagger:
+    if Config.config.generate_swagger:
         log.debug("Reordering OpenAPI docs to alphabetical order")
         for entity_data in spec._paths.values():
             for endpoint_name in sorted(entity_data.keys()):

diff --git a/datagateway_api/src/common/config.py b/datagateway_api/src/common/config.py
@@ -127,8 +127,6 @@ class SearchAPI(BaseModel):
     validation of the SearchAPI config data using Python type annotations.
     """
 
-    client_pool_init_size: StrictInt
-    client_pool_max_size: StrictInt
     extension: StrictStr
     icat_check_cert: StrictBool
     icat_url: StrictStr
@@ -216,4 +214,7 @@ def validate_api_extensions(cls, value, values):  # noqa: B902, N805
         return value
 
 
-config = APIConfig.load()
+class Config:
+    """Class containing config as a class variable so it can mocked during testing"""
+
+    config = APIConfig.load()
diff --git a/datagateway_api/src/common/logger_setup.py b/datagateway_api/src/common/logger_setup.py
@@ -1,9 +1,9 @@
 import logging.config
 from pathlib import Path
 
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 
-LOG_FILE_NAME = Path(config.log_location)
+LOG_FILE_NAME = Path(Config.config.log_location)
 logger_config = {
     "version": 1,
     "formatters": {
@@ -14,15 +14,15 @@
     },
     "handlers": {
         "default": {
-            "level": config.log_level,
+            "level": Config.config.log_level,
             "formatter": "default",
             "class": "logging.handlers.RotatingFileHandler",
             "filename": LOG_FILE_NAME,
             "maxBytes": 5000000,
             "backupCount": 10,
         },
     },
-    "root": {"level": config.log_level, "handlers": ["default"]},
+    "root": {"level": Config.config.log_level, "handlers": ["default"]},
 }
 
 

diff --git a/datagateway_api/src/datagateway_api/icat/filters.py b/datagateway_api/src/datagateway_api/icat/filters.py
@@ -1,6 +1,6 @@
 import logging
 
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 from datagateway_api.src.common.exceptions import FilterError
 from datagateway_api.src.common.filters import (
     DistinctFieldFilter,
@@ -217,13 +217,14 @@ def __init__(self, skip_value, filter_use="datagateway_api"):
     def apply_filter(self, query):
         if self.filter_use == "datagateway_api":
             icat_properties = get_icat_properties(
-                config.datagateway_api.icat_url, config.datagateway_api.icat_check_cert,
+                Config.config.datagateway_api.icat_url,
+                Config.config.datagateway_api.icat_check_cert,
             )
         else:
             icat_properties = get_icat_properties(
-                config.search_api.icat_url, config.search_api.icat_check_cert,
+                Config.config.search_api.icat_url,
+                Config.config.search_api.icat_check_cert,
             )
-
         icat_set_limit(query, self.skip_value, icat_properties["maxEntities"])
 
 

diff --git a/datagateway_api/src/datagateway_api/icat/icat_client_pool.py b/datagateway_api/src/datagateway_api/icat/icat_client_pool.py
@@ -3,19 +3,24 @@
 from icat.client import Client
 from object_pool import ObjectPool
 
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 
 log = logging.getLogger()
 
 
 class ICATClient(Client):
     """Wrapper class to allow an object pool of client objects to be created"""
 
-    def __init__(self):
-        super().__init__(
-            config.datagateway_api.icat_url,
-            checkCert=config.datagateway_api.icat_check_cert,
-        )
+    def __init__(self, client_use="datagateway_api"):
+        if client_use == "datagateway_api":
+            icat_url = Config.config.datagateway_api.icat_url
+            icat_check_cert = Config.config.datagateway_api.icat_check_cert
+        else:
+            # Search API use cases
+            icat_url = Config.config.search_api.icat_url
+            icat_check_cert = Config.config.search_api.icat_check_cert
+
+        super().__init__(icat_url, checkCert=icat_check_cert)
         # When clients are cleaned up, sessions won't be logged out
         self.autoLogout = False
 
@@ -36,8 +41,8 @@ def create_client_pool():
 
     return ObjectPool(
         ICATClient,
-        min_init=config.datagateway_api.client_pool_init_size,
-        max_capacity=config.datagateway_api.client_pool_max_size,
+        min_init=Config.config.datagateway_api.client_pool_init_size,
+        max_capacity=Config.config.datagateway_api.client_pool_max_size,
         max_reusable=0,
         expires=0,
     )
diff --git 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.src.common.config import config
+from datagateway_api.src.common.config import Config
 
 log = logging.getLogger()
 
@@ -19,7 +19,7 @@ class ExtendedLRUCache(LRUCache):
     """
 
     def __init__(self):
-        super().__init__(maxsize=config.datagateway_api.client_cache_size)
+        super().__init__(maxsize=Config.config.datagateway_api.client_cache_size)
 
     def popitem(self):
         key, client = super().popitem()

diff --git a/datagateway_api/src/datagateway_api/query_filter_factory.py b/datagateway_api/src/datagateway_api/query_filter_factory.py
@@ -1,6 +1,6 @@
 import logging
 
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 from datagateway_api.src.common.exceptions import (
     ApiError,
     FilterError,
@@ -27,7 +27,7 @@ def get_query_filter(request_filter):
         :raises FilterError: If the filter name is not recognised
         """
 
-        backend_type = config.datagateway_api.backend
+        backend_type = Config.config.datagateway_api.backend
         if backend_type == "db":
             from datagateway_api.src.datagateway_api.database.filters import (
                 DatabaseDistinctFieldFilter as DistinctFieldFilter,

diff --git a/datagateway_api/src/main.py b/datagateway_api/src/main.py
@@ -8,7 +8,7 @@
     create_openapi_endpoint,
     openapi_config,
 )
-from datagateway_api.src.common.config import config
+from datagateway_api.src.common.config import Config
 from datagateway_api.src.common.logger_setup import setup_logger
 
 setup_logger()
@@ -23,8 +23,8 @@
 
 if __name__ == "__main__":
     app.run(
-        host=config.host,
-        port=config.port,
-        debug=config.debug_mode,
-        use_reloader=config.flask_reloader,
+        host=Config.config.host,
+        port=Config.config.port,
+        debug=Config.config.debug_mode,
+        use_reloader=Config.config.flask_reloader,
     )
diff --git a/datagateway_api/src/resources/search_api_endpoints.py b/datagateway_api/src/resources/search_api_endpoints.py
@@ -1,29 +1,22 @@
 from flask_restful import Resource
 
+from datagateway_api.src.search_api.helpers import (
+    get_count,
+    get_files,
+    get_files_count,
+    get_search,
+    get_with_id,
+)
+
 
-# TODO - Might need kwargs on get_search_endpoint(), get_single_endpoint(),
-# get_number_count_endpoint(), get_files_endpoint(), get_number_count_files_endpoint()
-# for client handling?
 def get_search_endpoint(name):
     """
     TODO - Add docstring
     """
 
     class Endpoint(Resource):
         def get(self):
-            """
-            TODO - Need to return similar to
-            return (
-                backend.get_with_filters(
-                    get_session_id_from_auth_header(),
-                    entity_type,
-                    get_filters_from_query_string(),
-                    **kwargs,
-                ),
-                200,
-            )
-            """
-            pass
+            return get_search(name), 200
 
         # TODO - Add `get.__doc__`
 
@@ -38,8 +31,7 @@ def get_single_endpoint(name):
 
     class EndpointWithID(Resource):
         def get(self, pid):
-            # TODO - Add return
-            pass
+            return get_with_id(name, pid), 200
 
         # TODO - Add `get.__doc__`
 
@@ -54,8 +46,7 @@ def get_number_count_endpoint(name):
 
     class CountEndpoint(Resource):
         def get(self):
-            # TODO - Add return
-            pass
+            return get_count(name), 200
 
         # TODO - Add `get.__doc__`
 
@@ -70,8 +61,7 @@ def get_files_endpoint(name):
 
     class FilesEndpoint(Resource):
         def get(self, pid):
-            # TODO - Add return
-            pass
+            return get_files(name), 200
 
         # TODO - Add `get.__doc__`
 
@@ -86,8 +76,7 @@ def get_number_count_files_endpoint(name):
 
     class CountFilesEndpoint(Resource):
         def get(self, pid):
-            # TODO - Add return
-            pass
+            return get_files_count(name, pid)
 
         # TODO - Add `get.__doc__`
 

diff --git a/datagateway_api/src/search_api/helpers.py b/datagateway_api/src/search_api/helpers.py
@@ -1,3 +1,38 @@
-"""
-Code to store helper functions to deal with the endpoints, like for DataGateway API
-"""
+import logging
+
+from datagateway_api.src.search_api.session_handler import (
+    client_manager,
+    SessionHandler,
+)
+
+
+log = logging.getLogger()
+
+
+# TODO - Make filters mandatory, if no filters are in a request an empty list will be
+# given to these functions
+@client_manager
+def get_search(entity_name, filters=None):
+    # TODO - `getApiVersion()` used as a placeholder for testing client handling
+    # Replace with endpoint functionality when implementing the endpoints
+    return SessionHandler.client.getApiVersion()
+
+
+@client_manager
+def get_with_id(entity_name, id_, filters=None):
+    pass
+
+
+@client_manager
+def get_count(entity_name, filters=None):
+    pass
+
+
+@client_manager
+def get_files(entity_name, filters=None):
+    pass
+
+
+@client_manager
+def get_files_count(entity_name, id_, filters=None):
+    pass