Restructure project

app/jobs/routes.py

@@ -1,17 +1,16 @@
-from app.decorators import admin_required
-from app.models import Job, JobInput, JobResult, JobStatus
 from flask import (
     abort,
-    flash,
-    redirect,
+    current_app,
     render_template,
-    send_from_directory,
-    url_for
+    send_from_directory
 )
 from flask_login import current_user, login_required
-from . import bp
-from . import tasks
+from threading import Thread
 import os
+from app import db
+from app.decorators import admin_required
+from app.models import Job, JobInput, JobResult, JobStatus
+from . import bp
 
 
 @bp.route('/<hashid:job_id>')
@@ -27,35 +26,24 @@ def job(job_id):
     )
 
 
-@bp.route('/<hashid:job_id>/delete')
+@bp.route('/<hashid:job_id>', methods=['DELETE'])
 @login_required
 def delete_job(job_id):
+    def _delete_job(app, job_id):
+        with app.app_context():
+            job = Job.query.get(job_id)
+            job.delete()
+            db.session.commit()
+
     job = Job.query.get_or_404(job_id)
     if not (job.user == current_user or current_user.is_administrator()):
         abort(403)
-    tasks.delete_job(job_id)
-    flash(f'Job "{job.title}" marked for deletion', 'job')
-    return redirect(url_for('main.dashboard'))
-
-
-@bp.route('/<hashid:job_id>/inputs/<hashid:job_input_id>/download')
-@login_required
-def download_job_input(job_id, job_input_id):
-    job_input = JobInput.query.filter(
-        JobInput.job_id == job_id,
-        JobInput.id == job_input_id
-    ).first_or_404()
-    if not (
-        job_input.job.user == current_user
-        or current_user.is_administrator()
-    ):
-        abort(403)
-    return send_from_directory(
-        as_attachment=True,
-        attachment_filename=job_input.filename,
-        directory=os.path.dirname(job_input.path),
-        filename=os.path.basename(job_input.path)
+    thread = Thread(
+        target=_delete_job,
+        args=(current_app._get_current_object(), job_id)
     )
+    thread.start()
+    return {}, 202
 
 
 @bp.route('/<hashid:job_id>/log')
@@ -64,48 +52,65 @@ def download_job_input(job_id, job_input_id):
 def job_log(job_id):
     job = Job.query.get_or_404(job_id)
     if job.status not in [JobStatus.COMPLETED, JobStatus.FAILED]:
-        flash(
-            f'Can\'t restart job "{job.title}": Status is not "Completed/Failed"',  # noqa
-            category='error'
-        )
-    return send_from_directory(
-        attachment_filename=f'job_{job.hashid}_log.txt',
-        directory=os.path.join(job.path, 'pipeline_data'),
-        filename=os.path.join('logs', 'pyflow_log.txt')
-    )
+        response = {'errors': {'message': 'Job status is not completed or failed'}}
+        return response, 409
+    with open(os.path.join(job.path, 'pipeline_data', 'logs', 'pyflow_log.txt')) as log_file:
+        log = log_file.read()
+    return log, 200, {'Content-Type': 'text/plain; charset=utf-8'}
 
 
-@bp.route('/<hashid:job_id>/restart')
+@bp.route('/<hashid:job_id>/restart', methods=['POST'])
 @login_required
-@admin_required
-def restart(job_id):
+def restart_job(job_id):
+    def _restart_job(app, job_id):
+        with app.app_context():
+            job = Job.query.get(job_id)
+            job.restart()
+            db.session.commit()
+
     job = Job.query.get_or_404(job_id)
-    if job.status not in [JobStatus.COMPLETED, JobStatus.FAILED]:
-        flash(
-            f'Can\'t restart job "{job.title}": Status is not "Completed/Failed"',  # noqa
-            category='error'
-        )
-    else:
-        tasks.restart_job(job_id)
-        flash(f'Job "{job.title}" marked to get restarted', category='job')
-    return redirect(url_for('.job', job_id=job_id))
+    if not (job.user == current_user or current_user.is_administrator()):
+        abort(403)
+    if job.status == JobStatus.FAILED:
+        response = {'errors': {'message': 'Job status is not "failed"'}}
+        return response, 409
+    thread = Thread(
+        target=_restart_job,
+        args=(current_app._get_current_object(), job_id)
+    )
+    thread.start()
+    return {}, 202
+
+
+@bp.route('/<hashid:job_id>/inputs/<hashid:job_input_id>/download')
+@login_required
+def download_job_input(job_id, job_input_id):
+    job_input = JobInput.query.get_or_404(job_input_id)
+    if job_input.job.id != job_id:
+        abort(404)
+    if not (job_input.job.user == current_user or current_user.is_administrator()):
+        abort(403)
+    return send_from_directory(
+        os.path.dirname(job_input.path),
+        os.path.basename(job_input.path),
+        as_attachment=True,
+        attachment_filename=job_input.filename,
+        mimetype=job_input.mimetype
+    )
 
 
 @bp.route('/<hashid:job_id>/results/<hashid:job_result_id>/download')
 @login_required
 def download_job_result(job_id, job_result_id):
-    job_result = JobResult.query.filter(
-        JobResult.job_id == job_id,
-        JobResult.id == job_result_id
-    ).first_or_404()
-    if not (
-        job_result.job.user == current_user
-        or current_user.is_administrator()
-    ):
+    job_result = JobResult.query.get_or_404(job_result_id)
+    if job_result.job.id != job_id:
+        abort(404)
+    if not (job_result.job.user == current_user or current_user.is_administrator()):
         abort(403)
     return send_from_directory(
+        os.path.dirname(job_result.path),
+        os.path.basename(job_result.path),
         as_attachment=True,
         attachment_filename=job_result.filename,
-        directory=os.path.dirname(job_result.path),
-        filename=os.path.basename(job_result.path)
+        mimetype=job_result.mimetype
     )

app/jobs/tasks.py

@@ -1,27 +0,0 @@
-from app import db
-from app.decorators import background
-from app.models import Job
-
-
-@background
-def delete_job(job_id, *args, **kwargs):
-    with kwargs['app'].app_context():
-        job = Job.query.get(job_id)
-        if job is None:
-            raise Exception(f'Job {job_id} not found')
-        job.delete()
-        db.session.commit()
-
-
-@background
-def restart_job(job_id, *args, **kwargs):
-    with kwargs['app'].app_context():
-        job = Job.query.get(job_id)
-        if job is None:
-            raise Exception(f'Job {job_id} not found')
-        try:
-            job.restart()
-        except Exception:
-            pass
-        else:
-            db.session.commit()