From 61098535bea7cfbc4bff3d82f8e9317d04898cee Mon Sep 17 00:00:00 2001
From: dameyer <dameyer@techfak.uni-bielefeld.de>
Date: Sun, 2 Oct 2022 23:47:15 +0200
Subject: [PATCH 01/20] Update gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 76c4e06b..14a22fe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ __pycache__
 
 # Virtual environment
 venv
+.idea

From 9802fdd175028c5e75c41358b935dd9c6e29c743 Mon Sep 17 00:00:00 2001
From: dameyer <dameyer@techfak.uni-bielefeld.de>
Date: Sun, 2 Oct 2022 23:49:14 +0200
Subject: [PATCH 02/20] Add form and template for adding a model.

---
 app/contributions/forms.py                    | 75 +++++++++++++++++++
 app/contributions/routes.py                   | 11 ++-
 .../contributions/contribute.html.j2          | 32 ++++++++
 3 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 app/contributions/forms.py
 create mode 100644 app/templates/contributions/contribute.html.j2

diff --git a/app/contributions/forms.py b/app/contributions/forms.py
new file mode 100644
index 00000000..f00e49c3
--- /dev/null
+++ b/app/contributions/forms.py
@@ -0,0 +1,75 @@
+from flask_wtf import FlaskForm
+from wtforms import (
+    BooleanField,
+    PasswordField,
+    StringField,
+    SubmitField,
+    SelectMultipleField,
+    ValidationError, FieldList, IntegerField
+)
+from wtforms.validators import InputRequired, Email, EqualTo, Length, Regexp
+from app.models import User
+
+
+class ContributionForm(FlaskForm):
+
+    # The id field will be generated on insert.
+    # The user_id will be retrieved from the user who is performing this operation.
+
+    # title = db.Column(db.String(64))
+    title = StringField(
+        'Title',
+        validators=[InputRequired(), Length(max=64)]
+    )
+
+    # description = db.Column(db.String(255))
+    description = StringField(
+        'Description',
+        validators=[InputRequired(), Length(max=255)]
+    )
+
+    # version = db.Column(db.String(16))
+    version = StringField(
+        'Version',
+        validators=[InputRequired(), Length(max=16)]
+    )
+
+    # compatible_service_versions = db.Column(ContainerColumn(list, 255))
+    compatible_service_versions = SelectMultipleField(
+        'Compatible Service Versions',
+        choices=["asd", "blub", "bla"]
+    )
+
+    # publisher = db.Column(db.String(128))
+    publisher = StringField(
+        'Publisher',
+        validators=[InputRequired(), Length(max=128)]
+    )
+
+    # publisher_url = db.Column(db.String(512))
+    publisher_url = StringField(
+        'Publisher URL',
+        validators=[InputRequired(), Length(max=512)]
+    )
+
+    # publishing_url = db.Column(db.String(512))
+    publishing_url = StringField(
+        'Publishing URL',
+        validators=[InputRequired(), Length(max=512)]
+    )
+
+    # publishing_year = db.Column(db.Integer)
+    publishing_year = IntegerField(
+        'Publishing year',
+        validators=[InputRequired()]
+    )
+
+    # shared = db.Column(db.Boolean, default=False)
+    shared = BooleanField(
+        'Shared',
+        validators=[InputRequired()]
+    )
+
+    submit = SubmitField()
+
+
diff --git a/app/contributions/routes.py b/app/contributions/routes.py
index 80c6a82d..34d54d41 100644
--- a/app/contributions/routes.py
+++ b/app/contributions/routes.py
@@ -1,7 +1,9 @@
+from flask import render_template
 from flask_login import login_required
 from app.decorators import permission_required
 from app.models import Permission
 from . import bp
+from .forms import ContributionForm
 
 
 @bp.before_request
@@ -11,6 +13,11 @@ def before_request():
     pass
 
 
-@bp.route('')
+@bp.route('', methods=['GET', 'POST'])
 def contributions():
-    pass
+    form = ContributionForm(prefix='contribution-form')
+    return render_template(
+        'contributions/contribute.html.j2',
+        form=form,
+        title='Contribution'
+    )
diff --git a/app/templates/contributions/contribute.html.j2 b/app/templates/contributions/contribute.html.j2
new file mode 100644
index 00000000..6789e1f8
--- /dev/null
+++ b/app/templates/contributions/contribute.html.j2
@@ -0,0 +1,32 @@
+{% extends "base.html.j2" %}
+{% import "materialize/wtf.html.j2" as wtf %}
+
+
+{% block page_content %}
+<div class="container">
+  <div class="row">
+    <div class="col s12 m8 offset-m2">
+      <h1 id="title">{{ title }}</h1>
+      <p>
+        In order to add a new model, please fill in the form below.
+      </p>
+
+      <form method="POST">
+        <div class="card-panel">
+          {{ form.hidden_tag() }}
+          {{ wtf.render_field(form.title) }}
+          {{ wtf.render_field(form.description) }}
+          {{ wtf.render_field(form.publisher) }}
+          {{ wtf.render_field(form.publisher_url) }}
+          {{ wtf.render_field(form.publishing_url) }}
+          {{ wtf.render_field(form.publishing_year) }}
+          {{ wtf.render_field(form.shared) }}
+          {{ wtf.render_field(form.version) }}
+          {{ wtf.render_field(form.compatible_service_versions) }}
+          {{ wtf.render_field(form.submit, class_='width-100', material_icon='send') }}
+
+        </div>
+      </form>
+  </div>
+</div>
+{% endblock page_content %}
\ No newline at end of file

From 2470c8dfef56482e17273ae07bd824a5166ccc4a Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Tue, 11 Oct 2022 11:32:50 +0200
Subject: [PATCH 03/20] Remove redundant code

---
 app/corpora/routes.py  |  2 +-
 app/models.py          | 80 +++++++++++-------------------------------
 app/services/routes.py |  8 ++---
 3 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/app/corpora/routes.py b/app/corpora/routes.py
index bbe98090..57c14e65 100644
--- a/app/corpora/routes.py
+++ b/app/corpora/routes.py
@@ -149,7 +149,7 @@ def create_corpus_file(corpus_id):
                 mimetype='application/vrt+xml',
                 corpus=corpus
             )
-        except OSError:
+        except (AttributeError, OSError):
             abort(500)
         corpus.status = CorpusStatus.UNPREPARED
         db.session.commit()
diff --git a/app/models.py b/app/models.py
index 6719ca72..21a64d35 100644
--- a/app/models.py
+++ b/app/models.py
@@ -91,6 +91,26 @@ class FileMixin:
             ),
             'mimetype': self.mimetype
         }
+    
+    @classmethod
+    def create(cls, file_storage, **kwargs):
+        filename = kwargs.pop('filename', file_storage.filename)
+        mimetype = kwargs.pop('mimetype', file_storage.mimetype)
+        obj = cls(
+            filename=secure_filename(filename),
+            mimetype=mimetype,
+            **kwargs
+        )
+        db.session.add(obj)
+        db.session.flush(objects=[obj])
+        db.session.refresh(obj)
+        try:
+            file_storage.save(obj.path)
+        except (AttributeError, OSError) as e:
+            current_app.logger.error(e)
+            db.session.rollback()
+            raise e
+        return obj
 # endregion mixins
 
 
@@ -691,26 +711,6 @@ class JobInput(FileMixin, HashidMixin, db.Model):
     def user_id(self):
         return self.job.user_id
 
