Implement Flask-Breadcrumbs

app/__init__.py

@@ -4,6 +4,7 @@ from docker import DockerClient
 from flask import Flask
 from flask_apscheduler import APScheduler
 from flask_assets import Environment
+from flask_breadcrumbs import Breadcrumbs, default_breadcrumb_root
 from flask_login import LoginManager
 from flask_mail import Mail
 from flask_marshmallow import Marshmallow
@@ -16,6 +17,7 @@ from flask_hashids import Hashids
 
 apifairy = APIFairy()
 assets = Environment()
+breadcrumbs = Breadcrumbs()
 db = SQLAlchemy()
 docker_client = DockerClient()
 hashids = Hashids()
@@ -44,6 +46,7 @@ def create_app(config: Config = Config) -> Flask:
 
     apifairy.init_app(app)
     assets.init_app(app)
+    breadcrumbs.init_app(app)
     db.init_app(app)
     hashids.init_app(app)
     login.init_app(app)
@@ -64,9 +67,11 @@ def create_app(config: Config = Config) -> Flask:
     app.register_blueprint(api_blueprint, url_prefix='/api')
 
     from .auth import bp as auth_blueprint
+    default_breadcrumb_root(auth_blueprint, '.')
     app.register_blueprint(auth_blueprint, url_prefix='/auth')
 
     from .contributions import bp as contributions_blueprint
+    default_breadcrumb_root(contributions_blueprint, '.contributions')
     app.register_blueprint(contributions_blueprint, url_prefix='/contributions')
 
     from .corpora import bp as corpora_blueprint
@@ -76,9 +81,11 @@ def create_app(config: Config = Config) -> Flask:
     app.register_blueprint(jobs_blueprint, url_prefix='/jobs')
 
     from .main import bp as main_blueprint
+    default_breadcrumb_root(main_blueprint, '.')
     app.register_blueprint(main_blueprint, url_prefix='/')
 
     from .services import bp as services_blueprint
+    default_breadcrumb_root(services_blueprint, '.services')
     app.register_blueprint(services_blueprint, url_prefix='/services')
 
     from .settings import bp as settings_blueprint

app/auth/routes.py

@@ -1,11 +1,5 @@
-from flask import (
-    abort,
-    flash,
-    redirect,
-    render_template,
-    request,
-    url_for
-)
+from flask import abort, flash, redirect, render_template, request, url_for
+from flask_breadcrumbs import register_breadcrumb
 from flask_login import current_user, login_user, login_required, logout_user
 from app import db
 from app.email import create_message, send
