diff --git a/app/services/routes.py b/app/services/routes.py index 9f4cfdc0..8b4ac063 100644 --- a/app/services/routes.py +++ b/app/services/routes.py @@ -61,7 +61,7 @@ def file_setup_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/file_setup_pipeline.html.j2', - title=service_manifest['name'], + service_manifest=service_manifest, form=form ) @@ -110,7 +110,7 @@ def tesseract_ocr_pipeline(): user_tesseract_ocr_pipeline_models_count = len(current_user.tesseract_ocr_pipeline_models.all()) return render_template( 'services/tesseract_ocr_pipeline.html.j2', - title=service_manifest['name'], + service_manifest=service_manifest, form=form, tesseract_ocr_pipeline_models=tesseract_ocr_pipeline_models, user_tesseract_ocr_pipeline_models_count=user_tesseract_ocr_pipeline_models_count @@ -169,7 +169,7 @@ def transkribus_htr_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/transkribus_htr_pipeline.html.j2', - title=service_manifest['name'], + service_manifest=service_manifest, form=form, transkribus_htr_pipeline_models=transkribus_htr_pipeline_models ) @@ -215,7 +215,7 @@ def spacy_nlp_pipeline(): return {}, 201, {'Location': job.url} return render_template( 'services/spacy_nlp_pipeline.html.j2', - title=service_manifest['name'], + service_manifest=service_manifest, form=form, spacy_nlp_pipeline_models=spacy_nlp_pipeline_models, user_spacy_nlp_pipeline_models_count=user_spacy_nlp_pipeline_models_count diff --git a/app/services/services.yml b/app/services/services.yml index a686f683..1d50fd1c 100644 --- a/app/services/services.yml +++ b/app/services/services.yml @@ -7,22 +7,39 @@ file-setup-pipeline: 0.1.0: publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/file-setup-pipeline/-/releases/v0.1.0' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/file-setup-pipeline/-/tree/v0.1.0' tesseract-ocr-pipeline: name: 'Tesseract OCR Pipeline' publisher: 'Bielefeld University - CRC 1288 - INF' - latest_version: '0.1.1' + latest_version: '0.1.3' versions: 0.1.0: methods: - 'binarization' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.0' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/tree/v0.1.0' 0.1.1: methods: - 'binarization' - 'ocropus_nlbin_threshold' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.1' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/tree/v0.1.1' + 0.1.2: + methods: + - 'binarization' + - 'ocropus_nlbin_threshold' + publishing_year: 2023 + url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.2' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/tree/v0.1.2' + 0.1.3: + methods: + - 'binarization' + - 'ocropus_nlbin_threshold' + publishing_year: 2023 + url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/releases/v0.1.3' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/tesseract-ocr-pipeline/-/tree/v0.1.3' transkribus-htr-pipeline: name: 'Transkribus HTR Pipeline' publisher: 'Bielefeld University - CRC 1288 - INF' @@ -33,28 +50,51 @@ transkribus-htr-pipeline: - 'binarization' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/transkribus-htr-pipeline/-/releases/v0.1.0' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/transkribus-htr-pipeline/-/tree/v0.1.0' 0.1.1: methods: - 'binarization' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/transkribus-htr-pipeline/-/releases/v0.1.1' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/transkribus-htr-pipeline/-/tree/v0.1.1' spacy-nlp-pipeline: name: 'SpaCy NLP Pipeline' publisher: 'Bielefeld University - CRC 1288 - INF' - latest_version: '0.1.2' + latest_version: '0.1.5' versions: 0.1.0: methods: - 'encoding_detection' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.0' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.0' 0.1.1: methods: - 'encoding_detection' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.1' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.1' 0.1.2: methods: - 'encoding_detection' publishing_year: 2022 url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.2' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.2' + 0.1.3: + methods: + - 'encoding_detection' + publishing_year: 2023 + url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.3' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.3' + 0.1.4: + methods: + - 'encoding_detection' + publishing_year: 2023 + url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.4' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.4' + 0.1.5: + methods: + - 'encoding_detection' + publishing_year: 2023 + url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/releases/v0.1.5' + code_url: 'https://gitlab.ub.uni-bielefeld.de/sfb1288inf/spacy-nlp-pipeline/-/tree/v0.1.5' diff --git a/app/templates/services/file_setup_pipeline.html.j2 b/app/templates/services/file_setup_pipeline.html.j2 index 0f046e98..64f40c87 100644 --- a/app/templates/services/file_setup_pipeline.html.j2 +++ b/app/templates/services/file_setup_pipeline.html.j2 @@ -7,7 +7,7 @@
-

{{ title }}

+

{{ service_manifest.name }}

@@ -52,7 +52,14 @@ {{ wtf.render_field(form.images, accept='image/jpeg, image/png, image/tiff', placeholder='Choose JPEG, PNG or TIFF files') }}
- {{ wtf.render_field(form.version, material_icon='apps') }} +
+ apps + {{ form.version() }} + {{ form.version.label }} + + help_outline + +
@@ -65,3 +72,26 @@ {% endblock page_content %} + +{% block modals %} +{{ super() }} + +{% endblock modals %} diff --git a/app/templates/services/spacy_nlp_pipeline.html.j2 b/app/templates/services/spacy_nlp_pipeline.html.j2 index a7bf214c..d281a0ed 100644 --- a/app/templates/services/spacy_nlp_pipeline.html.j2 +++ b/app/templates/services/spacy_nlp_pipeline.html.j2 @@ -7,7 +7,7 @@
-

{{ title }}

+

{{ service_manifest.name }}

@@ -81,7 +81,14 @@
- {{ wtf.render_field(form.version, material_icon='apps') }} +
+ apps + {{ form.version() }} + {{ form.version.label }} + + help_outline + +
Preprocessing @@ -120,18 +127,6 @@ {% block modals %} {{ super() }} - - + + {% endblock modals %} {% block scripts %} diff --git a/app/templates/services/tesseract_ocr_pipeline.html.j2 b/app/templates/services/tesseract_ocr_pipeline.html.j2 index 69be6889..fdba533e 100644 --- a/app/templates/services/tesseract_ocr_pipeline.html.j2 +++ b/app/templates/services/tesseract_ocr_pipeline.html.j2 @@ -7,7 +7,7 @@
-

{{ title }}

+

{{ service_manifest.name }}

@@ -66,7 +66,14 @@
- {{ wtf.render_field(form.version, material_icon='apps') }} +
+ apps + {{ form.version() }} + {{ form.version.label }} + + help_outline + +
Preprocessing @@ -142,6 +149,26 @@ Close
+ + {% endblock modals %} {% block scripts %} diff --git a/app/templates/services/transkribus_htr_pipeline.html.j2 b/app/templates/services/transkribus_htr_pipeline.html.j2 index 50eb3b6e..3aa58cec 100644 --- a/app/templates/services/transkribus_htr_pipeline.html.j2 +++ b/app/templates/services/transkribus_htr_pipeline.html.j2 @@ -7,7 +7,7 @@
-

{{ title }}

+

{{ service_manifest.name }}

@@ -62,7 +62,7 @@ {{ form.model() }} {{ form.model.label }} - More details about models + help_outline {% for error in form.model.errors %} {{ error }} @@ -70,7 +70,14 @@
- {{ wtf.render_field(form.version, material_icon='apps') }} +
+ apps + {{ form.version() }} + {{ form.version.label }} + + help_outline + +
Preprocessing @@ -128,15 +135,23 @@
-