re-order imports the way backend always used to

.pre-commit-config.yaml

@@ -57,7 +57,7 @@ repos:
         entry: reorder-python-imports
         language: system
         types: [python]
-        args: [--application-directories=src]
+        args: [--application-directories=spiffworkflow-backend/src]
         exclude: "(/migrations/|load_database_models)"
       - id: trailing-whitespace
         files: ^spiffworkflow-backend/

spiffworkflow-backend/bin/import_tickets_for_command_line.py

@@ -2,6 +2,7 @@
 import csv
 
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend import get_hacked_up_app_for_script
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.user import UserModel

spiffworkflow-backend/bin/start_blocking_appscheduler.py

@@ -2,6 +2,7 @@
 import time
 
 from apscheduler.schedulers.background import BlockingScheduler  # type: ignore
+
 from spiffworkflow_backend import create_app
 from spiffworkflow_backend import start_scheduler
 from spiffworkflow_backend.helpers.db_helper import try_to_connect

spiffworkflow-backend/conftest.py

@@ -6,6 +6,9 @@ import pytest
 from flask.app import Flask
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.user import UserModel
@@ -16,8 +19,6 @@ from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 # We need to call this before importing spiffworkflow_backend

spiffworkflow-backend/src/spiffworkflow_backend/__init__.py

@@ -5,7 +5,6 @@ from typing import Any
 import connexion  # type: ignore
 import flask.app
 import flask.json
-import spiffworkflow_backend.load_database_models  # noqa: F401
 import sqlalchemy
 from apscheduler.schedulers.background import BackgroundScheduler  # type: ignore
 from apscheduler.schedulers.base import BaseScheduler  # type: ignore
@@ -15,6 +14,9 @@ from flask_bpmn.models.db import db
 from flask_bpmn.models.db import migrate
 from flask_cors import CORS  # type: ignore
 from flask_mail import Mail  # type: ignore
+from werkzeug.exceptions import NotFound
+
+import spiffworkflow_backend.load_database_models  # noqa: F401
 from spiffworkflow_backend.config import setup_config
 from spiffworkflow_backend.routes.admin_blueprint.admin_blueprint import admin_blueprint
 from spiffworkflow_backend.routes.process_api_blueprint import process_api_blueprint
@@ -24,7 +26,6 @@ from spiffworkflow_backend.services.authorization_service import AuthorizationSe
 from spiffworkflow_backend.services.background_processing_service import (
     BackgroundProcessingService,
 )
-from werkzeug.exceptions import NotFound
 
 
 class MyJSONEncoder(DefaultJSONProvider):

spiffworkflow-backend/src/spiffworkflow_backend/config/__init__.py

@@ -3,9 +3,10 @@ import os
 import threading
 
 from flask.app import Flask
-from spiffworkflow_backend.services.logging_service import setup_logger
 from werkzeug.utils import ImportStringError
 
+from spiffworkflow_backend.services.logging_service import setup_logger
+
 
 class ConfigurationError(Exception):
     """ConfigurationError."""

spiffworkflow-backend/src/spiffworkflow_backend/models/active_task.py

@@ -6,13 +6,14 @@ from typing import TYPE_CHECKING
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import RelationshipProperty
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.task import Task
 from spiffworkflow_backend.models.user import UserModel
-from sqlalchemy import ForeignKey
-from sqlalchemy.orm import relationship
-from sqlalchemy.orm import RelationshipProperty
 
 
 if TYPE_CHECKING:

spiffworkflow-backend/src/spiffworkflow_backend/models/active_task_user.py

@@ -5,9 +5,10 @@ from dataclasses import dataclass
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+
 from spiffworkflow_backend.models.active_task import ActiveTaskModel
 from spiffworkflow_backend.models.user import UserModel
-from sqlalchemy import ForeignKey
 
 
 @dataclass

spiffworkflow-backend/src/spiffworkflow_backend/models/file.py

@@ -8,11 +8,12 @@ from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
 from marshmallow import INCLUDE
 from marshmallow import Schema
-from spiffworkflow_backend.helpers.spiff_enum import SpiffEnum
-from spiffworkflow_backend.models.data_store import DataStoreModel
 from sqlalchemy.orm import deferred
 from sqlalchemy.orm import relationship
 
+from spiffworkflow_backend.helpers.spiff_enum import SpiffEnum
+from spiffworkflow_backend.models.data_store import DataStoreModel
+
 
 class FileModel(SpiffworkflowBaseDBModel):
     """FileModel."""

spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py

@@ -4,12 +4,13 @@ from typing import TYPE_CHECKING
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import relationship
+
 from spiffworkflow_backend.models.message_correlation_property import (
     MessageCorrelationPropertyModel,
 )
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
-from sqlalchemy import ForeignKey
-from sqlalchemy.orm import relationship
 
 if TYPE_CHECKING:
     from spiffworkflow_backend.models.message_correlation_message_instance import (  # noqa: F401

spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_message_instance.py

@@ -3,9 +3,10 @@ from dataclasses import dataclass
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+
 from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
 from spiffworkflow_backend.models.message_instance import MessageInstanceModel
-from sqlalchemy import ForeignKey
 
 
 @dataclass

spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_property.py

@@ -1,9 +1,10 @@
 """Message_correlation_property."""
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.message_model import MessageModel
 from sqlalchemy import ForeignKey
 
+from spiffworkflow_backend.models.message_model import MessageModel
+
 
 class MessageCorrelationPropertyModel(SpiffworkflowBaseDBModel):
     """MessageCorrelationPropertyModel."""

spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py

@@ -7,14 +7,15 @@ from typing import TYPE_CHECKING
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.message_model import MessageModel
-from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from sqlalchemy import ForeignKey
 from sqlalchemy.event import listens_for
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import validates
 
+from spiffworkflow_backend.models.message_model import MessageModel
+from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
+
 if TYPE_CHECKING:
     from spiffworkflow_backend.models.message_correlation_message_instance import (  # noqa: F401
         MessageCorrelationMessageInstanceModel,

spiffworkflow-backend/src/spiffworkflow_backend/models/message_triggerable_process_model.py

@@ -1,9 +1,10 @@
 """Message_correlation_property."""
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.message_model import MessageModel
 from sqlalchemy import ForeignKey
 
+from spiffworkflow_backend.models.message_model import MessageModel
+
 
 class MessageTriggerableProcessModel(SpiffworkflowBaseDBModel):
     """MessageTriggerableProcessModel."""

spiffworkflow-backend/src/spiffworkflow_backend/models/permission_assignment.py

@@ -4,11 +4,12 @@ from typing import Any
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.permission_target import PermissionTargetModel
-from spiffworkflow_backend.models.principal import PrincipalModel
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import validates
 
+from spiffworkflow_backend.models.permission_target import PermissionTargetModel
+from spiffworkflow_backend.models.principal import PrincipalModel
+
 
 class PermitDeny(enum.Enum):
     """PermitDeny."""

spiffworkflow-backend/src/spiffworkflow_backend/models/principal.py

@@ -3,12 +3,13 @@ from dataclasses import dataclass
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.group import GroupModel
-from spiffworkflow_backend.models.user import UserModel
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import relationship
 from sqlalchemy.schema import CheckConstraint
 
+from spiffworkflow_backend.models.group import GroupModel
+from spiffworkflow_backend.models.user import UserModel
+
 
 class DataValidityError(Exception):
     """DataValidityError."""

spiffworkflow-backend/src/spiffworkflow_backend/models/process_group.py

@@ -8,6 +8,7 @@ from typing import Any
 import marshmallow
 from marshmallow import post_load
 from marshmallow import Schema
+
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 
 

spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance.py

@@ -12,15 +12,16 @@ from marshmallow import INCLUDE
 from marshmallow import Schema
 from marshmallow_enum import EnumField  # type: ignore
 from SpiffWorkflow.util.deep_merge import DeepMerge  # type: ignore
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import deferred
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import validates
+
 from spiffworkflow_backend.helpers.spiff_enum import SpiffEnum
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.models.task import Task
 from spiffworkflow_backend.models.task import TaskSchema
 from spiffworkflow_backend.models.user import UserModel
-from sqlalchemy import ForeignKey
-from sqlalchemy.orm import deferred
-from sqlalchemy.orm import relationship
-from sqlalchemy.orm import validates
 
 
 class NavigationItemSchema(Schema):

spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py

@@ -9,6 +9,10 @@ from typing import TypedDict
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import deferred
+from sqlalchemy.orm import relationship
+
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
     ProcessEntityNotFoundError,
 )
@@ -18,9 +22,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
-from sqlalchemy import ForeignKey
-from sqlalchemy.orm import deferred
-from sqlalchemy.orm import relationship
 
 
 ReportMetadata = dict[str, Any]

spiffworkflow-backend/src/spiffworkflow_backend/models/process_model.py

@@ -9,6 +9,7 @@ from typing import Any
 import marshmallow
 from marshmallow import Schema
 from marshmallow.decorators import post_load
+
 from spiffworkflow_backend.models.file import File
 
 

spiffworkflow-backend/src/spiffworkflow_backend/models/script_attributes_context.py

@@ -1,5 +1,6 @@
 """Script_attributes_context."""
 from dataclasses import dataclass
+
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 
 

spiffworkflow-backend/src/spiffworkflow_backend/models/secret_model.py

@@ -4,9 +4,10 @@ from dataclasses import dataclass
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
 from marshmallow import Schema
-from spiffworkflow_backend.models.user import UserModel
 from sqlalchemy import ForeignKey
 
+from spiffworkflow_backend.models.user import UserModel
+
 
 @dataclass()
 class SecretModel(SpiffworkflowBaseDBModel):

spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_logging.py

@@ -4,9 +4,10 @@ from typing import Optional
 
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
+from sqlalchemy import ForeignKey
+
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.user import UserModel
-from sqlalchemy import ForeignKey
 
 
 @dataclass

spiffworkflow-backend/src/spiffworkflow_backend/models/user.py

@@ -10,12 +10,13 @@ from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
 from marshmallow import Schema
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import validates
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.services.authentication_service import (
     AuthenticationProviderTypes,
 )
-from sqlalchemy.orm import relationship
-from sqlalchemy.orm import validates
 
 
 class UserNotFoundError(Exception):

spiffworkflow-backend/src/spiffworkflow_backend/models/user_group_assignment.py

@@ -1,11 +1,12 @@
 """UserGroupAssignment."""
 from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
-from spiffworkflow_backend.models.group import GroupModel
-from spiffworkflow_backend.models.user import UserModel
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import relationship
 
+from spiffworkflow_backend.models.group import GroupModel
+from spiffworkflow_backend.models.user import UserModel
+
 
 class UserGroupAssignmentModel(SpiffworkflowBaseDBModel):
     """UserGroupAssignmentModel."""

spiffworkflow-backend/src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py

@@ -7,6 +7,8 @@ from flask import redirect
 from flask import render_template
 from flask import request
 from flask import url_for
+from werkzeug.wrappers import Response
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
@@ -16,7 +18,6 @@ from spiffworkflow_backend.services.process_instance_service import (
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.spec_file_service import SpecFileService
 from spiffworkflow_backend.services.user_service import UserService
-from werkzeug.wrappers import Response
 
 admin_blueprint = Blueprint(
     "admin", __name__, template_folder="templates", static_folder="static"

spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py

@@ -28,6 +28,9 @@ from lxml import etree  # type: ignore
 from lxml.builder import ElementMaker  # type: ignore
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 from SpiffWorkflow.task import TaskState
+from sqlalchemy import asc
+from sqlalchemy import desc
+
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
     ProcessEntityNotFoundError,
 )
@@ -72,8 +75,6 @@ from spiffworkflow_backend.services.secret_service import SecretService
 from spiffworkflow_backend.services.service_task_service import ServiceTaskService
 from spiffworkflow_backend.services.spec_file_service import SpecFileService
 from spiffworkflow_backend.services.user_service import UserService
-from sqlalchemy import asc
-from sqlalchemy import desc
 
 
 class TaskDataSelectOption(TypedDict):

spiffworkflow-backend/src/spiffworkflow_backend/routes/user.py

@@ -12,13 +12,14 @@ from flask import g
 from flask import redirect
 from flask import request
 from flask_bpmn.api.api_error import ApiError
+from werkzeug.wrappers import Response
+
 from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.services.authentication_service import (
     AuthenticationService,
 )
 from spiffworkflow_backend.services.authorization_service import AuthorizationService
 from spiffworkflow_backend.services.user_service import UserService
-from werkzeug.wrappers import Response
 
 """
 .. module:: crc.api.user

spiffworkflow-backend/src/spiffworkflow_backend/routes/user_blueprint.py

@@ -9,10 +9,11 @@ from flask import request
 from flask import Response
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
+from sqlalchemy.exc import IntegrityError
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.models.user_group_assignment import UserGroupAssignmentModel
-from sqlalchemy.exc import IntegrityError
 
 APPLICATION_JSON: Final = "application/json"
 

spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_localtime.py

@@ -4,6 +4,7 @@ from typing import Any
 
 import pytz
 from flask_bpmn.api.api_error import ApiError
+
 from spiffworkflow_backend.models.script_attributes_context import (
     ScriptAttributesContext,
 )

spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_process_info.py

@@ -1,7 +1,7 @@
 """Get_process_info."""
 from typing import Any
-from spiffworkflow_backend.models.script_attributes_context import ScriptAttributesContext
 
+from spiffworkflow_backend.models.script_attributes_context import ScriptAttributesContext
 from spiffworkflow_backend.scripts.script import Script
 
 

spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_user.py

@@ -2,6 +2,7 @@
 from typing import Any
 
 from flask import g
+
 from spiffworkflow_backend.models.script_attributes_context import (
     ScriptAttributesContext,
 )

spiffworkflow-backend/src/spiffworkflow_backend/scripts/script.py

@@ -9,6 +9,7 @@ from typing import Any
 from typing import Callable
 
 from flask_bpmn.api.api_error import ApiError
+
 from spiffworkflow_backend.models.script_attributes_context import (
     ScriptAttributesContext,
 )

spiffworkflow-backend/src/spiffworkflow_backend/services/acceptance_test_fixtures.py

@@ -4,9 +4,10 @@ import time
 
 from flask import current_app
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 def load_acceptance_test_fixtures() -> list[ProcessInstanceModel]:

spiffworkflow-backend/src/spiffworkflow_backend/services/authentication_service.py

@@ -11,9 +11,10 @@ from flask import current_app
 from flask import redirect
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
-from spiffworkflow_backend.models.refresh_token import RefreshTokenModel
 from werkzeug.wrappers import Response
 
+from spiffworkflow_backend.models.refresh_token import RefreshTokenModel
+
 
 class AuthenticationProviderTypes(enum.Enum):
     """AuthenticationServiceProviders."""

spiffworkflow-backend/src/spiffworkflow_backend/services/authorization_service.py

@@ -11,6 +11,8 @@ from flask import request
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
+from sqlalchemy import text
+
 from spiffworkflow_backend.models.active_task import ActiveTaskModel
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.models.permission_assignment import PermissionAssignmentModel
@@ -25,7 +27,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.user_service import UserService
-from sqlalchemy import text
 
 
 class PermissionsFileNotSetError(Exception):

spiffworkflow-backend/src/spiffworkflow_backend/services/background_processing_service.py

@@ -1,5 +1,6 @@
 """Background_processing_service."""
 import flask
+
 from spiffworkflow_backend.services.message_service import MessageService
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,

spiffworkflow-backend/src/spiffworkflow_backend/services/data_setup_service.py

@@ -1,5 +1,6 @@
 """Data_setup_service."""
 from flask import current_app
+
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.spec_file_service import SpecFileService
 

spiffworkflow-backend/src/spiffworkflow_backend/services/error_handling_service.py

@@ -5,6 +5,7 @@ from typing import Union
 
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus
 from spiffworkflow_backend.services.email_service import EmailService

spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py

@@ -7,6 +7,7 @@ from typing import Optional
 import pytz
 from flask import current_app
 from flask_bpmn.api.api_error import ApiError
+
 from spiffworkflow_backend.models.file import CONTENT_TYPES
 from spiffworkflow_backend.models.file import File
 from spiffworkflow_backend.models.file import FileType

spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py

@@ -2,6 +2,7 @@
 import os
 
 from flask import current_app
+
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.services.file_system_service import FileSystemService
 

spiffworkflow-backend/src/spiffworkflow_backend/services/group_service.py

@@ -2,6 +2,7 @@
 from typing import Optional
 
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.services.user_service import UserService
 

spiffworkflow-backend/src/spiffworkflow_backend/services/logging_service.py

@@ -8,6 +8,7 @@ from typing import Optional
 from flask import g
 from flask.app import Flask
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend.models.spiff_logging import SpiffLoggingModel
 
 

spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py

@@ -3,6 +3,10 @@ from typing import Any
 from typing import Optional
 
 from flask_bpmn.models.db import db
+from sqlalchemy import and_
+from sqlalchemy import or_
+from sqlalchemy import select
+
 from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
 from spiffworkflow_backend.models.message_correlation_message_instance import (
     MessageCorrelationMessageInstanceModel,
@@ -19,9 +23,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from sqlalchemy import and_
-from sqlalchemy import or_
-from sqlalchemy import select
 
 
 class MessageServiceError(Exception):

spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py

@@ -55,6 +55,7 @@ from SpiffWorkflow.spiff.serializer import UserTaskConverter
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.util.deep_merge import DeepMerge  # type: ignore
+
 from spiffworkflow_backend.models.active_task import ActiveTaskModel
 from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel
 from spiffworkflow_backend.models.bpmn_process_id_lookup import BpmnProcessIdLookup

spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py

@@ -10,6 +10,7 @@ from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 from SpiffWorkflow.util.deep_merge import DeepMerge  # type: ignore
+
 from spiffworkflow_backend.models.process_instance import ProcessInstanceApi
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus

spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py

@@ -8,6 +8,7 @@ from typing import Optional
 from typing import TypeVar
 
 from flask_bpmn.api.api_error import ApiError
+
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
     ProcessEntityNotFoundError,
 )

spiffworkflow-backend/src/spiffworkflow_backend/services/script_unit_test_runner.py

@@ -8,6 +8,7 @@ from typing import Optional
 
 from SpiffWorkflow.bpmn.exceptions import WorkflowTaskExecException  # type: ignore
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
+
 from spiffworkflow_backend.services.process_instance_processor import (
     CustomBpmnScriptEngine,
 )

spiffworkflow-backend/src/spiffworkflow_backend/services/secret_service.py

@@ -3,6 +3,7 @@ from typing import Optional
 
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend.models.secret_model import SecretModel
 
 # from cryptography.fernet import Fernet

spiffworkflow-backend/src/spiffworkflow_backend/services/service_task_service.py

@@ -5,6 +5,7 @@ from typing import Any
 import requests
 from flask import current_app
 from flask import g
+
 from spiffworkflow_backend.services.file_system_service import FileSystemService
 from spiffworkflow_backend.services.secret_service import SecretService
 

spiffworkflow-backend/src/spiffworkflow_backend/services/spec_file_service.py

@@ -11,6 +11,7 @@ from lxml import etree  # type: ignore
 from lxml.etree import _Element  # type: ignore
 from lxml.etree import Element as EtreeElement
 from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException  # type: ignore
+
 from spiffworkflow_backend.models.bpmn_process_id_lookup import BpmnProcessIdLookup
 from spiffworkflow_backend.models.file import File
 from spiffworkflow_backend.models.file import FileType

spiffworkflow-backend/src/spiffworkflow_backend/services/user_service.py

@@ -6,6 +6,7 @@ from flask import current_app
 from flask import g
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
+
 from spiffworkflow_backend.models.active_task import ActiveTaskModel
 from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel
 from spiffworkflow_backend.models.group import GroupModel

spiffworkflow-backend/tests/spiffworkflow_backend/helpers/base_test.py

@@ -12,6 +12,9 @@ from flask.app import Flask
 from flask.testing import FlaskClient
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+from werkzeug.test import TestResponse  # type: ignore
+
 from spiffworkflow_backend.models.permission_assignment import Permission
 from spiffworkflow_backend.models.permission_target import PermissionTargetModel
 from spiffworkflow_backend.models.process_group import ProcessGroup
@@ -24,8 +27,6 @@ from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.services.authorization_service import AuthorizationService
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.user_service import UserService
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
-from werkzeug.test import TestResponse  # type: ignore
 
 # from tests.spiffworkflow_backend.helpers.test_data import logged_in_headers
 

spiffworkflow-backend/tests/spiffworkflow_backend/helpers/example_data.py

@@ -4,6 +4,7 @@ import os
 from typing import Optional
 
 from flask import current_app
+
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.spec_file_service import SpecFileService

spiffworkflow-backend/tests/spiffworkflow_backend/helpers/test_data.py

@@ -1,13 +1,14 @@
 """User."""
 from typing import Optional
 
+from tests.spiffworkflow_backend.helpers.example_data import ExampleDataLoader
+
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
     ProcessEntityNotFoundError,
 )
 from spiffworkflow_backend.models.process_group import ProcessGroup
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
-from tests.spiffworkflow_backend.helpers.example_data import ExampleDataLoader
 
 
 def assure_process_group_exists(process_group_id: Optional[str] = None) -> ProcessGroup:

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_authentication.py

@@ -2,10 +2,11 @@
 import ast
 import base64
 
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.services.authentication_service import (
     AuthenticationService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 class TestAuthentication(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_logging_service.py

@@ -1,9 +1,10 @@
 """Test_logging_service."""
 from flask.app import Flask
 from flask.testing import FlaskClient
-from spiffworkflow_backend.models.user import UserModel
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
+from spiffworkflow_backend.models.user import UserModel
+
 
 class TestLoggingService(BaseTest):
     """Test logging service."""

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py

@@ -8,6 +8,9 @@ import pytest
 from flask.app import Flask
 from flask.testing import FlaskClient
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
     ProcessEntityNotFoundError,
 )
@@ -30,8 +33,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 # from spiffworkflow_backend.services.git_service import GitService
 

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_secret_service.py

@@ -6,14 +6,15 @@ import pytest
 from flask.app import Flask
 from flask.testing import FlaskClient
 from flask_bpmn.api.api_error import ApiError
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from werkzeug.test import TestResponse  # type: ignore
+
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.models.secret_model import SecretModel
 from spiffworkflow_backend.models.secret_model import SecretModelSchema
 from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.secret_service import SecretService
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from werkzeug.test import TestResponse  # type: ignore
 
 
 class SecretServiceTestHelpers(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/scripts/test_get_localtime.py

@@ -4,6 +4,9 @@ import datetime
 import pytz
 from flask.app import Flask
 from flask.testing import FlaskClient
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.script_attributes_context import (
     ScriptAttributesContext,
 )
@@ -14,8 +17,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestGetLocaltime(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_acceptance_test_fixtures.py

@@ -1,5 +1,6 @@
 """Test_acceptance_test_fixtures."""
 from flask.app import Flask
+
 from spiffworkflow_backend.services.acceptance_test_fixtures import (
     load_acceptance_test_fixtures,
 )

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_authorization_service.py

@@ -1,6 +1,9 @@
 """Test_message_service."""
 import pytest
 from flask import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.user import UserNotFoundError
 from spiffworkflow_backend.services.authorization_service import AuthorizationService
 from spiffworkflow_backend.services.process_instance_processor import (
@@ -9,8 +12,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestAuthorizationService(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_dot_notation.py

@@ -1,13 +1,14 @@
 """Test_various_bpmn_constructs."""
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestDotNotation(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_environment_var_script.py

@@ -1,9 +1,10 @@
 """Test_environment_var_script."""
 from flask import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 class TestEnvironmentVarScript(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_instance.py

@@ -2,11 +2,12 @@
 import pytest
 from flask import Flask
 from flask_bpmn.models.db import db
-from spiffworkflow_backend.models.message_instance import MessageInstanceModel
-from spiffworkflow_backend.models.message_model import MessageModel
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
+from spiffworkflow_backend.models.message_instance import MessageInstanceModel
+from spiffworkflow_backend.models.message_model import MessageModel
+
 
 class TestMessageInstance(BaseTest):
     """TestMessageInstance."""

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_service.py

@@ -1,5 +1,8 @@
 """Test_message_service."""
 from flask import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
 from spiffworkflow_backend.models.message_correlation_message_instance import (
     MessageCorrelationMessageInstanceModel,
@@ -13,8 +16,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestMessageService(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permission_target.py

@@ -2,11 +2,12 @@
 import pytest
 from flask.app import Flask
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.models.permission_target import (
     InvalidPermissionTargetUriError,
 )
 from spiffworkflow_backend.models.permission_target import PermissionTargetModel
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 class TestPermissionTarget(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permissions.py

@@ -1,13 +1,14 @@
 """Test Permissions."""
 from flask.app import Flask
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.models.permission_assignment import PermissionAssignmentModel
 from spiffworkflow_backend.models.permission_target import PermissionTargetModel
 from spiffworkflow_backend.models.principal import PrincipalModel
 from spiffworkflow_backend.services.user_service import UserService
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 # we think we can get the list of roles for a user.

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_group.py

@@ -1,5 +1,6 @@
 """Process Model."""
 from flask.app import Flask
+
 from spiffworkflow_backend.models.process_group import ProcessGroup
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_processor.py

@@ -2,6 +2,9 @@
 import pytest
 from flask import g
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.group import GroupModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus
 from spiffworkflow_backend.services.authorization_service import AuthorizationService
@@ -14,8 +17,6 @@ from spiffworkflow_backend.services.process_instance_processor import (
 from spiffworkflow_backend.services.process_instance_service import (
     ProcessInstanceService,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestProcessInstanceProcessor(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_report.py

@@ -2,11 +2,12 @@
 from typing import Optional
 
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance_report import (
     ProcessInstanceReportModel,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 # from tests.spiffworkflow_backend.helpers.test_data import find_or_create_process_group
 # from spiffworkflow_backend.models.permission_assignment import PermissionAssignmentModel

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model.py

@@ -1,13 +1,14 @@
 """Process Model."""
 from flask.app import Flask
 from flask_bpmn.models.db import db
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.models.bpmn_process_id_lookup import BpmnProcessIdLookup
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestProcessModel(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model_service.py

@@ -1,9 +1,10 @@
 """Test_process_model_service."""
 from flask import Flask
-from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
+from spiffworkflow_backend.services.process_model_service import ProcessModelService
+
 
 class TestProcessModelService(BaseTest):
     """TestProcessModelService."""

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_restricted_script_engine.py

@@ -2,11 +2,12 @@
 import pytest
 from flask.app import Flask
 from flask_bpmn.api.api_error import ApiError
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestOpenFile(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_script_unit_test_runner.py

@@ -1,12 +1,13 @@
 """Test Permissions."""
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.script_unit_test_runner import PythonScriptContext
 from spiffworkflow_backend.services.script_unit_test_runner import ScriptUnitTestRunner
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestScriptUnitTestRunner(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_service_task_delegate.py

@@ -1,8 +1,9 @@
 """Test_various_bpmn_constructs."""
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
 from spiffworkflow_backend.services.secret_service import SecretService
 from spiffworkflow_backend.services.service_task_service import ServiceTaskDelegate
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 class TestServiceTaskDelegate(BaseTest):

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py

@@ -5,10 +5,11 @@ import pytest
 from flask import Flask
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
-from spiffworkflow_backend.models.bpmn_process_id_lookup import BpmnProcessIdLookup
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
+from spiffworkflow_backend.models.bpmn_process_id_lookup import BpmnProcessIdLookup
+
 
 class TestSpecFileService(BaseTest):
     """TestSpecFileService."""

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spiff_logging.py

@@ -3,10 +3,11 @@ from decimal import Decimal
 
 from flask.app import Flask
 from flask_bpmn.models.db import db
-from spiffworkflow_backend.models.spiff_logging import SpiffLoggingModel
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
+from spiffworkflow_backend.models.spiff_logging import SpiffLoggingModel
+
 
 class TestSpiffLogging(BaseTest):
     """TestSpiffLogging."""

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_various_bpmn_constructs.py

@@ -1,10 +1,11 @@
 """Test_various_bpmn_constructs."""
 from flask.app import Flask
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
+
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
-from tests.spiffworkflow_backend.helpers.base_test import BaseTest
-from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
 
 
 class TestVariousBpmnConstructs(BaseTest):

spiffworkflow-backend/tests/test_main.py

@@ -1,6 +1,7 @@
 """Test cases for the __main__ module."""
 import pytest
 from click.testing import CliRunner
+
 from spiffworkflow_backend import __main__