@@ -36,6 +30,7 @@ def before_request():
 
 
 @bp.route('/register', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.register', 'Register')
 def register():
     if current_user.is_authenticated:
         return redirect(url_for('main.dashboard'))
@@ -71,6 +66,7 @@ def register():
 
 
 @bp.route('/login', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.login', 'Login')
 def login():
     if current_user.is_authenticated:
         return redirect(url_for('main.dashboard'))
@@ -97,6 +93,7 @@ def logout():
 
 
 @bp.route('/unconfirmed')
+@register_breadcrumb(bp, '.unconfirmed', 'Unconfirmed')
 @login_required
 def unconfirmed():
     if current_user.confirmed:
@@ -136,6 +133,7 @@ def confirm(token):
 
 
 @bp.route('/reset_password', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.reset_password_request', 'Password Reset')
 def reset_password_request():
     if current_user.is_authenticated:
         return redirect(url_for('main.dashboard'))
@@ -165,6 +163,7 @@ def reset_password_request():
 
 
 @bp.route('/reset_password/<token>', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.reset_password', 'Password Reset')
 def reset_password(token):
     if current_user.is_authenticated:
         return redirect(url_for('main.dashboard'))

app/contributions/__init__.py

@@ -2,16 +2,4 @@ from flask import Blueprint
 
 
 bp = Blueprint('contributions', __name__)
-from . import routes
-
-from .spacy_nlp_pipeline_models import bp as spacy_nlp_pipeline_models_bp
-bp.register_blueprint(
-    spacy_nlp_pipeline_models_bp,
-    url_prefix='/spacy-nlp-pipeline-models'
-)
-
-from .tesseract_ocr_pipeline_models import bp as tesseract_ocr_pipeline_models_bp
-bp.register_blueprint(
-    tesseract_ocr_pipeline_models_bp,
-    url_prefix='/tesseract-ocr-pipeline-models'
-)
+from . import json_routes, routes

app/contributions/forms.py

@@ -1,11 +1,14 @@
 from flask_wtf import FlaskForm
+from flask_wtf.file import FileField, FileRequired
 from wtforms import (
     StringField,
     SubmitField,
     SelectMultipleField,
-    IntegerField
+    IntegerField,
+    ValidationError
 )
 from wtforms.validators import InputRequired, Length
+from app.services import SERVICES
 
 
 class ContributionBaseForm(FlaskForm):
@@ -45,3 +48,79 @@ class ContributionBaseForm(FlaskForm):
 
 class EditContributionBaseForm(ContributionBaseForm):
     pass
+
+
+##############################################################################
+# /spacy-nlp-pipeline-models                                                 #
+##############################################################################
+class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm):
+    spacy_model_file = FileField(
+        'File',
+        validators=[FileRequired()]
+    )
+    pipeline_name = StringField(
+        'Pipeline name',
+        validators=[InputRequired(), Length(max=64)]
+    )
+
+    def validate_spacy_model_file(self, field):
+        if not field.data.filename.lower().endswith('.tar.gz'):
+            raise ValidationError('.tar.gz files only!')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        service_manifest = SERVICES['spacy-nlp-pipeline']
+        self.compatible_service_versions.choices = [('', 'Choose your option')]
+        self.compatible_service_versions.choices += [
+            (x, x) for x in service_manifest['versions'].keys()
+        ]
+        self.compatible_service_versions.default = ''
+
+
+class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm):
+    pipeline_name = StringField(
+        'Pipeline name',
+        validators=[InputRequired(), Length(max=64)]
+    )
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        service_manifest = SERVICES['spacy-nlp-pipeline']
+        self.compatible_service_versions.choices = [('', 'Choose your option')]
+        self.compatible_service_versions.choices += [
+            (x, x) for x in service_manifest['versions'].keys()
+        ]
+        self.compatible_service_versions.default = ''
+
+
+##############################################################################
+# /tesseract-ocr-pipeline-models                                             #
+##############################################################################
+class CreateTesseractOCRPipelineModelForm(ContributionBaseForm):
+    tesseract_model_file = FileField(
+        'File',
+        validators=[FileRequired()]
+    )
+    
+    def validate_tesseract_model_file(self, field):
+        if not field.data.filename.lower().endswith('.traineddata'):
+            raise ValidationError('traineddata files only!')
+
+    def __init__(self, *args, **kwargs):
+        service_manifest = SERVICES['tesseract-ocr-pipeline']
+        super().__init__(*args, **kwargs)
+        self.compatible_service_versions.choices = [('', 'Choose your option')]
+        self.compatible_service_versions.choices += [
+            (x, x) for x in service_manifest['versions'].keys()
+        ]
+        self.compatible_service_versions.default = ''
+
+
+class EditTesseractOCRPipelineModelForm(EditContributionBaseForm):
+    def __init__(self, *args, **kwargs):
+        service_manifest = SERVICES['tesseract-ocr-pipeline']
+        super().__init__(*args, **kwargs)
+        self.compatible_service_versions.choices = [('', 'Choose your option')]
+        self.compatible_service_versions.choices += [
+            (x, x) for x in service_manifest['versions'].keys()
+        ]
+        self.compatible_service_versions.default = ''

app/contributions/json_routes.py

@@ -0,0 +1,107 @@
+from flask import abort, current_app, request
+from flask_login import login_required, current_user
+from threading import Thread
+from app import db
+from app.decorators import content_negotiation, permission_required
+from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel
+from . import bp
+
+
+##############################################################################
+# /spacy-nlp-pipeline-models                                                 #
+##############################################################################
+@bp.route('/spacy-nlp-pipeline-models<hashid:spacy_nlp_pipeline_model_id>', methods=['DELETE'])
+@login_required
+@content_negotiation(produces='application/json')
+def delete_spacy_model(spacy_nlp_pipeline_model_id):
+    def _delete_spacy_model(app, spacy_nlp_pipeline_model_id):
+        with app.app_context():
+            snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id)
+            snpm.delete()
+            db.session.commit()
+    
+    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
+    if not (snpm.user == current_user or current_user.is_administrator()):
+        abort(403)
+    thread = Thread(
+        target=_delete_spacy_model,
+        args=(current_app._get_current_object(), snpm.id)
+    )
+    thread.start()
+    resonse_data = {
+        'message': \
+            f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion'
+    }
+    return resonse_data, 202
+
+
+@bp.route('/spacy-nlp-pipeline-models<hashid:spacy_nlp_pipeline_model_id>/is_public', methods=['PUT'])
+@login_required
+@permission_required('CONTRIBUTE')
+@content_negotiation(consumes='application/json', produces='application/json')
+def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id):
+    is_public = request.json
+    if not isinstance(is_public, bool):
+        abort(400)
+    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
+    if not (snpm.user == current_user or current_user.is_administrator()):
+        abort(403)
+    snpm.is_public = is_public
+    db.session.commit()
+    response_data = {
+        'message': (
+            f'SpaCy NLP Pipeline Model "{snpm.title}"'
+            f' is now {"public" if is_public else "private"}'
+        )
+    }
+    return response_data, 200
+
+
+##############################################################################
+# /tesseract-ocr-pipeline-models                                             #
+##############################################################################
+@bp.route('/tesseract-ocr-pipeline-models/<hashid:tesseract_ocr_pipeline_model_id>', methods=['DELETE'])
+@login_required
+@content_negotiation(produces='application/json')
+def delete_tesseract_model(tesseract_ocr_pipeline_model_id):
+    def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id):
+        with app.app_context():
+            topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id)
+            topm.delete()
+            db.session.commit()
+
+    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
+    if not (topm.user == current_user or current_user.is_administrator()):
+        abort(403)
+    thread = Thread(
+        target=_delete_tesseract_ocr_pipeline_model,
+        args=(current_app._get_current_object(), topm.id)
+    )
+    thread.start()
+    response_data = {
+        'message': \
+            f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion'
+    }
+    return response_data, 202
+
+
+@bp.route('/tesseract-ocr-pipeline-models/<hashid:tesseract_ocr_pipeline_model_id>/is_public', methods=['PUT'])
+@login_required
+@permission_required('CONTRIBUTE')
+@content_negotiation(consumes='application/json', produces='application/json')
+def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id):
+    is_public = request.json
+    if not isinstance(is_public, bool):
+        abort(400)
+    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
+    if not (topm.user == current_user or current_user.is_administrator()):
+        abort(403)
+    topm.is_public = is_public
+    db.session.commit()
+    response_data = {
+        'message': (
+            f'Tesseract OCR Pipeline Model "{topm.title}"'
+            f' is now {"public" if is_public else "private"}'
+        )
+    }
+    return response_data, 200

app/contributions/routes.py

@@ -1,12 +1,189 @@
-from flask import render_template
-from flask_login import login_required
+from flask import abort, flash, redirect, render_template, request, url_for
+from flask_breadcrumbs import register_breadcrumb
+from flask_login import current_user, login_required
+from app import db
+from app.models import SpaCyNLPPipelineModel, TesseractOCRPipelineModel
 from . import bp
+from .forms import (
+    CreateSpaCyNLPPipelineModelForm,
+    EditSpaCyNLPPipelineModelForm,
+    CreateTesseractOCRPipelineModelForm,
+    EditTesseractOCRPipelineModelForm
+)
 
 
-@bp.route('/')
+@bp.route('')
+@register_breadcrumb(bp, '.', 'Contributions')
 @login_required
 def contributions():
     return render_template(
         'contributions/contributions.html.j2',
         title='Contributions'
     )
