sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix model selection

Browse Source
This commit is contained in:
Patrick Jentsch 2022-05-17 16:16:31 +02:00
parent b4a9f81dfb
commit 31f91aaecb
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/services/forms.py
View File

@ -69,16 +69,12 @@ class AddTesseractOCRPipelineJobForm(AddJobForm):
if 'binarization' in service_info['methods']: if 'binarization' in service_info['methods']:
if 'disabled' in self.binarization.render_kw: if 'disabled' in self.binarization.render_kw:
del self.binarization.render_kw['disabled'] del self.binarization.render_kw['disabled']
compatible_models = [ models = [
x for x in TesseractOCRModel.query.filter_by(shared=True).all() x for x in TesseractOCRModel.query.filter().all()
if version in x.compatible_service_versions if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
]
compatible_models += [
x for x in TesseractOCRModel.query.filter_by(shared=False, user=current_user).all()
if version in x.compatible_service_versions
] ]
self.model.choices = [('', 'Choose your option')] self.model.choices = [('', 'Choose your option')]
self.model.choices += [(x.hashid, x.title) for x in compatible_models] self.model.choices += [(x.hashid, x.title) for x in models]
self.model.default = '' self.model.default = ''
self.version.choices = [(x, x) for x in service_manifest['versions']] self.version.choices = [(x, x) for x in service_manifest['versions']]
self.version.data = version self.version.data = version
@ -115,8 +111,10 @@ class AddTranskribusHTRPipelineJobForm(AddJobForm):
if 'binarization' in service_info['methods']: if 'binarization' in service_info['methods']:
if 'disabled' in self.binarization.render_kw: if 'disabled' in self.binarization.render_kw:
del self.binarization.render_kw['disabled'] del self.binarization.render_kw['disabled']
models = TranskribusHTRModel.query.filter_by(shared=True).all() models = [
models += TranskribusHTRModel.query.filter_by(shared=False, user=current_user).all() x for x in TranskribusHTRModel.query.filter().all()
if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
]
self.model.choices = [('', 'Choose your option')] self.model.choices = [('', 'Choose your option')]
self.model.choices += [(x.hashid, x.transkribus_name) for x in models] self.model.choices += [(x.hashid, x.transkribus_name) for x in models]
self.model.default = '' self.model.default = ''

12
app/services/routes.py
View File

@ -140,7 +140,11 @@ def tesseract_ocr_pipeline():
db.session.commit() db.session.commit()
flash(f'Job "{job.title}" added', 'job') flash(f'Job "{job.title}" added', 'job')
return make_response({'redirect_url': url_for('jobs.job', job_id=job.id)}, 201) # noqa return make_response({'redirect_url': url_for('jobs.job', job_id=job.id)}, 201) # noqa
tesseract_ocr_models = TesseractOCRModel.query.all() tesseract_ocr_models = [
x for x in TesseractOCRModel.query.filter().all()
if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
]
current_app.logger.warning(tesseract_ocr_models)
return render_template( return render_template(
'services/tesseract_ocr_pipeline.html.j2', 'services/tesseract_ocr_pipeline.html.j2',
form=form, form=form,
@ -204,8 +208,10 @@ def transkribus_htr_pipeline():
db.session.commit() db.session.commit()
flash(f'Job "{job.title}" added', 'job') flash(f'Job "{job.title}" added', 'job')
return make_response({'redirect_url': url_for('jobs.job', job_id=job.id)}, 201) # noqa return make_response({'redirect_url': url_for('jobs.job', job_id=job.id)}, 201) # noqa
transkribus_htr_models = TranskribusHTRModel.query.filter_by(shared=True).all() transkribus_htr_models = [
transkribus_htr_models += TranskribusHTRModel.query.filter_by(shared=False, user=current_user).all() x for x in TranskribusHTRModel.query.filter().all()
if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
]
return render_template( return render_template(
f'services/transkribus_htr_pipeline.html.j2', f'services/transkribus_htr_pipeline.html.j2',
form=form, form=form,