mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2024-12-25 10:54:18 +00:00
small fixes
This commit is contained in:
parent
9502891536
commit
176a67757a
@ -65,6 +65,7 @@ def _create_job_service(job):
|
|||||||
command += f' -m {job.service_args["model"]}'
|
command += f' -m {job.service_args["model"]}'
|
||||||
if 'binarization' in job.service_args and job.service_args['binarization']:
|
if 'binarization' in job.service_args and job.service_args['binarization']:
|
||||||
command += ' --binarize'
|
command += ' --binarize'
|
||||||
|
if 'ocropus_nlbin_threshold' in job.service_args and job.service_args['ocropus_nlbin_threshold']:
|
||||||
value = job.service_args['ocropus_nlbin_threshold']
|
value = job.service_args['ocropus_nlbin_threshold']
|
||||||
command += f' --ocropus-nlbin-threshold {value}'
|
command += f' --ocropus-nlbin-threshold {value}'
|
||||||
elif job.service == 'transkribus-htr-pipeline':
|
elif job.service == 'transkribus-htr-pipeline':
|
||||||
@ -146,8 +147,6 @@ def _create_job_service(job):
|
|||||||
)
|
)
|
||||||
''' ## Restart policy ## '''
|
''' ## Restart policy ## '''
|
||||||
restart_policy = docker.types.RestartPolicy()
|
restart_policy = docker.types.RestartPolicy()
|
||||||
print(command)
|
|
||||||
print(mounts)
|
|
||||||
try:
|
try:
|
||||||
docker_client.services.create(
|
docker_client.services.create(
|
||||||
image,
|
image,
|
||||||
|
@ -1,17 +1,12 @@
|
|||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
from flask_wtf import FlaskForm
|
from flask_wtf import FlaskForm
|
||||||
from flask_wtf.file import FileField, FileRequired
|
from flask_wtf.file import FileField, FileRequired
|
||||||
from wtforms import (
|
from wtforms import (BooleanField, DecimalRangeField, MultipleFileField,
|
||||||
BooleanField,
|
SelectField, StringField, SubmitField, ValidationError)
|
||||||
DecimalRangeField,
|
|
||||||
MultipleFileField,
|
|
||||||
SelectField,
|
|
||||||
StringField,
|
|
||||||
SubmitField,
|
|
||||||
ValidationError
|
|
||||||
)
|
|
||||||
from wtforms.validators import InputRequired, Length
|
from wtforms.validators import InputRequired, Length
|
||||||
from app.models import TesseractOCRPipelineModel, SpaCyNLPPipelineModel
|
|
||||||
|
from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel
|
||||||
|
|
||||||
from . import SERVICES
|
from . import SERVICES
|
||||||
|
|
||||||
|
|
||||||
@ -51,7 +46,7 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm):
|
|||||||
pdf = FileField('File', validators=[FileRequired()])
|
pdf = FileField('File', validators=[FileRequired()])
|
||||||
model = SelectField('Model', validators=[InputRequired()])
|
model = SelectField('Model', validators=[InputRequired()])
|
||||||
ocropus_nlbin_threshold = DecimalRangeField(
|
ocropus_nlbin_threshold = DecimalRangeField(
|
||||||
render_kw={'min': 0, 'max': 1, 'step': 0.1, 'start': [0.5]}
|
render_kw={'min': 0, 'max': 1, 'step': 0.1, 'start': [0.5], 'disabled': True}
|
||||||
)
|
)
|
||||||
|
|
||||||
def validate_binarization(self, field):
|
def validate_binarization(self, field):
|
||||||
@ -72,10 +67,16 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm):
|
|||||||
if self.binarization.render_kw is None:
|
if self.binarization.render_kw is None:
|
||||||
self.binarization.render_kw = {}
|
self.binarization.render_kw = {}
|
||||||
self.binarization.render_kw['disabled'] = True
|
self.binarization.render_kw['disabled'] = True
|
||||||
|
if self.ocropus_nlbin_threshold.render_kw is None:
|
||||||
|
self.ocropus_nlbin_threshold.render_kw = {}
|
||||||
|
self.ocropus_nlbin_threshold.render_kw['disabled'] = True
|
||||||
if 'methods' in service_info:
|
if 'methods' in service_info:
|
||||||
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']
|
||||||
|
if 'ocropus_nlbin_threshold' in service_info['methods']:
|
||||||
|
if 'disabled' in self.ocropus_nlbin_threshold.render_kw:
|
||||||
|
del self.ocropus_nlbin_threshold.render_kw['disabled']
|
||||||
models = [
|
models = [
|
||||||
x for x in TesseractOCRPipelineModel.query.order_by(TesseractOCRPipelineModel.title).all()
|
x for x in TesseractOCRPipelineModel.query.order_by(TesseractOCRPipelineModel.title).all()
|
||||||
if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
|
if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
|
||||||
|
@ -20,6 +20,7 @@ tesseract-ocr-pipeline:
|
|||||||
0.1.1:
|
0.1.1:
|
||||||
methods:
|
methods:
|
||||||
- 'binarization'
|
- 'binarization'
|
||||||
|
- 'ocropus_nlbin_threshold'
|
||||||
publishing_year: 2022
|
publishing_year: 2022
|
||||||
url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.1'
|
url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.1'
|
||||||
transkribus-htr-pipeline:
|
transkribus-htr-pipeline:
|
||||||
|
Loading…
Reference in New Issue
Block a user