+
+
+##############################################################################
+# /spacy-nlp-pipeline-models                                                 #
+##############################################################################
+@bp.route('/spacy-nlp-pipeline-models')
+@register_breadcrumb(bp, '.spacy_nlp_pipeline_models', 'SpaCy NLP Pipeline Models')
+@login_required
+def spacy_nlp_pipeline_models():
+    return render_template(
+        'contributions/spacy_nlp_pipeline_models.html.j2',
+        title='SpaCy NLP Pipeline Models'
+    )
+
+
+@bp.route('/spacy-nlp-pipeline-models/create', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.create', 'Create')
+@login_required
+def create_spacy_nlp_pipeline_model():
+    form_prefix = 'create-spacy-nlp-pipeline-model-form'
+    form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix)
+    if form.is_submitted():
+        if not form.validate():
+            return {'errors': form.errors}, 400
+        try:
+            snpm = SpaCyNLPPipelineModel.create(
+                form.spacy_model_file.data,
+                compatible_service_versions=form.compatible_service_versions.data,
+                description=form.description.data,
+                pipeline_name=form.pipeline_name.data,
+                publisher=form.publisher.data,
+                publisher_url=form.publisher_url.data,
+                publishing_url=form.publishing_url.data,
+                publishing_year=form.publishing_year.data,
+                is_public=False,
+                title=form.title.data,
+                version=form.version.data,
+                user=current_user
+            )
+        except OSError:
+            abort(500)
+        db.session.commit()
+        flash(f'SpaCy NLP Pipeline model "{snpm.title}" created')
+        return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')}
+    return render_template(
+        'contributions/create_spacy_nlp_pipeline_model.html.j2',
+        form=form,
+        title='Create SpaCy NLP Pipeline Model'
+    )
+
+
+def spacy_nlp_pipeline_model_dlc(*args, **kwargs):
+    snpm_id = request.view_args['spacy_nlp_pipeline_model_id']
+    snpm = SpaCyNLPPipelineModel.query.get(snpm_id)
+    return [
+        {
+            'text': f'{snpm.title} {snpm.version}',
+            'url': url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=snpm_id)
+        }
+    ]
+
+
+@bp.route('/spacy-nlp-pipeline-models/<hashid:spacy_nlp_pipeline_model_id>', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.spacy_nlp_pipeline_models.entity', '', dynamic_list_constructor=spacy_nlp_pipeline_model_dlc)
+@login_required
+def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id):
+    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
+    form_prefix = 'edit-spacy-nlp-pipeline-model-form'
+    form = EditSpaCyNLPPipelineModelForm(
+        data=snpm.to_json_serializeable(),
+        prefix=form_prefix
+    )
+    if form.validate_on_submit():
+        form.populate_obj(snpm)
+        if db.session.is_modified(snpm):
+            flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated')
+            db.session.commit()
+        return redirect(url_for('.spacy_nlp_pipeline_models'))
+    return render_template(
+        'contributions/spacy_nlp_pipeline_model.html.j2',
+        form=form,
+        spacy_nlp_pipeline_model=snpm,
+        title=f'{snpm.title} {snpm.version}'
+    )
+
+
+##############################################################################
+# /tesseract-ocr-pipeline-models                                             #
+##############################################################################
+@bp.route('/tesseract-ocr-pipeline-models')
+@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models', 'Tesseract OCR Pipeline Models')
+@login_required
+def tesseract_ocr_pipeline_models():
+    return render_template(
+        'contributions/tesseract_ocr_pipeline_models.html.j2',
+        title='Tesseract OCR Pipeline Models'
+    )
+
+
+@bp.route('/tesseract-ocr-pipeline-models/create', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.create', 'Create')
+@login_required
+def create_tesseract_ocr_pipeline_model():
+    form_prefix = 'create-tesseract-ocr-pipeline-model-form'
+    form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix)
+    if form.is_submitted():
+        if not form.validate():
+            return {'errors': form.errors}, 400
+        try:
+            topm = TesseractOCRPipelineModel.create(
+                form.tesseract_model_file.data,
+                compatible_service_versions=form.compatible_service_versions.data,
+                description=form.description.data,
+                publisher=form.publisher.data,
+                publisher_url=form.publisher_url.data,
+                publishing_url=form.publishing_url.data,
+                publishing_year=form.publishing_year.data,
+                is_public=False,
+                title=form.title.data,
+                version=form.version.data,
+                user=current_user
+            )
+        except OSError:
+            abort(500)
+        db.session.commit()
+        flash(f'Tesseract OCR Pipeline model "{topm.title}" created')
+        return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')}
+    return render_template(
+        'contributions/create_tesseract_ocr_pipeline_model.html.j2',
+        form=form,
+        title='Create Tesseract OCR Pipeline Model'
+    )
+
+
+def tesseract_ocr_pipeline_model_dlc(*args, **kwargs):
+    topm_id = request.view_args['tesseract_ocr_pipeline_model_id']
+    topm = TesseractOCRPipelineModel.query.get(topm_id)
+    return [
+        {
+            'text': f'{topm.title} {topm.version}',
+            'url': url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=topm_id)
+        }
+    ]
+
+
+@bp.route('/tesseract-ocr-pipeline-models/<hashid:tesseract_ocr_pipeline_model_id>', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.tesseract_ocr_pipeline_models.entity', '', dynamic_list_constructor=tesseract_ocr_pipeline_model_dlc)
+@login_required
+def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id):
+    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
+    form_prefix = 'edit-tesseract-ocr-pipeline-model-form'
+    form = EditTesseractOCRPipelineModelForm(
+        data=topm.to_json_serializeable(),
+        prefix=form_prefix
+    )
+    if form.validate_on_submit():
+        form.populate_obj(topm)
+        if db.session.is_modified(topm):
+            flash(f'Tesseract OCR Pipeline model "{topm.title}" updated')
+            db.session.commit()
+        return redirect(url_for('.tesseract_ocr_pipeline_models'))
+    return render_template(
+        'contributions/tesseract_ocr_pipeline_model.html.j2',
+        form=form,
+        tesseract_ocr_pipeline_model=topm,
+        title=f'{topm.title} {topm.version}'
+    )

app/contributions/spacy_nlp_pipeline_models/__init__.py

@@ -1,8 +0,0 @@
-from flask import Blueprint
-
-
-template_base_dir = 'contributions/spacy_nlp_pipeline_models'
-
-
-bp = Blueprint('spacy_nlp_pipeline_models', __name__)
-from . import routes, json_routes

app/contributions/spacy_nlp_pipeline_models/forms.py

@@ -1,44 +0,0 @@
-from flask_wtf.file import FileField, FileRequired
-from wtforms import StringField, ValidationError
-from wtforms.validators import InputRequired, Length
-from app.services import SERVICES
-from ..forms import ContributionBaseForm, EditContributionBaseForm
-
-
-class CreateSpaCyNLPPipelineModelForm(ContributionBaseForm):
-    spacy_model_file = FileField(
-        'File',
-        validators=[FileRequired()]
-    )
-    pipeline_name = StringField(
-        'Pipeline name',
-        validators=[InputRequired(), Length(max=64)]
-    )
-
-    def validate_spacy_model_file(self, field):
-        if not field.data.filename.lower().endswith('.tar.gz'):
-            raise ValidationError('.tar.gz files only!')
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        service_manifest = SERVICES['spacy-nlp-pipeline']
-        self.compatible_service_versions.choices = [('', 'Choose your option')]
-        self.compatible_service_versions.choices += [
-            (x, x) for x in service_manifest['versions'].keys()
-        ]
-        self.compatible_service_versions.default = ''
-
-
-class EditSpaCyNLPPipelineModelForm(EditContributionBaseForm):
-    pipeline_name = StringField(
-        'Pipeline name',
-        validators=[InputRequired(), Length(max=64)]
-    )
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        service_manifest = SERVICES['spacy-nlp-pipeline']
-        self.compatible_service_versions.choices = [('', 'Choose your option')]
-        self.compatible_service_versions.choices += [
-            (x, x) for x in service_manifest['versions'].keys()
-        ]
-        self.compatible_service_versions.default = ''

