sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-12 09:00:40 +00:00
Code Issues Projects Releases Wiki Activity

Handle job creation with the new Job class.

Browse Source
This commit is contained in:
Stephan Porada
2019-08-06 14:27:41 +02:00
parent 175dbceac6
commit 6f5bf674c6
2 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/services/views.py
View File

@ -3,10 +3,13 @@ from flask import current_app, flash, redirect, render_template, url_for
from . import services
from flask_login import current_user, login_required
from .forms import NewOCRJobForm, NewNLPJobForm
from ..models import Job
from ..import swarm
from .. import db
from threading import Thread
import hashlib
import os
import json
@services.route('/ocr', methods=['GET', 'POST'])
@ -15,24 +18,23 @@ def ocr():
new_ocr_job_form = NewOCRJobForm()
if new_ocr_job_form.validate_on_submit():
app = current_app._get_current_object()
id = hashlib.md5(
(current_user.username + '_' + datetime.now().isoformat()).encode()
).hexdigest()
'''
' TODO: Implement a Job class. For now a dictionary representation
' is enough.
'''
job = {'creator': current_user.id,
'id': id,
'requested_cpus': 2,
'requested_memory': 2048,
'service': 'ocr',
'service_args': {'lang': new_ocr_job_form.language.data,
'version': new_ocr_job_form.version.data
},
'status': 'queued'
}
dir = os.path.join(app.config['OPAQUE_STORAGE'], 'jobs', id)
ocr_job = Job()
ocr_job.title = new_ocr_job_form.title.data
ocr_job.description = new_ocr_job_form.description.data
ocr_job.user_id = current_user.id
ocr_job.creation_date = datetime.utcnow()
ocr_job.service = "ocr"
ocr_job.ressources = json.dumps({"n_cores": 2,
"mem_mb": 4096})
ocr_job.service_args = json.dumps({"args": ["--keep-intermediates",
"--skip-binarisation"],
"lang": new_ocr_job_form.language.data,
"version": new_ocr_job_form.version.data})
ocr_job.status = "queued"
db.session.add(ocr_job)
db.session.commit()
dir = os.path.join(app.config['OPAQUE_STORAGE'], 'jobs', str(ocr_job.id))
try:
os.makedirs(dir)
@ -47,7 +49,7 @@ def ocr():
' NOTE: Using self created threads is just for testing purpose as
' there is no scheduler available.
'''
thread = Thread(target=swarm.run, args=(job,))
thread = Thread(target=swarm.run, args=(ocr_job,))
thread.start()
flash('Job created!')
return redirect(url_for('services.ocr'))
@ -68,21 +70,21 @@ def nlp():
id = hashlib.md5(
(current_user.username + '_' + datetime.now().isoformat()).encode()
).hexdigest()
'''
' TODO: Implement a Job class. For now a dictionary representation
' is enough.
'''
job = {'creator': current_user.id,
'id': id,
'requested_cpus': 2,
'requested_memory': 2048,
'service': 'nlp',
'service_args': {'lang': new_nlp_job_form.language.data,
'version': new_nlp_job_form.version.data
},
'status': 'queued'
}
dir = os.path.join(app.config['OPAQUE_STORAGE'], 'jobs', id)
nlp_job = Job()
nlp_job.title = new_nlp_job_form.title.data
nlp_job.description = new_nlp_job_form.description.data
nlp_job.user_id = current_user.id
nlp_job.creation_date = datetime.utcnow()
nlp_job.service = "nlp"
nlp_job.ressources = json.dumps({"n_cores": 2,
"mem_mb": 4096})
nlp_job.service_args = json.dumps({"args": [],
"lang": new_nlp_job_form.language.data,
"version": new_nlp_job_form.version.data})
nlp_job.status = "queued"
db.session.add(nlp_job)
db.session.commit()
dir = os.path.join(app.config['OPAQUE_STORAGE'], 'jobs', str(nlp_job.id))
try:
os.makedirs(dir)
@ -97,7 +99,7 @@ def nlp():
' NOTE: Using self created threads is just for testing purpose as
' there is no scheduler available.
'''
thread = Thread(target=swarm.run, args=(job,))
thread = Thread(target=swarm.run, args=(nlp_job,))
thread.start()
flash('Job created!')
return redirect(url_for('services.nlp'))