Rename tables for pipeline models

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

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'])

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)

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