app/contributions/spacy_nlp_pipeline_models/json_routes.py

@@ -1,54 +0,0 @@
-from flask import abort, current_app, request
-from flask_login import login_required, current_user
-from threading import Thread
-from app import db
-from app.decorators import content_negotiation, permission_required
-from app.models import SpaCyNLPPipelineModel
-from . import bp
-
-
-@bp.route('/<hashid:spacy_nlp_pipeline_model_id>', methods=['DELETE'])
-@login_required
-@content_negotiation(produces='application/json')
-def delete_spacy_model(spacy_nlp_pipeline_model_id):
-    def _delete_spacy_model(app, spacy_nlp_pipeline_model_id):
-        with app.app_context():
-            snpm = SpaCyNLPPipelineModel.query.get(spacy_nlp_pipeline_model_id)
-            snpm.delete()
-            db.session.commit()
-    
-    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
-    if not (snpm.user == current_user or current_user.is_administrator()):
-        abort(403)
-    thread = Thread(
-        target=_delete_spacy_model,
-        args=(current_app._get_current_object(), snpm.id)
-    )
-    thread.start()
-    resonse_data = {
-        'message': \
-            f'SpaCy NLP Pipeline Model "{snpm.title}" marked for deletion'
-    }
-    return resonse_data, 202
-
-
-@bp.route('/<hashid:spacy_nlp_pipeline_model_id>/is_public', methods=['PUT'])
-@login_required
-@permission_required('CONTRIBUTE')
-@content_negotiation(consumes='application/json', produces='application/json')
-def update_spacy_nlp_pipeline_model_is_public(spacy_nlp_pipeline_model_id):
-    is_public = request.json
-    if not isinstance(is_public, bool):
-        abort(400)
-    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
-    if not (snpm.user == current_user or current_user.is_administrator()):
-        abort(403)
-    snpm.is_public = is_public
-    db.session.commit()
-    response_data = {
-        'message': (
-            f'SpaCy NLP Pipeline Model "{snpm.title}"'
-            f' is now {"public" if is_public else "private"}'
-        )
-    }
-    return response_data, 200

app/contributions/spacy_nlp_pipeline_models/routes.py

@@ -1,76 +0,0 @@
-from flask import abort, flash, redirect, render_template, url_for
-from flask_login import current_user, login_required
-from app import db
-from app.models import SpaCyNLPPipelineModel
-from . import bp, template_base_dir
-from .forms import (
-    CreateSpaCyNLPPipelineModelForm,
-    EditSpaCyNLPPipelineModelForm
-)
-
-
-@bp.route('')
-@login_required
-def spacy_nlp_pipeline_models():
-    return render_template(
-        f'{template_base_dir}/spacy_nlp_pipeline_models.html.j2',
-        title='SpaCy NLP Pipeline Models'
-    )
-
-
-@bp.route('/create', methods=['GET', 'POST'])
-@login_required
-def create_spacy_nlp_pipeline_model():
-    form_prefix = 'create-spacy-nlp-pipeline-model-form'
-    form = CreateSpaCyNLPPipelineModelForm(prefix=form_prefix)
-    if form.is_submitted():
-        if not form.validate():
-            return {'errors': form.errors}, 400
-        try:
-            snpm = SpaCyNLPPipelineModel.create(
-                form.spacy_model_file.data,
-                compatible_service_versions=form.compatible_service_versions.data,
-                description=form.description.data,
-                pipeline_name=form.pipeline_name.data,
-                publisher=form.publisher.data,
-                publisher_url=form.publisher_url.data,
-                publishing_url=form.publishing_url.data,
-                publishing_year=form.publishing_year.data,
-                is_public=False,
-                title=form.title.data,
-                version=form.version.data,
-                user=current_user
-            )
-        except OSError:
-            abort(500)
-        db.session.commit()
-        flash(f'SpaCy NLP Pipeline model "{snpm.title}" created')
-        return {}, 201, {'Location': url_for('.spacy_nlp_pipeline_models')}
-    return render_template(
-        f'{template_base_dir}/create_spacy_nlp_pipeline_model.html.j2',
-        form=form,
-        title='Create SpaCy NLP Pipeline Model'
-    )
-
-
-@bp.route('/<hashid:spacy_nlp_pipeline_model_id>', methods=['GET', 'POST'])
-@login_required
-def spacy_nlp_pipeline_model(spacy_nlp_pipeline_model_id):
-    snpm = SpaCyNLPPipelineModel.query.get_or_404(spacy_nlp_pipeline_model_id)
-    form_prefix = 'edit-spacy-nlp-pipeline-model-form'
-    form = EditSpaCyNLPPipelineModelForm(
-        data=snpm.to_json_serializeable(),
-        prefix=form_prefix
-    )
-    if form.validate_on_submit():
-        form.populate_obj(snpm)
-        if db.session.is_modified(snpm):
-            flash(f'SpaCy NLP Pipeline model "{snpm.title}" updated')
-            db.session.commit()
-        return redirect(url_for('.spacy_nlp_pipeline_models'))
-    return render_template(
-        f'{template_base_dir}/spacy_nlp_pipeline_model.html.j2',
-        form=form,
-        spacy_nlp_pipeline_model=snpm,
-        title=f'{snpm.title} {snpm.version}'
-    )

app/contributions/tesseract_ocr_pipeline_models/__init__.py

@@ -1,8 +0,0 @@
-from flask import Blueprint
-
-
-template_base_dir = 'contributions/tesseract_ocr_pipeline_models'
-
-
-bp = Blueprint('tesseract_ocr_pipeline_models', __name__)
-from . import routes, json_routes

app/contributions/tesseract_ocr_pipeline_models/forms.py

