Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances

app/jobs/routes.py

@@ -1,10 +1,16 @@
-from flask import (abort, flash, redirect, render_template,
-                   send_from_directory, url_for)
+from app.decorators import admin_required
+from app.models import Job, JobInput, JobResult, JobStatus
+from flask import (
+    abort,
+    flash,
+    redirect,
+    render_template,
+    send_from_directory,
+    url_for
+)
 from flask_login import current_user, login_required
 from . import bp
 from . import tasks
-from ..decorators import admin_required
-from ..models import Job, JobInput, JobResult
 import os
 
 
@@ -14,9 +20,11 @@ def job(job_id):
     job = Job.query.get_or_404(job_id)
     if not (job.user == current_user or current_user.is_administrator()):
         abort(403)
-    job_inputs = [job_input.to_dict() for job_input in job.inputs]
-    return render_template('jobs/job.html.j2', job=job, job_inputs=job_inputs,
-                           title='Job')
+    return render_template(
+        'jobs/job.html.j2',
+        job=job,
+        title='Job'
+    )
 
 
 @bp.route('/<hashid:job_id>/delete')
@@ -26,15 +34,21 @@ def delete_job(job_id):
     if not (job.user == current_user or current_user.is_administrator()):
         abort(403)
     tasks.delete_job(job_id)
-    flash('Job has been marked for deletion!', 'job')
+    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()  # noqa
-    if not (job_input.job.user == current_user or current_user.is_administrator()):  # noqa
+    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,
@@ -49,19 +63,28 @@ def download_job_input(job_id, job_input_id):
 @admin_required
 def restart(job_id):
     job = Job.query.get_or_404(job_id)
-    if job.status not in ['complete', 'failed']:
-        flash(f'Can not restart job "{job.title}": Status is not "complete/failed"', 'error')  # noqa
+    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!', 'job')
+        flash(f'Job "{job.title}" marked to get restarted', category='job')
     return redirect(url_for('.job', job_id=job_id))
 
 
 @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()  # noqa
-    if not (job_result.job.user == current_user or current_user.is_administrator()):  # noqa
+    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()
+    ):
         abort(403)
     return send_from_directory(
         as_attachment=True,

app/jobs/tasks.py

@@ -1,6 +1,6 @@
-from .. import db
-from ..decorators import background
-from ..models import Job
+from app import db
+from app.decorators import background
+from app.models import Job
 
 
 @background