Add create corpus form to dashboard.

This commit is contained in:
Patrick Jentsch 2019-08-01 11:47:14 +02:00
parent a5b7ccaeb7
commit 716ebdfa7c
3 changed files with 71 additions and 53 deletions

View File

@ -1,10 +1,12 @@
from flask import current_app, flash, redirect, render_template, request, url_for from datetime import datetime
from flask import current_app, flash, redirect, render_template, url_for
from flask_login import current_user, login_required from flask_login import current_user, login_required
from ..models import User from ..models import User
from ..tables import AdminUserTable, AdminUserItem from ..tables import AdminUserTable, AdminUserItem
from . import main from . import main
from .forms import CreateCorpusForm from .forms import CreateCorpusForm
from ..decorators import admin_required from ..decorators import admin_required
import hashlib
import os import os
@ -15,25 +17,23 @@ def dashboard():
if create_corpus_form.validate_on_submit(): if create_corpus_form.validate_on_submit():
app = current_app._get_current_object() app = current_app._get_current_object()
files = request.FILES id = hashlib.md5(
print(files) (current_user.username + '_' + datetime.now().isoformat()).encode()
corpus = { ).hexdigest()
'description': create_corpus_form.description.data, corpus = {'description': create_corpus_form.description.data,
'files': [], 'id': id,
'owner': current_user.id, 'creator': current_user.id,
'title': create_corpus_form.title.data 'title': create_corpus_form.title.data
} }
corpus_dir = os.path.join( dir = os.path.join(app.config['OPAQUE_FILES'], 'corpora', id)
app.config['OPAQUE_FILES'],
'corpora',
corpus['title']
)
try: try:
os.mkdir(corpus_dir) os.makedirs(dir)
except FileExistsError: except OSError:
flash('FileExistsError') flash('OSError!')
else: else:
for file in create_corpus_form.files.data:
file.save(os.path.join(dir, file.filename))
flash('Corpus created!') flash('Corpus created!')
return redirect(url_for('main.dashboard')) return redirect(url_for('main.dashboard'))

View File

@ -18,32 +18,29 @@ def ocr():
id = hashlib.md5( id = hashlib.md5(
(current_user.username + '_' + datetime.now().isoformat()).encode() (current_user.username + '_' + datetime.now().isoformat()).encode()
).hexdigest() ).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': ocr_job_form.language.data,
'version': 'latest'
},
'status': 'queued'
}
dir = os.path.join(app.config['OPAQUE_FILES'], 'jobs', id) dir = os.path.join(app.config['OPAQUE_FILES'], 'jobs', id)
try: try:
os.mkdir(dir) os.makedirs(dir)
except FileExistsError: except OSError:
# Possible MD5 hash collision occurred. flash('OSError!')
flash('Internal error occurred, please try again!')
else: else:
file = ocr_job_form.file.data file = ocr_job_form.file.data
file.save(os.path.join(dir, file.filename)) file.save(os.path.join(dir, file.filename))
'''
' TODO: Implement a Job class. For now a dictionary representation
' is enough.
'''
job = {'worker': None,
'creator': current_user.id,
'id': id,
'requested_cpus': 2,
'requested_memory': 2048,
'service': 'ocr',
'service_args': {'lang': ocr_job_form.language.data,
'version': 'latest'
},
'status': 'queued'
}
''' '''
' TODO: Let the scheduler run this job in the background. ' TODO: Let the scheduler run this job in the background.
' '
@ -52,6 +49,7 @@ def ocr():
''' '''
thread = Thread(target=swarm.run, args=(job,)) thread = Thread(target=swarm.run, args=(job,))
thread.start() thread.start()
flash('Job created!')
return redirect(url_for('services.ocr')) return redirect(url_for('services.ocr'))
return render_template( return render_template(

View File

@ -37,23 +37,43 @@
<div class="col s12"> <div class="col s12">
<div class="card small"> <div class="card small">
<div class="card-content"> <div class="card-content">
<form method="POST"> <form method="POST" enctype="multipart/form-data">
{{ create_corpus_form.hidden_tag() }} {{ create_corpus_form.hidden_tag() }}
<div class="input-field"> <div class="row">
<i class="material-icons prefix">title</i> <div class="col s12 m4">
{{ create_corpus_form.title() }} <div class="input-field">
{{ create_corpus_form.title.label }} <i class="material-icons prefix">title</i>
{% for error in create_corpus_form.title.errors %} {{ create_corpus_form.title() }}
<span class="helper-text red-text">{{ error }}</span> {{ create_corpus_form.title.label }}
{% endfor %} {% for error in create_corpus_form.title.errors %}
</div> <span class="helper-text red-text">{{ error }}</span>
<div class="input-field"> {% endfor %}
<i class="material-icons prefix">description</i> </div>
{{ create_corpus_form.description() }} </div>
{{ create_corpus_form.description.label }} <div class="col s12 m8">
{% for error in create_corpus_form.description.errors %} <div class="input-field">
<span class="helper-text red-text">{{ error }}</span> <i class="material-icons prefix">description</i>
{% endfor %} {{ create_corpus_form.description() }}
{{ create_corpus_form.description.label }}
{% for error in create_corpus_form.description.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
</div>
<div class="col s12">
<div class="file-field input-field">
<div class="btn">
<span>{{ create_corpus_form.files.label.text }}</span>
{{ create_corpus_form.files(accept='.vrt') }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
{% for error in create_corpus_form.files.errors %}
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
</div>
</div>
</div> </div>
<div class="card-action right-align"> <div class="card-action right-align">
{{ create_corpus_form.submit(class='btn') }} {{ create_corpus_form.submit(class='btn') }}