Apply prepare changes

Author: JulienChampagnol

src/opengeodeweb_back/app_config.py

@@ -5,6 +5,7 @@
 # Third party imports
 # Local application imports
 
+
 class Config(object):
     FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
     DEFAULT_PORT = "5000"

src/opengeodeweb_back/geode_functions.py

@@ -10,6 +10,7 @@
 from .geode_objects import geode_objects_dict
 from . import utils_functions
 
+
 def geode_object_value(geode_object: str):
     return geode_objects_dict()[geode_object]
 
@@ -140,7 +141,9 @@ def list_geode_objects(
     key: str = None,
 ):
     return_dict = {}
-    file_extension = utils_functions.extension_from_filename(os.path.basename(file_absolute_path))
+    file_extension = utils_functions.extension_from_filename(
+        os.path.basename(file_absolute_path)
+    )
     geode_objects_filtered_list = filter_geode_objects(key)
 
     for geode_object in geode_objects_filtered_list:

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -11,17 +11,20 @@
 
 routes = flask.Blueprint("routes", __name__)
 
+
 @routes.before_request
 def before_request():
     if "ping" not in flask.request.path:
         utils_functions.increment_request_counter(flask.current_app)
 
+
 @routes.teardown_request
 def teardown_request(exception):
     if "ping" not in flask.request.path:
         utils_functions.decrement_request_counter(flask.current_app)
         utils_functions.update_last_request_time(flask.current_app)
 
+
 schemas = os.path.join(os.path.dirname(__file__), "schemas")
 
 with open(
@@ -274,6 +277,7 @@ def save_viewable_file():
 ) as file:
     ping_json = json.load(file)
 
+
 @routes.route(
     ping_json["route"],
     methods=ping_json["methods"],

src/opengeodeweb_back/utils_functions.py

@@ -12,18 +12,21 @@
 
 # Local application imports
 
+
 def increment_request_counter(current_app):
     if "REQUEST_COUNTER" in current_app.config:
         REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
         REQUEST_COUNTER += 1
         current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
 
+
 def decrement_request_counter(current_app):
     if "REQUEST_COUNTER" in current_app.config:
         REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
         REQUEST_COUNTER -= 1
         current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
 
+
 def update_last_request_time(current_app):
     if "LAST_REQUEST_TIME" in current_app.config:
         LAST_REQUEST_TIME = time.time()
@@ -40,14 +43,17 @@ def kill_task(current_app):
     minutes_since_last_request = (current_time - LAST_REQUEST_TIME) / 60
     minutes_since_last_ping = (current_time - LAST_PING_TIME) / 60
 
-    if (((minutes_since_last_request > MINUTES_BEFORE_TIMEOUT) and (DESKTOP_APP == False)) or 
-        (minutes_since_last_ping > MINUTES_BEFORE_TIMEOUT)
-        ) and (REQUEST_COUNTER == 0):
+    if (
+        (
+            (minutes_since_last_request > MINUTES_BEFORE_TIMEOUT)
+            and (DESKTOP_APP == False)
+        )
+        or (minutes_since_last_ping > MINUTES_BEFORE_TIMEOUT)
+    ) and (REQUEST_COUNTER == 0):
         print("Server timed out due to inactivity, shutting down...", flush=True)
         os._exit(0)
 
 
-
 def versions(list_packages: list):
     list_with_versions = []
     for package in list_packages:
@@ -60,7 +66,6 @@ def versions(list_packages: list):
     return list_with_versions
 
 
-
 def validate_request(request, schema):
     json_data = request.get_json(force=True, silent=True)
 
@@ -73,7 +78,6 @@ def validate_request(request, schema):
         flask.abort(400, f"Validation error: {e.message}")
 
 
-
 def set_interval(func, sec, args=None):
     def func_wrapper():
         set_interval(func, sec, args)

tests/conftest.py

@@ -14,6 +14,7 @@ def client():
     client.headers = {"Content-type": "application/json", "Accept": "application/json"}
     yield client
 
+
 @pytest.fixture
 def app_context():
     with app.app_context():

tests/test_geode_functions.py

@@ -310,5 +310,3 @@ def test_geode_objects_output_extensions():
                         output_extension_value,
                     ) in output_geode_object_value.items():
                         assert type(output_extension_value["is_saveable"]) is bool
-
-

tests/test_utils_functions.py

@@ -7,11 +7,13 @@ def test_increment_request_counter(app_context):
     utils_functions.increment_request_counter(flask.current_app)
     assert flask.current_app.config.get("REQUEST_COUNTER") == 1
 
+
 def test_decrement_request_counter(app_context):
     assert flask.current_app.config.get("REQUEST_COUNTER") == 1
     utils_functions.decrement_request_counter(flask.current_app)
     assert flask.current_app.config.get("REQUEST_COUNTER") == 0
 
+
 def test_update_last_request_time(app_context):
     LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
     utils_functions.update_last_request_time(flask.current_app)
@@ -45,4 +47,4 @@ def test_handle_exception(client):
     assert type(data) is dict
     assert type(data["description"]) is str
     assert type(data["name"]) is str
-    assert type(data["code"]) is int
+    assert type(data["code"]) is int