sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-10-31 02:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Unify service pages.

Browse Source
This commit is contained in:
Patrick Jentsch
2019-09-24 16:55:24 +02:00
parent a267de0867
commit 787bf4c377
5 changed files with 80 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
app/services/views.py
View File

@@ -1,4 +1,4 @@
from flask import current_app, flash, redirect, render_template, url_for
from flask import abort, current_app, flash, redirect, render_template, url_for
from . import services
from flask_login import current_user, login_required
from .forms import NewOCRJobForm, NewNLPJobForm
@@ -8,93 +8,56 @@ import json
import os
@services.route('/nlp', methods=['GET', 'POST'])
SERVICE_REQUIREMENTS = {'nlp': {'mem_mb': 4096, 'n_cores': 2},
'ocr': {'mem_mb': 8192, 'n_cores': 4}}
@services.route('/<service_handle>', methods=['GET', 'POST'])
@login_required
def nlp():
new_nlp_job_form = NewNLPJobForm()
if new_nlp_job_form.validate_on_submit():
nlp_job = Job(creator=current_user,
description=new_nlp_job_form.description.data,
mem_mb=4096,
n_cores=2,
service='nlp',
service_args=json.dumps(
['-l {}'.format(new_nlp_job_form.language.data)]
),
service_version=new_nlp_job_form.version.data,
status='preparing',
title=new_nlp_job_form.title.data)
db.session.add(nlp_job)
def service(service_handle):
if service_handle not in ['nlp', 'ocr']:
abort(404)
elif service_handle == 'nlp':
page_title = 'Natural Language Processing'
new_job_form = NewNLPJobForm()
elif service_handle == 'ocr':
page_title = 'Optical Character Recognition'
new_job_form = NewOCRJobForm()
if new_job_form.validate_on_submit():
_service_args = ['-l {}'.format(new_job_form.language.data)]
if service_handle == 'ocr':
if not new_job_form.binarization.data:
_service_args.append('--skip-binarisation')
job = Job(
creator=current_user,
description=new_job_form.description.data,
mem_mb=SERVICE_REQUIREMENTS[service_handle]['mem_mb'],
n_cores=SERVICE_REQUIREMENTS[service_handle]['n_cores'],
service=service_handle,
service_args=json.dumps(_service_args),
service_version=new_job_form.version.data,
status='preparing',
title=new_job_form.title.data
)
db.session.add(job)
db.session.commit()
dir = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(nlp_job.user_id),
str(job.user_id),
'jobs',
str(nlp_job.id))
str(job.id))
try:
os.makedirs(dir)
except OSError:
flash('OSError!')
db.session.remove(nlp_job)
db.session.remove(job)
db.session.commit()
else:
for file in new_nlp_job_form.files.data:
for file in new_job_form.files.data:
file.save(os.path.join(dir, file.filename))
nlp_job.status = 'submitted'
job.status = 'submitted'
db.session.commit()
flash('Job created!')
return redirect(url_for('services.nlp'))
return render_template('services/nlp.html.j2',
title='Natrual Language Processing',
new_nlp_job_form=new_nlp_job_form)
@services.route('/ocr', methods=['GET', 'POST'])
@login_required
def ocr():
new_ocr_job_form = NewOCRJobForm()
if new_ocr_job_form.validate_on_submit():
ocr_job = Job(creator=current_user,
description=new_ocr_job_form.description.data,
mem_mb=8192,
n_cores=4,
service='ocr',
service_args=json.dumps(
[
'-l {}'.format(new_ocr_job_form.language.data),
'' if new_ocr_job_form.binarization.data
else '--skip-binarisation'
]
),
service_version=new_ocr_job_form.version.data,
status='preparing',
title=new_ocr_job_form.title.data)
db.session.add(ocr_job)
db.session.commit()
dir = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(ocr_job.user_id),
'jobs',
str(ocr_job.id))
try:
os.makedirs(dir)
except OSError:
flash('OSError!')
db.session.remove(ocr_job)
db.session.commit()
else:
for file in new_ocr_job_form.files.data:
file.save(os.path.join(dir, file.filename))
ocr_job.status = 'submitted'
db.session.commit()
flash('Job created!')
return redirect(url_for('services.ocr'))
return render_template('services/ocr.html.j2',
title='Optical Character Recognition',
new_ocr_job_form=new_ocr_job_form)
return redirect(url_for('services.{}'.format(service_handle)))
return render_template('services/{}.html.j2'.format(service_handle),
title=page_title,
new_job_form=new_job_form)