@@ -1,35 +0,0 @@
-from flask_wtf.file import FileField, FileRequired
-from wtforms import ValidationError
-from app.services import SERVICES
-from ..forms import ContributionBaseForm, EditContributionBaseForm
-
-
-class CreateTesseractOCRPipelineModelForm(ContributionBaseForm):
-    tesseract_model_file = FileField(
-        'File',
-        validators=[FileRequired()]
-    )
-    
-    def validate_tesseract_model_file(self, field):
-        if not field.data.filename.lower().endswith('.traineddata'):
-            raise ValidationError('traineddata files only!')
-
-    def __init__(self, *args, **kwargs):
-        service_manifest = SERVICES['tesseract-ocr-pipeline']
-        super().__init__(*args, **kwargs)
-        self.compatible_service_versions.choices = [('', 'Choose your option')]
-        self.compatible_service_versions.choices += [
-            (x, x) for x in service_manifest['versions'].keys()
-        ]
-        self.compatible_service_versions.default = ''
-
-
-class EditTesseractOCRPipelineModelForm(EditContributionBaseForm):
-    def __init__(self, *args, **kwargs):
-        service_manifest = SERVICES['tesseract-ocr-pipeline']
-        super().__init__(*args, **kwargs)
-        self.compatible_service_versions.choices = [('', 'Choose your option')]
-        self.compatible_service_versions.choices += [
-            (x, x) for x in service_manifest['versions'].keys()
-        ]
-        self.compatible_service_versions.default = ''

app/contributions/tesseract_ocr_pipeline_models/json_routes.py

@@ -1,54 +0,0 @@
-from flask import abort, current_app, request
-from flask_login import login_required, current_user
-from threading import Thread
-from app import db
-from app.decorators import content_negotiation, permission_required
-from app.models import TesseractOCRPipelineModel
-from . import bp
-
-
-@bp.route('/<hashid:tesseract_ocr_pipeline_model_id>', methods=['DELETE'])
-@login_required
-@content_negotiation(produces='application/json')
-def delete_tesseract_model(tesseract_ocr_pipeline_model_id):
-    def _delete_tesseract_ocr_pipeline_model(app, tesseract_ocr_pipeline_model_id):
-        with app.app_context():
-            topm = TesseractOCRPipelineModel.query.get(tesseract_ocr_pipeline_model_id)
-            topm.delete()
-            db.session.commit()
-
-    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
-    if not (topm.user == current_user or current_user.is_administrator()):
-        abort(403)
-    thread = Thread(
-        target=_delete_tesseract_ocr_pipeline_model,
-        args=(current_app._get_current_object(), topm.id)
-    )
-    thread.start()
-    response_data = {
-        'message': \
-            f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion'
-    }
-    return response_data, 202
-
-
-@bp.route('/<hashid:tesseract_ocr_pipeline_model_id>/is_public', methods=['PUT'])
-@login_required
-@permission_required('CONTRIBUTE')
-@content_negotiation(consumes='application/json', produces='application/json')
-def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_id):
-    is_public = request.json
-    if not isinstance(is_public, bool):
-        abort(400)
-    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
-    if not (topm.user == current_user or current_user.is_administrator()):
-        abort(403)
-    topm.is_public = is_public
-    db.session.commit()
-    response_data = {
-        'message': (
-            f'Tesseract OCR Pipeline Model "{topm.title}"'
-            f' is now {"public" if is_public else "private"}'
-        )
-    }
-    return response_data, 200

app/contributions/tesseract_ocr_pipeline_models/routes.py

@@ -1,75 +0,0 @@
-from flask import abort, flash, redirect, render_template, url_for
-from flask_login import login_required, current_user
-from app import db
-from app.models import TesseractOCRPipelineModel
-from . import bp, template_base_dir
-from .forms import (
-    CreateTesseractOCRPipelineModelForm,
-    EditTesseractOCRPipelineModelForm
-)
-
-
-@bp.route('')
-@login_required
-def tesseract_ocr_pipeline_models():
-    return render_template(
-        f'{template_base_dir}/tesseract_ocr_pipeline_models.html.j2',
-        title='Tesseract OCR Pipeline Models'
-    )
-
-
-@bp.route('/create', methods=['GET', 'POST'])
-@login_required
-def create_tesseract_ocr_pipeline_model():
-    form_prefix = 'create-tesseract-ocr-pipeline-model-form'
-    form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix)
-    if form.is_submitted():
-        if not form.validate():
-            return {'errors': form.errors}, 400
-        try:
-            topm = TesseractOCRPipelineModel.create(
-                form.tesseract_model_file.data,
-                compatible_service_versions=form.compatible_service_versions.data,
-                description=form.description.data,
-                publisher=form.publisher.data,
-                publisher_url=form.publisher_url.data,
-                publishing_url=form.publishing_url.data,
-                publishing_year=form.publishing_year.data,
-                is_public=False,
-                title=form.title.data,
-                version=form.version.data,
-                user=current_user
-            )
-        except OSError:
-            abort(500)
-        db.session.commit()
-        flash(f'Tesseract OCR Pipeline model "{topm.title}" created')
-        return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')}
-    return render_template(
-        f'{template_base_dir}/create_tesseract_ocr_pipeline_model.html.j2',
-        form=form,
-        title='Create Tesseract OCR Pipeline Model'
-    )
-
-
-@bp.route('/<hashid:tesseract_ocr_pipeline_model_id>', methods=['GET', 'POST'])
-@login_required
-def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id):
-    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
-    form_prefix = 'edit-tesseract-ocr-pipeline-model-form'
-    form = EditTesseractOCRPipelineModelForm(
-        data=topm.to_json_serializeable(),
-        prefix=form_prefix
-    )
-    if form.validate_on_submit():
-        form.populate_obj(topm)
-        if db.session.is_modified(topm):
-            flash(f'Tesseract OCR Pipeline model "{topm.title}" updated')
-            db.session.commit()
-        return redirect(url_for('.tesseract_ocr_pipeline_models'))
-    return render_template(
-        f'{template_base_dir}/tesseract_ocr_pipeline_model.html.j2',
-        form=form,
-        tesseract_ocr_pipeline_model=topm,
-        title=f'{topm.title} {topm.version}'
-    )

app/corpora/routes.py

@@ -1,23 +1,18 @@
-from flask import (
-    abort,
-    flash,
-    Markup,
-    redirect,
-    render_template,
-    url_for
-)
+from flask import abort, flash, redirect, render_template, url_for
 from flask_login import current_user, login_required
 from .decorators import corpus_follower_permission_required
 from app import db
-from app.models import (
-    Corpus,
-    CorpusFollowerAssociation,
-    CorpusFollowerRole,
-)
+from app.models import Corpus, CorpusFollowerAssociation, CorpusFollowerRole
 from . import bp
 from .forms import CreateCorpusForm
 
 
+@bp.route('')
+@login_required
+def corpora():
+    return redirect(url_for('main.dashboard', _anchor='corpora'))
+
+
 @bp.route('/create', methods=['GET', 'POST'])
 @login_required
 def create_corpus():

