Merge pull request #1 from merantix/jan-pr

improve handling of session

Author: Jan Steinke

picasso/picasso.py

@@ -29,6 +29,7 @@
 import io
 import time
 import inspect
+import shutil
 from operator import itemgetter
 from tempfile import mkdtemp
 from importlib import import_module
@@ -87,6 +88,7 @@
 ml_backend.load(app.config['DATA_DIR'])
 
 
+@app.before_request
 def initialize_new_session():
     if 'image_uid_counter' in session and 'image_list' in session:
         app.logger.debug('images are already being tracked')
@@ -101,7 +103,6 @@ def initialize_new_session():
         session['img_input_dir'] = mkdtemp()
         session['img_output_dir'] = mkdtemp()
 
-
 def get_visualizations():
     """Get visualization classes in context
 
@@ -161,7 +162,6 @@ def api_root():
     displays a hello world message.
 
     """
-    initialize_new_session()
     return jsonify(hello='world')
 
 
@@ -174,7 +174,6 @@ def api_images():
     TODO: return file URL instead of filename
 
     """
-    initialize_new_session()
     if request.method == 'POST':
         file_upload = request.files['file']
         if file_upload:
@@ -197,7 +196,6 @@ def api_images():
 
 @app.route('/api/visualize', methods=['GET'])
 def api_visualize():
-    initialize_new_session()
     session['settings'] = {}
     image_uid = request.args.get('image')
     vis_name = request.args.get('visualizer')
@@ -223,6 +221,14 @@ def api_visualize():
     return jsonify(output=output)
 
 
+@app.route('/api/reset', methods=['GET'])
+def end_session():
+    shutil.rmtree(session['img_input_dir'])
+    shutil.rmtree(session['img_output_dir'])
+    session.clear()
+    return jsonify(ok='true')
+
+
 @app.route('/', methods=['GET', 'POST'])
 def landing():
     """Landing page for the application
@@ -233,7 +239,6 @@ def landing():
     render file selection.
 
     """
-    initialize_new_session()
     if request.method == 'POST':
         session['vis_name'] = request.form.get('choice')
         vis = get_visualizations()[session['vis_name']]
@@ -262,7 +267,6 @@ def visualization_settings():
     attribute.
 
     """
-    initialize_new_session()
     if request.method == 'POST':
         vis = get_visualizations()[session['vis_name']]
         return render_template('settings.html',
@@ -283,7 +287,6 @@ def select_files():
         and `result`.
 
     """
-    initialize_new_session()
     if 'file[]' in request.files:
         vis = get_visualizations()[session['vis_name']]
         inputs = []
@@ -343,15 +346,13 @@ def select_files():
 @app.route('/inputs/<filename>')
 def download_inputs(filename):
     """For serving input images"""
-    initialize_new_session()
     return send_from_directory(session['img_input_dir'],
                                filename)
 
 
 @app.route('/outputs/<filename>')
 def download_outputs(filename):
     """For serving output images"""
-    initialize_new_session()
     return send_from_directory(session['img_output_dir'],
                                filename)
 

tests/test_picasso.py

@@ -103,6 +103,10 @@ def test_listing_images(self, client):
         response = client.get(url_for('api_images'))
         assert response.status_code == 200
 
+    def test_end_session(self, client):
+        response = client.get(url_for('end_session'))
+        assert response.status_code == 200
+
 
 class TestBaseModel: