Codestyle enhancements

app/contributions/tesseract_ocr_pipeline_models/__init__.py

@@ -1,7 +1,7 @@
 from flask import Blueprint
 
 
-TEMPLATE_FOLDER = 'contributions/tesseract_ocr_pipeline_models'
+template_base_dir = 'contributions/tesseract_ocr_pipeline_models'
 
 
 bp = Blueprint('tesseract_ocr_pipeline_models', __name__)

app/contributions/tesseract_ocr_pipeline_models/json_routes.py

@@ -1,4 +1,4 @@
-from flask import abort, current_app, jsonify, request
+from flask import abort, current_app, request
 from flask_login import login_required, current_user
 from threading import Thread
 from app import db
@@ -29,9 +29,7 @@ def delete_tesseract_model(tesseract_ocr_pipeline_model_id):
         'message': \
             f'Tesseract OCR Pipeline Model "{topm.title}" marked for deletion'
     }
-    response = jsonify(response_data)
-    response.status_code = 202
-    return response
+    return response_data, 202
 
 
 @bp.route('/<hashid:tesseract_ocr_pipeline_model_id>/is_public', methods=['PUT'])
@@ -53,6 +51,4 @@ def update_tesseract_ocr_pipeline_model_is_public(tesseract_ocr_pipeline_model_i
             f' is now {"public" if is_public else "private"}'
         )
     }
-    response = jsonify(response_data)
-    response.status_code = 200
-    return response
+    return response_data, 200

app/contributions/tesseract_ocr_pipeline_models/routes.py

@@ -1,8 +1,8 @@
-from flask import abort, flash, Markup, redirect, render_template, url_for
+from flask import abort, flash, redirect, render_template, url_for
 from flask_login import login_required, current_user
 from app import db
 from app.models import TesseractOCRPipelineModel
-from . import bp, TEMPLATE_FOLDER
+from . import bp, template_base_dir
 from .forms import (
     CreateTesseractOCRPipelineModelForm,
     EditTesseractOCRPipelineModelForm
@@ -13,7 +13,7 @@ from .forms import (
 @login_required
 def tesseract_ocr_pipeline_models():
     return render_template(
-        f'{TEMPLATE_FOLDER}/tesseract_ocr_pipeline_models.html.j2',
+        f'{template_base_dir}/tesseract_ocr_pipeline_models.html.j2',
         title='Tesseract OCR Pipeline Models'
     )
 
@@ -21,13 +21,13 @@ def tesseract_ocr_pipeline_models():
 @bp.route('/create', methods=['GET', 'POST'])
 @login_required
 def create_tesseract_ocr_pipeline_model():
-    form = CreateTesseractOCRPipelineModelForm(prefix='create-tesseract-ocr-pipeline-model-form')
+    form_prefix = 'create-tesseract-ocr-pipeline-model-form'
+    form = CreateTesseractOCRPipelineModelForm(prefix=form_prefix)
     if form.is_submitted():
         if not form.validate():
-            response = {'errors': form.errors}
-            return response, 400
+            return {'errors': form.errors}, 400
         try:
-            tesseract_ocr_pipeline_model = TesseractOCRPipelineModel.create(
+            topm = TesseractOCRPipelineModel.create(
                 form.tesseract_model_file.data,
                 compatible_service_versions=form.compatible_service_versions.data,
                 description=form.description.data,
@@ -43,15 +43,10 @@ def create_tesseract_ocr_pipeline_model():
         except OSError:
             abort(500)
         db.session.commit()
-        tesseract_ocr_pipeline_model_url = url_for(
-            '.tesseract_ocr_pipeline_model',
-            tesseract_ocr_pipeline_model_id=tesseract_ocr_pipeline_model.id
-        )
-        message = Markup(f'Tesseract OCR Pipeline model "<a href="{tesseract_ocr_pipeline_model_url}">{tesseract_ocr_pipeline_model.title}</a>" created')
-        flash(message)
-        return {}, 201, {'Location': tesseract_ocr_pipeline_model_url}
+        flash(f'Tesseract OCR Pipeline model "{topm.title}" created')
+        return {}, 201, {'Location': url_for('.tesseract_ocr_pipeline_models')}
     return render_template(
-        f'{TEMPLATE_FOLDER}/create_tesseract_ocr_pipeline_model.html.j2',
+        f'{template_base_dir}/create_tesseract_ocr_pipeline_model.html.j2',
         form=form,
         title='Create Tesseract OCR Pipeline Model'
     )
@@ -60,21 +55,21 @@ def create_tesseract_ocr_pipeline_model():
 @bp.route('/<hashid:tesseract_ocr_pipeline_model_id>', methods=['GET', 'POST'])
 @login_required
 def tesseract_ocr_pipeline_model(tesseract_ocr_pipeline_model_id):
-    tesseract_ocr_pipeline_model = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
+    topm = TesseractOCRPipelineModel.query.get_or_404(tesseract_ocr_pipeline_model_id)
+    form_prefix = 'edit-tesseract-ocr-pipeline-model-form'
     form = EditTesseractOCRPipelineModelForm(
-        data=tesseract_ocr_pipeline_model.to_json_serializeable(),
-        prefix='edit-tesseract-ocr-pipeline-model-form'
+        data=topm.to_json_serializeable(),
+        prefix=form_prefix
     )
     if form.validate_on_submit():
-        form.populate_obj(tesseract_ocr_pipeline_model)
-        if db.session.is_modified(tesseract_ocr_pipeline_model):
-            message = Markup(f'Tesseract OCR Pipeline model "<a href="{tesseract_ocr_pipeline_model.url}">{tesseract_ocr_pipeline_model.title}</a>" updated')
-            flash(message)
+        form.populate_obj(topm)
+        if db.session.is_modified(topm):
+            flash(f'Tesseract OCR Pipeline model "{topm.title}" updated')
             db.session.commit()
         return redirect(url_for('.tesseract_ocr_pipeline_models'))
     return render_template(
-        f'{TEMPLATE_FOLDER}/tesseract_ocr_pipeline_model.html.j2',
+        f'{template_base_dir}/tesseract_ocr_pipeline_model.html.j2',
         form=form,
-        tesseract_ocr_pipeline_model=tesseract_ocr_pipeline_model,
-        title=f'{tesseract_ocr_pipeline_model.title} {tesseract_ocr_pipeline_model.version}'
+        tesseract_ocr_pipeline_model=topm,
+        title=f'{topm.title} {topm.version}'
     )