app/main/routes.py

@@ -1,4 +1,5 @@
 from flask import flash, redirect, render_template, url_for
+from flask_breadcrumbs import register_breadcrumb
 from flask_login import current_user, login_required, login_user
 from app.auth.forms import LoginForm
 from app.models import Corpus, User
@@ -6,6 +7,7 @@ from . import bp
 
 
 @bp.route('', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.', '<i class="material-icons">home</i>')
 def index():
     form = LoginForm(prefix='login-form')
     if form.validate_on_submit():
@@ -20,37 +22,44 @@ def index():
 
 
 @bp.route('/faq')
+@register_breadcrumb(bp, '.faq', 'Frequently Asked Questions')
 def faq():
     return render_template('main/faq.html.j2', title='Frequently Asked Questions')
 
 
 @bp.route('/dashboard')
+@register_breadcrumb(bp, '.dashboard', 'Dashboard')
 @login_required
 def dashboard():
     return render_template('main/dashboard.html.j2', title='Dashboard')
 
 
 @bp.route('/user_manual')
+@register_breadcrumb(bp, '.user_manual', 'User manual')
 def user_manual():
     return render_template('main/user_manual.html.j2', title='User manual')
 
 
 @bp.route('/news')
+@register_breadcrumb(bp, '.news', 'News')
 def news():
     return render_template('main/news.html.j2', title='News')
 
 
 @bp.route('/privacy_policy')
+@register_breadcrumb(bp, '.privacy_policy', 'Private statement (GDPR)')
 def privacy_policy():
     return render_template('main/privacy_policy.html.j2', title='Privacy statement (GDPR)')
 
 
 @bp.route('/terms_of_use')
+@register_breadcrumb(bp, '.terms_of_use', 'Terms of Use')
 def terms_of_use():
     return render_template('main/terms_of_use.html.j2', title='Terms of Use')
 
 
 @bp.route('/social-area')
+@register_breadcrumb(bp, '.social_area', 'Social Area')
 def social_area():
     users = [
         u.to_json_serializeable(relationships=True, filter_by_privacy_settings=True,) for u

app/services/routes.py

@@ -1,4 +1,5 @@
-from flask import abort, current_app, flash, make_response, Markup, render_template, request
+from flask import abort, current_app, flash, Markup, redirect, render_template, request, url_for
+from flask_breadcrumbs import register_breadcrumb
 from flask_login import current_user, login_required
 import requests
 from app import db, hashids
@@ -18,7 +19,15 @@ from .forms import (
 )
 
 
+@bp.route('/services')
+@register_breadcrumb(bp, '.', 'Services')
+@login_required
+def services():
+    return redirect(url_for('main.dashboard'))
+
+
 @bp.route('/file-setup-pipeline', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.file_setup_pipeline', 'File Setup')
 @login_required
 def file_setup_pipeline():
     service = 'file-setup-pipeline'
@@ -60,6 +69,7 @@ def file_setup_pipeline():
 
 
 @bp.route('/tesseract-ocr-pipeline', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.tesseract_ocr_pipeline', 'Tesseract OCR Pipeline')
 @login_required
 def tesseract_ocr_pipeline():
     service_name = 'tesseract-ocr-pipeline'
@@ -109,6 +119,7 @@ def tesseract_ocr_pipeline():
 
 
 @bp.route('/transkribus-htr-pipeline', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.transkribus_htr_pipeline', 'Transkribus HTR Pipeline')
 @login_required
 def transkribus_htr_pipeline():
     if not current_app.config.get('NOPAQUE_TRANSKRIBUS_ENABLED'):
@@ -168,6 +179,7 @@ def transkribus_htr_pipeline():
 
 
 @bp.route('/spacy-nlp-pipeline', methods=['GET', 'POST'])
+@register_breadcrumb(bp, '.spacy_nlp_pipeline', 'SpaCy NLP Pipeline')
 @login_required
 def spacy_nlp_pipeline():
     service = 'spacy-nlp-pipeline'
@@ -213,9 +225,10 @@ def spacy_nlp_pipeline():
 
 
 @bp.route('/corpus-analysis')
+@register_breadcrumb(bp, '.corpus_analysis', 'Corpus Analysis')
 @login_required
 def corpus_analysis():
     return render_template(
         'services/corpus_analysis.html.j2',
-        title='Corpus analysis'
+        title='Corpus Analysis'
     )

app/templates/_navbar.html.j2

@@ -14,10 +14,12 @@
     </div>
     <div class="nav-content primary-variant-color">
       <ul class="tabs tabs-transparent">
-        <li class="tab"><a href="{{ url_for('main.index') }}" target="_self"><i class="material-icons">home</i></a></li>
-        {% if breadcrumbs is defined %}
-        {{ breadcrumbs }}
+        {%- for breadcrumb in breadcrumbs -%}
+        <li class="tab"><a {{ 'class="active"' if loop.last }} href="{{ breadcrumb.url }}" target="_self">{{ breadcrumb.text }}</a></li>
+        {% if not loop.last %}
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
         {% endif %}
+        {%- endfor -%}
       </ul>
       {% if current_user.is_authenticated %}
       <a class="btn-floating btn-large halfway-fab modal-trigger pink tooltipped waves-effect waves-light" data-tooltip="Roadmap" href="#roadmap-modal"><i class="material-icons">explore</i></a>

app/templates/_sidenav.html.j2

@@ -35,7 +35,7 @@
   <li class="service-color service-color-border border-darken" data-service="transkribus-htr-pipeline" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.transkribus_htr_pipeline') }}"><i class="nopaque-icons service-icons" data-service="transkribus-htr-pipeline"></i>HTR</a></li>
   {% endif %}
   <li class="service-color service-color-border border-darken" data-service="spacy-nlp-pipeline" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.spacy_nlp_pipeline') }}"><i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>NLP</a></li>
-  <li class="service-color service-color-border border-darken" data-service="corpus-analysis" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.corpus_analysis') }}"><i class="nopaque-icons service-icons" data-service="corpus-analysis"></i>Corpus analysis</a></li>
+  <li class="service-color service-color-border border-darken" data-service="corpus-analysis" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.corpus_analysis') }}"><i class="nopaque-icons service-icons" data-service="corpus-analysis"></i>Corpus Analysis</a></li>
   <li><div class="divider"></div></li>
   <li><a class="subheader">Account</a></li>
   <li><a href="{{ url_for('settings.settings') }}"><i class="material-icons">settings</i>General Settings</a></li>

app/templates/admin/_breadcrumbs.html.j2

@@ -1,18 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.index') }}" target="_self">Administration</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('.users') %}
-<li class="tab"><a class="active" href="{{ url_for('.users') }}" target="_self">Users</a></li>
-{% elif request.path == url_for('.user', user_id=user.id) %}
-<li class="tab"><a href="{{ url_for('.users') }}" target="_self">Users</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.user', user_id=user.id) }}" target="_self">{{ user.username }}</a></li>
-{% elif request.path == url_for('.edit_user', user_id=user.id) %}
-<li class="tab"><a href="{{ url_for('.users') }}" target="_self">Users</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.user', user_id=user.id) }}" target="_self">{{ user.username }}</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.edit_user', user_id=user.id) }}" target="_self">Edit</a></li>
-{% endif %}
-{% endset %}

app/templates/admin/edit_user.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block page_content %}

app/templates/admin/user.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/admin/users.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "admin/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/auth/_breadcrumbs.html.j2

@@ -1,14 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('.login') %}
-<li class="tab"><a class="active" href="{{ url_for('.login') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.register') %}
-<li class="tab"><a class="active" href="{{ url_for('.register') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.reset_password', token=token) %}
-<li class="tab"><a class="active" href="{{ url_for('.reset_password', token=token) }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.reset_password_request') %}
-<li class="tab"><a class="active" href="{{ url_for('.reset_password_request') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.unconfirmed') %}
-<li class="tab"><a class="active" href="{{ url_for('.unconfirmed') }}" target="_self">{{ title }}</a></li>
-{% endif %}
-{% endset %}

