diff --git a/app/contributions/routes.py b/app/contributions/routes.py index b63a43ec9c88b38977205bffc0ce637ff0cb6ae1..c20774d707cea6e45cbe5bf8a055aa1565d27107 100644 --- a/app/contributions/routes.py +++ b/app/contributions/routes.py @@ -25,8 +25,6 @@ def contributions(): spacy_nlp_user_models = [ x for x in current_user.spacy_nlp_pipeline_models ] - spacy_models = SpaCyNLPPipelineModel.query.all() - print(spacy_models) return render_template( 'contributions/contribution_overview.html.j2', tesseract_ocr_user_models=tesseract_ocr_user_models, diff --git a/app/daemon/job_utils.py b/app/daemon/job_utils.py index 32def73df20b0f555b7c65d105077a574a7fd202..518100f7c8ab65117ff4813e552cca16b42d1b20 100644 --- a/app/daemon/job_utils.py +++ b/app/daemon/job_utils.py @@ -3,7 +3,8 @@ from app.models import ( Job, JobResult, JobStatus, - TesseractOCRPipelineModel + TesseractOCRPipelineModel, + SpaCyNLPPipelineModel ) from datetime import datetime from flask import current_app @@ -103,6 +104,16 @@ def _create_job_service(job): models_mount_target = f'/usr/local/share/tessdata/{model.filename}' models_mount = f'{models_mount_source}:{models_mount_target}:ro' mounts.append(models_mount) + elif job.service == 'spacy-nlp-pipeline': + model_id = hashids.decode(job.service_args['model']) + model = SpaCyNLPPipelineModel.query.get(model_id) + if model is None: + job.status = JobStatus.FAILED + return + models_mount_source = model.path + models_mount_target = f'/usr/local/share/spacy/models/{model.filename}' + models_mount = f'{models_mount_source}:{models_mount_target}:ro' + mounts.append(models_mount) ''' ### Output mount ### ''' output_mount_source = os.path.join(job.path, 'results') output_mount_target = '/output'