-    @staticmethod
-    def create(input_file, **kwargs):
-        filename = kwargs.get('filename', input_file.filename)
-        mimetype = kwargs.get('mimetype', input_file.mimetype)
-        job_input = JobInput(
-            filename=secure_filename(filename),
-            mimetype=mimetype,
-            **kwargs
-        )
-        db.session.add(job_input)
-        db.session.flush(objects=[job_input])
-        db.session.refresh(job_input)
-        try:
-            input_file.save(job_input.path)
-        except OSError as e:
-            current_app.logger.error(e)
-            db.session.rollback()
-            raise e
-        return job_input
-
     def to_json(self, backrefs=False, relationships=False):
         _json = {
             'id': self.hashid,
@@ -766,26 +766,6 @@ class JobResult(FileMixin, HashidMixin, db.Model):
     def user_id(self):
         return self.job.user_id
 
-    @staticmethod
-    def create(input_file, **kwargs):
-        filename = kwargs.get('filename', input_file.filename)
-        mimetype = kwargs.get('mimetype', input_file.mimetype)
-        job_result = JobResult(
-            filename=secure_filename(filename),
-            mimetype=mimetype,
-            **kwargs
-        )
-        db.session.add(job_result)
-        db.session.flush(objects=[job_result])
-        db.session.refresh(job_result)
-        try:
-            input_file.save(job_result.path)
-        except OSError as e:
-            current_app.logger.error(e)
-            db.session.rollback()
-            raise e
-        return job_result
-
     def to_json(self, backrefs=False, relationships=False):
         _json = {
             'id': self.hashid,
@@ -1024,26 +1004,6 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
             _json['corpus'] = self.corpus.to_json(backrefs=True)
         return _json
 
-    @staticmethod
-    def create(input_file, **kwargs):
-        filename = kwargs.pop('filename', input_file.filename)
-        mimetype = kwargs.pop('mimetype', input_file.mimetype)
-        corpus_file = CorpusFile(
-            filename=secure_filename(filename),
-            mimetype=mimetype,
-            **kwargs,
-        )
-        db.session.add(corpus_file)
-        db.session.flush(objects=[corpus_file])
-        db.session.refresh(corpus_file)
-        try:
-            input_file.save(corpus_file.path)
-        except OSError as e:
-            current_app.logger.error(e)
-            db.session.rollback()
-            raise e
-        return corpus_file
-
 class Corpus(HashidMixin, db.Model):
     '''
     Class to define a corpus.
diff --git a/app/services/routes.py b/app/services/routes.py
index 9f5c81ef..913acbb7 100644
--- a/app/services/routes.py
+++ b/app/services/routes.py
@@ -45,7 +45,7 @@ def file_setup_pipeline():
         for input_file in form.images.data:
             try:
                 JobInput.create(input_file, job=job)
-            except OSError:
+            except (AttributeError, OSError):
                 abort(500)
         job.status = JobStatus.SUBMITTED
         db.session.commit()
@@ -88,7 +88,7 @@ def tesseract_ocr_pipeline():
             abort(500)
         try:
             JobInput.create(form.pdf.data, job=job)
-        except OSError:
+        except (AttributeError, OSError):
             abort(500)
         job.status = JobStatus.SUBMITTED
         db.session.commit()
@@ -138,7 +138,7 @@ def transkribus_htr_pipeline():
             abort(500)
         try:
             JobInput.create(form.pdf.data, job=job)
-        except OSError:
+        except (AttributeError, OSError):
             abort(500)
         job.status = JobStatus.SUBMITTED
         db.session.commit()
@@ -187,7 +187,7 @@ def spacy_nlp_pipeline():
             abort(500)
         try:
             JobInput.create(form.txt.data, job=job)
-        except OSError:
+        except (AttributeError, OSError):
             abort(500)
         job.status = JobStatus.SUBMITTED
         db.session.commit()

From 236d3e7ee40cfaf757549e6e6255b26fec3fa21d Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 12 Oct 2022 10:23:05 +0200
Subject: [PATCH 04/20] Rename tables for pipeline models

---
 ...=> TesseractOCRPipelineModel.defaults.yml} |  0
 app/api/auth.py                               |  1 -
 app/api/jobs.py                               | 12 ++--
 app/api/schemas.py                            | 13 +++-
 app/api/users.py                              |  2 +-
 app/cli.py                                    | 15 +++--
 app/daemon/job_utils.py                       |  8 +--
 app/models.py                                 | 35 ++++++-----
 app/services/forms.py                         |  8 +--
 app/services/routes.py                        | 16 ++---
 .../services/tesseract_ocr_pipeline.html.j2   |  4 +-
 .../services/transkribus_htr_pipeline.html.j2 |  4 +-
 migrations/versions/63b2cc26a01f_.py          | 59 +++++++++++++++++++
 nopaque.py                                    |  8 +--
 14 files changed, 127 insertions(+), 58 deletions(-)
 rename app/{TesseractOCRModel.defaults.yml => TesseractOCRPipelineModel.defaults.yml} (100%)
 create mode 100644 migrations/versions/63b2cc26a01f_.py

diff --git a/app/TesseractOCRModel.defaults.yml b/app/TesseractOCRPipelineModel.defaults.yml
similarity index 100%
rename from app/TesseractOCRModel.defaults.yml
rename to app/TesseractOCRPipelineModel.defaults.yml
diff --git a/app/api/auth.py b/app/api/auth.py
index afda3a30..398052f5 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,4 +1,3 @@
-from flask import current_app
 from flask_httpauth import HTTPBasicAuth, HTTPTokenAuth
 from werkzeug.exceptions import Forbidden, Unauthorized
 from app.models import User
diff --git a/app/api/jobs.py b/app/api/jobs.py
index e730f2e6..2eaecd3f 100644
--- a/app/api/jobs.py
+++ b/app/api/jobs.py
@@ -4,8 +4,8 @@ from apifairy.decorators import body, other_responses
 from flask import abort, Blueprint
 from werkzeug.exceptions import InternalServerError
 from app import db, hashids
-from app.models import Job, JobInput, JobStatus, TesseractOCRModel
-from .schemas import EmptySchema, JobSchema, SpaCyNLPPipelineJobSchema, TesseractOCRPipelineJobSchema, TesseractOCRModelSchema
+from app.models import Job, JobInput, JobStatus, TesseractOCRPipelineModel
+from .schemas import EmptySchema, JobSchema, SpaCyNLPPipelineJobSchema, TesseractOCRPipelineJobSchema, TesseractOCRPipelineModelSchema
 from .auth import auth_error_responses, token_auth
 
 
@@ -14,8 +14,8 @@ job_schema = JobSchema()
 jobs_schema = JobSchema(many=True)
 spacy_nlp_pipeline_job_schema = SpaCyNLPPipelineJobSchema()
 tesseract_ocr_pipeline_job_schema = TesseractOCRPipelineJobSchema()
-tesseract_ocr_model_schema = TesseractOCRModelSchema()
-tesseract_ocr_models_schema = TesseractOCRModelSchema(many=True)
+tesseract_ocr_pipeline_model_schema = TesseractOCRPipelineModelSchema()
+tesseract_ocr_pipeline_models_schema = TesseractOCRPipelineModelSchema(many=True)
 
 
 @bp.route('', methods=['GET'])
@@ -60,11 +60,11 @@ def create_tesseract_ocr_pipeline_job(args):
 
 @bp.route('/tesseract-ocr-pipeline/models', methods=['GET'])
 @authenticate(token_auth)
-@response(tesseract_ocr_models_schema)
+@response(tesseract_ocr_pipeline_models_schema)
 @other_responses(auth_error_responses)
 def get_tesseract_ocr_models():
     """Get all Tesseract OCR Models"""
-    return TesseractOCRModel.query.all()
+    return TesseractOCRPipelineModel.query.all()
 
 
 @bp.route('/<hashid:job_id>', methods=['DELETE'])
diff --git a/app/api/schemas.py b/app/api/schemas.py
index 394b1ebb..9474bd1a 100644
--- a/app/api/schemas.py
+++ b/app/api/schemas.py
@@ -3,7 +3,14 @@ from marshmallow import validate, validates, ValidationError
 from marshmallow.decorators import post_dump
 from app import ma
 from app.auth import USERNAME_REGEX
-from app.models import Job, JobStatus, TesseractOCRModel, Token, User, UserSettingJobStatusMailNotificationLevel
+from app.models import (
+    Job,
+    JobStatus,
+    TesseractOCRPipelineModel,
+    Token,
+    User,
+    UserSettingJobStatusMailNotificationLevel
+)
 from app.services import SERVICES
 
 
@@ -21,9 +28,9 @@ class TokenSchema(ma.SQLAlchemySchema):
     refresh_token = ma.String()
 
 
-class TesseractOCRModelSchema(ma.SQLAlchemySchema):
+class TesseractOCRPipelineModelSchema(ma.SQLAlchemySchema):
     class Meta:
-        model = TesseractOCRModel
+        model = TesseractOCRPipelineModel
         ordered = True
 
     hashid = ma.String(data_key='id', dump_only=True)
diff --git a/app/api/users.py b/app/api/users.py
index fc180df0..c9ea5d39 100644
--- a/app/api/users.py
+++ b/app/api/users.py
@@ -1,7 +1,7 @@
 
 from apifairy import authenticate, body, response
 from apifairy.decorators import other_responses
-from flask import abort, Blueprint, current_app
+from flask import abort, Blueprint
 from werkzeug.exceptions import InternalServerError
 from app import db
 from app.email import create_message, send
diff --git a/app/cli.py b/app/cli.py
index d9b4fdf0..bfaf8754 100644
--- a/app/cli.py
+++ b/app/cli.py
@@ -2,7 +2,12 @@ from flask import current_app
 from flask_migrate import upgrade
 import click
 import os
-from app.models import Role, User, TesseractOCRModel, TranskribusHTRModel
+from app.models import (
+    Role,
+    User,
+    TesseractOCRPipelineModel,
+    TranskribusHTRPipelineModel
+)
 
 
 def _make_default_dirs():
@@ -35,10 +40,10 @@ def register(app):
         Role.insert_defaults()
         current_app.logger.info('Insert/Update default users')
         User.insert_defaults()
-        current_app.logger.info('Insert/Update default TesseractOCRModels')
-        TesseractOCRModel.insert_defaults()
-        current_app.logger.info('Insert/Update default TranskribusHTRModels')
-        TranskribusHTRModel.insert_defaults()
+        current_app.logger.info('Insert/Update default TesseractOCRPipelineModels')
+        TesseractOCRPipelineModel.insert_defaults()
+        current_app.logger.info('Insert/Update default TranskribusHTRPipelineModels')
+        TranskribusHTRPipelineModel.insert_defaults()
 
     @app.cli.group()
     def converter():
diff --git a/app/daemon/job_utils.py b/app/daemon/job_utils.py
index 38d6c48b..0f74f3a0 100644
--- a/app/daemon/job_utils.py
+++ b/app/daemon/job_utils.py
@@ -3,8 +3,8 @@ from app.models import (
     Job,
     JobResult,
     JobStatus,
-    TesseractOCRModel,
-    TranskribusHTRModel
+    TesseractOCRPipelineModel,
+    TranskribusHTRPipelineModel
 )
 from datetime import datetime
 from flask import current_app
@@ -61,7 +61,7 @@ def _create_job_service(job):
         if 'binarization' in job.service_args and job.service_args['binarization']:
             command += ' --binarize'
     elif job.service == 'transkribus-htr-pipeline':
-        transkribus_htr_model = TranskribusHTRModel.query.get(job.service_args['model'])
+        transkribus_htr_model = TranskribusHTRPipelineModel.query.get(job.service_args['model'])
         command += f' -m {transkribus_htr_model.transkribus_model_id}'
         readcoop_username = current_app.config.get('NOPAQUE_READCOOP_USERNAME')
         command += f' --readcoop-username "{readcoop_username}"'
@@ -96,7 +96,7 @@ def _create_job_service(job):
         else:
             job.status = JobStatus.FAILED
             return
-        model = TesseractOCRModel.query.get(model_id)
+        model = TesseractOCRPipelineModel.query.get(model_id)
         if model is None:
             job.status = JobStatus.FAILED
             return
diff --git a/app/models.py b/app/models.py
index 21a64d35..beab7d6e 100644
--- a/app/models.py
+++ b/app/models.py
@@ -23,7 +23,6 @@ from app.email import create_message
 TRANSKRIBUS_HTR_MODELS = \
     json.loads(requests.get('https://transkribus.eu/TrpServer/rest/models/text', params={'docType': 'handwritten'}).content)['trpModelMetadata']  # noqa
 
-
 ##############################################################################
 # enums                                                                      #
 ##############################################################################
@@ -274,14 +273,14 @@ class User(HashidMixin, UserMixin, db.Model):
     last_seen = db.Column(db.DateTime())
     # Backrefs: role: Role
     # Relationships
-    tesseract_ocr_models = db.relationship(
-        'TesseractOCRModel',
+    tesseract_ocr_pipeline_models = db.relationship(
+        'TesseractOCRPipelineModel',
         backref='user',
         cascade='all, delete-orphan',
         lazy='dynamic'
     )
-    transkribus_htr_models = db.relationship(
-        'TranskribusHTRModel',
+    transkribus_htr_pipeline_models = db.relationship(
+        'TranskribusHTRPipelineModel',
         backref='user',
         cascade='all, delete-orphan',
         lazy='dynamic'
@@ -342,7 +341,7 @@ class User(HashidMixin, UserMixin, db.Model):
         db.session.refresh(user)
         try:
             os.mkdir(user.path)
-            os.mkdir(os.path.join(user.path, 'tesseract_ocr_models'))
+            os.mkdir(os.path.join(user.path, 'tesseract_ocr_pipeline_models'))
             os.mkdir(os.path.join(user.path, 'corpora'))
             os.mkdir(os.path.join(user.path, 'jobs'))
         except OSError as e:
@@ -518,14 +517,14 @@ class User(HashidMixin, UserMixin, db.Model):
                 x.hashid: x.to_json(relationships=True)
                 for x in self.jobs
             }
-            _json['tesseract_ocr_models'] = {
+            _json['tesseract_ocr_pipeline_models'] = {
                 x.hashid: x.to_json(relationships=True)
-                for x in self.tesseract_ocr_models
+                for x in self.tesseract_ocr_pipeline_models
             }
         return _json
 
-class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
-    __tablename__ = 'tesseract_ocr_models'
+class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
+    __tablename__ = 'tesseract_ocr_pipeline_models'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
     # Foreign keys
@@ -546,7 +545,7 @@ class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
     def path(self):
         return os.path.join(
             self.user.path,
-            'tesseract_ocr_models',
+            'tesseract_ocr_pipeline_models',
             str(self.id)
         )
 
@@ -555,12 +554,12 @@ class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
         nopaque_user = User.query.filter_by(username='nopaque').first()
         defaults_file = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            'TesseractOCRModel.defaults.yml'
+            'TesseractOCRPipelineModel.defaults.yml'
         )
         with open(defaults_file, 'r') as f:
             defaults = yaml.safe_load(f)
         for m in defaults:
-            model = TesseractOCRModel.query.filter_by(title=m['title'], version=m['version']).first()  # noqa
+            model = TesseractOCRPipelineModel.query.filter_by(title=m['title'], version=m['version']).first()  # noqa
             if model is not None:
                 model.compatible_service_versions = m['compatible_service_versions']
                 model.description = m['description']
@@ -572,7 +571,7 @@ class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
                 model.title = m['title']
                 model.version = m['version']
                 continue
-            model = TesseractOCRModel(
+            model = TesseractOCRPipelineModel(
                 compatible_service_versions=m['compatible_service_versions'],
                 description=m['description'],
                 publisher=m['publisher'],
@@ -623,8 +622,8 @@ class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
         return _json
 
 
-class TranskribusHTRModel(HashidMixin, db.Model):
-    __tablename__ = 'transkribus_htr_models'
+class TranskribusHTRPipelineModel(HashidMixin, db.Model):
+    __tablename__ = 'transkribus_htr_pipeline_models'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
     # Foreign keys
@@ -643,12 +642,12 @@ class TranskribusHTRModel(HashidMixin, db.Model):
         #     and 'docType' in m and m['docType'] == 'handwritten'
         # ]
         for m in TRANSKRIBUS_HTR_MODELS:
-            model = TranskribusHTRModel.query.filter_by(transkribus_model_id=m['modelId']).first()  # noqa
+            model = TranskribusHTRPipelineModel.query.filter_by(transkribus_model_id=m['modelId']).first()  # noqa
             if model is not None:
                 model.shared = True
                 model.transkribus_model_id = m['modelId']
                 continue
-            model = TranskribusHTRModel(
+            model = TranskribusHTRPipelineModel(
                 transkribus_model_id=m['modelId'],
                 shared=True,
                 user=nopaque_user,
diff --git a/app/services/forms.py b/app/services/forms.py
index 008e0d0a..ea1c1e70 100644
--- a/app/services/forms.py
+++ b/app/services/forms.py
@@ -12,8 +12,8 @@ from wtforms import (
 from wtforms.validators import InputRequired, Length
 from app.models import (
     TRANSKRIBUS_HTR_MODELS,
-    TesseractOCRModel,
-    TranskribusHTRModel
+    TesseractOCRPipelineModel,
+    TranskribusHTRPipelineModel
 )
 from . import SERVICES
 
@@ -77,7 +77,7 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm):
                 if 'disabled' in self.binarization.render_kw:
                     del self.binarization.render_kw['disabled']
         models = [
-            x for x in TesseractOCRModel.query.filter().all()
+            x for x in TesseractOCRPipelineModel.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')]
@@ -119,7 +119,7 @@ class CreateTranskribusHTRPipelineJobForm(CreateJobBaseForm):
                 if 'disabled' in self.binarization.render_kw:
                     del self.binarization.render_kw['disabled']
         models = [
-            x for x in TranskribusHTRModel.query.filter().all()
+            x for x in TranskribusHTRPipelineModel.query.filter().all()
             if x.shared == True or x.user == current_user
         ]
         self.model.choices = [('', 'Choose your option')]
diff --git a/app/services/routes.py b/app/services/routes.py
index 913acbb7..4f019525 100644
--- a/app/services/routes.py
+++ b/app/services/routes.py
@@ -5,9 +5,9 @@ from app.models import (
     Job,
     JobInput,
     JobStatus,
-    TesseractOCRModel,
+    TesseractOCRPipelineModel,
     TRANSKRIBUS_HTR_MODELS,
-    TranskribusHTRModel
+    TranskribusHTRPipelineModel
 )
 from . import bp, SERVICES
 from .forms import (
@@ -95,14 +95,14 @@ def tesseract_ocr_pipeline():
         message = Markup(f'Job "<a href="{job.url}">{job.title}</a>" created')
         flash(message, 'job')
         return {}, 201, {'Location': job.url}
-    tesseract_ocr_models = [
-        x for x in TesseractOCRModel.query.all()
+    tesseract_ocr_pipeline_models = [
+        x for x in TesseractOCRPipelineModel.query.all()
         if version in x.compatible_service_versions and (x.shared == True or x.user == current_user)
     ]
     return render_template(
         'services/tesseract_ocr_pipeline.html.j2',
         form=form,
-        tesseract_ocr_models=tesseract_ocr_models,
+        tesseract_ocr_pipeline_models=tesseract_ocr_pipeline_models,
         title=service_manifest['name']
     )
 
@@ -145,8 +145,8 @@ def transkribus_htr_pipeline():
         message = Markup(f'Job "<a href="{job.url}">{job.title}</a>" created')
         flash(message, 'job')
         return {}, 201, {'Location': job.url}
-    transkribus_htr_models = [
-        x for x in TranskribusHTRModel.query.all()
+    transkribus_htr_pipeline_models = [
+        x for x in TranskribusHTRPipelineModel.query.all()
         if x.shared == True or x.user == current_user
     ]
     return render_template(
@@ -154,7 +154,7 @@ def transkribus_htr_pipeline():
         form=form,
         title=service_manifest['name'],
         TRANSKRIBUS_HTR_MODELS=TRANSKRIBUS_HTR_MODELS,
-        transkribus_htr_models=transkribus_htr_models
+        transkribus_htr_pipeline_models=transkribus_htr_pipeline_models
     )
 
 
diff --git a/app/templates/services/tesseract_ocr_pipeline.html.j2 b/app/templates/services/tesseract_ocr_pipeline.html.j2
index c38c3965..982265bc 100644
--- a/app/templates/services/tesseract_ocr_pipeline.html.j2
+++ b/app/templates/services/tesseract_ocr_pipeline.html.j2
@@ -160,8 +160,8 @@
         </tr>
       </thead>
       <tbody>
-        {% for m in tesseract_ocr_models %}
-        <tr id="tesseract-ocr-model-{{ m.hashid }}">
+        {% for m in tesseract_ocr_pipeline_models %}
+        <tr id="tesseract-ocr-pipeline-model-{{ m.hashid }}">
           <td>{{ m.title }}</td>
           {% if m.description == '' %}
           <td>Description is not available.</td>
diff --git a/app/templates/services/transkribus_htr_pipeline.html.j2 b/app/templates/services/transkribus_htr_pipeline.html.j2
index 7aedbd4f..79519f3a 100644
--- a/app/templates/services/transkribus_htr_pipeline.html.j2
+++ b/app/templates/services/transkribus_htr_pipeline.html.j2
@@ -157,8 +157,8 @@
   <div class="modal-content">
     <h4>Transkribus HTR Pipeline models</h4>
     <ul class="collapsible popout" id="transkribus-htr-models">
-      {% for m in transkribus_htr_models %}
-      <li id="transkribus-htr-model-{{ m.hashid }}">
+      {% for m in transkribus_htr_pipeline_models %}
+      <li id="transkribus-htr-pipeline-model-{{ m.hashid }}">
         {% for m_info in TRANSKRIBUS_HTR_MODELS if m_info['modelId'] == m.transkribus_model_id %}
         <div class="collapsible-header"><i class="material-icons">widgets</i>{{ m_info.name }}</div>
         <div class="collapsible-body">
diff --git a/migrations/versions/63b2cc26a01f_.py b/migrations/versions/63b2cc26a01f_.py
new file mode 100644
index 00000000..5876ed3c
--- /dev/null
+++ b/migrations/versions/63b2cc26a01f_.py
@@ -0,0 +1,59 @@
+"""Rename pipeline model tables
+
+Revision ID: 63b2cc26a01f
+Revises: 260b57d5f4e7
+Create Date: 2022-10-11 14:32:13.227364
+
+"""
+from alembic import op
+from flask import current_app
+import os
+from app.models import User
+
+# revision identifiers, used by Alembic.
+revision = '63b2cc26a01f'
+down_revision = '260b57d5f4e7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    users = User.query.all()
+    for user in users:
+        old_tesseract_ocr_pipeline_model_path = os.path.join(
+            user.path,
+            'tesseract_ocr_models'
+        )
+        new_tesseract_ocr_pipeline_model_path = os.path.join(
+            user.path,
+            'tesseract_ocr_pipeline_models'
+        )
+        os.rename(
+            old_tesseract_ocr_pipeline_model_path,
+            new_tesseract_ocr_pipeline_model_path
+        )
+    op.rename_table('tesseract_ocr_models', 'tesseract_ocr_pipeline_models')
+    op.rename_table('transkribus_htr_models', 'transkribus_htr_pipeline_models')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    users = User.query.all()
+    for user in users:
+        old_tesseract_ocr_pipeline_model_path = os.path.join(
+            user.path,
+            'tesseract_ocr_models'
+        )
+        new_tesseract_ocr_pipeline_model_path = os.path.join(
+            user.path,
+            'tesseract_ocr_pipeline_models'
+        )
+        os.rename(
+            new_tesseract_ocr_pipeline_model_path,
+            old_tesseract_ocr_pipeline_model_path
+        )
+    op.rename_table('tesseract_ocr_pipeline_models', 'tesseract_ocr_models')
+    op.rename_table('transkribus_htr_pipeline_models', 'transkribus_htr_models')
+    # ### end Alembic commands ###
diff --git a/nopaque.py b/nopaque.py
index 96746d97..457add2c 100644
--- a/nopaque.py
+++ b/nopaque.py
@@ -12,8 +12,8 @@ from app.models import (
     JobResult,
     Permission,
     Role,
-    TesseractOCRModel,
-    TranskribusHTRModel,
+    TesseractOCRPipelineModel,
+    TranskribusHTRPipelineModel,
     User
 )  # noqa
 from flask import Flask  # noqa
@@ -42,8 +42,8 @@ def make_shell_context() -> Dict[str, Any]:
         'JobResult': JobResult,
         'Permission': Permission,
         'Role': Role,
-        'TesseractOCRModel': TesseractOCRModel,
-        'TranskribusHTRModel': TranskribusHTRModel,
+        'TesseractOCRPipelineModel': TesseractOCRPipelineModel,
+        'TranskribusHTRPipelineModel': TranskribusHTRPipelineModel,
         'User': User
     }
 

From f96bac93f28ed27b691230fd836c6aee6b8dce92 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Wed, 12 Oct 2022 14:05:01 +0200
Subject: [PATCH 05/20] Optical code adjustments

---
 app/static/js/CorpusAnalysis/QueryBuilder.js | 125 +++++++++++--------
 1 file changed, 70 insertions(+), 55 deletions(-)

diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index 256dadd2..e221e19b 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -164,14 +164,20 @@ class ConcordanceQueryBuilder {
 
   }
 
+
+
+  // ##########################################################################
+  // #################### General Functions ###################################
+  // ##########################################################################
+
   //#region General Functions
 
-  closeQueryBuilderModal(closeInstance){
+  closeQueryBuilderModal(closeInstance) {
     let instance = M.Modal.getInstance(closeInstance);
     instance.close();
   }
   
-  showPositionalAttrArea(){
+  showPositionalAttrArea() {
     this.elements.positionalAttrArea.classList.remove('hide');
     this.elements.wordBuilder.classList.remove("hide");
     this.elements.inputOptions.classList.remove("hide");
@@ -194,7 +200,7 @@ class ConcordanceQueryBuilder {
     this.elements.positionalAttr.value = "word";
   }
 
-  showStructuralAttrArea(){
+  showStructuralAttrArea() {
     this.elements.positionalAttrArea.classList.add('hide');
     this.elements.structuralAttrArea.classList.remove('hide');
   }
@@ -207,15 +213,15 @@ class ConcordanceQueryBuilder {
     let chipColor = 'style="background-color:#';
 
     // Sets chip color, depending on the type of element
-    if (dataType === 'start-sentence' || dataType === 'end-sentence'){
+    if (dataType === 'start-sentence' || dataType === 'end-sentence') {
       chipColor += 'FD9720';
-    }else if (dataType === "start-empty-entity" || dataType === "start-entity" || dataType === "end-entity"){
+    } else if (dataType === "start-empty-entity" || dataType === "start-entity" || dataType === "end-entity") {
       chipColor += 'A6E22D';
-    }else if (dataType === "text-annotation"){
+    } else if (dataType === "text-annotation") {
      chipColor += '2FBBAB';
-    }else if (dataType === "token"){
+    } else if (dataType === "token") {
      chipColor += '28B3D1';
-    }else {
+    } else {
      chipColor = '';
     }
 
@@ -232,9 +238,9 @@ class ConcordanceQueryBuilder {
     buttonElement.addEventListener("click", () => {this.deleteAttr(buttonElement);});
 
     // Ensures that metadata is always at the end of the query:
-    if(this.elements.yourQuery.lastChild === null || this.elements.yourQuery.lastChild.dataset.type !== "text-annotation"){
+    if (this.elements.yourQuery.lastChild === null || this.elements.yourQuery.lastChild.dataset.type !== "text-annotation") {
       this.elements.yourQuery.appendChild(buttonElement);
-    }else if (this.elements.yourQuery.lastChild.dataset.type === "text-annotation"){
+    } else if (this.elements.yourQuery.lastChild.dataset.type === "text-annotation") {
       this.elements.yourQuery.insertBefore(buttonElement, this.elements.yourQuery.lastChild);
     }
 
@@ -242,14 +248,14 @@ class ConcordanceQueryBuilder {
     this.queryPreviewBuilder();
 
     // Opens a hint about the possible functions for editing the query when the first chip is added. It is displayed for 5 seconds and then deleted.
-    if (this.elements.yourQuery.classList.contains("tooltipped")){
+    if (this.elements.yourQuery.classList.contains("tooltipped")) {
       let tooltipInstance = M.Tooltip.getInstance(this.elements.yourQuery);
       tooltipInstance.tooltipEl.style.background = "#98ACD2";
       tooltipInstance.tooltipEl.style.borderTop = "solid 4px #0064A3"
       tooltipInstance.tooltipEl.style.padding = "10px";
       tooltipInstance.tooltipEl.style.color = "black";
 
-      if (tooltipInstance !== undefined){
+      if (tooltipInstance !== undefined) {
         setTimeout(() => {
           tooltipInstance.open();
           setTimeout(() => {
@@ -261,23 +267,23 @@ class ConcordanceQueryBuilder {
     }
   }
 
-    //#region Drag&Drop Events
-  dragStartHandler(event){
+    //#region	 Drag&Drop Events
+  dragStartHandler(event) {
     this.elements.dropButton = event.target;
     let targetChip = `
-    <div class="chip target" ondragover="concordanceQueryBuilder.dragOverHandler(event)" ondragenter="concordanceQueryBuilder.dragEnterHandler(event)" ondragleave="concordanceQueryBuilder.dragLeaveHandler(event)" ondrop="concordanceQueryBuilder.dropHandler(event)">
-      Drop here
-    </div>
+      <div class="chip target" ondragover="concordanceQueryBuilder.dragOverHandler(event)" ondragenter="concordanceQueryBuilder.dragEnterHandler(event)" ondragleave="concordanceQueryBuilder.dragLeaveHandler(event)" ondrop="concordanceQueryBuilder.dropHandler(event)">
+        Drop here
+      </div>
     `.trim();
     let childNodes = this.elements.yourQuery.querySelectorAll("div:not(.target)");
 
     setTimeout(() => {
-      for (let element of childNodes){
-        if(element === event.target){
+      for (let element of childNodes) {
+        if (element === event.target) {
           continue;
-        }else if (element === event.target.nextSibling){
+        } else if (element === event.target.nextSibling) {
           continue;
-        }else {
+        } else {
           element.insertAdjacentHTML("beforebegin", targetChip)
         }
       }
@@ -285,37 +291,37 @@ class ConcordanceQueryBuilder {
     },0);
   }
 
-  dragOverHandler(event){
+  dragOverHandler(event) {
     event.preventDefault();
   }
 
-  dragEnterHandler(event){
+  dragEnterHandler(event) {
     event.preventDefault();
     event.target.style.borderStyle = "solid dotted";
   }
 
-  dragLeaveHandler(event){
+  dragLeaveHandler(event) {
     event.preventDefault();
     event.target.style.borderStyle = "hidden";
   }
 
-  dragEndHandler(event){
+  dragEndHandler(event) {
     let targets = document.querySelectorAll('.target');
-    for (let target of targets){
+    for (let target of targets) {
       target.remove();
     }
   }
 
-  dropHandler(event){
+  dropHandler(event) {
     let dropzone = event.target;
 
-    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++){
-      if (dropzone === dropzone.parentElement.childNodes[i]){
+    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++) {
+      if (dropzone === dropzone.parentElement.childNodes[i]) {
         nodeIndex = i;
       }
     }
-    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++){
-      if (this.elements.dropButton === dropzone.parentElement.childNodes[i]){
+    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++) {
+      if (this.elements.dropButton === dropzone.parentElement.childNodes[i]) {
         draggedElementIndex = i;
       }
     }
@@ -325,15 +331,15 @@ class ConcordanceQueryBuilder {
   }
     //#endregion Drag&Drop Events
 
-  queryPreviewBuilder(){
+  queryPreviewBuilder() {
     this.elements.yourQueryContent = [];
 
     for (let element of this.elements.yourQuery.childNodes) {
       let queryElement = decodeURI(element.dataset.query);
-      if (queryElement.includes("<")){
+      if (queryElement.includes("<")) {
         queryElement = queryElement.replace("<", "&#60;");
       }
-      if (queryElement.includes(">")){
+      if (queryElement.includes(">")) {
         queryElement = queryElement.replace(">", "&#62;");
       }
       if (queryElement !== "undefined") {
@@ -351,7 +357,7 @@ class ConcordanceQueryBuilder {
     this.elements.yourQuery.removeChild(attr);
 
     this.elements.counter -= 1;
-    if(this.elements.counter === 0){
+    if (this.elements.counter === 0) {
       this.elements.queryContainer.classList.add("hide");
     }
 
@@ -362,10 +368,10 @@ class ConcordanceQueryBuilder {
     this.elements.yourQueryContent = [];
 
     for (let element of this.elements.yourQuery.childNodes) {
-    let queryElement = decodeURI(element.dataset.query);
-    if (queryElement !== "undefined"){
-      this.elements.yourQueryContent.push(queryElement);
-    }
+      let queryElement = decodeURI(element.dataset.query);
+      if (queryElement !== "undefined") {
+        this.elements.yourQueryContent.push(queryElement);
+      }
     }
 
     let queryString = this.elements.yourQueryContent.join(' ');
@@ -373,7 +379,6 @@ class ConcordanceQueryBuilder {
 
     this.elements.concordanceQueryBuilder.classList.add('modal-close');
     this.elements.extFormQuery.value = queryString;
-
   }
 
   clearAll() {
@@ -411,6 +416,13 @@ class ConcordanceQueryBuilder {
 
   //#endregion General Functions
 
+
+
+
+  // ##########################################################################
+  // ############## Token Attribute Builder Functions #########################
+  // ##########################################################################
+
   //#region Token Attribute Builder Functions
 
     //#region General functions of the Token Builder
@@ -441,7 +453,7 @@ class ConcordanceQueryBuilder {
     }
   }
 
-  hideEverything(){
+  hideEverything() {
 
     this.elements.wordBuilder.classList.add("hide");
     this.elements.lemmaBuilder.classList.add("hide");
@@ -472,11 +484,7 @@ class ConcordanceQueryBuilder {
     this.elements.tokenQuery.appendChild(buttonElement);
   }
 
-  deleteTokenAttr(attr){
-    // let tokenQuery = this.elements.tokenQuery.childNodes;
-    // console.log(tokenQuery);
-    // console.log(this.elements.tokenQuery);
-    console.log(this.elements.tokenQuery.childNodes.length);
+  deleteTokenAttr(attr) {
     if (this.elements.tokenQuery.childNodes.length < 2) {
       this.elements.tokenQuery.removeChild(attr);
       this.wordBuilder();
@@ -493,22 +501,22 @@ class ConcordanceQueryBuilder {
     this.elements.cancelBool = false;
     let emptyTokenCheck = false;
 
-    if (this.elements.ignoreCase.checked){
+    if (this.elements.ignoreCase.checked) {
       c = ' %c';
-    }else{
+    } else {
       c = '';
     }
 
 
-    for (let element of this.elements.tokenQuery.childNodes){
+    for (let element of this.elements.tokenQuery.childNodes) {
       tokenQueryContent += ' ' + element.firstChild.data + ' ';
       tokenQueryText += decodeURI(element.dataset.tokentext);
-      if (element.innerText.indexOf("empty token") !== -1){
+      if (element.innerText.indexOf("empty token") !== -1) {
         emptyTokenCheck = true;
       }
     }
 
-    if (this.elements.tokenQueryFilled === false){
+    if (this.elements.tokenQueryFilled === false) {
       switch (this.elements.positionalAttr.value) {
         case "word":
           if (this.elements.wordInput.value === "") {
@@ -562,7 +570,7 @@ class ConcordanceQueryBuilder {
     }
 
     // cancelBool looks in disableTokenSubmit() whether a value is passed. If the input fields/dropdowns are empty (cancelBool === true), no token is added.
-    if (this.elements.cancelBool === false){
+    if (this.elements.cancelBool === false) {
       // Square brackets are added only if it is not an empty token (where they are already present).
       if (emptyTokenCheck === false) {
         tokenQueryText = '[' + tokenQueryText + ']';
@@ -813,9 +821,9 @@ class ConcordanceQueryBuilder {
     let tokenQueryText;
     let c;
 
-    if (this.elements.ignoreCase.checked){
+    if (this.elements.ignoreCase.checked) {
       c = ' %c';
-    }else{
+    } else {
       c = '';
     }
 
@@ -859,10 +867,17 @@ class ConcordanceQueryBuilder {
 
   //#endregion Token Attribute Builder Functions
 
+
+
+
+  // ##########################################################################
+  // ############ Structural Attribute Builder Functions ######################
+  // ##########################################################################
+
   //#region Structural Attribute Builder Functions
   addSentence() {
     this.hideEverything();
-    if(this.elements.sentence.text === 'End Sentence') {
+    if (this.elements.sentence.text === 'End Sentence') {
       this.buttonfactory('end-sentence', 'Sentence End', '</s>');
       this.elements.sentence.innerHTML = 'Sentence';
     } else {

From 2e45db10cab6e185eb17b6f0fbb153cb0ee876f3 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Wed, 12 Oct 2022 14:08:42 +0200
Subject: [PATCH 06/20] Optical adjustments 2.0

---
 app/static/js/CorpusAnalysis/QueryBuilder.js | 540 +++++++++----------
 1 file changed, 270 insertions(+), 270 deletions(-)

diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index e221e19b..42dc9968 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -8,31 +8,31 @@ class ConcordanceQueryBuilder {
       counter: 0,
       yourQueryContent: [],
       queryContent:[],
-      concordanceQueryBuilder: document.querySelector("#concordance-query-builder"),
-      concordanceQueryBuilderButton: document.querySelector("#concordance-query-builder-button"),
-      closeQueryBuilder: document.querySelector("#close-query-builder"),
+      concordanceQueryBuilder: document.querySelector('#concordance-query-builder'),
+      concordanceQueryBuilderButton: document.querySelector('#concordance-query-builder-button'),
+      closeQueryBuilder: document.querySelector('#close-query-builder'),
       queryBuilderTutorialModal: document.querySelector('#query-builder-tutorial-modal'),
 
       //#region QueryBuilder Elements
       
       positionalAttrButton: document.querySelector('#positional-attr-button'),
       positionalAttrArea: document.querySelector('#positional-attr'),
-      positionalAttr: document.querySelector("#token-attr"),
+      positionalAttr: document.querySelector('#token-attr'),
       structuralAttrButton: document.querySelector('#structural-attr-button'),
-      structuralAttrArea: document.querySelector("#structural-attr"),
+      structuralAttrArea: document.querySelector('#structural-attr'),
       queryContainer: document.querySelector('#query-container'),
-      buttonPreparer: document.querySelector("#button-preparer"),
-      yourQuery: document.querySelector("#your-query"),
-      insertQueryButton: document.querySelector("#insert-query-button"),
+      buttonPreparer: document.querySelector('#button-preparer'),
+      yourQuery: document.querySelector('#your-query'),
+      insertQueryButton: document.querySelector('#insert-query-button'),
       queryPreview: document.querySelector('#query-preview'),
-      tokenQuery: document.querySelector("#token-query"),
-      tokenBuilderContent: document.querySelector("#token-builder-content"),
-      tokenSubmitButton: document.querySelector("#token-submit"),
+      tokenQuery: document.querySelector('#token-query'),
+      tokenBuilderContent: document.querySelector('#token-builder-content'),
+      tokenSubmitButton: document.querySelector('#token-submit'),
       extFormQuery: document.querySelector('#concordance-extension-form-query'),
-      dropButton: "",
+      dropButton: '',
       
       queryBuilderTutorialInfoIcon: document.querySelector('#query-builder-tutorial-info-icon'),
-      tokenTutorialInfoIcon: document.querySelector("#token-tutorial-info-icon"),
+      tokenTutorialInfoIcon: document.querySelector('#token-tutorial-info-icon'),
       editTokenTutorialInfoIcon: document.querySelector('#edit-options-tutorial-info-icon'),
       structuralAttributeTutorialInfoIcon: document.querySelector('#add-structural-attribute-tutorial-info-icon'),
       generalOptionsQueryBuilderTutorialInfoIcon: document.querySelector('#general-options-query-builder-tutorial-info-icon'),
@@ -42,73 +42,73 @@ class ConcordanceQueryBuilder {
 
       //#region Strucutral Attributes
       
-      sentence:document.querySelector("#sentence"),
-      entity: document.querySelector("#entity"),
-      textAnnotation: document.querySelector("#text-annotation"),
+      sentence:document.querySelector('#sentence'),
+      entity: document.querySelector('#entity'),
+      textAnnotation: document.querySelector('#text-annotation'),
 
-      entityBuilder: document.querySelector("#entity-builder"),
-      englishEntType: document.querySelector("#english-ent-type"),
-      germanEntType: document.querySelector("#german-ent-type"),
-      emptyEntity: document.querySelector("#empty-entity"),
+      entityBuilder: document.querySelector('#entity-builder'),
+      englishEntType: document.querySelector('#english-ent-type'),
+      germanEntType: document.querySelector('#german-ent-type'),
+      emptyEntity: document.querySelector('#empty-entity'),
       entityAnyType: false,
 
-      textAnnotationBuilder: document.querySelector("#text-annotation-builder"),
-      textAnnotationOptions: document.querySelector("#text-annotation-options"),
-      textAnnotationInput: document.querySelector("#text-annotation-input"),
-      textAnnotationSubmit: document.querySelector("#text-annotation-submit"),
+      textAnnotationBuilder: document.querySelector('#text-annotation-builder'),
+      textAnnotationOptions: document.querySelector('#text-annotation-options'),
+      textAnnotationInput: document.querySelector('#text-annotation-input'),
+      textAnnotationSubmit: document.querySelector('#text-annotation-submit'),
       noValueMetadataMessage: document.querySelector('#no-value-metadata-message'),
       //#endregion Structural Attributes
 
       //#region Token Attributes
       tokenQueryFilled: false,
 
-      lemma: document.querySelector("#lemma"),
-      emptyToken: document.querySelector("#empty-token"),
-      word: document.querySelector("#word"),
-      lemma: document.querySelector("#lemma"),
-      pos: document.querySelector("#pos"),
-      simplePosButton: document.querySelector("#simple-pos-button"),
-      incidenceModifiers: document.querySelector("[data-target='incidence-modifiers']"),
-      or: document.querySelector("#or"),
-      and: document.querySelector("#and"),
+      lemma: document.querySelector('#lemma'),
+      emptyToken: document.querySelector('#empty-token'),
+      word: document.querySelector('#word'),
+      lemma: document.querySelector('#lemma'),
+      pos: document.querySelector('#pos'),
+      simplePosButton: document.querySelector('#simple-pos-button'),
+      incidenceModifiers: document.querySelector('[data-target="incidence-modifiers"]'),
+      or: document.querySelector('#or'),
+      and: document.querySelector('#and'),
 
       //#region Word and Lemma Elements
-      wordBuilder: document.querySelector("#word-builder"),
-      lemmaBuilder: document.querySelector("#lemma-builder"),
-      inputOptions: document.querySelector("#input-options"),
-      incidenceModifiersButton: document.querySelector("#incidence-modifiers-button"),
+      wordBuilder: document.querySelector('#word-builder'),
+      lemmaBuilder: document.querySelector('#lemma-builder'),
+      inputOptions: document.querySelector('#input-options'),
+      incidenceModifiersButton: document.querySelector('#incidence-modifiers-button'),
       conditionContainer: document.querySelector('#condition-container'),
-      wordInput: document.querySelector("#word-input"),
-      lemmaInput: document.querySelector("#lemma-input"),
-      ignoreCaseCheckbox : document.querySelector("#ignore-case-checkbox"),
-      ignoreCase: document.querySelector("input[type='checkbox']"),
-      wildcardChar: document.querySelector("#wildcard-char"),
-      optionGroup: document.querySelector("#option-group"),
+      wordInput: document.querySelector('#word-input'),
+      lemmaInput: document.querySelector('#lemma-input'),
+      ignoreCaseCheckbox : document.querySelector('#ignore-case-checkbox'),
+      ignoreCase: document.querySelector('input[type="checkbox"]'),
+      wildcardChar: document.querySelector('#wildcard-char'),
+      optionGroup: document.querySelector('#option-group'),
       //#endregion Word and Lemma Elements
 
       //#region posBuilder Elements
-      englishPosBuilder: document.querySelector("#english-pos-builder"),
-      englishPos: document.querySelector("#english-pos"),
-      germanPosBuilder: document.querySelector("#german-pos-builder"),
-      germanPos: document.querySelector("#german-pos"),
+      englishPosBuilder: document.querySelector('#english-pos-builder'),
+      englishPos: document.querySelector('#english-pos'),
+      germanPosBuilder: document.querySelector('#german-pos-builder'),
+      germanPos: document.querySelector('#german-pos'),
       //#endregion posBuilder Elements
 
       //#region simple_posBuilder Elements
-      simplePosBuilder: document.querySelector("#simplepos-builder"),
-      simplePos: document.querySelector("#simple-pos"),
+      simplePosBuilder: document.querySelector('#simplepos-builder'),
+      simplePos: document.querySelector('#simple-pos'),
       //#endregion simple_posBuilder Elements
 
       //#region incidence modifiers
-      oneOrMore: document.querySelector("#one-or-more"),
-      zeroOrMore: document.querySelector("#zero-or-more"),
-      zeroOrOne: document.querySelector("#zero-or-one"),
-      exactlyN: document.querySelector("#exactlyN"),
-      betweenNM: document.querySelector("#betweenNM"),
-      nInput: document.querySelector("#n-input"),
-      nSubmit: document.querySelector("#n-submit"),
-      nmInput: document.querySelector("#n-m-input"),
-      mInput: document.querySelector("#m-input"),
-      nmSubmit: document.querySelector("#n-m-submit"),
+      oneOrMore: document.querySelector('#one-or-more'),
+      zeroOrMore: document.querySelector('#zero-or-more'),
+      zeroOrOne: document.querySelector('#zero-or-one'),
+      exactlyN: document.querySelector('#exactlyN'),
+      betweenNM: document.querySelector('#betweenNM'),
+      nInput: document.querySelector('#n-input'),
+      nSubmit: document.querySelector('#n-submit'),
+      nmInput: document.querySelector('#n-m-input'),
+      mInput: document.querySelector('#m-input'),
+      nmSubmit: document.querySelector('#n-m-submit'),
       //#endregion incidence modifiers
 
       cancelBool: false,
@@ -116,48 +116,48 @@ class ConcordanceQueryBuilder {
       //#endregion Token Attributes
     }
     
-    this.elements.closeQueryBuilder.addEventListener("click", () => {this.closeQueryBuilderModal(this.elements.concordanceQueryBuilder);});
-    this.elements.concordanceQueryBuilderButton.addEventListener("click", () => {this.clearAll();});
-    this.elements.insertQueryButton.addEventListener("click", () => {this.insertQuery();});
-    this.elements.positionalAttrButton.addEventListener("click", () => {this.showPositionalAttrArea();});
-    this.elements.structuralAttrButton.addEventListener("click", () => {this.showStructuralAttrArea();});
+    this.elements.closeQueryBuilder.addEventListener('click', () => {this.closeQueryBuilderModal(this.elements.concordanceQueryBuilder);});
+    this.elements.concordanceQueryBuilderButton.addEventListener('click', () => {this.clearAll();});
+    this.elements.insertQueryButton.addEventListener('click', () => {this.insertQuery();});
+    this.elements.positionalAttrButton.addEventListener('click', () => {this.showPositionalAttrArea();});
+    this.elements.structuralAttrButton.addEventListener('click', () => {this.showStructuralAttrArea();});
 
     //#region Structural Attribute Event Listeners
-    this.elements.sentence.addEventListener("click", () => {this.addSentence();});
-    this.elements.entity.addEventListener("click", () => {this.addEntity();});
-    this.elements.textAnnotation.addEventListener("click", () => {this.addTextAnnotation();});
+    this.elements.sentence.addEventListener('click', () => {this.addSentence();});
+    this.elements.entity.addEventListener('click', () => {this.addEntity();});
+    this.elements.textAnnotation.addEventListener('click', () => {this.addTextAnnotation();});
 
-    this.elements.englishEntType.addEventListener("change", () => {this.englishEntTypeHandler();});
-    this.elements.germanEntType.addEventListener("change", () => {this.germanEntTypeHandler();});
-    this.elements.emptyEntity.addEventListener("click", () => {this.emptyEntityButton();});
+    this.elements.englishEntType.addEventListener('change', () => {this.englishEntTypeHandler();});
+    this.elements.germanEntType.addEventListener('change', () => {this.germanEntTypeHandler();});
+    this.elements.emptyEntity.addEventListener('click', () => {this.emptyEntityButton();});
     
-    this.elements.textAnnotationSubmit.addEventListener("click", () => {this.textAnnotationSubmitHandler();});
+    this.elements.textAnnotationSubmit.addEventListener('click', () => {this.textAnnotationSubmitHandler();});
 
     //#endregion
     
     //#region Token Attribute Event Listeners
-    this.elements.queryBuilderTutorialInfoIcon.addEventListener("click", () => {this.tutorialIconHandler('#query-builder-tutorial-start');});
-    this.elements.tokenTutorialInfoIcon.addEventListener("click", () => {this.tutorialIconHandler('#add-new-token-tutorial');});
-    this.elements.editTokenTutorialInfoIcon.addEventListener("click", () => {this.tutorialIconHandler('#edit-options-tutorial');});
-    this.elements.structuralAttributeTutorialInfoIcon.addEventListener("click", () => {this.tutorialIconHandler('#add-structural-attribute-tutorial');});
-    this.elements.generalOptionsQueryBuilderTutorialInfoIcon.addEventListener("click", () => {this.tutorialIconHandler('#general-options-query-builder');});
+    this.elements.queryBuilderTutorialInfoIcon.addEventListener('click', () => {this.tutorialIconHandler('#query-builder-tutorial-start');});
+    this.elements.tokenTutorialInfoIcon.addEventListener('click', () => {this.tutorialIconHandler('#add-new-token-tutorial');});
+    this.elements.editTokenTutorialInfoIcon.addEventListener('click', () => {this.tutorialIconHandler('#edit-options-tutorial');});
+    this.elements.structuralAttributeTutorialInfoIcon.addEventListener('click', () => {this.tutorialIconHandler('#add-structural-attribute-tutorial');});
+    this.elements.generalOptionsQueryBuilderTutorialInfoIcon.addEventListener('click', () => {this.tutorialIconHandler('#general-options-query-builder');});
 
-    this.elements.positionalAttr.addEventListener("change", () => {this.tokenTypeSelector();});
-    this.elements.tokenSubmitButton.addEventListener("click", () => {this.addToken();});
+    this.elements.positionalAttr.addEventListener('change', () => {this.tokenTypeSelector();});
+    this.elements.tokenSubmitButton.addEventListener('click', () => {this.addToken();});
 
 
-    this.elements.ignoreCase.addEventListener("change", () => {this.inputOptionHandler(this.elements.ignoreCase);});
-    this.elements.wildcardChar.addEventListener("click", () => {this.inputOptionHandler(this.elements.wildcardChar);});
-    this.elements.optionGroup.addEventListener("click", () => {this.inputOptionHandler(this.elements.optionGroup);});
+    this.elements.ignoreCase.addEventListener('change', () => {this.inputOptionHandler(this.elements.ignoreCase);});
+    this.elements.wildcardChar.addEventListener('click', () => {this.inputOptionHandler(this.elements.wildcardChar);});
+    this.elements.optionGroup.addEventListener('click', () => {this.inputOptionHandler(this.elements.optionGroup);});
 
-    this.elements.oneOrMore.addEventListener("click", () => {this.incidenceModifiersHandler(this.elements.oneOrMore);});
-    this.elements.zeroOrMore.addEventListener("click", () => {this.incidenceModifiersHandler(this.elements.zeroOrMore);});
-    this.elements.zeroOrOne.addEventListener("click", () => {this.incidenceModifiersHandler(this.elements.zeroOrOne);});
-    this.elements.nSubmit.addEventListener("click", () => {this.nSubmitHandler();});
-    this.elements.nmSubmit.addEventListener("click", () => {this.nmSubmitHandler();});
+    this.elements.oneOrMore.addEventListener('click', () => {this.incidenceModifiersHandler(this.elements.oneOrMore);});
+    this.elements.zeroOrMore.addEventListener('click', () => {this.incidenceModifiersHandler(this.elements.zeroOrMore);});
+    this.elements.zeroOrOne.addEventListener('click', () => {this.incidenceModifiersHandler(this.elements.zeroOrOne);});
+    this.elements.nSubmit.addEventListener('click', () => {this.nSubmitHandler();});
+    this.elements.nmSubmit.addEventListener('click', () => {this.nmSubmitHandler();});
 
-    this.elements.or.addEventListener("click", () => {this.orHandler();});
-    this.elements.and.addEventListener("click", () => {this.andHandler();});
+    this.elements.or.addEventListener('click', () => {this.orHandler();});
+    this.elements.and.addEventListener('click', () => {this.andHandler();});
   
   
     //#endregion Token Attribute Event Listeners
@@ -179,11 +179,11 @@ class ConcordanceQueryBuilder {
   
   showPositionalAttrArea() {
     this.elements.positionalAttrArea.classList.remove('hide');
-    this.elements.wordBuilder.classList.remove("hide");
-    this.elements.inputOptions.classList.remove("hide");
+    this.elements.wordBuilder.classList.remove('hide');
+    this.elements.inputOptions.classList.remove('hide');
     this.elements.incidenceModifiersButton.classList.remove('hide');
-    this.elements.conditionContainer.classList.remove("hide");
-    this.elements.ignoreCaseCheckbox.classList.remove("hide");
+    this.elements.conditionContainer.classList.remove('hide');
+    this.elements.ignoreCaseCheckbox.classList.remove('hide');
     this.elements.structuralAttrArea.classList.add('hide');
     this.elements.lemmaBuilder.classList.add('hide');
     this.elements.englishPosBuilder.classList.add('hide');
@@ -192,12 +192,12 @@ class ConcordanceQueryBuilder {
 
     this.elements.tokenQueryFilled = false;
 
-    window.location.href = "#token-builder-content";
+    window.location.href = '#token-builder-content';
 
     // Resets materialize select field to default value 
     let SelectInstance = M.FormSelect.getInstance(this.elements.positionalAttr);
-    SelectInstance.input.value = "word";
-    this.elements.positionalAttr.value = "word";
+    SelectInstance.input.value = 'word';
+    this.elements.positionalAttr.value = 'word';
   }
 
   showStructuralAttrArea() {
@@ -207,7 +207,7 @@ class ConcordanceQueryBuilder {
 
   buttonfactory(dataType, prettyText, queryText) {
 
-    window.location.href = "#query-container";
+    window.location.href = '#query-container';
     this.elements.counter += 1;
     queryText = encodeURI(queryText);
     let chipColor = 'style="background-color:#';
@@ -215,45 +215,45 @@ class ConcordanceQueryBuilder {
     // Sets chip color, depending on the type of element
     if (dataType === 'start-sentence' || dataType === 'end-sentence') {
       chipColor += 'FD9720';
-    } else if (dataType === "start-empty-entity" || dataType === "start-entity" || dataType === "end-entity") {
+    } else if (dataType === 'start-empty-entity' || dataType === 'start-entity' || dataType === 'end-entity') {
       chipColor += 'A6E22D';
-    } else if (dataType === "text-annotation") {
+    } else if (dataType === 'text-annotation') {
      chipColor += '2FBBAB';
-    } else if (dataType === "token") {
+    } else if (dataType === 'token') {
      chipColor += '28B3D1';
     } else {
      chipColor = '';
     }
 
-    // Creates a chip with the previously selected element. Is first created in the "BuilderElement" and populated with an EventListener, then moved to "yourQuery".
+    // Creates a chip with the previously selected element. Is first created in the 'BuilderElement' and populated with an EventListener, then moved to 'yourQuery'.
     let builderElement = document.createElement('div');
     builderElement.innerHTML +=`
-      <div class="chip" ${chipColor}" data-type="${dataType}" data-query="${queryText}" draggable="true" style="cursor:pointer;" ondragstart="concordanceQueryBuilder.dragStartHandler(event)" ondragend="concordanceQueryBuilder.dragEndHandler(event)">
+      <div class='chip' ${chipColor}' data-type='${dataType}' data-query='${queryText}' draggable='true' style='cursor:pointer;' ondragstart='concordanceQueryBuilder.dragStartHandler(event)' ondragend='concordanceQueryBuilder.dragEndHandler(event)'>
         ${prettyText}
-        <i class="material-icons close">close</i>
+        <i class='material-icons close'>close</i>
       </div>
     `.trim();
 
     let buttonElement = builderElement.firstElementChild;
-    buttonElement.addEventListener("click", () => {this.deleteAttr(buttonElement);});
+    buttonElement.addEventListener('click', () => {this.deleteAttr(buttonElement);});
 
     // Ensures that metadata is always at the end of the query:
-    if (this.elements.yourQuery.lastChild === null || this.elements.yourQuery.lastChild.dataset.type !== "text-annotation") {
+    if (this.elements.yourQuery.lastChild === null || this.elements.yourQuery.lastChild.dataset.type !== 'text-annotation') {
       this.elements.yourQuery.appendChild(buttonElement);
-    } else if (this.elements.yourQuery.lastChild.dataset.type === "text-annotation") {
+    } else if (this.elements.yourQuery.lastChild.dataset.type === 'text-annotation') {
       this.elements.yourQuery.insertBefore(buttonElement, this.elements.yourQuery.lastChild);
     }
 
-    this.elements.queryContainer.classList.remove("hide");
+    this.elements.queryContainer.classList.remove('hide');
     this.queryPreviewBuilder();
 
     // Opens a hint about the possible functions for editing the query when the first chip is added. It is displayed for 5 seconds and then deleted.
-    if (this.elements.yourQuery.classList.contains("tooltipped")) {
+    if (this.elements.yourQuery.classList.contains('tooltipped')) {
       let tooltipInstance = M.Tooltip.getInstance(this.elements.yourQuery);
-      tooltipInstance.tooltipEl.style.background = "#98ACD2";
-      tooltipInstance.tooltipEl.style.borderTop = "solid 4px #0064A3"
-      tooltipInstance.tooltipEl.style.padding = "10px";
-      tooltipInstance.tooltipEl.style.color = "black";
+      tooltipInstance.tooltipEl.style.background = '#98ACD2';
+      tooltipInstance.tooltipEl.style.borderTop = 'solid 4px #0064A3'
+      tooltipInstance.tooltipEl.style.padding = '10px';
+      tooltipInstance.tooltipEl.style.color = 'black';
 
       if (tooltipInstance !== undefined) {
         setTimeout(() => {
@@ -263,7 +263,7 @@ class ConcordanceQueryBuilder {
           }, 5000);
         }, 500);
       }
-      this.elements.yourQuery.classList.remove("tooltipped");
+      this.elements.yourQuery.classList.remove('tooltipped');
     }
   }
 
@@ -271,11 +271,11 @@ class ConcordanceQueryBuilder {
   dragStartHandler(event) {
     this.elements.dropButton = event.target;
     let targetChip = `
-      <div class="chip target" ondragover="concordanceQueryBuilder.dragOverHandler(event)" ondragenter="concordanceQueryBuilder.dragEnterHandler(event)" ondragleave="concordanceQueryBuilder.dragLeaveHandler(event)" ondrop="concordanceQueryBuilder.dropHandler(event)">
+      <div class='chip target' ondragover='concordanceQueryBuilder.dragOverHandler(event)' ondragenter='concordanceQueryBuilder.dragEnterHandler(event)' ondragleave='concordanceQueryBuilder.dragLeaveHandler(event)' ondrop='concordanceQueryBuilder.dropHandler(event)'>
         Drop here
       </div>
     `.trim();
-    let childNodes = this.elements.yourQuery.querySelectorAll("div:not(.target)");
+    let childNodes = this.elements.yourQuery.querySelectorAll('div:not(.target)');
 
     setTimeout(() => {
       for (let element of childNodes) {
@@ -284,10 +284,10 @@ class ConcordanceQueryBuilder {
         } else if (element === event.target.nextSibling) {
           continue;
         } else {
-          element.insertAdjacentHTML("beforebegin", targetChip)
+          element.insertAdjacentHTML('beforebegin', targetChip)
         }
       }
-      childNodes[childNodes.length-1].insertAdjacentHTML("afterend", targetChip);
+      childNodes[childNodes.length-1].insertAdjacentHTML('afterend', targetChip);
     },0);
   }
 
@@ -297,12 +297,12 @@ class ConcordanceQueryBuilder {
 
   dragEnterHandler(event) {
     event.preventDefault();
-    event.target.style.borderStyle = "solid dotted";
+    event.target.style.borderStyle = 'solid dotted';
   }
 
   dragLeaveHandler(event) {
     event.preventDefault();
-    event.target.style.borderStyle = "hidden";
+    event.target.style.borderStyle = 'hidden';
   }
 
   dragEndHandler(event) {
@@ -336,19 +336,19 @@ class ConcordanceQueryBuilder {
 
     for (let element of this.elements.yourQuery.childNodes) {
       let queryElement = decodeURI(element.dataset.query);
-      if (queryElement.includes("<")) {
-        queryElement = queryElement.replace("<", "&#60;");
+      if (queryElement.includes('<')) {
+        queryElement = queryElement.replace('<', '&#60;');
       }
-      if (queryElement.includes(">")) {
-        queryElement = queryElement.replace(">", "&#62;");
+      if (queryElement.includes('>')) {
+        queryElement = queryElement.replace('>', '&#62;');
       }
-      if (queryElement !== "undefined") {
+      if (queryElement !== 'undefined') {
         this.elements.yourQueryContent.push(queryElement);
       }
     }
 
     let queryString = this.elements.yourQueryContent.join(' ');
-    queryString += ";";
+    queryString += ';';
     this.elements.queryPreview.innerHTML = queryString;
   }
 
@@ -358,7 +358,7 @@ class ConcordanceQueryBuilder {
 
     this.elements.counter -= 1;
     if (this.elements.counter === 0) {
-      this.elements.queryContainer.classList.add("hide");
+      this.elements.queryContainer.classList.add('hide');
     }
 
     this.queryPreviewBuilder();
@@ -369,20 +369,20 @@ class ConcordanceQueryBuilder {
 
     for (let element of this.elements.yourQuery.childNodes) {
       let queryElement = decodeURI(element.dataset.query);
-      if (queryElement !== "undefined") {
+      if (queryElement !== 'undefined') {
         this.elements.yourQueryContent.push(queryElement);
       }
     }
 
     let queryString = this.elements.yourQueryContent.join(' ');
-    queryString += ";";
+    queryString += ';';
 
     this.elements.concordanceQueryBuilder.classList.add('modal-close');
     this.elements.extFormQuery.value = queryString;
   }
 
   clearAll() {
-    // Everything is reset. After 5 seconds for 5 seconds (with "instance"), a message is displayed indicating that further information can be obtained via the question mark icon
+    // Everything is reset. After 5 seconds for 5 seconds (with 'instance'), a message is displayed indicating that further information can be obtained via the question mark icon
     let instance = M.Tooltip.getInstance(this.elements.queryBuilderTutorialInfoIcon);
 
     this.hideEverything();
@@ -429,22 +429,22 @@ class ConcordanceQueryBuilder {
   tokenTypeSelector() {
     this.hideEverything();
     switch (this.elements.positionalAttr.value) {
-      case "word":
+      case 'word':
         this.wordBuilder();
         break;
-      case "lemma":
+      case 'lemma':
         this.lemmaBuilder();
         break;
-      case "english-pos":
+      case 'english-pos':
         this.englishPosHandler();
         break;
-      case "german-pos":
+      case 'german-pos':
         this.germanPosHandler();
         break;    
-      case "simple-pos-button":
+      case 'simple-pos-button':
         this.simplePosBuilder();
         break;
-      case "empty-token":
+      case 'empty-token':
         this.emptyTokenHandler();
         break;
       default:
@@ -455,17 +455,17 @@ class ConcordanceQueryBuilder {
 
   hideEverything() {
 
-    this.elements.wordBuilder.classList.add("hide");
-    this.elements.lemmaBuilder.classList.add("hide");
-    this.elements.ignoreCaseCheckbox.classList.add("hide");
-    this.elements.inputOptions.classList.add("hide");
-    this.elements.incidenceModifiersButton.classList.add("hide");
-    this.elements.conditionContainer.classList.add("hide");
-    this.elements.englishPosBuilder.classList.add("hide");
-    this.elements.germanPosBuilder.classList.add("hide");
-    this.elements.simplePosBuilder.classList.add("hide");
-    this.elements.entityBuilder.classList.add("hide");
-    this.elements.textAnnotationBuilder.classList.add("hide");
+    this.elements.wordBuilder.classList.add('hide');
+    this.elements.lemmaBuilder.classList.add('hide');
+    this.elements.ignoreCaseCheckbox.classList.add('hide');
+    this.elements.inputOptions.classList.add('hide');
+    this.elements.incidenceModifiersButton.classList.add('hide');
+    this.elements.conditionContainer.classList.add('hide');
+    this.elements.englishPosBuilder.classList.add('hide');
+    this.elements.germanPosBuilder.classList.add('hide');
+    this.elements.simplePosBuilder.classList.add('hide');
+    this.elements.entityBuilder.classList.add('hide');
+    this.elements.textAnnotationBuilder.classList.add('hide');
 
   }
 
@@ -475,12 +475,12 @@ class ConcordanceQueryBuilder {
     let buttonElement;
     builderElement = document.createElement('div');
     builderElement.innerHTML = `
-    <div class="chip col s2 l2" style="margin-top:20px;" data-tokentext="${tokenText}">
+    <div class='chip col s2 l2' style='margin-top:20px;' data-tokentext='${tokenText}'>
       ${prettyText}
-      <i class="material-icons close">close</i>
+      <i class='material-icons close'>close</i>
     </div>`;
     buttonElement = builderElement.firstElementChild;
-    buttonElement.addEventListener("click", () => {this.deleteTokenAttr(buttonElement);});
+    buttonElement.addEventListener('click', () => {this.deleteTokenAttr(buttonElement);});
     this.elements.tokenQuery.appendChild(buttonElement);
   }
 
@@ -496,8 +496,8 @@ class ConcordanceQueryBuilder {
 
   addToken() {
     let c;
-    let tokenQueryContent = ""; //for ButtonFactory(prettyText)
-    let tokenQueryText = ""; //for ButtonFactory(queryText)
+    let tokenQueryContent = ''; //for ButtonFactory(prettyText)
+    let tokenQueryText = ''; //for ButtonFactory(queryText)
     this.elements.cancelBool = false;
     let emptyTokenCheck = false;
 
@@ -511,55 +511,55 @@ class ConcordanceQueryBuilder {
     for (let element of this.elements.tokenQuery.childNodes) {
       tokenQueryContent += ' ' + element.firstChild.data + ' ';
       tokenQueryText += decodeURI(element.dataset.tokentext);
-      if (element.innerText.indexOf("empty token") !== -1) {
+      if (element.innerText.indexOf('empty token') !== -1) {
         emptyTokenCheck = true;
       }
     }
 
     if (this.elements.tokenQueryFilled === false) {
       switch (this.elements.positionalAttr.value) {
-        case "word":
-          if (this.elements.wordInput.value === "") {
+        case 'word':
+          if (this.elements.wordInput.value === '') {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `word=${this.elements.wordInput.value}${c}`;
-            tokenQueryText += `word="${this.elements.wordInput.value}"${c}`;
+            tokenQueryText += `word='${this.elements.wordInput.value}'${c}`;
             this.elements.wordInput.value = '';
           }
           break;
-        case "lemma":
-          if (this.elements.lemmaInput.value === "") {
+        case 'lemma':
+          if (this.elements.lemmaInput.value === '') {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `lemma=${this.elements.lemmaInput.value}${c}`;
-            tokenQueryText += `lemma="${this.elements.lemmaInput.value}"${c}`;
+            tokenQueryText += `lemma='${this.elements.lemmaInput.value}'${c}`;
             this.elements.lemmaInput.value = '';
           }
           break;
-        case "english-pos":
-          if (this.elements.englishPos.value === "default") {
+        case 'english-pos':
+          if (this.elements.englishPos.value === 'default') {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `pos=${this.elements.englishPos.value}`;
-            tokenQueryText += `pos="${this.elements.englishPos.value}"`;
+            tokenQueryText += `pos='${this.elements.englishPos.value}'`;
             this.elements.englishPos.value = '';
           }
           break;
-        case "german-pos":
-          if (this.elements.germanPos.value === "default") {
+        case 'german-pos':
+          if (this.elements.germanPos.value === 'default') {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `pos=${this.elements.germanPos.value}`;
-            tokenQueryText += `pos="${this.elements.germanPos.value}"`;
+            tokenQueryText += `pos='${this.elements.germanPos.value}'`;
             this.elements.germanPos.value = '';
           }
           break;
-        case "simple-pos-button":
-          if (this.elements.simplePos.value === "default") {
+        case 'simple-pos-button':
+          if (this.elements.simplePos.value === 'default') {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `simple_pos=${this.elements.simplePos.value}`;
-            tokenQueryText += `simple_pos="${this.elements.simplePos.value}"`;
+            tokenQueryText += `simple_pos='${this.elements.simplePos.value}'`;
             this.elements.simplePos.value = '';
           }
           break;
@@ -578,17 +578,17 @@ class ConcordanceQueryBuilder {
       this.buttonfactory('token', tokenQueryContent, tokenQueryText);
       this.hideEverything();
       this.elements.positionalAttrArea.classList.add('hide');
-      this.elements.tokenQuery.innerHTML = "";
+      this.elements.tokenQuery.innerHTML = '';
     }
 
   }
 
   disableTokenSubmit() {
     this.elements.cancelBool = true;
-    this.elements.tokenSubmitButton.classList.add("red");
+    this.elements.tokenSubmitButton.classList.add('red');
     this.elements.noValueMessage.classList.remove('hide');
     setTimeout(() => {
-      this.elements.tokenSubmitButton.classList.remove("red");
+      this.elements.tokenSubmitButton.classList.remove('red');
     }, 500);
     setTimeout(() => {
       this.elements.noValueMessage.classList.add('hide');
@@ -600,75 +600,75 @@ class ConcordanceQueryBuilder {
     //#region Dropdown Select Handler
   wordBuilder() {
     this.hideEverything();
-    this.elements.wordInput.value = "";
-    this.elements.wordBuilder.classList.remove("hide");
-    this.elements.inputOptions.classList.remove("hide");
+    this.elements.wordInput.value = '';
+    this.elements.wordBuilder.classList.remove('hide');
+    this.elements.inputOptions.classList.remove('hide');
     this.elements.incidenceModifiersButton.classList.remove('hide');
-    this.elements.conditionContainer.classList.remove("hide");
-    this.elements.ignoreCaseCheckbox.classList.remove("hide");
+    this.elements.conditionContainer.classList.remove('hide');
+    this.elements.ignoreCaseCheckbox.classList.remove('hide');
 
     // Resets materialize select field to default value 
     let SelectInstance = M.FormSelect.getInstance(this.elements.positionalAttr);
-    SelectInstance.input.value = "word";
-    this.elements.positionalAttr.value = "word";
+    SelectInstance.input.value = 'word';
+    this.elements.positionalAttr.value = 'word';
 
   }
 
   lemmaBuilder() {
     this.hideEverything();
-    this.elements.lemmaBuilder.classList.remove("hide");
-    this.elements.inputOptions.classList.remove("hide");
+    this.elements.lemmaBuilder.classList.remove('hide');
+    this.elements.inputOptions.classList.remove('hide');
     this.elements.incidenceModifiersButton.classList.remove('hide');
-    this.elements.conditionContainer.classList.remove("hide");
-    this.elements.ignoreCaseCheckbox.classList.remove("hide");
+    this.elements.conditionContainer.classList.remove('hide');
+    this.elements.ignoreCaseCheckbox.classList.remove('hide');
   }
 
   englishPosHandler() {
     this.hideEverything();
-    this.elements.englishPosBuilder.classList.remove("hide");
+    this.elements.englishPosBuilder.classList.remove('hide');
     this.elements.incidenceModifiersButton.classList.remove('hide');
-    this.elements.conditionContainer.classList.remove("hide");
+    this.elements.conditionContainer.classList.remove('hide');
     
     // Resets materialize select dropdown
     let selectInstance = M.FormSelect.getInstance(this.elements.englishPos);
-    selectInstance.input.value = "English pos tagset";
-    this.elements.englishPos.value = "default";
+    selectInstance.input.value = 'English pos tagset';
+    this.elements.englishPos.value = 'default';
   }
   
   germanPosHandler() {
     this.hideEverything();
-    this.elements.germanPosBuilder.classList.remove("hide");
+    this.elements.germanPosBuilder.classList.remove('hide');
     this.elements.incidenceModifiersButton.classList.remove('hide');
-    this.elements.conditionContainer.classList.remove("hide");
+    this.elements.conditionContainer.classList.remove('hide');
 
     // Resets materialize select dropdown
     let selectInstance = M.FormSelect.getInstance(this.elements.germanPos);
-    selectInstance.input.value = "German pos tagset";
-    this.elements.germanPos.value = "default";
+    selectInstance.input.value = 'German pos tagset';
+    this.elements.germanPos.value = 'default';
   }
 
   simplePosBuilder() {
   this.hideEverything();
-  this.elements.simplePosBuilder.classList.remove("hide");
+  this.elements.simplePosBuilder.classList.remove('hide');
   this.elements.incidenceModifiersButton.classList.remove('hide');
-  this.elements.conditionContainer.classList.remove("hide");
+  this.elements.conditionContainer.classList.remove('hide');
   this.elements.simplePos.selectedIndex = 0;
   
   // Resets materialize select dropdown
   let selectInstance = M.FormSelect.getInstance(this.elements.simplePos);
-  selectInstance.input.value = "simple_pos tagset";
-  this.elements.simplePos.value = "default";
+  selectInstance.input.value = 'simple_pos tagset';
+  this.elements.simplePos.value = 'default';
   }
 
   emptyTokenHandler() {
-    this.tokenButtonfactory("empty token", "[]");
+    this.tokenButtonfactory('empty token', '[]');
     this.elements.tokenQueryFilled = true;
     this.hideEverything();
     this.elements.incidenceModifiersButton.classList.remove('hide');
   }
   //#endregion Dropdown Select Handler
   
-    //#region Options to edit your token - Wildcard Charakter, Option Group, Incidence Modifiers, Ignore Case, "and", "or"
+    //#region Options to edit your token - Wildcard Charakter, Option Group, Incidence Modifiers, Ignore Case, 'and', 'or'
 
   inputOptionHandler(elem) {
     let input;
@@ -695,35 +695,35 @@ class ConcordanceQueryBuilder {
     instance.close();
     
     switch (this.elements.positionalAttr.value) {
-      case "word":
-        this.elements.wordInput.value += " {" + this.elements.nInput.value + "}";
+      case 'word':
+        this.elements.wordInput.value += ' {' + this.elements.nInput.value + '}';
         break;
-      case "lemma":
-        this.elements.lemmaInput.value += " {" + this.elements.nInput.value + "}";
+      case 'lemma':
+        this.elements.lemmaInput.value += ' {' + this.elements.nInput.value + '}';
         break;
-      case "english-pos":
+      case 'english-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
-        this.tokenButtonfactory("{" + this.elements.nInput.value + "}", "{" + this.elements.nInput.value + "}");
-        this.elements.englishPosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
+        this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
+        this.elements.englishPosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "german-pos":
+      case 'german-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
-        this.tokenButtonfactory("{" + this.elements.nInput.value + "}", "{" + this.elements.nInput.value + "}");
-        this.elements.germanPosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
+        this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
+        this.elements.germanPosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "simple-pos-button":
+      case 'simple-pos-button':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
-        this.tokenButtonfactory("{" + this.elements.nInput.value + "}", "{" + this.elements.nInput.value + "}");
-        this.elements.simplePosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
+        this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
+        this.elements.simplePosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "empty-token":
-        this.tokenButtonfactory("{" + this.elements.nInput.value + "}", "{" + this.elements.nInput.value + "}");
+      case 'empty-token':
+        this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
         break;
       default:
         break;
@@ -736,34 +736,34 @@ class ConcordanceQueryBuilder {
     instance.close();
 
     switch (this.elements.positionalAttr.value) {
-      case "word":
+      case 'word':
         this.elements.wordInput.value += `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`;
         break;
-      case "lemma":
+      case 'lemma':
         this.elements.lemmaInput.value += `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`;
         break;
-      case "english-pos":
+      case 'english-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
+        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
-        this.elements.englishPosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.elements.englishPosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "german-pos":
+      case 'german-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
+        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
-        this.elements.germanPosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.elements.germanPosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "simple-pos-button":
+      case 'simple-pos-button':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
+        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
-        this.elements.simplePosBuilder.classList.add("hide");
-        this.elements.incidenceModifiersButton.classList.add("hide");
+        this.elements.simplePosBuilder.classList.add('hide');
+        this.elements.incidenceModifiersButton.classList.add('hide');
         break;
-      case "empty-token":
+      case 'empty-token':
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
         break;
       default:
@@ -773,25 +773,25 @@ class ConcordanceQueryBuilder {
 
   incidenceModifiersHandler(elem) {
     // For word and lemma, the incidence modifiers are inserted in the input field. For the others, one or two chips are created which contain the respective value of the token and the incidence modifier.
-    if (this.elements.positionalAttr.value === "empty-token") {
+    if (this.elements.positionalAttr.value === 'empty-token') {
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
-    } else if (this.elements.positionalAttr.value === "english-pos") {
-      this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
+    } else if (this.elements.positionalAttr.value === 'english-pos') {
+      this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
-      this.elements.englishPosBuilder.classList.add("hide");
-      this.elements.incidenceModifiersButton.classList.add("hide");
+      this.elements.englishPosBuilder.classList.add('hide');
+      this.elements.incidenceModifiersButton.classList.add('hide');
       this.elements.tokenQueryFilled = true;
-    } else if (this.elements.positionalAttr.value === "german-pos") {
-      this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
+    } else if (this.elements.positionalAttr.value === 'german-pos') {
+      this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
-      this.elements.germanPosBuilder.classList.add("hide");
-      this.elements.incidenceModifiersButton.classList.add("hide");
+      this.elements.germanPosBuilder.classList.add('hide');
+      this.elements.incidenceModifiersButton.classList.add('hide');
       this.elements.tokenQueryFilled = true;
-    } else if (this.elements.positionalAttr.value === "simple-pos-button") {
-      this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
+    } else if (this.elements.positionalAttr.value === 'simple-pos-button') {
+      this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
-      this.elements.simplePosBuilder.classList.add("hide");
-      this.elements.incidenceModifiersButton.classList.add("hide");
+      this.elements.simplePosBuilder.classList.add('hide');
+      this.elements.incidenceModifiersButton.classList.add('hide');
       this.elements.tokenQueryFilled = true;
     } else {
       let input;
@@ -808,11 +808,11 @@ class ConcordanceQueryBuilder {
   }
 
   orHandler() {
-    this.conditionHandler("or", " | ");
+    this.conditionHandler('or', ' | ');
   }
 
   andHandler() {
-    this.conditionHandler("and", " & ");
+    this.conditionHandler('and', ' & ');
   }
 
   conditionHandler(conditionText, conditionQueryContent) {
@@ -828,29 +828,29 @@ class ConcordanceQueryBuilder {
     }
 
     switch (this.elements.positionalAttr.value) {
-      case "word":
+      case 'word':
         tokenQueryContent = `word=${this.elements.wordInput.value}${c}`;
-        tokenQueryText = `word="${this.elements.wordInput.value}"${c}`;
+        tokenQueryText = `word='${this.elements.wordInput.value}'${c}`;
         this.elements.wordInput.value = '';
         break;
-      case "lemma":
+      case 'lemma':
         tokenQueryContent = `lemma=${this.elements.lemmaInput.value}${c}`;
-        tokenQueryText = `word="${this.elements.lemmaInput.value}"${c}`;
+        tokenQueryText = `word='${this.elements.lemmaInput.value}'${c}`;
         this.elements.lemmaInput.value = '';
         break;
-      case "english-pos":
+      case 'english-pos':
         tokenQueryContent = `pos=${this.elements.englishPos.value}`;
-        tokenQueryText = `pos="${this.elements.englishPos.value}"`;
+        tokenQueryText = `pos='${this.elements.englishPos.value}'`;
         this.elements.englishPos.value = '';
         break;
-      case "german-pos":
+      case 'german-pos':
         tokenQueryContent = `pos=${this.elements.germanPos.value}`;
-        tokenQueryText = `pos="${this.elements.germanPos.value}"`;
+        tokenQueryText = `pos='${this.elements.germanPos.value}'`;
         this.elements.germanPos.value = '';
         break;
-      case "simple-pos-button":
+      case 'simple-pos-button':
         tokenQueryContent = `simple_pos=${this.elements.simplePos.value}`;
-        tokenQueryText = `simple_pos="${this.elements.simplePos.value}"`;
+        tokenQueryText = `simple_pos='${this.elements.simplePos.value}'`;
         this.elements.simplePos.value = '';
         break;
       default:
@@ -863,7 +863,7 @@ class ConcordanceQueryBuilder {
     this.wordBuilder();
   }
 
-  //#endregion Options to edit your token - Wildcard Charakter, Option Group, Incidence Modifiers, Ignore Case, "and", "or"
+  //#endregion Options to edit your token - Wildcard Charakter, Option Group, Incidence Modifiers, Ignore Case, 'and', 'or'
 
   //#endregion Token Attribute Builder Functions
 
@@ -899,33 +899,33 @@ class ConcordanceQueryBuilder {
       this.elements.entity.innerHTML = 'Entity';
     } else {
       this.hideEverything();
-      this.elements.entityBuilder.classList.remove("hide");
-      window.location.href = "#entity-builder";
+      this.elements.entityBuilder.classList.remove('hide');
+      window.location.href = '#entity-builder';
     }
   }
 
   englishEntTypeHandler() {
-    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.englishEntType.value, '<ent_type="' + this.elements.englishEntType.value + '">');
+    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.englishEntType.value, '<ent_type="" + this.elements.englishEntType.value + "">');
     this.elements.entity.innerHTML = 'End Entity';
     this.hideEverything();
     this.elements.entityAnyType = false;
     
     // Resets materialize select dropdown
     let SelectInstance = M.FormSelect.getInstance(this.elements.englishEntType);
-    SelectInstance.input.value = "English ent_type";
-    this.elements.englishEntType.value = "default";
+    SelectInstance.input.value = 'English ent_type';
+    this.elements.englishEntType.value = 'default';
   }   
 
   germanEntTypeHandler() {
-    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.germanEntType.value, '<ent_type="' + this.elements.germanEntType.value + '">');
+    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.germanEntType.value, '<ent_type="" + this.elements.germanEntType.value + "">');
     this.elements.entity.innerHTML = 'End Entity';
     this.hideEverything();
     this.elements.entityAnyType = false;
 
     // Resets materialize select dropdown
     let SelectInstance = M.FormSelect.getInstance(this.elements.germanEntType);
-    SelectInstance.input.value = "German ent_type";
-    this.elements.germanEntType.value = "default";
+    SelectInstance.input.value = 'German ent_type';
+    this.elements.germanEntType.value = 'default';
   }
 
   emptyEntityButton() {
@@ -937,14 +937,14 @@ class ConcordanceQueryBuilder {
 
   addTextAnnotation() {
     this.hideEverything();
-    this.elements.textAnnotationBuilder.classList.remove("hide");
-    window.location.href = "#text-annotation-builder";
+    this.elements.textAnnotationBuilder.classList.remove('hide');
+    window.location.href = '#text-annotation-builder';
 
     // Resets materialize select dropdown
     let SelectInstance = M.FormSelect.getInstance(this.elements.textAnnotationOptions);
-    SelectInstance.input.value = "address";
-    this.elements.textAnnotationOptions.value = "address";
-    this.elements.textAnnotationInput.value= "";
+    SelectInstance.input.value = 'address';
+    this.elements.textAnnotationOptions.value = 'address';
+    this.elements.textAnnotationInput.value= '';
   }
 
   textAnnotationSubmitHandler() {
@@ -958,7 +958,7 @@ class ConcordanceQueryBuilder {
         this.elements.noValueMetadataMessage.classList.add('hide');
       }, 3000);
     } else {
-      let queryText = `:: match.text_${this.elements.textAnnotationOptions.value}="${this.elements.textAnnotationInput.value}"`;
+      let queryText = `:: match.text_${this.elements.textAnnotationOptions.value}='${this.elements.textAnnotationInput.value}'`;
       this.buttonfactory('text-annotation', `${this.elements.textAnnotationOptions.value}=${this.elements.textAnnotationInput.value}`, queryText);
       this.hideEverything();
     }

From dc3709decbe6e82428f437195fcf99f6628c1e13 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 12 Oct 2022 15:10:55 +0200
Subject: [PATCH 07/20] Remove the TranskribusHTRPipelineModel and fetch data
 on request.

---
 app/cli.py                                    |  5 +-
 app/daemon/job_utils.py                       |  7 +--
 app/models.py                                 | 55 +------------------
 app/services/forms.py                         | 13 +----
 app/services/routes.py                        | 27 +++++----
 .../services/transkribus_htr_pipeline.html.j2 | 12 ++--
 migrations/versions/a3b727e3ff71_.py          | 35 ++++++++++++
 nopaque.py                                    |  2 -
 8 files changed, 64 insertions(+), 92 deletions(-)
 create mode 100644 migrations/versions/a3b727e3ff71_.py

diff --git a/app/cli.py b/app/cli.py
index bfaf8754..54226707 100644
--- a/app/cli.py
+++ b/app/cli.py
@@ -5,8 +5,7 @@ import os
 from app.models import (
     Role,
     User,
-    TesseractOCRPipelineModel,
-    TranskribusHTRPipelineModel
+    TesseractOCRPipelineModel
 )
 
 
@@ -42,8 +41,6 @@ def register(app):
         User.insert_defaults()
         current_app.logger.info('Insert/Update default TesseractOCRPipelineModels')
         TesseractOCRPipelineModel.insert_defaults()
-        current_app.logger.info('Insert/Update default TranskribusHTRPipelineModels')
-        TranskribusHTRPipelineModel.insert_defaults()
 
     @app.cli.group()
     def converter():
diff --git a/app/daemon/job_utils.py b/app/daemon/job_utils.py
index 0f74f3a0..32def73d 100644
--- a/app/daemon/job_utils.py
+++ b/app/daemon/job_utils.py
@@ -3,8 +3,7 @@ from app.models import (
     Job,
     JobResult,
     JobStatus,
-    TesseractOCRPipelineModel,
-    TranskribusHTRPipelineModel
+    TesseractOCRPipelineModel
 )
 from datetime import datetime
 from flask import current_app
@@ -61,8 +60,8 @@ def _create_job_service(job):
         if 'binarization' in job.service_args and job.service_args['binarization']:
             command += ' --binarize'
     elif job.service == 'transkribus-htr-pipeline':
-        transkribus_htr_model = TranskribusHTRPipelineModel.query.get(job.service_args['model'])
-        command += f' -m {transkribus_htr_model.transkribus_model_id}'
+        transkribus_htr_pipeline_model_id = job.service_args['model']
+        command += f' -m {transkribus_htr_pipeline_model_id}'
         readcoop_username = current_app.config.get('NOPAQUE_READCOOP_USERNAME')
         command += f' --readcoop-username "{readcoop_username}"'
         readcoop_password = current_app.config.get('NOPAQUE_READCOOP_PASSWORD')
diff --git a/app/models.py b/app/models.py
index beab7d6e..18188b49 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 from enum import Enum, IntEnum
+import re
 from flask import current_app, url_for
 from flask_hashids import HashidMixin
 from flask_login import UserMixin
@@ -20,9 +21,6 @@ from app.converters.vrt import normalize_vrt_file
 from app.email import create_message
 
 
-TRANSKRIBUS_HTR_MODELS = \
-    json.loads(requests.get('https://transkribus.eu/TrpServer/rest/models/text', params={'docType': 'handwritten'}).content)['trpModelMetadata']  # noqa
-
 ##############################################################################
 # enums                                                                      #
 ##############################################################################
@@ -279,12 +277,6 @@ class User(HashidMixin, UserMixin, db.Model):
         cascade='all, delete-orphan',
         lazy='dynamic'
     )
-    transkribus_htr_pipeline_models = db.relationship(
-        'TranskribusHTRPipelineModel',
-        backref='user',
-        cascade='all, delete-orphan',
-        lazy='dynamic'
-    )
     corpora = db.relationship(
         'Corpus',
         backref='user',
@@ -622,51 +614,6 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
         return _json
 
 
-class TranskribusHTRPipelineModel(HashidMixin, db.Model):
-    __tablename__ = 'transkribus_htr_pipeline_models'
-    # Primary key
-    id = db.Column(db.Integer, primary_key=True)
-    # Foreign keys
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
-    # Fields
-    shared = db.Column(db.Boolean, default=False)
-    transkribus_model_id = db.Column(db.Integer)
-    # Backrefs: user: User
-
-    @staticmethod
-    def insert_defaults():
-        nopaque_user = User.query.filter_by(username='nopaque').first()
-        # models = [
-        #     m for m in TRANSKRIBUS_HTR_MODELS if True
-        #     and 'creator' in m and m['creator'] == 'Transkribus Team'
-        #     and 'docType' in m and m['docType'] == 'handwritten'
-        # ]
-        for m in TRANSKRIBUS_HTR_MODELS:
-            model = TranskribusHTRPipelineModel.query.filter_by(transkribus_model_id=m['modelId']).first()  # noqa
-            if model is not None:
-                model.shared = True
-                model.transkribus_model_id = m['modelId']
-                continue
-            model = TranskribusHTRPipelineModel(
-                transkribus_model_id=m['modelId'],
-                shared=True,
-                user=nopaque_user,
-            )
-            db.session.add(model)
-        db.session.commit()
-
-    def to_json(self, backrefs=False, relationships=False):
-        _json = {
-            'id': self.hashid,
-            'user_id': self.user.hashid,
-            'shared': self.shared,
-            'transkribus_model_id': self.transkribus_model_id,
-        }
-        if backrefs:
-            _json['user'] = self.user.to_json(backrefs=True)
-        return _json
-
-
 class JobInput(FileMixin, HashidMixin, db.Model):
     __tablename__ = 'job_inputs'
     # Primary key
diff --git a/app/services/forms.py b/app/services/forms.py
index ea1c1e70..5c0af906 100644
--- a/app/services/forms.py
+++ b/app/services/forms.py
@@ -10,11 +10,7 @@ from wtforms import (
     ValidationError
 )
 from wtforms.validators import InputRequired, Length
-from app.models import (
-    TRANSKRIBUS_HTR_MODELS,
-    TesseractOCRPipelineModel,
-    TranskribusHTRPipelineModel
-)
+from app.models import TesseractOCRPipelineModel
 from . import SERVICES
 
 
@@ -107,6 +103,7 @@ class CreateTranskribusHTRPipelineJobForm(CreateJobBaseForm):
             raise ValidationError('PDF files only!')
 
     def __init__(self, *args, **kwargs):
+        transkribus_htr_pipeline_models = kwargs.pop('transkribus_htr_pipeline_models', [])
         service_manifest = SERVICES['transkribus-htr-pipeline']
         version = kwargs.pop('version', service_manifest['latest_version'])
         super().__init__(*args, **kwargs)
@@ -118,12 +115,8 @@ class CreateTranskribusHTRPipelineJobForm(CreateJobBaseForm):
             if 'binarization' in service_info['methods']:
                 if 'disabled' in self.binarization.render_kw:
                     del self.binarization.render_kw['disabled']
-        models = [
-            x for x in TranskribusHTRPipelineModel.query.filter().all()
-            if x.shared == True or x.user == current_user
-        ]
         self.model.choices = [('', 'Choose your option')]
-        self.model.choices += [(x.hashid, [y['name'] for y in TRANSKRIBUS_HTR_MODELS if y['modelId'] == x.transkribus_model_id ][0]) for x in models]
+        self.model.choices += [(x['modelId'], x['name']) for x in transkribus_htr_pipeline_models]
         self.model.default = ''
         self.version.choices = [(x, x) for x in service_manifest['versions']]
         self.version.data = version
diff --git a/app/services/routes.py b/app/services/routes.py
index 4f019525..b34d0619 100644
--- a/app/services/routes.py
+++ b/app/services/routes.py
@@ -1,13 +1,12 @@
-from flask import abort, current_app, flash, Markup, render_template, request
+from flask import abort, current_app, flash, make_response, Markup, render_template, request
 from flask_login import current_user, login_required
+import requests
 from app import db, hashids
 from app.models import (
     Job,
     JobInput,
     JobStatus,
-    TesseractOCRPipelineModel,
-    TRANSKRIBUS_HTR_MODELS,
-    TranskribusHTRPipelineModel
+    TesseractOCRPipelineModel
 )
 from . import bp, SERVICES
 from .forms import (
@@ -117,7 +116,18 @@ def transkribus_htr_pipeline():
     version = request.args.get('version', service_manifest['latest_version'])
     if version not in service_manifest['versions']:
         abort(404)
-    form = CreateTranskribusHTRPipelineJobForm(prefix='create-job-form', version=version)
+    r = requests.get(
+        'https://transkribus.eu/TrpServer/rest/models/text',
+        headers={'Accept': 'application/json'}
+    )
+    if r.status_code != 200:
+        abort(500)
+    transkribus_htr_pipeline_models = r.json()['trpModelMetadata']
+    form = CreateTranskribusHTRPipelineJobForm(
+        transkribus_htr_pipeline_models=transkribus_htr_pipeline_models,
+        prefix='create-job-form',
+        version=version
+    )
     if form.is_submitted():
         if not form.validate():
             response = {'errors': form.errors}
@@ -129,7 +139,7 @@ def transkribus_htr_pipeline():
                 service=service,
                 service_args={
                     'binarization': form.binarization.data,
-                    'model': hashids.decode(form.model.data)
+                    'model': form.model.data
                 },
                 service_version=form.version.data,
                 user=current_user
@@ -145,15 +155,10 @@ def transkribus_htr_pipeline():
         message = Markup(f'Job "<a href="{job.url}">{job.title}</a>" created')
         flash(message, 'job')
         return {}, 201, {'Location': job.url}
-    transkribus_htr_pipeline_models = [
-        x for x in TranskribusHTRPipelineModel.query.all()
-        if x.shared == True or x.user == current_user
-    ]
     return render_template(
         'services/transkribus_htr_pipeline.html.j2',
         form=form,
         title=service_manifest['name'],
-        TRANSKRIBUS_HTR_MODELS=TRANSKRIBUS_HTR_MODELS,
         transkribus_htr_pipeline_models=transkribus_htr_pipeline_models
     )
 
diff --git a/app/templates/services/transkribus_htr_pipeline.html.j2 b/app/templates/services/transkribus_htr_pipeline.html.j2
index 79519f3a..d54d9906 100644
--- a/app/templates/services/transkribus_htr_pipeline.html.j2
+++ b/app/templates/services/transkribus_htr_pipeline.html.j2
@@ -156,15 +156,13 @@
 <div id="models-modal" class="modal">
   <div class="modal-content">
     <h4>Transkribus HTR Pipeline models</h4>
-    <ul class="collapsible popout" id="transkribus-htr-models">
-      {% for m in transkribus_htr_pipeline_models %}
-      <li id="transkribus-htr-pipeline-model-{{ m.hashid }}">
-        {% for m_info in TRANSKRIBUS_HTR_MODELS if m_info['modelId'] == m.transkribus_model_id %}
-        <div class="collapsible-header"><i class="material-icons">widgets</i>{{ m_info.name }}</div>
+    <ul class="collapsible popout" id="transkribus-htr-pipeline-models">
+      {% for x in transkribus_htr_pipeline_models %}
+      <li id="transkribus-htr-pipeline-model-{{ x.modelId }}">
+        <div class="collapsible-header"><i class="material-icons">widgets</i>{{ x.name }}</div>
         <div class="collapsible-body">
-          {{ m_info|tojson }}
+          {{ x|tojson }}
         </div>
-        {% endfor %}
       </li>
       {% endfor %}
     </ul>
diff --git a/migrations/versions/a3b727e3ff71_.py b/migrations/versions/a3b727e3ff71_.py
new file mode 100644
index 00000000..a2fb37fb
--- /dev/null
+++ b/migrations/versions/a3b727e3ff71_.py
@@ -0,0 +1,35 @@
+"""Remove transkribus_htr_pipeline_models table
+
+Revision ID: a3b727e3ff71
+Revises: 63b2cc26a01f
+Create Date: 2022-10-12 13:08:19.065218
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a3b727e3ff71'
+down_revision = '63b2cc26a01f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('transkribus_htr_pipeline_models')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('transkribus_htr_pipeline_models',
+    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.Column('shared', sa.BOOLEAN(), autoincrement=False, nullable=True),
+    sa.Column('transkribus_model_id', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='transkribus_htr_models_user_id_fkey'),
+    sa.PrimaryKeyConstraint('id', name='transkribus_htr_models_pkey')
+    )
+    # ### end Alembic commands ###
diff --git a/nopaque.py b/nopaque.py
index 457add2c..bff58ae1 100644
--- a/nopaque.py
+++ b/nopaque.py
@@ -13,7 +13,6 @@ from app.models import (
     Permission,
     Role,
     TesseractOCRPipelineModel,
-    TranskribusHTRPipelineModel,
     User
 )  # noqa
 from flask import Flask  # noqa
@@ -43,7 +42,6 @@ def make_shell_context() -> Dict[str, Any]:
         'Permission': Permission,
         'Role': Role,
         'TesseractOCRPipelineModel': TesseractOCRPipelineModel,
-        'TranskribusHTRPipelineModel': TranskribusHTRPipelineModel,
         'User': User
     }
 

From 2ead38bbe4ffa74a95f163a5c45447aaf927af26 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 12 Oct 2022 15:32:47 +0200
Subject: [PATCH 08/20] Add new config option. DOCKER_NETWORK_NAME

---
 app/daemon/corpus_utils.py | 2 +-
 config.py                  | 3 +++
 docker-compose.yml         | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/daemon/corpus_utils.py b/app/daemon/corpus_utils.py
index 1703521a..4d807c14 100644
--- a/app/daemon/corpus_utils.py
+++ b/app/daemon/corpus_utils.py
@@ -143,7 +143,7 @@ def _create_cqpserver_container(corpus):
     ''' ## Name ## '''
     name = f'cqpserver_{corpus.id}'
     ''' ## Network ## '''
-    network = 'nopaque_default'
+    network = f'{current_app.config["DOCKER_NETWORK_NAME"]}'
     ''' ## Volumes ## '''
     volumes = []
     ''' ### Corpus data volume ### '''
diff --git a/config.py b/config.py
index 4eba99d2..97e810ee 100644
--- a/config.py
+++ b/config.py
@@ -11,6 +11,9 @@ load_dotenv(os.path.join(basedir, '.env'))
 
 
 class Config:
+    ''' Docker '''
+    DOCKER_NETWORK_NAME = os.environ.get('DOCKER_NETWORK_NAME', 'nopaque_default')
+
     ''' APIFairy '''
     APIFAIRY_TITLE = 'nopaque'
     APIFAIRY_VERSION = '0.0.1'
diff --git a/docker-compose.yml b/docker-compose.yml
index f668e00d..52f011e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,9 @@
 version: "3.5"
 
+networks:
+  default:
+    name: "${DOCKER_NETWORK_NAME:-nopaque_default}"
+
 services:
   db:
     env_file: db.env

From 89ccca11ebea9e3f4190c091959170d2bd9f6b86 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 13 Oct 2022 11:09:47 +0200
Subject: [PATCH 09/20] Add new configuration variable to .env template

---
 .env.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.env.tpl b/.env.tpl
index 588e2f45..30a89416 100644
--- a/.env.tpl
+++ b/.env.tpl
@@ -21,6 +21,9 @@ HOST_DOCKER_GID=
 # NOTES: Use `.` as <project-basedir>
 # HOST_LOG_DIR=
 
+# DEFAULT: nopaque_default
+# DOCKER_NETWORK_NAME=
+
 ################################################################################
 # Flask                                                                        #
 # https://flask.palletsprojects.com/en/1.1.x/config/                           #
@@ -186,4 +189,4 @@ NOPAQUE_DOCKER_REGISTRY_PASSWORD=
 
 # READ-COOP account data: https://readcoop.eu/
 # NOPAQUE_READCOOP_USERNAME=
-# NOPAQUE_READCOOP_PASSWORD=
\ No newline at end of file
+# NOPAQUE_READCOOP_PASSWORD=

From b9e5939c1b5783cba99abfa70081f904dbd9682a Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 13 Oct 2022 15:05:54 +0200
Subject: [PATCH 10/20] Add SpaCyNLPModel database model

---
 app/SpaCyNLPPipelineModel.defaults.yml |  10 +++
 app/cli.py                             |   5 +-
 app/models.py                          | 106 +++++++++++++++++++++++++
 migrations/versions/31dd42e5ea6f_.py   |  53 +++++++++++++
 migrations/versions/63b2cc26a01f_.py   |   6 +-
 5 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100644 app/SpaCyNLPPipelineModel.defaults.yml
 create mode 100644 migrations/versions/31dd42e5ea6f_.py

diff --git a/app/SpaCyNLPPipelineModel.defaults.yml b/app/SpaCyNLPPipelineModel.defaults.yml
new file mode 100644
index 00000000..576f85e4
--- /dev/null
+++ b/app/SpaCyNLPPipelineModel.defaults.yml
@@ -0,0 +1,10 @@
+- title: 'de_core_news_md-3.4.0'
+  description: 'German pipeline optimized for CPU. Components: tok2vec, tagger, morphologizer, parser, lemmatizer (trainable_lemmatizer), senter, ner.'
+  url: 'https://github.com/explosion/spacy-models/releases/download/de_core_news_md-3.4.0/de_core_news_md-3.4.0.tar.gz'
+  publisher: 'Explosion'
+  publisher_url: 'https://github.com/explosion'
+  publishing_url: 'https://github.com/explosion/spacy-models/releases/tag/de_core_news_md-3.4.0'
+  publishing_year: 2022
+  version: '3.4.0'
+  compatible_service_versions:
+    - '0.1.0'
diff --git a/app/cli.py b/app/cli.py
index 54226707..826aa790 100644
--- a/app/cli.py
+++ b/app/cli.py
@@ -5,7 +5,8 @@ import os
 from app.models import (
     Role,
     User,
-    TesseractOCRPipelineModel
+    TesseractOCRPipelineModel,
+    SpaCyNLPPipelineModel
 )
 
 
@@ -39,6 +40,8 @@ def register(app):
         Role.insert_defaults()
         current_app.logger.info('Insert/Update default users')
         User.insert_defaults()
+        current_app.logger.info('Insert/Update default SpaCyNLPPipelineModels')
+        SpaCyNLPPipelineModel.insert_defaults()
         current_app.logger.info('Insert/Update default TesseractOCRPipelineModels')
         TesseractOCRPipelineModel.insert_defaults()
 
diff --git a/app/models.py b/app/models.py
index 18188b49..cc5d60ce 100644
--- a/app/models.py
+++ b/app/models.py
@@ -277,6 +277,12 @@ class User(HashidMixin, UserMixin, db.Model):
         cascade='all, delete-orphan',
         lazy='dynamic'
     )
+    spacy_nlp_pipeline_models = db.relationship(
+        'SpaCyNLPPipelineModel',
+        backref='user',
+        cascade='all, delete-orphan',
+        lazy='dynamic'
+    )
     corpora = db.relationship(
         'Corpus',
         backref='user',
@@ -333,6 +339,7 @@ class User(HashidMixin, UserMixin, db.Model):
         db.session.refresh(user)
         try:
             os.mkdir(user.path)
+            os.mkdir(os.path.join(user.path, 'spacy_nlp_pipeline_models'))
             os.mkdir(os.path.join(user.path, 'tesseract_ocr_pipeline_models'))
             os.mkdir(os.path.join(user.path, 'corpora'))
             os.mkdir(os.path.join(user.path, 'jobs'))
@@ -614,6 +621,105 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
         return _json
 
 
+class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
+    __tablename__ = 'spacy_nlp_pipeline_models'
+    # Primary key
+    id = db.Column(db.Integer, primary_key=True)
+    # Foreign keys
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
+    # Fields
+    title = db.Column(db.String(64))
+    description = db.Column(db.String(255))
+    version = db.Column(db.String(16))
+    compatible_service_versions = db.Column(ContainerColumn(list, 255))
+    publisher = db.Column(db.String(128))
+    publisher_url = db.Column(db.String(512))
+    publishing_url = db.Column(db.String(512))
+    publishing_year = db.Column(db.Integer)
+    shared = db.Column(db.Boolean, default=False)
+    # Backrefs: user: User
+
+    @property
+    def path(self):
+        return os.path.join(
+            self.user.path,
+            'spacy_nlp_pipeline_models',
+            str(self.id)
+        )
+
+    @staticmethod
+    def insert_defaults():
+        nopaque_user = User.query.filter_by(username='nopaque').first()
+        defaults_file = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            'SpaCyNLPPipelineModel.defaults.yml'
+        )
+        with open(defaults_file, 'r') as f:
+            defaults = yaml.safe_load(f)
+        for m in defaults:
+            model = SpaCyNLPPipelineModel.query.filter_by(title=m['title'], version=m['version']).first()  # noqa
+            if model is not None:
+                model.compatible_service_versions = m['compatible_service_versions']
+                model.description = m['description']
+                model.publisher = m['publisher']
+                model.publisher_url = m['publisher_url']
+                model.publishing_url = m['publishing_url']
+                model.publishing_year = m['publishing_year']
+                model.shared = True
+                model.title = m['title']
+                model.version = m['version']
+                continue
+            model = SpaCyNLPPipelineModel(
+                compatible_service_versions=m['compatible_service_versions'],
+                description=m['description'],
+                publisher=m['publisher'],
+                publisher_url=m['publisher_url'],
+                publishing_url=m['publishing_url'],
+                publishing_year=m['publishing_year'],
+                shared=True,
+                title=m['title'],
+                user=nopaque_user,
+                version=m['version']
+            )
+            db.session.add(model)
+            db.session.flush(objects=[model])
+            db.session.refresh(model)
+            model.filename = f'{model.id}.traineddata'
+            r = requests.get(m['url'], stream=True)
+            pbar = tqdm(
+                desc=f'{model.title} ({model.filename})',
+                unit="B",
+                unit_scale=True,
+                unit_divisor=1024,
+                total=int(r.headers['Content-Length'])
+            )
+            pbar.clear()
+            with open(model.path, 'wb') as f:
+                for chunk in r.iter_content(chunk_size=1024):
+                    if chunk:  # filter out keep-alive new chunks
+                        pbar.update(len(chunk))
+                        f.write(chunk)
+                pbar.close()
+        db.session.commit()
+
+    def to_json(self, backrefs=False, relationships=False):
+        _json = {
+            'id': self.hashid,
+            'compatible_service_versions': self.compatible_service_versions,
+            'description': self.description,
+            'publisher': self.publisher,
+            'publisher_url': self.publisher_url,
+            'publishing_url': self.publishing_url,
+            'publishing_year': self.publishing_year,
+            'shared': self.shared,
+            'title': self.title,
+            **self.file_mixin_to_json()
+        }
+        if backrefs:
+            _json['user'] = self.user.to_json(backrefs=True)
+        return _json
+
+
 class JobInput(FileMixin, HashidMixin, db.Model):
     __tablename__ = 'job_inputs'
     # Primary key
diff --git a/migrations/versions/31dd42e5ea6f_.py b/migrations/versions/31dd42e5ea6f_.py
new file mode 100644
index 00000000..a92ada9c
--- /dev/null
+++ b/migrations/versions/31dd42e5ea6f_.py
@@ -0,0 +1,53 @@
+"""Add spacy_nlp_pipeline_models table
+
+Revision ID: 31dd42e5ea6f
+Revises: a3b727e3ff71
+Create Date: 2022-10-13 12:47:50.870474
+
+"""
+from alembic import op
+import shutil
+import sqlalchemy as sa
+import os
+from app.models import User
+
+
+# revision identifiers, used by Alembic.
+revision = '31dd42e5ea6f'
+down_revision = 'a3b727e3ff71'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    for user in User.query.all():
+        os.mkdir(os.path.join(user.path, 'spacy_nlp_pipeline_models'))
+    op.create_table('spacy_nlp_pipeline_models',
+    sa.Column('creation_date', sa.DateTime(), nullable=True),
+    sa.Column('filename', sa.String(length=255), nullable=True),
+    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+    sa.Column('mimetype', sa.String(length=255), nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.Column('title', sa.String(length=64), nullable=True),
+    sa.Column('description', sa.String(length=255), nullable=True),
+    sa.Column('version', sa.String(length=16), nullable=True),
+    sa.Column('compatible_service_versions', sa.String(length=255), nullable=True),
+    sa.Column('publisher', sa.String(length=128), nullable=True),
+    sa.Column('publisher_url', sa.String(length=512), nullable=True),
+    sa.Column('publishing_url', sa.String(length=512), nullable=True),
+    sa.Column('publishing_year', sa.Integer(), nullable=True),
+    sa.Column('shared', sa.Boolean(), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    for user in User.query.all():
+        shutil.rmtree(os.path.join(user.path, 'spacy_nlp_pipeline_models'))
+    op.drop_table('spacy_nlp_pipeline_models')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/63b2cc26a01f_.py b/migrations/versions/63b2cc26a01f_.py
index 5876ed3c..35eacc86 100644
--- a/migrations/versions/63b2cc26a01f_.py
+++ b/migrations/versions/63b2cc26a01f_.py
@@ -19,8 +19,7 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    users = User.query.all()
-    for user in users:
+    for user in User.query.all():
         old_tesseract_ocr_pipeline_model_path = os.path.join(
             user.path,
             'tesseract_ocr_models'
@@ -40,8 +39,7 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    users = User.query.all()
-    for user in users:
+    for user in User.query.all():
         old_tesseract_ocr_pipeline_model_path = os.path.join(
             user.path,
             'tesseract_ocr_models'

From 20b1a968624bc727d2002c7a06104ebbaaec51e6 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Thu, 13 Oct 2022 15:15:53 +0200
Subject: [PATCH 11/20] New CSS File

---
 app/static/css/queryBuilder.css              | 146 +++++++++++++++++++
 app/static/js/CorpusAnalysis/QueryBuilder.js |  43 ++----
 app/templates/_styles.html.j2                |   1 +
 app/templates/test/analyse_corpus.html.j2    |  75 +++++-----
 4 files changed, 194 insertions(+), 71 deletions(-)
 create mode 100644 app/static/css/queryBuilder.css

diff --git a/app/static/css/queryBuilder.css b/app/static/css/queryBuilder.css
new file mode 100644
index 00000000..4ff7eb9d
--- /dev/null
+++ b/app/static/css/queryBuilder.css
@@ -0,0 +1,146 @@
+.modal-conent {
+  overflow-x: hidden;
+}
+
+#concordance-query-builder {
+  width: 70%;
+}
+
+#concordance-query-builder nav {
+  background-color: #6B3F89;
+  margin-top: -25px;
+  margin-left: -25px;
+  width: 105%;
+}
+
+#query-builder-nav{
+  padding-left: 15px;
+}
+
+#close-query-builder {
+  margin-right: 50px;
+  cursor: pointer;
+}
+
+#general-options-query-builder-tutorial-info-icon {
+  color: black;
+}
+
+#your-query {
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+#insert-query-button {
+  background-color: #00426f;
+  text-align: center;
+}
+
+#structural-attr h6 {
+  margin-left: 15px;
+}
+
+#add-structural-attribute-tutorial-info-icon {
+  color: black;
+}
+
+#sentence {
+  background-color:#FD9720;
+}
+
+#entity {
+  background-color: #A6E22D;
+}
+
+#text-annotation {
+  background-color: #2FBBAB;
+}
+
+#no-value-metadata-message {
+  padding-top: 25px;
+  margin-left: -20px;
+}
+
+#token-kind-selector {
+  background-color: #f2eff7;
+  padding: 15px;
+  border-top-style: solid;
+  border-color: #6B3F89;
+}
+
+#token-kind-selector.s5 {
+  margin-top: 15px;
+}
+
+#token-kind-selector h6 {
+  margin-left: 15px;
+}
+
+#token-tutorial-info-icon {
+  color: black;
+}
+
+#no-value-message {
+  padding-top: 25px;
+  margin-left: -20px;
+}
+
+#token-edit-options h6 {
+  margin-left: 15px;
+}
+
+#edit-options-tutorial-info-icon {
+  color: black;
+}
+
+#incidence-modifiers-button a{
+  background-color: #2FBBAB;
+}
+
+#incidence-modifiers a{
+  background-color: white;
+}
+
+#ignore-case {
+  margin-left: 5px;
+}
+
+#or, #and {
+  background-color: #fc0;
+}
+
+#betweenNM {
+  width: 60%;
+}
+
+#query-builder-tutorial-modal {
+  width: 60%;
+}
+
+#query-builder-tutorial-modal ul {
+  margin-top: 10px;
+}
+
+#query-builder-tutorial {
+  padding:15px;
+}
+
+#scroll-up-button-query-builder-tutorial {
+  background-color: #28B3D1;
+}
+
+[data-type="start-sentence"], [data-type="end-sentence"] {
+  background-color: #FD9720;
+}
+
+[data-type="start-empty-entity"], [data-type="start-entity"], [data-type="end-entity"] {
+  background-color: #A6E22D;
+}
+
+[data-type="start-text-annotation"]{
+  background-color: #2FBBAB;
+}
+
+[data-type="token"] {
+  background-color: #28B3D1;
+}
diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index 42dc9968..e16a1e41 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -210,31 +210,14 @@ class ConcordanceQueryBuilder {
     window.location.href = '#query-container';
     this.elements.counter += 1;
     queryText = encodeURI(queryText);
-    let chipColor = 'style="background-color:#';
-
-    // Sets chip color, depending on the type of element
-    if (dataType === 'start-sentence' || dataType === 'end-sentence') {
-      chipColor += 'FD9720';
-    } else if (dataType === 'start-empty-entity' || dataType === 'start-entity' || dataType === 'end-entity') {
-      chipColor += 'A6E22D';
-    } else if (dataType === 'text-annotation') {
-     chipColor += '2FBBAB';
-    } else if (dataType === 'token') {
-     chipColor += '28B3D1';
-    } else {
-     chipColor = '';
-    }
-
-    // Creates a chip with the previously selected element. Is first created in the 'BuilderElement' and populated with an EventListener, then moved to 'yourQuery'.
-    let builderElement = document.createElement('div');
-    builderElement.innerHTML +=`
-      <div class='chip' ${chipColor}' data-type='${dataType}' data-query='${queryText}' draggable='true' style='cursor:pointer;' ondragstart='concordanceQueryBuilder.dragStartHandler(event)' ondragend='concordanceQueryBuilder.dragEndHandler(event)'>
-        ${prettyText}
-        <i class='material-icons close'>close</i>
-      </div>
-    `.trim();
-
-    let buttonElement = builderElement.firstElementChild;
+    let buttonElement = Utils.elementFromString(
+      `
+        <div class='chip' data-type='${dataType}' data-query='${queryText}' draggable='true' style='cursor:pointer;' ondragstart='concordanceQueryBuilder.dragStartHandler(event)' ondragend='concordanceQueryBuilder.dragEndHandler(event)'>
+          ${prettyText}
+          <i class='material-icons close'>close</i>
+        </div>
+      `
+    );
     buttonElement.addEventListener('click', () => {this.deleteAttr(buttonElement);});
 
     // Ensures that metadata is always at the end of the query:
@@ -963,12 +946,6 @@ class ConcordanceQueryBuilder {
       this.hideEverything();
     }
   }