app/templates/auth/login.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 

app/templates/auth/register.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 

app/templates/auth/reset_password.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block page_content %}

app/templates/auth/reset_password_request.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block page_content %}

app/templates/auth/unconfirmed.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "auth/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/contributions/_breadcrumbs.html.j2

@@ -1,46 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('.contributions') %}
-<li class="tab"><a class="active" href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-{% elif request.path == url_for('.tesseract_ocr_pipeline_models')%}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.tesseract_ocr_pipeline_models') }}" target="_self">Tesseract OCR Pipeline Models</a></li>
-{% elif request.path == url_for('.spacy_nlp_pipeline_models')%}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.spacy_nlp_pipeline_models') }}" target="_self">SpaCy NLP Pipeline Models</a></li>
-{% elif request.path == url_for('.create_tesseract_ocr_pipeline_model') %}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.tesseract_ocr_pipeline_models') }}" target="_self">Tesseract OCR Pipeline Models</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.create_tesseract_ocr_pipeline_model') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.create_spacy_nlp_pipeline_model') %}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.spacy_nlp_pipeline_models') }}" target="_self">SpaCy NLP Pipeline Models</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.create_spacy_nlp_pipeline_model') }}" target="_self">{{ title }}</a></li>
-{% elif tesseract_ocr_pipeline_model and request.path == url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=tesseract_ocr_pipeline_model.id) %}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.tesseract_ocr_pipeline_models') }}" target="_self">Tesseract OCR Pipeline Models</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab">
-  <a class="active" href="{{ url_for('.tesseract_ocr_pipeline_model', tesseract_ocr_pipeline_model_id=tesseract_ocr_pipeline_model.id) }}" target="_self">
-    {{ tesseract_ocr_pipeline_model.title }} {{ tesseract_ocr_pipeline_model.version }}
-  </a>
-</li>
-{% elif spacy_nlp_pipeline_model and request.path == url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=spacy_nlp_pipeline_model.id) %}
-<li class="tab"><a href="{{ url_for('.contributions') }}" target="_self">Contributions Overview</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.spacy_nlp_pipeline_models') }}" target="_self">SpaCy NLP Pipeline Models</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab">
-  <a class="active" href="{{ url_for('.spacy_nlp_pipeline_model', spacy_nlp_pipeline_model_id=spacy_nlp_pipeline_model.id) }}" target="_self">
-    {{ spacy_nlp_pipeline_model.title }} {{ spacy_nlp_pipeline_model.version }}
-  </a>
-</li>
-{% endif %}
-{% endset %}

app/templates/contributions/contributions.html.j2

@@ -10,7 +10,7 @@
 
     <div class="col s4">
       <div class="card extension-selector hoverable service-color" data-service="tesseract-ocr-pipeline">
-        <a href="{{ url_for('.tesseract_ocr_pipeline_models.tesseract_ocr_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
+        <a href="{{ url_for('.tesseract_ocr_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
         <div class="card-content">
           <span class="card-title" data-service="tesseract-ocr-pipeline"><i class="nopaque-icons service-icons" data-service="tesseract-ocr-pipeline"></i>Tesseract OCR Pipeline Models</span>
           <p>Here you can see and edit the models that you have created. You can also create new models.</p>
@@ -20,7 +20,7 @@
 
     <div class="col s4">
       <div class="card extension-selector hoverable service-color" data-service="spacy-nlp-pipeline">
-        <a href="{{ url_for('.spacy_nlp_pipeline_models.spacy_nlp_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
+        <a href="{{ url_for('.spacy_nlp_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
         <div class="card-content">
           <span class="card-title"><i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>SpaCy NLP Pipeline Models</span>
           <p>Here you can see and edit the models that you have created. You can also create new models.</p>

app/templates/corpora/_breadcrumbs.html.j2

@@ -1,28 +0,0 @@
-{# {% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" target="_self">My corpora</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('.create_corpus') %}
-<li class="tab"><a class="active" href="{{ url_for('.create_corpus') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.import_corpus') %}
-<li class="tab"><a class="active" href="{{ url_for('.import_corpus') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.corpus', corpus_id=corpus.id) %}
-<li class="tab"><a class="active" href="{{ url_for('.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-{% elif request.path == url_for('.analyse_corpus', corpus_id=corpus.id) %}
-<li class="tab"><a href="{{ url_for('.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.analyse_corpus', corpus_id=corpus.id) }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.create_corpus_file', corpus_id=corpus.id) %}
-<li class="tab"><a href="{{ url_for('.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.corpus', corpus_id=corpus.id, _anchor='files') }}" target="_self">Corpus files</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.create_corpus_file', corpus_id=corpus.id) }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.corpus_file', corpus_file_id=corpus_file.id, corpus_id=corpus.id) %}
-<li class="tab"><a href="{{ url_for('.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('.corpus', corpus_id=corpus.id, _anchor='files') }}" target="_self">Corpus files</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.corpus_file', corpus_file_id=corpus_file.id, corpus_id=corpus.id) }}" target="_self">{{ corpus_file.author }}: {{ corpus_file.title }} ({{ corpus_file.publishing_year }})</a></li>
-{% endif %}
-{% endset %} #}