-
-
-//#endregion Structural Attribute Builder Functions
-
-
-
-
+  //#endregion Structural Attribute Builder Functions
+  
 }
-
diff --git a/app/templates/_styles.html.j2 b/app/templates/_styles.html.j2
index 2c1ea8f8..cb047f8f 100644
--- a/app/templates/_styles.html.j2
+++ b/app/templates/_styles.html.j2
@@ -4,6 +4,7 @@
 <link href="{{ url_for('static', filename='css/materialize/sticky_footer.css') }}" media="screen,projection" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/materialize/fixes.css') }}" media="screen,projection" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/nopaque_icons.css') }}" media="screen,projection" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/queryBuilder.css') }}" media="screen,projection" rel="stylesheet">
 {%- assets
   filters='pyscss',
   output='gen/app.%(version)s.css',
diff --git a/app/templates/test/analyse_corpus.html.j2 b/app/templates/test/analyse_corpus.html.j2
index 514e3178..8f7374c9 100644
--- a/app/templates/test/analyse_corpus.html.j2
+++ b/app/templates/test/analyse_corpus.html.j2
@@ -4,7 +4,6 @@
   a   {color: #FFFFFF;}
 </style>
 
-
 {% block main_attribs %} class="service-scheme" data-service="corpus-analysis" id="corpus-analysis-app-container"{% endblock main_attribs %}
 
 {% block page_content %}
@@ -82,19 +81,19 @@
 </div> 
 
 
-<div class="modal" id="concordance-query-builder" style="width:70%;">
-  <div class="modal-content" style="overflow-x:hidden;">
-  <div >
-    <nav style="background-color:#6B3F89; margin-top:-25px; margin-left:-25px; width:105%;">
-      <div class="nav-wrapper" style="padding-left:15px;">
-        <a href="#!" class="brand-logo"><i class="material-icons">build</i>Query Builder</a>
-        <i class="material-icons close right" style="margin-right: 50px; cursor:pointer;" id="close-query-builder">close</i>
-        <a class="modal-trigger" href="#query-builder-tutorial-modal" >
-          <i class="material-icons right tooltipped" id="query-builder-tutorial-info-icon" data-position="bottom" data-tooltip="Click here if you are unsure how to use the Query Builder <br>and want to find out what other options it offers.">help</i>
-        </a>
-      </div>
-    </nav>
-  </div>
+<div class="modal" id="concordance-query-builder">
+  <div class="modal-content">
+    <div>
+      <nav>
+        <div class="nav-wrapper" id="query-builder-nav">
+          <a href="#!" class="brand-logo"><i class="material-icons">build</i>Query Builder</a>
+          <i class="material-icons close right" id="close-query-builder">close</i>
+          <a class="modal-trigger" href="#query-builder-tutorial-modal" >
+            <i class="material-icons right tooltipped" id="query-builder-tutorial-info-icon" data-position="bottom" data-tooltip="Click here if you are unsure how to use the Query Builder <br>and want to find out what other options it offers.">help</i>
+          </a>
+        </div>
+      </nav>
+    </div>
     
     <p></p>
     
@@ -103,12 +102,12 @@
       <div class="row">
         <h6 class="col s2">Your Query:
           <a class="modal-trigger" href="#query-builder-tutorial-modal">
-          <i class="material-icons left" id="general-options-query-builder-tutorial-info-icon" style="color:black;">help_outline</i></a>
+          <i class="material-icons left" id="general-options-query-builder-tutorial-info-icon">help_outline</i></a>
         </h6>
       </div>
       <div class="row">
-        <div class="col s10 tooltipped" id="your-query" style="border-bottom-style: solid; border-bottom-width:1px;"  data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
-        <a class="btn-small waves-effect waves-teal col s1" id="insert-query-button" style="background-color:#00426f; text-align:center">
+        <div class="col s10 tooltipped" id="your-query" data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
+        <a class="btn-small waves-effect waves-teal col s1" id="insert-query-button">
           <i class="material-icons">send</i>
         </a>
       </div>
@@ -125,13 +124,13 @@
     
     <div id="structural-attr" class="hide">
       <p></p>
-      <h6 style="margin-left:15px;">Which structural attribute do you want to add to your query?<a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="add-structural-attribute-tutorial-info-icon" style="color:black;">help_outline</i></a></h6>
+      <h6>Which structural attribute do you want to add to your query?<a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="add-structural-attribute-tutorial-info-icon">help_outline</i></a></h6>
       <p></p>
       <div class="row">
         <div class="col s12">
-          <a class="btn-small waves-effect waves-light" id="sentence" style="background-color:#FD9720">sentence</a>
-          <a class="btn-small waves-effect waves-light" id="entity" style="background-color:#A6E22D">entity</a>
-          <a class="btn-small waves-effect waves-light" id="text-annotation" style="background-color:#2FBBAB">Meta Data</a>
+          <a class="btn-small waves-effect waves-light" id="sentence">sentence</a>
+          <a class="btn-small waves-effect waves-light" id="entity">entity</a>
+          <a class="btn-small waves-effect waves-light" id="text-annotation">Meta Data</a>
         </div>
       </div>
       
@@ -209,7 +208,7 @@
               <i class="material-icons right">send</i>
             </p>
           </div>
-          <div class="hide" id="no-value-metadata-message" style="padding-top:25px; margin-left:-20px;"><i>No value entered!</i></div>
+          <div class="hide" id="no-value-metadata-message"><i>No value entered!</i></div>
 
         </div>
       </div>
@@ -217,9 +216,9 @@
 
     <div id="positional-attr" class="hide">
       <p></p>
-      <div class="row" style="background-color:#f2eff7; padding:15px; border-top-style: solid; border-color:#6B3F89">
-        <div class="col s5" style="margin-top:15px;">
-          <h6 style="margin-left:15px;">Which kind of token are you looking for? <a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="token-tutorial-info-icon" style="color:black;">help_outline</i></a></h6>
+      <div class="row" id="token-kind-selector">
+        <div class="col s5">
+          <h6>Which kind of token are you looking for? <a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="token-tutorial-info-icon">help_outline</i></a></h6>
         </div>
         <div class="input-field col s3">
           <select id="token-attr">
@@ -331,13 +330,13 @@
                 <i class="material-icons right">send</i>
               </p>
           </div>
-          <div class="hide" id="no-value-message" style="padding-top:25px; margin-left:-20px;"><i>No value entered!</i></div>
+          <div class="hide" id="no-value-message"><i>No value entered!</i></div>
           
         </div>
 
         <div id="token-edit-options">
           <div class="row">
-            <h6 style="margin-left:15px;">Options to edit your token: <a class="modal-trigger" href="#query-builder-tutorial-modal" style="color:black"><i class="material-icons left" id="edit-options-tutorial-info-icon">help_outline</i></a></h6>
+            <h6>Options to edit your token: <a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="edit-options-tutorial-info-icon">help_outline</i></a></h6>
           </div>
           <p></p>
           <div class="row">
@@ -346,7 +345,7 @@
                 <a id="option-group" class="btn-small waves-effect waves-light tooltipped" data-position="top" data-tooltip="Find character sequences from a list of options">Option Group</a>
             </div>
             <div class="col s3 m3 l3 xl3" id="incidence-modifiers-button">
-              <a class="dropdown-trigger btn-small  waves-effect waves-light" href="#" data-target="incidence-modifiers" style="background-color:#2fbbab" data-position="top" data-tooltip="Incidence Modifiers are special characters or patterns, <br>which determine how often a character represented previously should occur.">incidence modifiers</a>
+              <a class="dropdown-trigger btn-small  waves-effect waves-light" href="#" data-target="incidence-modifiers" data-position="top" data-tooltip="Incidence Modifiers are special characters or patterns, <br>which determine how often a character represented previously should occur.">incidence modifiers</a>
             </div>
             
             <ul id="incidence-modifiers" class="dropdown-content">
@@ -358,7 +357,7 @@
             </ul>
 
             <div id="ignore-case-checkbox" class="col s2 m2 l2 xl2">
-              <p id="ignore-case" style="margin-top:5px;">
+              <p id="ignore-case">
                   <label>
                     <input type="checkbox" class="filled-in" />
                     <span>Ignore Case</span>
@@ -366,17 +365,17 @@
               </p>
             </div>
             <div class="col s2 m2 l2 xl2" id="condition-container">
-              <a class="btn-small tooltipped waves-effect waves-light" id="or" style="background-color:#fc0" data-position="bottom" data-tooltip="You can add another condition to your token. <br>At least one must be fulfilled">or</a>
-              <a class="btn-small tooltipped waves-effect waves-light" id="and" style="background-color:#fc0" data-position="bottom" data-tooltip="You can add another condition to your token. <br>Both must be fulfilled">and</a>
+              <a class="btn-small tooltipped waves-effect waves-light" id="or" data-position="bottom" data-tooltip="You can add another condition to your token. <br>At least one must be fulfilled">or</a>
+              <a class="btn-small tooltipped waves-effect waves-light" id="and" data-position="bottom" data-tooltip="You can add another condition to your token. <br>Both must be fulfilled">and</a>
             </div>
           </div>
         </div>
 
       </div>
 
-      <div id ="exactlyN" class="modal">
+      <div id="exactlyN" class="modal">
           <div class="row modal-content">
-            <div class= "input-field col s10">
+            <div class="input-field col s10">
                 <i class="material-icons prefix">mode_edit</i>
                 <input placeholder="type in a number for 'n'" type="text" id="n-input">
             </div>
@@ -388,7 +387,7 @@
           </div>
       </div>
 
-      <div id ="betweenNM" class="modal" style="width:60%;">
+      <div id="betweenNM" class="modal">
           <div class="row modal-content">
             <div class= "input-field col s5">
                 <i class="material-icons prefix">mode_edit</i>
@@ -410,17 +409,17 @@
   </div>
 </div>
 
-<div class="modal modal-fixed-footer" id="query-builder-tutorial-modal" style="width:60%;">
+<div class="modal modal-fixed-footer" id="query-builder-tutorial-modal">
   <div class="modal-content" >
     <div id="query-builder-tutorial-start"></div>
-    <ul class="tabs" style="margin-top:10px;">
+    <ul class="tabs">
       <li class="tab"><a class="active" href="#query-builder-tutorial">Query Builder Tutorial</a></li>
       {# <li class="tab"><a href="#qb-examples">Examples</a></li> #}
       <li class="tab"><a href="#cql-cb-tutorial">Corpus Query Language Tutorial</a></li>
       <li class="tab"><a href="#tagsets-cb-tutorial">Tagsets</a></li>
     </ul>
   
-    <div id="query-builder-tutorial" style="padding:15px;">
+    <div id="query-builder-tutorial">
       {% include "main/manual/_09_query_builder.html.j2" %}
     </div>
     {# <div id="qb-examples"></div> #}
@@ -434,7 +433,7 @@
       {% include "main/manual/_10_tagsets.html.j2" %}
     </div>
     <div class="fixed-action-btn">
-      <a class="btn-floating btn-large teal" id="scroll-up-button-query-builder-tutorial" href='#query-builder-tutorial-start' style="background:#28B3D1">
+      <a class="btn-floating btn-large teal" id="scroll-up-button-query-builder-tutorial" href='#query-builder-tutorial-start'>
         <i class="large material-icons">arrow_upward</i>
       </a>
     </div>

From 0009a0bacfe17a2e30ea78ec32634cb5317294c6 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Thu, 20 Oct 2022 15:52:25 +0200
Subject: [PATCH 12/20] Query Builder implementation

---
 app/static/js/CorpusAnalysis/QueryBuilder.js  | 120 +++---
 .../analyse_corpus.concordance.html.j2        |   2 +-
 app/templates/corpora/analyse_corpus.html.j2  | 356 ++++++++++++++++++
 3 files changed, 427 insertions(+), 51 deletions(-)

diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index e16a1e41..f9a10256 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -12,6 +12,7 @@ class ConcordanceQueryBuilder {
       concordanceQueryBuilderButton: document.querySelector('#concordance-query-builder-button'),
       closeQueryBuilder: document.querySelector('#close-query-builder'),
       queryBuilderTutorialModal: document.querySelector('#query-builder-tutorial-modal'),
+      valueValidator: true,
 
       //#region QueryBuilder Elements
       
@@ -206,7 +207,6 @@ class ConcordanceQueryBuilder {
   }
 
   buttonfactory(dataType, prettyText, queryText) {
-
     window.location.href = '#query-container';
     this.elements.counter += 1;
     queryText = encodeURI(queryText);
@@ -226,7 +226,6 @@ class ConcordanceQueryBuilder {
     } else if (this.elements.yourQuery.lastChild.dataset.type === 'text-annotation') {
       this.elements.yourQuery.insertBefore(buttonElement, this.elements.yourQuery.lastChild);
     }
-
     this.elements.queryContainer.classList.remove('hide');
     this.queryPreviewBuilder();
 
@@ -252,25 +251,30 @@ class ConcordanceQueryBuilder {
 
     //#region	 Drag&Drop Events
   dragStartHandler(event) {
+    // Creates element with the class 'target' and all necessary drop functions, in which drop content can be released
     this.elements.dropButton = event.target;
     let targetChip = `
       <div class='chip target' ondragover='concordanceQueryBuilder.dragOverHandler(event)' ondragenter='concordanceQueryBuilder.dragEnterHandler(event)' ondragleave='concordanceQueryBuilder.dragLeaveHandler(event)' ondrop='concordanceQueryBuilder.dropHandler(event)'>
         Drop here
       </div>
     `.trim();
+    // selects all nodes without target class
     let childNodes = this.elements.yourQuery.querySelectorAll('div:not(.target)');
 
+    // Adds a target chip in front of all draggable childnodes
     setTimeout(() => {
       for (let element of childNodes) {
-        if (element === event.target) {
-          continue;
-        } else if (element === event.target.nextSibling) {
+        if (element === this.elements.dropButton) {
+          // If the dragged element is not at the very end, a target chip is also inserted at the end
+          if (childNodes[childNodes.length - 1] !== element) {
+            childNodes[childNodes.length - 1].insertAdjacentHTML('afterend', targetChip);
+          }
+        } else if (element === this.elements.dropButton.nextSibling) {
           continue;
         } else {
           element.insertAdjacentHTML('beforebegin', targetChip)
         }
       }
-      childNodes[childNodes.length-1].insertAdjacentHTML('afterend', targetChip);
     },0);
   }
 
@@ -297,18 +301,6 @@ class ConcordanceQueryBuilder {
 
   dropHandler(event) {
     let dropzone = event.target;
-
-    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++) {
-      if (dropzone === dropzone.parentElement.childNodes[i]) {
-        nodeIndex = i;
-      }
-    }
-    for (let i = 0; i < dropzone.parentElement.childNodes.length; i++) {
-      if (this.elements.dropButton === dropzone.parentElement.childNodes[i]) {
-        draggedElementIndex = i;
-      }
-    }
-
     dropzone.parentElement.replaceChild(this.elements.dropButton, dropzone);
     this.queryPreviewBuilder();
   }
@@ -316,7 +308,6 @@ class ConcordanceQueryBuilder {
 
   queryPreviewBuilder() {
     this.elements.yourQueryContent = [];
-
     for (let element of this.elements.yourQuery.childNodes) {
       let queryElement = decodeURI(element.dataset.query);
       if (queryElement.includes('<')) {
@@ -349,19 +340,48 @@ class ConcordanceQueryBuilder {
 
   insertQuery() {
     this.elements.yourQueryContent = [];
+    this.validateValue();
+    if (this.elements.valueValidator === true) {
+      for (let element of this.elements.yourQuery.childNodes) {
+        let queryElement = decodeURI(element.dataset.query);
+        if (queryElement !== 'undefined') {
+          this.elements.yourQueryContent.push(queryElement);
+        }
+      }
 
+      let queryString = this.elements.yourQueryContent.join(' ');
+      queryString += ';';
+
+      this.elements.concordanceQueryBuilder.classList.add('modal-close');
+      this.elements.extFormQuery.value = queryString;
+    }
+  }
+
+  validateValue() {
+    this.elements.valueValidator = true;
+    let sentenceCounter = 0;
+    let sentenceEndCounter = 0;
+    let entityCounter = 0;
+    let entityEndCounter = 0;
     for (let element of this.elements.yourQuery.childNodes) {
-      let queryElement = decodeURI(element.dataset.query);
-      if (queryElement !== 'undefined') {
-        this.elements.yourQueryContent.push(queryElement);
+      if (element.dataset.type === 'start-sentence') {
+        sentenceCounter += 1;
+      }else if (element.dataset.type === 'end-sentence') {
+        sentenceEndCounter += 1;
+      }else if (element.dataset.type === 'start-entity' || element.dataset.type === 'start-empty-entity') {
+        entityCounter += 1;
+      }else if (element.dataset.type === 'end-entity') {
+        entityEndCounter += 1;
       }
     }
-
-    let queryString = this.elements.yourQueryContent.join(' ');
-    queryString += ';';
-
-    this.elements.concordanceQueryBuilder.classList.add('modal-close');
-    this.elements.extFormQuery.value = queryString;
+    if (sentenceCounter !== sentenceEndCounter) {
+      app.flash('Please add a closing sentence tag', 'error');
+      this.elements.valueValidator = false;
+    }
+    if (entityCounter !== entityEndCounter) {
+      app.flash('Please add a closing entity tag', 'error');
+      this.elements.valueValidator = false;
+    }
   }
 
   clearAll() {
@@ -506,7 +526,7 @@ class ConcordanceQueryBuilder {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `word=${this.elements.wordInput.value}${c}`;
-            tokenQueryText += `word='${this.elements.wordInput.value}'${c}`;
+            tokenQueryText += `word="${this.elements.wordInput.value}"${c}`;
             this.elements.wordInput.value = '';
           }
           break;
@@ -515,7 +535,7 @@ class ConcordanceQueryBuilder {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `lemma=${this.elements.lemmaInput.value}${c}`;
-            tokenQueryText += `lemma='${this.elements.lemmaInput.value}'${c}`;
+            tokenQueryText += `lemma="${this.elements.lemmaInput.value}"${c}`;
             this.elements.lemmaInput.value = '';
           }
           break;
@@ -524,7 +544,7 @@ class ConcordanceQueryBuilder {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `pos=${this.elements.englishPos.value}`;
-            tokenQueryText += `pos='${this.elements.englishPos.value}'`;
+            tokenQueryText += `pos="${this.elements.englishPos.value}"`;
             this.elements.englishPos.value = '';
           }
           break;
@@ -533,7 +553,7 @@ class ConcordanceQueryBuilder {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `pos=${this.elements.germanPos.value}`;
-            tokenQueryText += `pos='${this.elements.germanPos.value}'`;
+            tokenQueryText += `pos="${this.elements.germanPos.value}"`;
             this.elements.germanPos.value = '';
           }
           break;
@@ -542,7 +562,7 @@ class ConcordanceQueryBuilder {
             this.disableTokenSubmit();
           } else {
             tokenQueryContent += `simple_pos=${this.elements.simplePos.value}`;
-            tokenQueryText += `simple_pos='${this.elements.simplePos.value}'`;
+            tokenQueryText += `simple_pos="${this.elements.simplePos.value}"`;
             this.elements.simplePos.value = '';
           }
           break;
@@ -557,7 +577,7 @@ class ConcordanceQueryBuilder {
       // Square brackets are added only if it is not an empty token (where they are already present).
       if (emptyTokenCheck === false) {
         tokenQueryText = '[' + tokenQueryText + ']';
-      }
+        }
       this.buttonfactory('token', tokenQueryContent, tokenQueryText);
       this.hideEverything();
       this.elements.positionalAttrArea.classList.add('hide');
@@ -686,21 +706,21 @@ class ConcordanceQueryBuilder {
         break;
       case 'english-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
+        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
         this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
         this.elements.englishPosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
         break;
       case 'german-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
+        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
         this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
         this.elements.germanPosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
         break;
       case 'simple-pos-button':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
+        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
         this.tokenButtonfactory('{' + this.elements.nInput.value + '}', '{' + this.elements.nInput.value + '}');
         this.elements.simplePosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
@@ -727,21 +747,21 @@ class ConcordanceQueryBuilder {
         break;
       case 'english-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
+        this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
         this.elements.englishPosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
         break;
       case 'german-pos':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
+        this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
         this.elements.germanPosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
         break;
       case 'simple-pos-button':
         this.elements.tokenQueryFilled = true;
-        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
+        this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
         this.tokenButtonfactory(`{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`, `{${this.elements.nmInput.value}, ${this.elements.mInput.value}}`);
         this.elements.simplePosBuilder.classList.add('hide');
         this.elements.incidenceModifiersButton.classList.add('hide');
@@ -759,19 +779,19 @@ class ConcordanceQueryBuilder {
     if (this.elements.positionalAttr.value === 'empty-token') {
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
     } else if (this.elements.positionalAttr.value === 'english-pos') {
-      this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos='${this.elements.englishPos.value}'`);
+      this.tokenButtonfactory(`pos=${this.elements.englishPos.value}`, `pos="${this.elements.englishPos.value}"`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
       this.elements.englishPosBuilder.classList.add('hide');
       this.elements.incidenceModifiersButton.classList.add('hide');
       this.elements.tokenQueryFilled = true;
     } else if (this.elements.positionalAttr.value === 'german-pos') {
-      this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos='${this.elements.germanPos.value}'`);
+      this.tokenButtonfactory(`pos=${this.elements.germanPos.value}`, `pos="${this.elements.germanPos.value}"`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
       this.elements.germanPosBuilder.classList.add('hide');
       this.elements.incidenceModifiersButton.classList.add('hide');
       this.elements.tokenQueryFilled = true;
     } else if (this.elements.positionalAttr.value === 'simple-pos-button') {
-      this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos='${this.elements.simplePos.value}'`);
+      this.tokenButtonfactory(`simple_pos=${this.elements.simplePos.value}`, `simple_pos="${this.elements.simplePos.value}"`);
       this.tokenButtonfactory(elem.innerText, elem.dataset.token);
       this.elements.simplePosBuilder.classList.add('hide');
       this.elements.incidenceModifiersButton.classList.add('hide');
@@ -813,27 +833,27 @@ class ConcordanceQueryBuilder {
     switch (this.elements.positionalAttr.value) {
       case 'word':
         tokenQueryContent = `word=${this.elements.wordInput.value}${c}`;
-        tokenQueryText = `word='${this.elements.wordInput.value}'${c}`;
+        tokenQueryText = `word="${this.elements.wordInput.value}"${c}`;
         this.elements.wordInput.value = '';
         break;
       case 'lemma':
         tokenQueryContent = `lemma=${this.elements.lemmaInput.value}${c}`;
-        tokenQueryText = `word='${this.elements.lemmaInput.value}'${c}`;
+        tokenQueryText = `lemma="${this.elements.lemmaInput.value}"${c}`;
         this.elements.lemmaInput.value = '';
         break;
       case 'english-pos':
         tokenQueryContent = `pos=${this.elements.englishPos.value}`;
-        tokenQueryText = `pos='${this.elements.englishPos.value}'`;
+        tokenQueryText = `pos="${this.elements.englishPos.value}"`;
         this.elements.englishPos.value = '';
         break;
       case 'german-pos':
         tokenQueryContent = `pos=${this.elements.germanPos.value}`;
-        tokenQueryText = `pos='${this.elements.germanPos.value}'`;
+        tokenQueryText = `pos="${this.elements.germanPos.value}"`;
         this.elements.germanPos.value = '';
         break;
       case 'simple-pos-button':
         tokenQueryContent = `simple_pos=${this.elements.simplePos.value}`;
-        tokenQueryText = `simple_pos='${this.elements.simplePos.value}'`;
+        tokenQueryText = `simple_pos="${this.elements.simplePos.value}"`;
         this.elements.simplePos.value = '';
         break;
       default:
@@ -888,7 +908,7 @@ class ConcordanceQueryBuilder {
   }
 
   englishEntTypeHandler() {
-    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.englishEntType.value, '<ent_type="" + this.elements.englishEntType.value + "">');
+    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.englishEntType.value, '<ent_type="' + this.elements.englishEntType.value + '">');
     this.elements.entity.innerHTML = 'End Entity';
     this.hideEverything();
     this.elements.entityAnyType = false;
@@ -900,7 +920,7 @@ class ConcordanceQueryBuilder {
   }   
 
   germanEntTypeHandler() {
-    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.germanEntType.value, '<ent_type="" + this.elements.germanEntType.value + "">');
+    this.buttonfactory('start-entity', 'Entity Type=' + this.elements.germanEntType.value, '<ent_type="' + this.elements.germanEntType.value + '">');
     this.elements.entity.innerHTML = 'End Entity';
     this.hideEverything();
     this.elements.entityAnyType = false;
diff --git a/app/templates/corpora/analyse_corpus.concordance.html.j2 b/app/templates/corpora/analyse_corpus.concordance.html.j2
index 0fc14597..d223ca30 100644
--- a/app/templates/corpora/analyse_corpus.concordance.html.j2
+++ b/app/templates/corpora/analyse_corpus.concordance.html.j2
@@ -64,7 +64,7 @@
             </div>
             <div class="col s12 m3 l3 right-align">
               <p class="hide-on-small-only">&nbsp;</p>
-              <a class="btn disabled waves-effect waves-light">
+              <a class="btn waves-effect waves-light modal-trigger" href="#concordance-query-builder" id="concordance-query-builder-button">
                 <i class="material-icons left">build</i>
                 Query builder
               </a>
diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index 3c59bca4..50c7d71c 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -248,6 +248,361 @@
     </div>
   </div>
 </div>
+
+<div class="modal" id="concordance-query-builder">
+  <div class="modal-content">
+    <div>
+      <nav>
+        <div class="nav-wrapper" id="query-builder-nav">
+          <a href="#!" class="brand-logo"><i class="material-icons">build</i>Query Builder</a>
+          <i class="material-icons close right" id="close-query-builder">close</i>
+          <a class="modal-trigger" href="#query-builder-tutorial-modal" >
+            <i class="material-icons right tooltipped" id="query-builder-tutorial-info-icon" data-position="bottom" data-tooltip="Click here if you are unsure how to use the Query Builder <br>and want to find out what other options it offers.">help</i>
+          </a>
+        </div>
+      </nav>
+    </div>
+    
+    <p></p>
+    
+    <div id="query-container" class="hide">
+      
+      <div class="row">
+        <h6 class="col s2">Your Query:
+          <a class="modal-trigger" href="#query-builder-tutorial-modal">
+          <i class="material-icons left" id="general-options-query-builder-tutorial-info-icon">help_outline</i></a>
+        </h6>
+      </div>
+      <div class="row">
+        <div class="col s10 tooltipped" id="your-query" data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
+        <a class="btn-small waves-effect waves-teal col s1" id="insert-query-button">
+          <i class="material-icons">send</i>
+        </a>
+      </div>
+      <p><i> Preview:</i></p>
+      <p id="query-preview"></p>
+      <br>
+    </div>
+    
+    
+    <h6>Use the following options to build your query. If you need help, click on the question mark in the upper right corner!</h6>
+    <p></p>
+    <a class="btn-large waves-effect waves-light tooltipped" id="positional-attr-button" data-position="bottom" data-tooltip="Search for any token, for example a word, a lemma or a part-of-speech tag">Add new token to your query</a>
+    <a class="btn-large waves-effect waves-light tooltipped" id="structural-attr-button" data-position="bottom" data-tooltip="Structure your query with structural attributes, for example sentences, entities or annotate the text">Add structural attributes to your query</a>
+    
+    <div id="structural-attr" class="hide">
+      <p></p>
+      <h6>Which structural attribute do you want to add to your query?<a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="add-structural-attribute-tutorial-info-icon">help_outline</i></a></h6>
+      <p></p>
+      <div class="row">
+        <div class="col s12">
+          <a class="btn-small waves-effect waves-light" id="sentence">sentence</a>
+          <a class="btn-small waves-effect waves-light" id="entity">entity</a>
+          <a class="btn-small waves-effect waves-light" id="text-annotation">Meta Data</a>
+        </div>
+      </div>
+      
+
+      <div id="entity-builder" class="hide">
+        <p></p>
+        <br>
+        <div class="row">
+          <a class="btn waves-effect waves-light col s4" id="empty-entity">Add Entity of any type</a>
+          <p class="col s1 l1"></p>
+          <div class= "input-field col s3">
+              <select name="englishenttype" id="english-ent-type">
+                <option value="" disabled selected>English ent_type</option>
+                <option value="CARDINAL">CARDINAL</option>
+                <option value="DATE">DATE</option>
+                <option value="EVENT">EVENT</option>
+                <option value="FAC">FAC</option>
+                <option value="GPE">GPE</option>
+                <option value="LANGUAGE">LANGUAGE</option>
+                <option value="LAW">LAW</option>
+                <option value="LOC">LOC</option>
+                <option value="MONEY">MONEY</option>
+                <option value="NORP">NORP</option>
+                <option value="ORDINAL">ORDINAL</option>
+                <option value="ORG">ORG</option>
+                <option value="PERCENT">PERCENT</option>
+                <option value="PERSON">PERSON</option>
+                <option value="PRODUCT">PRODUCT</option>
+                <option value="QUANTITY">QUANTITY</option>
+                <option value="TIME">TIME</option>
+                <option value="WORK_OF_ART">WORK_OF_ART</option>
+              </select>
+              <label>Entity Type</label>
+          </div>
+          <div class= "input-field col s3">
+              <select name="germanenttype" id="german-ent-type">
+                <option value="" disabled selected>German ent_type</option>
+                <option value="LOC">LOC</option>
+                <option value="MISC">MISC</option>
+                <option value="ORG">ORG</option>
+                <option value="PER">PER</option>
+              </select>
+          </div>
+        </div>
+      </div>
+    
+
+      <div id="text-annotation-builder" class="hide">
+        <p></p>
+        <br>
+        <div class="row">
+          <div class= "input-field col s4 l3">
+            <select name="text-annotation-options" id="text-annotation-options">
+              <option class="btn-small waves-effect waves-light" value="address">address</option>
+              <option class="btn-small waves-effect waves-light" value="author">author</option>
+              <option class="btn-small waves-effect waves-light" value="booktitle">booktitle</option>
+              <option class="btn-small waves-effect waves-light" value="chapter">chapter</option>
+              <option class="btn-small waves-effect waves-light" value="editor">editor</option>
+              <option class="btn-small waves-effect waves-light" value="institution">institution</option>
+              <option class="btn-small waves-effect waves-light" value="journal">journal</option>
+              <option class="btn-small waves-effect waves-light" value="pages">pages</option>
+              <option class="btn-small waves-effect waves-light" value="publisher">publisher</option>
+              <option class="btn-small waves-effect waves-light" value="publishing_year">publishing year</option>
+              <option class="btn-small waves-effect waves-light" value="school">school</option>
+              <option class="btn-small waves-effect waves-light" value="title">title</option>
+            </select>
+            <label>Meta data</label>
+          </div>
+          <div class= "input-field col s7 l5">
+            <i class="material-icons prefix">mode_edit</i>
+            <input placeholder="Type in your text annotation" type="text" id="text-annotation-input">
+          </div>
+          <div class="col s1 l1 center-align">
+            <p class="btn-floating waves-effect waves-light" id="text-annotation-submit">
+              <i class="material-icons right">send</i>
+            </p>
+          </div>
+          <div class="hide" id="no-value-metadata-message"><i>No value entered!</i></div>
+        </div>
+      </div>
+    </div>
+
+    <div id="positional-attr" class="hide">
+      <p></p>
+      <div class="row" id="token-kind-selector">
+        <div class="col s5">
+          <h6>Which kind of token are you looking for? <a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="token-tutorial-info-icon">help_outline</i></a></h6>
+        </div>
+        <div class="input-field col s3">
+          <select id="token-attr">
+            <option value="word" selected>word</option>
+            <option value="lemma">lemma</option>
+            <option value="english-pos">english pos</option>
+            <option value="german-pos">german pos</option>
+            <option value="simple-pos-button">simple_pos</option>
+            <option value="empty-token">empty token</option>
+          </select>
+        </div>
+      </div>
+      <p></p>
+      <div id="token-builder-content">
+        <div class="row" >
+          <div id="token-query"></div>
+          
+          <div id="word-builder">
+              <div class= "input-field col s3 l4">
+                <i class="material-icons prefix">mode_edit</i>
+                <input placeholder="Type in your word" type="text" id="word-input">
+              </div>
+          </div>
+
+          <div id="lemma-builder" class="hide" >
+              <div class= "input-field col s3 l4">
+                <i class="material-icons prefix">mode_edit</i>
+                <input placeholder="Type in your lemma" type="text" id="lemma-input">
+              </div>
+          </div>
+
+          <div id="english-pos-builder" class="hide">
+            <div class="col s6 m4 l4">
+              <div class="row">
+                <div class= "input-field col s12">
+                  <select name="englishpos" id="english-pos">
+                    <option value="default" disabled selected>English pos tagset</option>
+                    <option value="ADD">email</option>
+                    <option value="AFX">affix</option>
+                    <option value="CC">conjunction, coordinating</option>
+                    <option value="CD">cardinal number</option>
+                    <option value="DT">determiner</option>
+                    <option value="EX">existential there</option>
+                    <option value="FW">foreign word</option>
+                    <option value="HYPH">punctuation mark, hyphen</option>
+                    <option value="IN">conjunction, subordinating or preposition</option>
+                    <option value="JJ">adjective</option>
+                    <option value="JJR">adjective, comparative</option>
+                    <option value="JJS">adjective, superlative</option>
+                  </select>
+                  <label>Part-of-speech tags</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+          <div id="german-pos-builder" class="hide">
+            <div class="col s6 m4 l4">
+              <div class="row">
+                <div class= "input-field col s12">
+                  <select name="germanpos" id="german-pos">
+                    <option value="default" disabled selected>German pos tagset</option>
+                    <option value="ADJA">adjective, attributive</option>
+                    <option value="ADJD">adjective, adverbial or predicative</option>
+                    <option value="ADV">adverb</option>
+                    <option value="APPO">postposition</option>
+                    <option value="APPR">preposition; circumposition left</option>
+                    <option value="APPRART">preposition with article</option>
+                    <option value="APZR">circumposition right</option>
+                    <option value="ART">definite or indefinite article</option>
+                  </select>
+                  <label>Part-of-speech tags</label>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div id="simplepos-builder" class="hide">
+            <div class="col s6 m4 l4">
+              <div class="row">
+                <div class= "input-field col s12">
+                  <select name="simplepos" id="simple-pos">
+                    <option value="default" disabled selected>simple_pos tagset</option>
+                    <option value="ADJ">adjective</option>
+                    <option value="ADP">adposition</option>
+                    <option value="ADV">adverb</option>
+                    <option value="AUX">auxiliary verb</option>
+                    <option value="CONJ">coordinating conjunction</option>
+                    <option value="DET">determiner</option>
+                    <option value="INTJ">interjection</option>
+                    <option value="NOUN">noun</option>
+                    <option value="NUM">numeral</option>
+                    <option value="PART">particle</option>
+                    <option value="PRON">pronoun</option>
+                    <option value="PROPN">proper noun</option>
+                    <option value="PUNCT">punctuation</option>
+                    <option value="SCONJ">subordinating conjunction</option>
+                    <option value="SYM">symbol</option>
+                    <option value="VERB">verb</option>
+                    <option value="X">other</option>
+                  </select>
+                  <label>Simple part-of-speech tags</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="col s1 l1 center-align">
+              <p class="btn-floating waves-effect waves-light" id="token-submit">
+                <i class="material-icons right">send</i>
+              </p>
+          </div>
+          <div class="hide" id="no-value-message"><i>No value entered!</i></div>
+        </div>
+        <div id="token-edit-options">
+          <div class="row">
+            <h6>Options to edit your token: <a class="modal-trigger" href="#query-builder-tutorial-modal"><i class="material-icons left" id="edit-options-tutorial-info-icon">help_outline</i></a></h6>
+          </div>
+          <p></p>
+          <div class="row">
+            <div id="input-options" class="col s5 m5 l5 xl4">
+                <a id="wildcard-char" class="btn-small waves-effect waves-light tooltipped" data-position="top" data-tooltip="Look for a variable character (also called wildcard character)">Wildcard character</a>
+                <a id="option-group" class="btn-small waves-effect waves-light tooltipped" data-position="top" data-tooltip="Find character sequences from a list of options">Option Group</a>
+            </div>
+            <div class="col s3 m3 l3 xl3" id="incidence-modifiers-button">
+              <a class="dropdown-trigger btn-small  waves-effect waves-light" href="#" data-target="incidence-modifiers" data-position="top" data-tooltip="Incidence Modifiers are special characters or patterns, <br>which determine how often a character represented previously should occur.">incidence modifiers</a>
+            </div>
+            
+            <ul id="incidence-modifiers" class="dropdown-content">
+              <li><a id="one-or-more" data-token="+" class="tooltipped" data-position ="top" data-tooltip="...occurrences of the character/token before">one or more (+)</a></li>
+              <li><a id="zero-or-more" data-token="*" class="tooltipped" data-position ="top" data-tooltip="...occurrences of the character/token before">zero or more (*)</a></li>
+              <li><a id="zero-or-one" data-token="?" class="tooltipped" data-position ="top" data-tooltip="...occurrences of the character/token before">zero or one (?)</a></li>
+              <li><a id="exactly-n" class="modal-trigger tooltipped" href="#exactlyN" data-token="{n}" class="" data-position ="top" data-tooltip="...occurrences of the character/token before">exactly n ({n})</a></li>
+              <li><a id="between-n-m" class="modal-trigger tooltipped" href="#betweenNM" data-token="{n,m}" class="" data-position ="top" data-tooltip="...occurrences of the character/token before">between n and m ({n,m})</a></li>
+            </ul>
+
+            <div id="ignore-case-checkbox" class="col s2 m2 l2 xl2">
+              <p id="ignore-case">
+                  <label>
+                    <input type="checkbox" class="filled-in" />
+                    <span>Ignore Case</span>
+                  </label>
+              </p>
+            </div>
+            <div class="col s2 m2 l2 xl2" id="condition-container">
+              <a class="btn-small tooltipped waves-effect waves-light" id="or" data-position="bottom" data-tooltip="You can add another condition to your token. <br>At least one must be fulfilled">or</a>
+              <a class="btn-small tooltipped waves-effect waves-light" id="and" data-position="bottom" data-tooltip="You can add another condition to your token. <br>Both must be fulfilled">and</a>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div id="exactlyN" class="modal">
+          <div class="row modal-content">
+            <div class="input-field col s10">
+                <i class="material-icons prefix">mode_edit</i>
+                <input placeholder="type in a number for 'n'" type="text" id="n-input">
+            </div>
+            <div class="col s2">
+              <p class="btn-floating waves-effect waves-light" id="n-submit">
+                <i class="material-icons right">send</i>
+              </p>
+            </div>
+          </div>
+      </div>
+
+      <div id="betweenNM" class="modal">
+          <div class="row modal-content">
+            <div class= "input-field col s5">
+                <i class="material-icons prefix">mode_edit</i>
+                <input placeholder="number for 'n'" type="text" id="n-m-input">
+            </div>
+            <div class= "input-field col s5">
+                <i class="material-icons prefix">mode_edit</i>
+                <input placeholder="number for 'm'" type="text" id="m-input">
+            </div>
+            <div class="col s2">
+              <p class="btn-floating waves-effect waves-light" id="n-m-submit">
+                <i class="material-icons right">send</i>
+              </p>
+            </div>
+          </div>
+      </div>
+    </div>
+   
+  </div>
+</div>
+
+<div class="modal modal-fixed-footer" id="query-builder-tutorial-modal">
+  <div class="modal-content" >
+    <div id="query-builder-tutorial-start"></div>
+    <ul class="tabs">
+      <li class="tab"><a class="active" href="#query-builder-tutorial">Query Builder Tutorial</a></li>
+      {# <li class="tab"><a href="#qb-examples">Examples</a></li> #}
+      <li class="tab"><a href="#cql-cb-tutorial">Corpus Query Language Tutorial</a></li>
+      <li class="tab"><a href="#tagsets-cb-tutorial">Tagsets</a></li>
+    </ul>
+  
+    <div id="query-builder-tutorial">
+      {% include "main/manual/_09_query_builder.html.j2" %}
+    </div>
+    {# <div id="qb-examples"></div> #}
+    <div id ="cql-cb-tutorial">
+      {% with headline_num=4 %}
+        {% include "main/manual/_08_cqp_query_language.html.j2" %}
+      {% endwith %}
+    </div>
+    <div id="tagsets-cb-tutorial">
+      <h4>Tagsets</h4>
+      {% include "main/manual/_10_tagsets.html.j2" %}
+    </div>
+    <div class="fixed-action-btn">
+      <a class="btn-floating btn-large teal" id="scroll-up-button-query-builder-tutorial" href='#query-builder-tutorial-start'>
+        <i class="large material-icons">arrow_upward</i>
+      </a>
+    </div>
+  </div>
+</div>
+
 {% endblock modals %}
 
 {% block scripts %}
@@ -256,6 +611,7 @@
 const corpusAnalysisApp = new CorpusAnalysisApp({{ corpus.hashid|tojson }});
 const corpusAnalysisConcordance = new CorpusAnalysisConcordance(corpusAnalysisApp);
 const corpusAnalysisReader = new CorpusAnalysisReader(corpusAnalysisApp);
+const concordanceQueryBuilder = new ConcordanceQueryBuilder();
 
 corpusAnalysisApp.init();
 </script>

From 8bee4196d3d822abfcc87ce3f23c02231ed34330 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Fri, 21 Oct 2022 09:46:15 +0200
Subject: [PATCH 13/20] URL revision

---
 .../main/manual/_09_query_builder.html.j2        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/main/manual/_09_query_builder.html.j2 b/app/templates/main/manual/_09_query_builder.html.j2
index f22e5369..ff3544eb 100644
--- a/app/templates/main/manual/_09_query_builder.html.j2
+++ b/app/templates/main/manual/_09_query_builder.html.j2
@@ -38,14 +38,14 @@ under the tab "Examples".</p>
   Submit button on the right. You can also use the options below to modify your 
   token request before pressing the submit button. These options are explained 
   further here.</p>
-  <img src="static/images/manual/query_builder/word_lemma.gif" alt="word and lemma explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/word_lemma.gif') }}" alt="word and lemma explanation" width="100%;" style="margin-bottom:20px;">
   <br>
 
   <h4>English pos, german pos or simple_pos</h4>
   <p>You can choose between the options "english pos", "german pos" and 
   "simple_pos" to search for different parts-of-speech. You can find an overview 
   of all tags under the "Tagsets" tab.</p>
-  <img src="static/images/manual/query_builder/pos.gif" alt="part-of-speech-tag explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/pos.gif') }}" alt="part-of-speech-tag explanation" width="100%;" style="margin-bottom:20px;">
 
   <h4>Empty Token</h4>
   <p>Here you can search for an empty token. This selection should never stand 
@@ -75,7 +75,7 @@ under the tab "Examples".</p>
   <p>With an option group you can search for different variants of a token. The 
   variants are not limited, so you can manually enter more options in the same 
   format. "Option1" and "option2" must be replaced accordingly. </p>
-  <img src="static/images/manual/query_builder/option_group.gif" alt="option group explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/option_group.gif') }}" alt="option group explanation" width="100%;" style="margin-bottom:20px;">
   <p></p>
   <br>
 
@@ -100,7 +100,7 @@ under the tab "Examples".</p>
   it will be displayed. Note that "and" is not responsible for lining up tokens in 
   this case. For this you can simply string them together: <br>
   [word="I"] [word="will" & simple_pos="VERB"] [word="go"].</p>
-  <img src="static/images/manual/query_builder/or_and.gif" alt="part-of-speech-tag explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/or_and.gif') }}" alt="OR/AND explanation" width="100%;" style="margin-bottom:20px;">
   <p></p>
   <br>
 </div>
@@ -134,7 +134,7 @@ under the tab "Examples".</p>
   the respective abbreviations under the tab "Tagsets". <br>
   You can also search for unspecified entities by selecting "Add entity of any type".</p>
   To close the entity query you started, you have to click the entity button one more time. This will make the <div class="chip" style="background-color:#A6E22D;">Entity End</div> element appear in your query.
-  <img src="static/images/manual/query_builder/entity.gif" alt="entity explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/entity.gif') }}" alt="entity explanation" width="100%;" style="margin-bottom:20px;">
   <p></p>
   <br>
 
@@ -142,7 +142,7 @@ under the tab "Examples".</p>
   <p>With the meta data you can annotate your text and add specific conditions. 
   You can select a category on the left and enter your desired value on the right. 
   The selected metadata will apply to your entire request and will be added at the end.</p>
-  <img src="static/images/manual/query_builder/meta_data.gif" alt="meta data explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/meta_data.gif') }}" alt="meta data explanation" width="100%;" style="margin-bottom:20px;">
   <p></p>
   <br>
 
@@ -158,11 +158,11 @@ under the tab "Examples".</p>
 
   <h4>Deleting the elements</h4>
   <p>You can delete the added elements from the query by clicking the X behind the respective content.</p>
-  <img src="static/images/manual/query_builder/delete.gif" alt="delete explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/delete.gif') }}" alt="delete explanation" width="100%;" style="margin-bottom:20px;">
 
   <h4>Move the elements of your query</h4>
   <p>You can drag and drop elements to customize your query.</p>
-  <img src="static/images/manual/query_builder/drag_and_drop.gif" alt="Drag&Drop explanation" width="100%;" style="margin-bottom:20px;">
+  <img src="{{ url_for('static', filename='images/manual/query_builder/drag_and_drop.gif') }}" alt="Drag&Drop explanation" width="100%;" style="margin-bottom:20px;">
 
 </div>
 

From cbf3abb424ab50ae7fac961f0868e94c7011742a Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Fri, 21 Oct 2022 13:33:25 +0200
Subject: [PATCH 14/20] Add SpaCyNLPPipelineModel to flask shell context

---
 nopaque.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nopaque.py b/nopaque.py
index bff58ae1..cf1b1dec 100644
--- a/nopaque.py
+++ b/nopaque.py
@@ -13,6 +13,7 @@ from app.models import (
     Permission,
     Role,
     TesseractOCRPipelineModel,
+    SpaCyNLPPipelineModel,
     User
 )  # noqa
 from flask import Flask  # noqa
@@ -42,6 +43,7 @@ def make_shell_context() -> Dict[str, Any]:
         'Permission': Permission,
         'Role': Role,
         'TesseractOCRPipelineModel': TesseractOCRPipelineModel,
+        'SpaCyNLPPipelineModel': SpaCyNLPPipelineModel,
         'User': User
     }
 

From 0b3456f877a752c126129236d563b867c6683f56 Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Mon, 24 Oct 2022 15:01:13 +0200
Subject: [PATCH 15/20] Small fixes

---
 app/static/js/CorpusAnalysis/QueryBuilder.js  | 55 ++++++++-----------
 .../analyse_corpus.concordance.html.j2        |  2 +-
 app/templates/corpora/analyse_corpus.html.j2  |  4 +-
 app/templates/test/analyse_corpus.html.j2     |  2 +-
 4 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index f9a10256..522054dd 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -166,7 +166,6 @@ class ConcordanceQueryBuilder {
   }
 
 
-
   // ##########################################################################
   // #################### General Functions ###################################
   // ##########################################################################
@@ -229,27 +228,13 @@ class ConcordanceQueryBuilder {
     this.elements.queryContainer.classList.remove('hide');
     this.queryPreviewBuilder();
 
-    // Opens a hint about the possible functions for editing the query when the first chip is added. It is displayed for 5 seconds and then deleted.
-    if (this.elements.yourQuery.classList.contains('tooltipped')) {
-      let tooltipInstance = M.Tooltip.getInstance(this.elements.yourQuery);
-      tooltipInstance.tooltipEl.style.background = '#98ACD2';
-      tooltipInstance.tooltipEl.style.borderTop = 'solid 4px #0064A3'
-      tooltipInstance.tooltipEl.style.padding = '10px';
-      tooltipInstance.tooltipEl.style.color = 'black';
-
-      if (tooltipInstance !== undefined) {
-        setTimeout(() => {
-          tooltipInstance.open();
-          setTimeout(() => {
-            tooltipInstance.destroy();
-          }, 5000);
-        }, 500);
-      }
-      this.elements.yourQuery.classList.remove('tooltipped');
+    // Shows a hint about possible functions for editing the query at the first added element in the query
+    if (this.elements.yourQuery.childNodes.length === 1) {
+      app.flash('You can edit your query by deleting individual elements or moving them via drag and drop.');
     }
   }
 
-    //#region	 Drag&Drop Events
+  //#region	 Drag&Drop Events
   dragStartHandler(event) {
     // Creates element with the class 'target' and all necessary drop functions, in which drop content can be released
     this.elements.dropButton = event.target;
@@ -329,12 +314,15 @@ class ConcordanceQueryBuilder {
 
   deleteAttr(attr) {
     this.elements.yourQuery.removeChild(attr);
-
+    if (attr.dataset.type === "start-sentence") {
+      this.elements.sentence.innerHTML = 'Sentence';
+    } else if (attr.dataset.type === "start-entity" || attr.dataset.type === "start-empty-entity") {
+      this.elements.entity.innerHTML = 'Entity';
+    }
     this.elements.counter -= 1;
     if (this.elements.counter === 0) {
       this.elements.queryContainer.classList.add('hide');
     }
-
     this.queryPreviewBuilder();
   }
 
@@ -374,12 +362,19 @@ class ConcordanceQueryBuilder {
         entityEndCounter += 1;
       }
     }
-    if (sentenceCounter !== sentenceEndCounter) {
-      app.flash('Please add a closing sentence tag', 'error');
+    // Checks if the same number of opening and closing tags (entity and sentence) are present. Depending on what is missing, the corresponding error message is ejected
+    if (sentenceCounter > sentenceEndCounter) {
+      app.flash('Please add the closing sentence tag', 'error');
+      this.elements.valueValidator = false;
+    } else if (sentenceCounter < sentenceEndCounter) {
+      app.flash('Please remove the closing sentence tag', 'error');
       this.elements.valueValidator = false;
     }
-    if (entityCounter !== entityEndCounter) {
-      app.flash('Please add a closing entity tag', 'error');
+    if (entityCounter > entityEndCounter) {
+      app.flash('Please add the closing entity tag', 'error');
+      this.elements.valueValidator = false;
+    } else if (entityCounter < entityEndCounter) {
+      app.flash('Please remove the closing entity tag', 'error');
       this.elements.valueValidator = false;
     }
   }
@@ -395,6 +390,8 @@ class ConcordanceQueryBuilder {
     this.elements.structuralAttrArea.classList.add('hide');
     this.elements.yourQuery.innerHTML = '';
     this.elements.queryContainer.classList.add('hide');
+    this.elements.entity.innerHTML = 'Entity';
+    this.elements.sentence.innerHTML = 'Sentence';
     
     instance.tooltipEl.style.background = '#98ACD2';
     instance.tooltipEl.style.borderTop = 'solid 4px #0064A3';
@@ -420,15 +417,13 @@ class ConcordanceQueryBuilder {
   //#endregion General Functions
 
 
-
-
   // ##########################################################################
   // ############## Token Attribute Builder Functions #########################
   // ##########################################################################
 
   //#region Token Attribute Builder Functions
 
-    //#region General functions of the Token Builder
+  //#region General functions of the Token Builder
   tokenTypeSelector() {
     this.hideEverything();
     switch (this.elements.positionalAttr.value) {
@@ -871,8 +866,6 @@ class ConcordanceQueryBuilder {
   //#endregion Token Attribute Builder Functions
 
 
-
-
   // ##########################################################################
   // ############ Structural Attribute Builder Functions ######################
   // ##########################################################################
@@ -961,7 +954,7 @@ class ConcordanceQueryBuilder {
         this.elements.noValueMetadataMessage.classList.add('hide');
       }, 3000);
     } else {
-      let queryText = `:: match.text_${this.elements.textAnnotationOptions.value}='${this.elements.textAnnotationInput.value}'`;
+      let queryText = `:: match.text_${this.elements.textAnnotationOptions.value}="${this.elements.textAnnotationInput.value}"`;
       this.buttonfactory('text-annotation', `${this.elements.textAnnotationOptions.value}=${this.elements.textAnnotationInput.value}`, queryText);
       this.hideEverything();
     }
diff --git a/app/templates/corpora/analyse_corpus.concordance.html.j2 b/app/templates/corpora/analyse_corpus.concordance.html.j2
index d223ca30..e19a3728 100644
--- a/app/templates/corpora/analyse_corpus.concordance.html.j2
+++ b/app/templates/corpora/analyse_corpus.concordance.html.j2
@@ -66,7 +66,7 @@
               <p class="hide-on-small-only">&nbsp;</p>
               <a class="btn waves-effect waves-light modal-trigger" href="#concordance-query-builder" id="concordance-query-builder-button">
                 <i class="material-icons left">build</i>
-                Query builder
+                Query builder (beta)
               </a>
               <button class="btn waves-effect waves-light corpus-analysis-action" id="concordance-extension-form-submit" type="submit" name="submit">
                 Send 
diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index 50c7d71c..779eafd4 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -254,7 +254,7 @@
     <div>
       <nav>
         <div class="nav-wrapper" id="query-builder-nav">
-          <a href="#!" class="brand-logo"><i class="material-icons">build</i>Query Builder</a>
+          <a href="#!" class="brand-logo"><i class="material-icons">build</i>Query Builder (beta)</a>
           <i class="material-icons close right" id="close-query-builder">close</i>
           <a class="modal-trigger" href="#query-builder-tutorial-modal" >
             <i class="material-icons right tooltipped" id="query-builder-tutorial-info-icon" data-position="bottom" data-tooltip="Click here if you are unsure how to use the Query Builder <br>and want to find out what other options it offers.">help</i>
@@ -274,7 +274,7 @@
         </h6>
       </div>
       <div class="row">
-        <div class="col s10 tooltipped" id="your-query" data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
+        <div class="col s10" id="your-query"></div>
         <a class="btn-small waves-effect waves-teal col s1" id="insert-query-button">
           <i class="material-icons">send</i>
         </a>
diff --git a/app/templates/test/analyse_corpus.html.j2 b/app/templates/test/analyse_corpus.html.j2
index 8f7374c9..faef6abd 100644
--- a/app/templates/test/analyse_corpus.html.j2
+++ b/app/templates/test/analyse_corpus.html.j2
@@ -106,7 +106,7 @@
         </h6>
       </div>
       <div class="row">
-        <div class="col s10 tooltipped" id="your-query" data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
+        <div class="col s10" id="your-query" data-position="bottom" data-tooltip="You can edit your query by deleting individual elements or moving them via drag and drop."></div>
         <a class="btn-small waves-effect waves-teal col s1" id="insert-query-button">
           <i class="material-icons">send</i>
         </a>

From 40a71ad9ddb1330dc0e4cacf0472c285ca9f88f3 Mon Sep 17 00:00:00 2001
From: dameyer <dameyer@techfak.uni-bielefeld.de>
Date: Tue, 25 Oct 2022 13:07:10 +0200
Subject: [PATCH 16/20] fix model contribution.

---
 app/contributions/forms.py  |  7 +++++
 app/contributions/routes.py | 55 +++++++++++++++++++++++++++++++++++--
 app/models.py               | 49 +++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/app/contributions/forms.py b/app/contributions/forms.py
index f00e49c3..2f9b4a57 100644
--- a/app/contributions/forms.py
+++ b/app/contributions/forms.py
@@ -1,4 +1,5 @@
 from flask_wtf import FlaskForm
+from flask_wtf.file import FileField, FileRequired
 from wtforms import (
     BooleanField,
     PasswordField,
@@ -70,6 +71,12 @@ class ContributionForm(FlaskForm):
         validators=[InputRequired()]
     )
 
+    # file upload
+    file = FileField(
+        'File',
+        validators=[FileRequired()]
+    )
+
     submit = SubmitField()
 
 
diff --git a/app/contributions/routes.py b/app/contributions/routes.py
index 34d54d41..c59cd5d2 100644
--- a/app/contributions/routes.py
+++ b/app/contributions/routes.py
@@ -1,9 +1,11 @@
-from flask import render_template
-from flask_login import login_required
+from apifairy import authenticate
+from flask import render_template, flash, abort
+from flask_login import login_required, current_user
 from app.decorators import permission_required
-from app.models import Permission
+from app.models import Permission, TesseractOCRModel, JobStatus
 from . import bp
 from .forms import ContributionForm
+from .. import db
 
 
 @bp.before_request
@@ -14,8 +16,55 @@ def before_request():
 
 
 @bp.route('', methods=['GET', 'POST'])
+@login_required
 def contributions():
     form = ContributionForm(prefix='contribution-form')
+
+    # Is the form submitted?
+    if form.is_submitted():
+        # Are their any false inputs?
+        if not form.validate():
+            response = {'errors': form.errors}
+            return response, 400
+
+
+        # At this point we can be sure that the form data is okay
+        # example
+        # compatible_service_versions = ['0.1.0', '0.1.1']
+
+
+        compatible_service_versions=form.compatible_service_versions.data
+        description=form.description
+        publisher=form.publisher
+        publisher_url=form.publisher_url
+        publishing_url=form.publishing_url
+        publishing_year=form.publishing_year
+        shared=False
+        title=form.title
+        version=form.version
+
+
+        try:
+            TesseractOCRModel.create(form.file.data,
+                                     compatible_service_versions,
+                                     description,
+                                     publisher,
+                                     publisher_url,
+                                     publishing_url,
+                                     publishing_year,
+                                     shared,
+                                     title,
+                                     version)
+
+        except OSError:
+            abort(500)
+        # job.status = JobStatus.SUBMITTED
+        db.session.commit()
+        # message = Markup(f'Job "<a href="{job.url}">{job.title}</a>" created')
+        flash("Model has been added.")
+        return {}, 201, {'message': 'Model has been created'}
+
+
     return render_template(
         'contributions/contribute.html.j2',
         form=form,
diff --git a/app/models.py b/app/models.py
index 8efc4bd2..6481dce6 100644
--- a/app/models.py
+++ b/app/models.py
@@ -602,6 +602,55 @@ class TesseractOCRModel(FileMixin, HashidMixin, db.Model):
             _json['user'] = self.user.to_json(backrefs=True)
         return _json
 
+    @staticmethod
+    def create(model_file, **kwargs):  # ??? Ist das so richtig? übergeben wir das form? Im anderen Fall ist das nicht so .. aber was soll hier überhaupt rein?
+        filename = kwargs.get('filename', model_file.filename)
+        mimetype = kwargs.get('mimetype', model_file.mimetype)
+        tesseract_ocr_model = TesseractOCRModel(
+            filename=secure_filename(filename),
+            mimetype=mimetype,
+            **kwargs
+        )
+
+        db.session.add(tesseract_ocr_model)
+        db.session.flush(objects=[tesseract_ocr_model])
+        db.session.refresh(tesseract_ocr_model)
+        try:
+            # ??? Woher soll file kommen? Wir haben der methode das ganze form übergeben.
+            # filename = form.file.data.filename
+            model_file.save(tesseract_ocr_model.path)
+        except OSError as e:
+            current_app.logger.error(e)
+            db.session.rollback()
+            raise e
+        return tesseract_ocr_model
+
+
+        # Kann man das so committen?
+        # db.session.add(model)
+        # db.session.flush(objects=[model])
+        # db.session.refresh(model)
+        # model.filename = f'{model.id}.traineddata'
+        # r = requests.get(m['url'], stream=True)
+        # pbar = tqdm(
+        #     desc=f'{model.title} ({model.filename})',
+        #     unit="B",
+        #     unit_scale=True,
+        #     unit_divisor=1024,
+        #     total=int(r.headers['Content-Length'])
+        # )
+        # pbar.clear()
+        # with open(model.path, 'wb') as f:
+        #     for chunk in r.iter_content(chunk_size=1024):
+        #         if chunk:  # filter out keep-alive new chunks
+        #             pbar.update(len(chunk))
+        #             f.write(chunk)
+        #     pbar.close()
+        #
+        # db.session.commit()
+
+
+
 
 class TranskribusHTRModel(HashidMixin, db.Model):
     __tablename__ = 'transkribus_htr_models'

From 36d3ea2ce02de72ca3a7592633a3557afaa0f412 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 26 Oct 2022 10:12:54 +0200
Subject: [PATCH 17/20] Remove helper comments and add service versions
 dynamically to select.

---
 app/contributions/forms.py | 52 ++++++++++----------------------------
 1 file changed, 14 insertions(+), 38 deletions(-)

diff --git a/app/contributions/forms.py b/app/contributions/forms.py
index 2f9b4a57..d123e6d1 100644
--- a/app/contributions/forms.py
+++ b/app/contributions/forms.py
@@ -2,81 +2,57 @@ from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileRequired
 from wtforms import (
     BooleanField,
-    PasswordField,
     StringField,
     SubmitField,
     SelectMultipleField,
-    ValidationError, FieldList, IntegerField
+    IntegerField
 )
-from wtforms.validators import InputRequired, Email, EqualTo, Length, Regexp
-from app.models import User
+from wtforms.validators import InputRequired, Length
+from app.services import SERVICES
 
 
 class ContributionForm(FlaskForm):
-
-    # The id field will be generated on insert.
-    # The user_id will be retrieved from the user who is performing this operation.
-
-    # title = db.Column(db.String(64))
     title = StringField(
         'Title',
         validators=[InputRequired(), Length(max=64)]
     )
-
-    # description = db.Column(db.String(255))
     description = StringField(
         'Description',
         validators=[InputRequired(), Length(max=255)]
     )
-
-    # version = db.Column(db.String(16))
     version = StringField(
         'Version',
         validators=[InputRequired(), Length(max=16)]
     )
-
-    # compatible_service_versions = db.Column(ContainerColumn(list, 255))
     compatible_service_versions = SelectMultipleField(
-        'Compatible Service Versions',
-        choices=["asd", "blub", "bla"]
+        'Compatible service versions'
     )
-
-    # publisher = db.Column(db.String(128))
     publisher = StringField(
         'Publisher',
         validators=[InputRequired(), Length(max=128)]
     )
-
-    # publisher_url = db.Column(db.String(512))
     publisher_url = StringField(
         'Publisher URL',
         validators=[InputRequired(), Length(max=512)]
     )
-
-    # publishing_url = db.Column(db.String(512))
     publishing_url = StringField(
         'Publishing URL',
         validators=[InputRequired(), Length(max=512)]
     )
-
-    # publishing_year = db.Column(db.Integer)
     publishing_year = IntegerField(
         'Publishing year',
         validators=[InputRequired()]
     )
-
-    # shared = db.Column(db.Boolean, default=False)
-    shared = BooleanField(
-        'Shared',
-        validators=[InputRequired()]
-    )
-
-    # file upload
-    file = FileField(
-        'File',
-        validators=[FileRequired()]
-    )
-
+    shared = BooleanField('Shared', validators=[InputRequired()])
+    model_file = FileField('File',validators=[FileRequired()])
     submit = SubmitField()
 
 
+    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 = ''

From 24851b38d9328edf979fea79b524d7d74b3557c1 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 26 Oct 2022 10:23:22 +0200
Subject: [PATCH 18/20] Move route, cleanup and first fixes

---
 app/contributions/routes.py | 72 ++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

diff --git a/app/contributions/routes.py b/app/contributions/routes.py
index c59cd5d2..d82bf511 100644
--- a/app/contributions/routes.py
+++ b/app/contributions/routes.py
@@ -1,11 +1,10 @@
-from apifairy import authenticate
-from flask import render_template, flash, abort
-from flask_login import login_required, current_user
+from flask import abort, flash, Markup, render_template, url_for
+from flask_login import login_required
+from app import db
 from app.decorators import permission_required
-from app.models import Permission, TesseractOCRModel, JobStatus
+from app.models import TesseractOCRModel, Permission
 from . import bp
 from .forms import ContributionForm
-from .. import db
 
 
 @bp.before_request
@@ -15,56 +14,39 @@ def before_request():
     pass
 
 
-@bp.route('', methods=['GET', 'POST'])
-@login_required
+@bp.route('')
 def contributions():
-    form = ContributionForm(prefix='contribution-form')
+    pass
 
-    # Is the form submitted?
+
+@bp.route('/tesseract-ocr-pipeline-models', methods=['GET', 'POST'])
+def tesseract_ocr_pipeline_models():
+    form = ContributionForm(
+        prefix='contribute-tesseract-ocr-pipeline-model-form'
+    )
     if form.is_submitted():
-        # Are their any false inputs?
         if not form.validate():
             response = {'errors': form.errors}
             return response, 400
-
-
-        # At this point we can be sure that the form data is okay
-        # example
-        # compatible_service_versions = ['0.1.0', '0.1.1']
-
-
-        compatible_service_versions=form.compatible_service_versions.data
-        description=form.description
-        publisher=form.publisher
-        publisher_url=form.publisher_url
-        publishing_url=form.publishing_url
-        publishing_year=form.publishing_year
-        shared=False
-        title=form.title
-        version=form.version
-
-
         try:
-            TesseractOCRModel.create(form.file.data,
-                                     compatible_service_versions,
-                                     description,
-                                     publisher,
-                                     publisher_url,
-                                     publishing_url,
-                                     publishing_year,
-                                     shared,
-                                     title,
-                                     version)
-
+            tesseract_ocr_model = TesseractOCRModel.create(
+                form.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,
+                shared=form.shared.data,
+                title=form.title.data,
+                version=form.version.data
+            )
         except OSError:
             abort(500)
-        # job.status = JobStatus.SUBMITTED
         db.session.commit()
-        # message = Markup(f'Job "<a href="{job.url}">{job.title}</a>" created')
-        flash("Model has been added.")
-        return {}, 201, {'message': 'Model has been created'}
-
-
+        message = Markup(f'Model "{tesseract_ocr_model.title}" created')
+        flash(message)
+        return {}, 201, {'Location': url_for('contributions.contributions')}
     return render_template(
         'contributions/contribute.html.j2',
         form=form,

From 0b656d3cf171b420ad8b301ac16bfbe4da6ebcca Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 26 Oct 2022 10:34:07 +0200
Subject: [PATCH 19/20] Add parallel fs changes to migration scripts and
 cleanup

---
 migrations/versions/116b4ab3ef9c_.py |  23 +--
 migrations/versions/260b57d5f4e7_.py |   8 +-
 migrations/versions/2c4e27331ccb_.py |   9 +-
 migrations/versions/31dd42e5ea6f_.py |  58 +++---
 migrations/versions/63b2cc26a01f_.py |  37 +---
 migrations/versions/9e8d7d15d950_.py | 265 +++++++++++++++------------
 migrations/versions/a3b727e3ff71_.py |  19 +-
 migrations/versions/f9070ff1fa4a_.py |  14 +-
 8 files changed, 223 insertions(+), 210 deletions(-)

diff --git a/migrations/versions/116b4ab3ef9c_.py b/migrations/versions/116b4ab3ef9c_.py
index 5bc75946..77a7d9b7 100644
--- a/migrations/versions/116b4ab3ef9c_.py
+++ b/migrations/versions/116b4ab3ef9c_.py
@@ -17,25 +17,22 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('tokens',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('access_token', sa.String(length=64), nullable=True),
-    sa.Column('access_expiration', sa.DateTime(), nullable=True),
-    sa.Column('refresh_token', sa.String(length=64), nullable=True),
-    sa.Column('refresh_expiration', sa.DateTime(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        'tokens',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('access_token', sa.String(length=64), nullable=True),
+        sa.Column('access_expiration', sa.DateTime(), nullable=True),
+        sa.Column('refresh_token', sa.String(length=64), nullable=True),
+        sa.Column('refresh_expiration', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_tokens_access_token'), 'tokens', ['access_token'], unique=False)
     op.create_index(op.f('ix_tokens_refresh_token'), 'tokens', ['refresh_token'], unique=False)
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_index(op.f('ix_tokens_refresh_token'), table_name='tokens')
     op.drop_index(op.f('ix_tokens_access_token'), table_name='tokens')
     op.drop_table('tokens')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/260b57d5f4e7_.py b/migrations/versions/260b57d5f4e7_.py
index 8f5fd95b..8c9cfda6 100644
--- a/migrations/versions/260b57d5f4e7_.py
+++ b/migrations/versions/260b57d5f4e7_.py
@@ -17,12 +17,10 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('transkribus_htr_models', 'transkribus_name')
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('transkribus_htr_models', sa.Column('transkribus_name', sa.VARCHAR(length=64), autoincrement=False, nullable=True))
-    # ### end Alembic commands ###
+    op.add_column('transkribus_htr_models',
+        sa.Column('transkribus_name', sa.String(length=64), autoincrement=False, nullable=True)
+    )
diff --git a/migrations/versions/2c4e27331ccb_.py b/migrations/versions/2c4e27331ccb_.py
index 302c6670..ea8aa9e1 100644
--- a/migrations/versions/2c4e27331ccb_.py
+++ b/migrations/versions/2c4e27331ccb_.py
@@ -17,13 +17,12 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('corpora', sa.Column('is_public', sa.Boolean(), nullable=True))
+    op.add_column(
+        'corpora',
+        sa.Column('is_public', sa.Boolean(), nullable=True)
+    )
     op.execute('UPDATE corpora SET is_public = false;')
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('corpora', 'is_public')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/31dd42e5ea6f_.py b/migrations/versions/31dd42e5ea6f_.py
index a92ada9c..b4824c49 100644
--- a/migrations/versions/31dd42e5ea6f_.py
+++ b/migrations/versions/31dd42e5ea6f_.py
@@ -20,34 +20,44 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     for user in User.query.all():
-        os.mkdir(os.path.join(user.path, 'spacy_nlp_pipeline_models'))
-    op.create_table('spacy_nlp_pipeline_models',
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('filename', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('mimetype', sa.String(length=255), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('title', sa.String(length=64), nullable=True),
-    sa.Column('description', sa.String(length=255), nullable=True),
-    sa.Column('version', sa.String(length=16), nullable=True),
-    sa.Column('compatible_service_versions', sa.String(length=255), nullable=True),
-    sa.Column('publisher', sa.String(length=128), nullable=True),
-    sa.Column('publisher_url', sa.String(length=512), nullable=True),
-    sa.Column('publishing_url', sa.String(length=512), nullable=True),
-    sa.Column('publishing_year', sa.Integer(), nullable=True),
-    sa.Column('shared', sa.Boolean(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+        spacy_nlp_pipeline_models_dir = os.path.join(user.path, 'spacy_nlp_pipeline_models')
+        if os.path.exists(spacy_nlp_pipeline_models_dir):
+            if not os.path.isdir(spacy_nlp_pipeline_models_dir):
+                raise OSError(f'Not a directory: {spacy_nlp_pipeline_models_dir}')
+            if not os.listdir(spacy_nlp_pipeline_models_dir):
+                raise OSError(f'Directory not empty: {spacy_nlp_pipeline_models_dir}')
+        else:
+            os.mkdir(spacy_nlp_pipeline_models_dir)
+
+
+    op.create_table(
+        'spacy_nlp_pipeline_models',
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('filename', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('mimetype', sa.String(length=255), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('title', sa.String(length=64), nullable=True),
+        sa.Column('description', sa.String(length=255), nullable=True),
+        sa.Column('version', sa.String(length=16), nullable=True),
+        sa.Column('compatible_service_versions', sa.String(length=255), nullable=True),
+        sa.Column('publisher', sa.String(length=128), nullable=True),
+        sa.Column('publisher_url', sa.String(length=512), nullable=True),
+        sa.Column('publishing_url', sa.String(length=512), nullable=True),
+        sa.Column('publishing_year', sa.Integer(), nullable=True),
+        sa.Column('shared', sa.Boolean(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     for user in User.query.all():
-        shutil.rmtree(os.path.join(user.path, 'spacy_nlp_pipeline_models'))
+        spacy_nlp_pipeline_models_dir = os.path.join(user.path, 'spacy_nlp_pipeline_models')
+        if os.path.exists(spacy_nlp_pipeline_models_dir):
+            shutil.rmtree(spacy_nlp_pipeline_models_dir)
+
+
     op.drop_table('spacy_nlp_pipeline_models')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/63b2cc26a01f_.py b/migrations/versions/63b2cc26a01f_.py
index 35eacc86..cd807282 100644
--- a/migrations/versions/63b2cc26a01f_.py
+++ b/migrations/versions/63b2cc26a01f_.py
@@ -5,8 +5,8 @@ Revises: 260b57d5f4e7
 Create Date: 2022-10-11 14:32:13.227364
 
 """
+from genericpath import isdir
 from alembic import op
-from flask import current_app
 import os
 from app.models import User
 
@@ -18,40 +18,19 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     for user in User.query.all():
-        old_tesseract_ocr_pipeline_model_path = os.path.join(
-            user.path,
-            'tesseract_ocr_models'
-        )
-        new_tesseract_ocr_pipeline_model_path = os.path.join(
-            user.path,
-            'tesseract_ocr_pipeline_models'
-        )
-        os.rename(
-            old_tesseract_ocr_pipeline_model_path,
-            new_tesseract_ocr_pipeline_model_path
-        )
+        old_tesseract_ocr_pipeline_model_path = os.path.join(user.path, 'tesseract_ocr_models')
+        new_tesseract_ocr_pipeline_model_path = os.path.join(user.path, 'tesseract_ocr_pipeline_models')
+        os.rename(old_tesseract_ocr_pipeline_model_path, new_tesseract_ocr_pipeline_model_path)
     op.rename_table('tesseract_ocr_models', 'tesseract_ocr_pipeline_models')
     op.rename_table('transkribus_htr_models', 'transkribus_htr_pipeline_models')
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     for user in User.query.all():
-        old_tesseract_ocr_pipeline_model_path = os.path.join(
-            user.path,
-            'tesseract_ocr_models'
-        )
-        new_tesseract_ocr_pipeline_model_path = os.path.join(
-            user.path,
-            'tesseract_ocr_pipeline_models'
-        )
-        os.rename(
-            new_tesseract_ocr_pipeline_model_path,
-            old_tesseract_ocr_pipeline_model_path
-        )
+        old_tesseract_ocr_pipeline_model_path = os.path.join(user.path, 'tesseract_ocr_models')
+        new_tesseract_ocr_pipeline_model_path = os.path.join(user.path, 'tesseract_ocr_pipeline_models')
+        os.rename(old_tesseract_ocr_pipeline_model_path, new_tesseract_ocr_pipeline_model_path)
+        os.rename(new_tesseract_ocr_pipeline_model_path, old_tesseract_ocr_pipeline_model_path)
     op.rename_table('tesseract_ocr_pipeline_models', 'tesseract_ocr_models')
     op.rename_table('transkribus_htr_pipeline_models', 'transkribus_htr_models')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/9e8d7d15d950_.py b/migrations/versions/9e8d7d15d950_.py
index 9d59da39..bb6e9fe9 100644
--- a/migrations/versions/9e8d7d15d950_.py
+++ b/migrations/versions/9e8d7d15d950_.py
@@ -6,7 +6,10 @@ Create Date: 2022-04-22 09:38:49.527498
 
 """
 from alembic import op
+from flask import current_app
 import sqlalchemy as sa
+import os
+import shutil
 
 
 # revision identifiers, used by Alembic.
@@ -17,138 +20,167 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('roles',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('default', sa.Boolean(), nullable=True),
-    sa.Column('name', sa.String(length=64), nullable=True),
-    sa.Column('permissions', sa.Integer(), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name')
+    users_dir = os.path.join(current_app.config['NOPAQUE_DATA_DIR'], 'users')
+    if os.path.exists(users_dir):
+        if not os.path.isdir(users_dir):
+            raise OSError(f'Not a directory: {users_dir}')
+        if not os.listdir(users_dir):
+            raise OSError(f'Directory not empty: {users_dir}')
+    else:
+        os.mkdir(users_dir)
+
+
+    op.create_table(
+        'roles',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('default', sa.Boolean(), nullable=True),
+        sa.Column('name', sa.String(length=64), nullable=True),
+        sa.Column('permissions', sa.Integer(), nullable=True),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('name')
     )
     op.create_index(op.f('ix_roles_default'), 'roles', ['default'], unique=False)
-    op.create_table('users',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('role_id', sa.Integer(), nullable=True),
-    sa.Column('confirmed', sa.Boolean(), nullable=True),
-    sa.Column('email', sa.String(length=254), nullable=True),
-    sa.Column('last_seen', sa.DateTime(), nullable=True),
-    sa.Column('member_since', sa.DateTime(), nullable=True),
-    sa.Column('password_hash', sa.String(length=128), nullable=True),
-    sa.Column('token', sa.String(length=32), nullable=True),
-    sa.Column('token_expiration', sa.DateTime(), nullable=True),
-    sa.Column('username', sa.String(length=64), nullable=True),
-    sa.Column('setting_dark_mode', sa.Boolean(), nullable=True),
-    sa.Column('setting_job_status_mail_notification_level', sa.Integer(), nullable=True),
-    sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'users',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('role_id', sa.Integer(), nullable=True),
+        sa.Column('confirmed', sa.Boolean(), nullable=True),
+        sa.Column('email', sa.String(length=254), nullable=True),
+        sa.Column('last_seen', sa.DateTime(), nullable=True),
+        sa.Column('member_since', sa.DateTime(), nullable=True),
+        sa.Column('password_hash', sa.String(length=128), nullable=True),
+        sa.Column('token', sa.String(length=32), nullable=True),
+        sa.Column('token_expiration', sa.DateTime(), nullable=True),
+        sa.Column('username', sa.String(length=64), nullable=True),
+        sa.Column('setting_dark_mode', sa.Boolean(), nullable=True),
+        sa.Column('setting_job_status_mail_notification_level', sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
     op.create_index(op.f('ix_users_token'), 'users', ['token'], unique=True)
     op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
-    op.create_table('corpora',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('description', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('status', sa.Integer(), nullable=True),
-    sa.Column('title', sa.String(length=32), nullable=True),
-    sa.Column('num_analysis_sessions', sa.Integer(), nullable=True),
-    sa.Column('num_tokens', sa.Integer(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'corpora',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('description', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('status', sa.Integer(), nullable=True),
+        sa.Column('title', sa.String(length=32), nullable=True),
+        sa.Column('num_analysis_sessions', sa.Integer(), nullable=True),
+        sa.Column('num_tokens', sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('jobs',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('description', sa.String(length=255), nullable=True),
-    sa.Column('end_date', sa.DateTime(), nullable=True),
-    sa.Column('service', sa.String(length=64), nullable=True),
-    sa.Column('service_args', sa.String(length=255), nullable=True),
-    sa.Column('service_version', sa.String(length=16), nullable=True),
-    sa.Column('status', sa.Integer(), nullable=True),
-    sa.Column('title', sa.String(length=32), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'jobs',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('description', sa.String(length=255), nullable=True),
+        sa.Column('end_date', sa.DateTime(), nullable=True),
+        sa.Column('service', sa.String(length=64), nullable=True),
+        sa.Column('service_args', sa.String(length=255), nullable=True),
+        sa.Column('service_version', sa.String(length=16), nullable=True),
+        sa.Column('status', sa.Integer(), nullable=True),
+        sa.Column('title', sa.String(length=32), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('tesseract_ocr_models',
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('filename', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('mimetype', sa.String(length=255), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('compatible_service_versions', sa.String(length=255), nullable=True),
-    sa.Column('description', sa.String(length=255), nullable=True),
-    sa.Column('publisher', sa.String(length=128), nullable=True),
-    sa.Column('publisher_url', sa.String(length=512), nullable=True),
-    sa.Column('publishing_url', sa.String(length=512), nullable=True),
-    sa.Column('publishing_year', sa.Integer(), nullable=True),
-    sa.Column('shared', sa.Boolean(), nullable=True),
-    sa.Column('title', sa.String(length=64), nullable=True),
-    sa.Column('version', sa.String(length=16), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'tesseract_ocr_models',
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('filename', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('mimetype', sa.String(length=255), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('compatible_service_versions', sa.String(length=255), nullable=True),
+        sa.Column('description', sa.String(length=255), nullable=True),
+        sa.Column('publisher', sa.String(length=128), nullable=True),
+        sa.Column('publisher_url', sa.String(length=512), nullable=True),
+        sa.Column('publishing_url', sa.String(length=512), nullable=True),
+        sa.Column('publishing_year', sa.Integer(), nullable=True),
+        sa.Column('shared', sa.Boolean(), nullable=True),
+        sa.Column('title', sa.String(length=64), nullable=True),
+        sa.Column('version', sa.String(length=16), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('transkribus_htr_models',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('shared', sa.Boolean(), nullable=True),
-    sa.Column('transkribus_model_id', sa.Integer(), nullable=True),
-    sa.Column('transkribus_name', sa.String(length=64), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'transkribus_htr_models',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=True),
+        sa.Column('shared', sa.Boolean(), nullable=True),
+        sa.Column('transkribus_model_id', sa.Integer(), nullable=True),
+        sa.Column('transkribus_name', sa.String(length=64), nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('corpus_files',
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('filename', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('mimetype', sa.String(length=255), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('corpus_id', sa.Integer(), nullable=True),
-    sa.Column('address', sa.String(length=255), nullable=True),
-    sa.Column('author', sa.String(length=255), nullable=True),
-    sa.Column('booktitle', sa.String(length=255), nullable=True),
-    sa.Column('chapter', sa.String(length=255), nullable=True),
-    sa.Column('editor', sa.String(length=255), nullable=True),
-    sa.Column('institution', sa.String(length=255), nullable=True),
-    sa.Column('journal', sa.String(length=255), nullable=True),
-    sa.Column('pages', sa.String(length=255), nullable=True),
-    sa.Column('publisher', sa.String(length=255), nullable=True),
-    sa.Column('publishing_year', sa.Integer(), nullable=True),
-    sa.Column('school', sa.String(length=255), nullable=True),
-    sa.Column('title', sa.String(length=255), nullable=True),
-    sa.ForeignKeyConstraint(['corpus_id'], ['corpora.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'corpus_files',
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('filename', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('mimetype', sa.String(length=255), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('corpus_id', sa.Integer(), nullable=True),
+        sa.Column('address', sa.String(length=255), nullable=True),
+        sa.Column('author', sa.String(length=255), nullable=True),
+        sa.Column('booktitle', sa.String(length=255), nullable=True),
+        sa.Column('chapter', sa.String(length=255), nullable=True),
+        sa.Column('editor', sa.String(length=255), nullable=True),
+        sa.Column('institution', sa.String(length=255), nullable=True),
+        sa.Column('journal', sa.String(length=255), nullable=True),
+        sa.Column('pages', sa.String(length=255), nullable=True),
+        sa.Column('publisher', sa.String(length=255), nullable=True),
+        sa.Column('publishing_year', sa.Integer(), nullable=True),
+        sa.Column('school', sa.String(length=255), nullable=True),
+        sa.Column('title', sa.String(length=255), nullable=True),
+        sa.ForeignKeyConstraint(['corpus_id'], ['corpora.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('job_inputs',
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('filename', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('mimetype', sa.String(length=255), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('job_id', sa.Integer(), nullable=True),
-    sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'job_inputs',
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('filename', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('mimetype', sa.String(length=255), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('job_id', sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('job_results',
-    sa.Column('creation_date', sa.DateTime(), nullable=True),
-    sa.Column('filename', sa.String(length=255), nullable=True),
-    sa.Column('last_edited_date', sa.DateTime(), nullable=True),
-    sa.Column('mimetype', sa.String(length=255), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('job_id', sa.Integer(), nullable=True),
-    sa.Column('description', sa.String(length=255), nullable=True),
-    sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ),
-    sa.PrimaryKeyConstraint('id')
+
+    op.create_table(
+        'job_results',
+        sa.Column('creation_date', sa.DateTime(), nullable=True),
+        sa.Column('filename', sa.String(length=255), nullable=True),
+        sa.Column('last_edited_date', sa.DateTime(), nullable=True),
+        sa.Column('mimetype', sa.String(length=255), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('job_id', sa.Integer(), nullable=True),
+        sa.Column('description', sa.String(length=255), nullable=True),
+        sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
+    users_dir = os.path.join(current_app.config['NOPAQUE_DATA_DIR'], 'users')
+    if os.path.exists(users_dir):
+        shutil.rmtree(users_dir)
+
+
     op.drop_table('job_results')
     op.drop_table('job_inputs')
     op.drop_table('corpus_files')
@@ -162,4 +194,3 @@ def downgrade():
     op.drop_table('users')
     op.drop_index(op.f('ix_roles_default'), table_name='roles')
     op.drop_table('roles')
-    # ### end Alembic commands ###
diff --git a/migrations/versions/a3b727e3ff71_.py b/migrations/versions/a3b727e3ff71_.py
index a2fb37fb..8dd58159 100644
--- a/migrations/versions/a3b727e3ff71_.py
+++ b/migrations/versions/a3b727e3ff71_.py
@@ -17,19 +17,16 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('transkribus_htr_pipeline_models')
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('transkribus_htr_pipeline_models',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=True),
-    sa.Column('shared', sa.BOOLEAN(), autoincrement=False, nullable=True),
-    sa.Column('transkribus_model_id', sa.INTEGER(), autoincrement=False, nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='transkribus_htr_models_user_id_fkey'),
-    sa.PrimaryKeyConstraint('id', name='transkribus_htr_models_pkey')
+    op.create_table(
+        'transkribus_htr_pipeline_models',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('user_id', sa.Integer(), autoincrement=False, nullable=True),
+        sa.Column('shared', sa.Boolean(), autoincrement=False, nullable=True),
+        sa.Column('transkribus_model_id', sa.Integer(), autoincrement=False, nullable=True),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='transkribus_htr_models_user_id_fkey'),
+        sa.PrimaryKeyConstraint('id', name='transkribus_htr_models_pkey')
     )
-    # ### end Alembic commands ###
diff --git a/migrations/versions/f9070ff1fa4a_.py b/migrations/versions/f9070ff1fa4a_.py
index a352ab13..87504f99 100644
--- a/migrations/versions/f9070ff1fa4a_.py
+++ b/migrations/versions/f9070ff1fa4a_.py
@@ -16,16 +16,18 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.drop_index('ix_users_token', table_name='users')
     op.drop_column('users', 'token')
     op.drop_column('users', 'token_expiration')
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('token_expiration', sa.DateTime(), autoincrement=False, nullable=True))
-    op.add_column('users', sa.Column('token', sa.VARCHAR(length=32), autoincrement=False, nullable=True))
+    op.add_column(
+        'users',
+        sa.Column('token_expiration', sa.DateTime(), autoincrement=False, nullable=True)
+    )
+    op.add_column(
+        'users',
+        sa.Column('token', sa.String(length=32), autoincrement=False, nullable=True)
+    )
     op.create_index('ix_users_token', 'users', ['token'], unique=False)
-    # ### end Alembic commands ###

From 1faa98b4e8cd8ecfa1aa7ae3dbc5f8feef0cb80f Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Wed, 26 Oct 2022 12:02:53 +0200
Subject: [PATCH 20/20] Adjustment Contribution Package

---
 app/contributions/forms.py  |  2 +-
 app/contributions/routes.py |  8 +++---
 app/models.py               | 49 -------------------------------------
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/app/contributions/forms.py b/app/contributions/forms.py
index d123e6d1..44279a1d 100644
--- a/app/contributions/forms.py
+++ b/app/contributions/forms.py
@@ -11,7 +11,7 @@ from wtforms.validators import InputRequired, Length
 from app.services import SERVICES
 
 
-class ContributionForm(FlaskForm):
+class TesseractOCRModelContributionForm(FlaskForm):
     title = StringField(
         'Title',
         validators=[InputRequired(), Length(max=64)]
diff --git a/app/contributions/routes.py b/app/contributions/routes.py
index d82bf511..287eda18 100644
--- a/app/contributions/routes.py
+++ b/app/contributions/routes.py
@@ -2,9 +2,9 @@ from flask import abort, flash, Markup, render_template, url_for
 from flask_login import login_required
 from app import db
 from app.decorators import permission_required
-from app.models import TesseractOCRModel, Permission
+from app.models import TesseractOCRPipelineModel, Permission
 from . import bp
-from .forms import ContributionForm
+from .forms import TesseractOCRModelContributionForm
 
 
 @bp.before_request
@@ -21,7 +21,7 @@ def contributions():
 
 @bp.route('/tesseract-ocr-pipeline-models', methods=['GET', 'POST'])
 def tesseract_ocr_pipeline_models():
-    form = ContributionForm(
+    form = TesseractOCRModelContributionForm(
         prefix='contribute-tesseract-ocr-pipeline-model-form'
     )
     if form.is_submitted():
@@ -29,7 +29,7 @@ def tesseract_ocr_pipeline_models():
             response = {'errors': form.errors}
             return response, 400
         try:
-            tesseract_ocr_model = TesseractOCRModel.create(
+            tesseract_ocr_model = TesseractOCRPipelineModel.create(
                 form.file.data,
                 compatible_service_versions=form.compatible_service_versions.data,
                 description=form.description.data,
diff --git a/app/models.py b/app/models.py
index c0cedf21..cc5d60ce 100644
--- a/app/models.py
+++ b/app/models.py
@@ -620,55 +620,6 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
             _json['user'] = self.user.to_json(backrefs=True)
         return _json
 
-    @staticmethod
-    def create(model_file, **kwargs):  # ??? Ist das so richtig? übergeben wir das form? Im anderen Fall ist das nicht so .. aber was soll hier überhaupt rein?
-        filename = kwargs.get('filename', model_file.filename)
-        mimetype = kwargs.get('mimetype', model_file.mimetype)
-        tesseract_ocr_model = TesseractOCRModel(
-            filename=secure_filename(filename),
-            mimetype=mimetype,
-            **kwargs
-        )
-
-        db.session.add(tesseract_ocr_model)
-        db.session.flush(objects=[tesseract_ocr_model])
-        db.session.refresh(tesseract_ocr_model)
-        try:
-            # ??? Woher soll file kommen? Wir haben der methode das ganze form übergeben.
-            # filename = form.file.data.filename
-            model_file.save(tesseract_ocr_model.path)
-        except OSError as e:
-            current_app.logger.error(e)
-            db.session.rollback()
-            raise e
-        return tesseract_ocr_model
-
-
-        # Kann man das so committen?
-        # db.session.add(model)
-        # db.session.flush(objects=[model])
-        # db.session.refresh(model)
-        # model.filename = f'{model.id}.traineddata'
-        # r = requests.get(m['url'], stream=True)
-        # pbar = tqdm(
-        #     desc=f'{model.title} ({model.filename})',
-        #     unit="B",
-        #     unit_scale=True,
-        #     unit_divisor=1024,
-        #     total=int(r.headers['Content-Length'])
-        # )
-        # pbar.clear()
-        # with open(model.path, 'wb') as f:
-        #     for chunk in r.iter_content(chunk_size=1024):
-        #         if chunk:  # filter out keep-alive new chunks
-        #             pbar.update(len(chunk))
-        #             f.write(chunk)
-        #     pbar.close()
-        #
-        # db.session.commit()
-
-
-
 
 class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
     __tablename__ = 'spacy_nlp_pipeline_models'