app/templates/corpora/corpus.html.j2

@@ -1,6 +1,5 @@
 {% extends "base.html.j2" %}
 {% import "materialize/wtf.html.j2" as wtf %}
-{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}
 

app/templates/corpora/create_corpus.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}

app/templates/corpora/files/corpus_file.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}

app/templates/corpora/files/create_corpus_file.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}

app/templates/corpora/import_corpus.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "corpora/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}

app/templates/jobs/_breadcrumbs.html.j2

@@ -1,8 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" target="_self">My jobs</a></li>
-{% if request.path == url_for('.job', job_id=job.id) %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a class="active" href="{{ url_for('.job', job_id=job.id) }}" target="_self">{{ job.title }}</a></li>
-{% endif %}
-{% endset %}

app/templates/jobs/job.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "jobs/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block main_attribs %} class="service-scheme" data-service="{{ job.service }}"{% endblock main_attribs %}
 

app/templates/main/_breadcrumbs.html.j2

@@ -1,14 +0,0 @@
-{% set breadcrumbs %}
-{% if not (request.path == url_for('.index')) %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% endif %}
-{% if request.path == url_for('.faq') %}
-<li class="tab"><a class="active" href="{{ url_for('.faq') }}" target="_self">Frequently Asked Questions</a></li>
-{% elif request.path == url_for('.dashboard') %}
-<li class="tab"><a class="active" href="{{ url_for('.dashboard') }}" target="_self">Dashboard</a></li>
-{% elif request.path == url_for('.news') %}
-<li class="tab"><a class="active" href="{{ url_for('.news') }}" target="_self">News</a></li>
-{% elif request.path == url_for('.terms_of_use') %}
-<li class="tab"><a class="active" href="{{ url_for('.terms_of_use') }}" target="_self">Terms of use</a></li>
-{% endif %}
-{% endset %}

app/templates/main/dashboard.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/faq.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/index.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block page_content %}

app/templates/main/news.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/news_new.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/privacy_policy.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/terms_of_use.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/main/user_manual.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "main/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block page_content %}
 <div class="container">

app/templates/services/_breadcrumbs.html.j2

@@ -1,16 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-<li class="tab"><a href="{{ url_for('main.index', _anchor='services') }}" target="_self">Processes & Services</a></li>
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('.corpus_analysis') %}
-<li class="tab"><a class="active" href="{{ url_for('.corpus_analysis') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.file_setup_pipeline') %}
-<li class="tab"><a class="active" href="{{ url_for('.file_setup_pipeline') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.spacy_nlp_pipeline') %}
-<li class="tab"><a class="active" href="{{ url_for('.spacy_nlp_pipeline') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.tesseract_ocr_pipeline') %}
-<li class="tab"><a class="active" href="{{ url_for('.tesseract_ocr_pipeline') }}" target="_self">{{ title }}</a></li>
-{% elif request.path == url_for('.transkribus_htr_pipeline') %}
-<li class="tab"><a class="active" href="{{ url_for('.transkribus_htr_pipeline') }}" target="_self">{{ title }}</a></li>
-{% endif %}
-{% endset %}

app/templates/services/corpus_analysis.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %}
 
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %}
 

app/templates/services/file_setup_pipeline.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="file-setup-pipeline"{% endblock main_attribs %}

app/templates/services/spacy_nlp_pipeline.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="spacy-nlp-pipeline"{% endblock main_attribs %}
@@ -77,7 +76,7 @@
                   {{ form.model.label }}
                   <span class="helper-text">
                     <a class="modal-trigger tooltipped" href="#models-modal" data-position="bottom" data-tooltip="See more information about models"><i class="material-icons" style="color:#0064A3;">help_outline</i></a>
-                    <a class="tooltipped" href="{{ url_for('contributions.spacy_nlp_pipeline_models.create_spacy_nlp_pipeline_model') }}" data-position="bottom" data-tooltip="Add your own spaCy NLP models"><i class="material-icons" style="color:#0064A3">new_label</i></a>
+                    <a class="tooltipped" href="{{ url_for('contributions.create_spacy_nlp_pipeline_model') }}" data-position="bottom" data-tooltip="Add your own spaCy NLP models"><i class="material-icons" style="color:#0064A3">new_label</i></a>
                   </span>
                 </div>
               </div>

app/templates/services/tesseract_ocr_pipeline.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="tesseract-ocr-pipeline"{% endblock main_attribs %}
@@ -59,7 +58,7 @@
                   {{ form.model.label }}
                   <span class="helper-text">
                     <a class="modal-trigger tooltipped" href="#models-modal" data-position="bottom" data-tooltip="See more information about models"><i class="material-icons" style="color:#00A58B;">help_outline</i></a>
-                    <a class="tooltipped" href="{{ url_for('contributions.tesseract_ocr_pipeline_models.create_tesseract_ocr_pipeline_model') }}" data-position="bottom" data-tooltip="Add your own Tesseract OCR models"><i class="material-icons" style="color:#00A58B">new_label</i></a>
+                    <a class="tooltipped" href="{{ url_for('contributions.create_tesseract_ocr_pipeline_model') }}" data-position="bottom" data-tooltip="Add your own Tesseract OCR models"><i class="material-icons" style="color:#00A58B">new_label</i></a>
                   </span>
                   {% for error in form.model.errors %}
                   <span class="helper-text error-color-text">{{ error }}</span>

app/templates/services/transkribus_htr_pipeline.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "services/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block main_attribs %} class="service-scheme" data-service="transkribus-htr-pipeline"{% endblock main_attribs %}

app/templates/settings/_breadcrumbs.html.j2

@@ -1,6 +0,0 @@
-{% set breadcrumbs %}
-<li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-{% if request.path == url_for('settings.settings') %}
-<li class="tab"><a{%if request.path == url_for('settings.settings') %} class="active"{% endif %} href="{{ url_for('settings.settings') }}" target="_self">Settings</a></li>
-{% endif %}
-{% endset %}

app/templates/settings/settings.html.j2

@@ -1,5 +1,4 @@
 {% extends "base.html.j2" %}
-{% from "settings/_breadcrumbs.html.j2" import breadcrumbs with context %}
 {% import "materialize/wtf.html.j2" as wtf %}
 
 {% block page_content %}

requirements.txt

@@ -6,6 +6,7 @@ eventlet
 Flask==2.1.3
 Flask-APScheduler
 Flask-Assets
+Flask-Breadcrumbs
 Flask-Hashids==1.0.1
 Flask-HTTPAuth
 Flask-Login