Squashed 'spiffworkflow-backend/' changes from 0de4c06d0..4d7e5e531

4d7e5e531 we will set these at runtime
39c9e8785 templated SPIFF_SUBDOMAIN for keycloak
1a51f9091 update flask-bpmn
354e6edb1 Merge pull request #8 from sartography/feature/clean_up_sentry_errors
0c11a0b75 pyl passes w/ burnettk
9c57a876e avoid sending two errors to sentry w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 4d7e5e53185431b113eb7c038b687134499422c8

bin/import_tickets_for_command_line.py

@@ -2,7 +2,6 @@
 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

bin/recreate_db

@@ -9,6 +9,20 @@ set -o errtrace -o errexit -o nounset -o pipefail
 
 export FLASK_SESSION_SECRET_KEY="this_is_recreate_db_secret_key"
 
+if [[ -z "${BPMN_SPEC_ABSOLUTE_DIR:-}" ]]; then
+  script_dir="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+
+  BPMN_SPEC_ABSOLUTE_DIR="${script_dir}/../../../sample-process-models"
+  if [[ ! -d "$BPMN_SPEC_ABSOLUTE_DIR" ]]; then
+    BPMN_SPEC_ABSOLUTE_DIR="${script_dir}/../../sample-process-models"
+    if [[ ! -d "$BPMN_SPEC_ABSOLUTE_DIR" ]]; then
+      >&2 echo "ERROR: Could not find a location for the sample processes. Last tried: $BPMN_SPEC_ABSOLUTE_DIR"
+      exit 1
+    fi
+  fi
+  export BPMN_SPEC_ABSOLUTE_DIR
+fi
+
 tasks=""
 if [[ "${1:-}" == "clean" ]]; then
   subcommand="${2:-}"

bin/run_server_locally

@@ -19,7 +19,16 @@ fi
 
 if [[ -z "${BPMN_SPEC_ABSOLUTE_DIR:-}" ]]; then
   script_dir="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-  export BPMN_SPEC_ABSOLUTE_DIR="$script_dir/../../sample-process-models"
+
+  BPMN_SPEC_ABSOLUTE_DIR="${script_dir}/../../../sample-process-models"
+  if [[ ! -d "$BPMN_SPEC_ABSOLUTE_DIR" ]]; then
+    BPMN_SPEC_ABSOLUTE_DIR="${script_dir}/../../sample-process-models"
+    if [[ ! -d "$BPMN_SPEC_ABSOLUTE_DIR" ]]; then
+      >&2 echo "ERROR: Could not find a location for the sample processes. Last tried: $BPMN_SPEC_ABSOLUTE_DIR"
+      exit 1
+    fi
+  fi
+  export BPMN_SPEC_ABSOLUTE_DIR
 fi
 
 export FLASK_SESSION_SECRET_KEY=super_secret_key

bin/spiffworkflow-realm.json

@@ -1280,6 +1280,7 @@
         "http://localhost:7000/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7000/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": [],
@@ -1552,6 +1553,7 @@
         "http://localhost:7001/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7001/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": ["*"],
@@ -1623,6 +1625,7 @@
         "http://localhost:7001/*",
         "http://67.205.133.116:7000/*",
         "http://167.172.242.138:7001/*",
+        "https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
         "https://api.demo.spiffworkflow.org/*"
       ],
       "webOrigins": [],

bin/start_blocking_appscheduler.py

@@ -2,7 +2,6 @@
 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

bin/start_keycloak

@@ -18,7 +18,7 @@ set -o errtrace -o errexit -o nounset -o pipefail
 if ! docker network inspect spiffworkflow > /dev/null 2>&1; then
   docker network create spiffworkflow
 fi
-docker rm keycloak 2>/dev/null || echo 'no keycloak container found'
+docker rm keycloak 2>/dev/null || echo 'no keycloak container found, safe to start new container'
 docker run \
   -p 7002:8080 \
   -d \
@@ -31,7 +31,10 @@ docker run \
   -Dkeycloak.profile.feature.token_exchange=enabled \
   -Dkeycloak.profile.feature.admin_fine_grained_authz=enabled
 
-docker cp  bin/spiffworkflow-realm.json keycloak:/tmp
+cp bin/spiffworkflow-realm.json /tmp/spiffworkflow-realm.json
+spiff_subdomain="unused-for-local-dev"
+perl -pi -e "s/{{SPIFF_SUBDOMAIN}}/${spiff_subdomain}/g" /tmp/spiffworkflow-realm.json
+docker cp /tmp/spiffworkflow-realm.json keycloak:/tmp
 
 sleep 20
 remove_traps

conftest.py

@@ -6,9 +6,6 @@ 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
@@ -19,6 +16,8 @@ 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
@@ -36,21 +35,9 @@ from spiffworkflow_backend import create_app  # noqa: E402
 def app() -> Flask:
     """App."""
     os.environ["SPIFFWORKFLOW_BACKEND_ENV"] = "testing"
-
-    # os.environ["FLASK_SESSION_SECRET_KEY"] = "this_is_testing_secret_key"
     os.environ["FLASK_SESSION_SECRET_KEY"] = "super_secret_key"
     app = create_app()
 
-    # NOTE: set this here since nox shoves tests and src code to
-    # different places and this allows us to know exactly where we are at the start
-    app.config["BPMN_SPEC_ABSOLUTE_DIR"] = os.path.join(
-        os.path.dirname(__file__),
-        "tests",
-        "spiffworkflow_backend",
-        "files",
-        "bpmn_specs",
-    )
-
     return app
 
 

keycloak/Dockerfile

@@ -6,7 +6,7 @@ ENV KC_HEALTH_ENABLED="true"
 # ENV KC_METRICS_ENABLED=true
 ENV PROXY_ADDRESS_FORWARDING="true"
 # ENV KC_HOSTNAME="keycloak.demo.spiffworkflow.org"
-ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org"
+# ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org"
 ENV KC_FEATURES="token-exchange,admin-fine-grained-authz"
 # ENV KC_DB=postgres
 # Install custom providers

poetry.lock

@@ -639,7 +639,7 @@ werkzeug = "*"
 type = "git"
 url = "https://github.com/sartography/flask-bpmn"
 reference = "main"
-resolved_reference = "a901d7ffb2b79abfec17c332bbe77c43c1d28705"
+resolved_reference = "cedc5253add81a18a274f2cd3289fe36bb138f8b"
 
 [[package]]
 name = "Flask-Cors"

pyproject.toml

@@ -27,15 +27,11 @@ flask-marshmallow = "*"
 flask-migrate = "*"
 flask-restful = "*"
 werkzeug = "*"
-# go back to main once https://github.com/sartography/SpiffWorkflow/pull/241 is merged
 SpiffWorkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "main"}
-# SpiffWorkflow = {develop = true, path = "/Users/kevin/projects/github/sartography/SpiffWorkflow"}
-# SpiffWorkflow = {develop = true, path = "/home/jason/projects/github/sartography/SpiffWorkflow"}
 sentry-sdk = "^1.10"
 sphinx-autoapi = "^2.0"
-# flask-bpmn = {develop = true, path = "/home/jason/projects/github/sartography/flask-bpmn"}
-# flask-bpmn = {develop = true, path = "/Users/kevin/projects/github/sartography/flask-bpmn"}
 flask-bpmn = {git = "https://github.com/sartography/flask-bpmn", rev = "main"}
+# flask-bpmn = {develop = true, path = "../flask-bpmn"}
 mysql-connector-python = "^8.0.29"
 pytest-flask = "^1.2.0"
 pytest-flask-sqlalchemy = "^1.1.0"

src/spiffworkflow_backend/__init__.py

@@ -5,6 +5,7 @@ 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
@@ -14,9 +15,6 @@ 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
@@ -26,6 +24,7 @@ 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):
@@ -148,6 +147,7 @@ def configure_sentry(app: flask.app.Flask) -> None:
     import sentry_sdk
     from sentry_sdk.integrations.flask import FlaskIntegration
 
+    # get rid of NotFound errors
     def before_send(event: Any, hint: Any) -> Any:
         """Before_send."""
         if "exc_info" in hint:

src/spiffworkflow_backend/config/__init__.py

@@ -3,9 +3,12 @@ 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."""
 
 
 def setup_database_uri(app: Flask) -> None:
@@ -85,5 +88,8 @@ def setup_config(app: Flask) -> None:
     # src/spiffworkflow_backend/config/secrets.py
     app.config.from_pyfile(os.path.join("config", "secrets.py"), silent=True)
 
+    if app.config["BPMN_SPEC_ABSOLUTE_DIR"] is None:
+        raise ConfigurationError("BPMN_SPEC_ABSOLUTE_DIR config must be set")
+
     thread_local_data = threading.local()
     app.config["THREAD_LOCAL_DATA"] = thread_local_data

src/spiffworkflow_backend/config/default.py

@@ -7,7 +7,7 @@ SELF_REGISTRATION = environ.get("SELF_REGISTRATION", default=False)
 
 DEVELOPMENT = False
 
-BPMN_SPEC_ABSOLUTE_DIR = environ.get("BPMN_SPEC_ABSOLUTE_DIR", default="")
+BPMN_SPEC_ABSOLUTE_DIR = environ.get("BPMN_SPEC_ABSOLUTE_DIR")
 CORS_DEFAULT = "*"
 CORS_ALLOW_ORIGINS = re.split(
     r",\s*", environ.get("CORS_ALLOW_ORIGINS", default=CORS_DEFAULT)

src/spiffworkflow_backend/config/permissions/development.yml

@@ -65,7 +65,7 @@ permissions:
     uri: /v1.0/process-models/finance/*
 
   read-all:
-    groups: [finance, admin, "Project Lead"]
+    groups: [admin, "Project Lead"]
     users: []
     allowed_permissions: [read]
     uri: /*

src/spiffworkflow_backend/config/testing.py

@@ -1,7 +1,7 @@
 """Testing.py."""
+import os
 from os import environ
 
-
 TESTING = True
 SECRET_KEY = "the_secret_key"
 SPIFFWORKFLOW_BACKEND_LOG_TO_FILE = (
@@ -15,3 +15,13 @@ SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME = environ.get(
 SPIFFWORKFLOW_BACKEND_LOG_LEVEL = environ.get(
     "SPIFFWORKFLOW_BACKEND_LOG_LEVEL", default="debug"
 )
+
+# NOTE: set this here since nox shoves tests and src code to
+# different places and this allows us to know exactly where we are at the start
+BPMN_SPEC_ABSOLUTE_DIR = os.path.join(
+    os.path.dirname(__file__),
+    "tests",
+    "spiffworkflow_backend",
+    "files",
+    "bpmn_specs",
+)

src/spiffworkflow_backend/models/active_task.py

@@ -6,14 +6,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 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:

src/spiffworkflow_backend/models/active_task_user.py

@@ -5,10 +5,9 @@ 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

src/spiffworkflow_backend/models/file.py

@@ -8,11 +8,10 @@ from flask_bpmn.models.db import db
 from flask_bpmn.models.db import SpiffworkflowBaseDBModel
 from marshmallow import INCLUDE
 from marshmallow import Schema
-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
+from sqlalchemy.orm import deferred
+from sqlalchemy.orm import relationship
 
 
 class FileModel(SpiffworkflowBaseDBModel):

src/spiffworkflow_backend/models/message_correlation.py

@@ -4,13 +4,12 @@ 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

src/spiffworkflow_backend/models/message_correlation_message_instance.py

@@ -3,10 +3,9 @@ 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

src/spiffworkflow_backend/models/message_correlation_property.py

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

src/spiffworkflow_backend/models/message_instance.py

@@ -7,15 +7,14 @@ 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,

src/spiffworkflow_backend/models/message_triggerable_process_model.py

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

src/spiffworkflow_backend/models/permission_assignment.py

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

src/spiffworkflow_backend/models/principal.py

@@ -3,13 +3,12 @@ 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."""

src/spiffworkflow_backend/models/process_group.py

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

src/spiffworkflow_backend/models/process_instance.py

@@ -12,16 +12,15 @@ 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):

src/spiffworkflow_backend/models/process_instance_report.py

@@ -9,10 +9,6 @@ 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,
 )
@@ -22,6 +18,9 @@ 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]

src/spiffworkflow_backend/models/process_model.py

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

src/spiffworkflow_backend/models/secret_model.py

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

src/spiffworkflow_backend/models/spiff_logging.py

@@ -4,10 +4,9 @@ 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

src/spiffworkflow_backend/models/user.py

@@ -10,13 +10,12 @@ 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):

src/spiffworkflow_backend/models/user_group_assignment.py

@@ -1,11 +1,10 @@
 """UserGroupAssignment."""
 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.group import GroupModel
 from spiffworkflow_backend.models.user import UserModel
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import relationship
 
 
 class UserGroupAssignmentModel(SpiffworkflowBaseDBModel):

src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py

@@ -7,8 +7,6 @@ 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,
 )
@@ -18,6 +16,7 @@ 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"

src/spiffworkflow_backend/routes/process_api_blueprint.py

@@ -29,9 +29,6 @@ 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,
 )
@@ -76,6 +73,8 @@ 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):

src/spiffworkflow_backend/routes/user.py

@@ -12,14 +12,13 @@ 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

src/spiffworkflow_backend/routes/user_blueprint.py

@@ -9,11 +9,10 @@ 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"
 

src/spiffworkflow_backend/scripts/fact_service.py

@@ -3,7 +3,6 @@ from typing import Any
 from typing import Optional
 
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
-
 from spiffworkflow_backend.scripts.script import Script
 
 

src/spiffworkflow_backend/scripts/get_env.py

@@ -3,7 +3,6 @@ from typing import Any
 from typing import Optional
 
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
-
 from spiffworkflow_backend.scripts.script import Script
 
 

src/spiffworkflow_backend/scripts/get_localtime.py

@@ -6,7 +6,6 @@ from typing import Optional
 import pytz
 from flask_bpmn.api.api_error import ApiError
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
-
 from spiffworkflow_backend.scripts.script import Script
 
 

src/spiffworkflow_backend/scripts/get_user.py

@@ -4,7 +4,6 @@ from typing import Optional
 
 from flask import g
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
-
 from spiffworkflow_backend.scripts.script import Script
 
 

src/spiffworkflow_backend/services/acceptance_test_fixtures.py

@@ -4,10 +4,9 @@ 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]:

src/spiffworkflow_backend/services/authentication_service.py

@@ -11,9 +11,8 @@ 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 werkzeug.wrappers import Response
-
 from spiffworkflow_backend.models.refresh_token import RefreshTokenModel
+from werkzeug.wrappers import Response
 
 
 class AuthenticationProviderTypes(enum.Enum):

src/spiffworkflow_backend/services/authorization_service.py

@@ -11,8 +11,6 @@ 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
@@ -22,10 +20,12 @@ from spiffworkflow_backend.models.principal import PrincipalModel
 from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.models.user import UserNotFoundError
 from spiffworkflow_backend.models.user_group_assignment import UserGroupAssignmentModel
+from spiffworkflow_backend.services.group_service import GroupService
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
 )
 from spiffworkflow_backend.services.user_service import UserService
+from sqlalchemy import text
 
 
 class PermissionsFileNotSetError(Exception):
@@ -138,25 +138,11 @@ class AuthorizationService:
         default_group = None
         if "default_group" in permission_configs:
             default_group_identifier = permission_configs["default_group"]
-            default_group = GroupModel.query.filter_by(
+            default_group = GroupService.find_or_create_group(default_group_identifier)
-                identifier=default_group_identifier
-            ).first()
-            if default_group is None:
-                default_group = GroupModel(identifier=default_group_identifier)
-                db.session.add(default_group)
-                db.session.commit()
-                UserService.create_principal(
-                    default_group.id, id_column_name="group_id"
-                )
 
         if "groups" in permission_configs:
             for group_identifier, group_config in permission_configs["groups"].items():
-                group = GroupModel.query.filter_by(identifier=group_identifier).first()
+                group = GroupService.find_or_create_group(group_identifier)
-                if group is None:
-                    group = GroupModel(identifier=group_identifier)
-                    db.session.add(group)
-                    db.session.commit()
-                    UserService.create_principal(group.id, id_column_name="group_id")
                 for username in group_config["users"]:
                     user = UserModel.query.filter_by(username=username).first()
                     if user is None:
@@ -186,13 +172,9 @@ class AuthorizationService:
                 for allowed_permission in permission_config["allowed_permissions"]:
                     if "groups" in permission_config:
                         for group_identifier in permission_config["groups"]:
-                            principal = (
+                            group = GroupService.find_or_create_group(group_identifier)
-                                PrincipalModel.query.join(GroupModel)
-                                .filter(GroupModel.identifier == group_identifier)
-                                .first()
-                            )
                             cls.create_permission_for_principal(
-                                principal, permission_target, allowed_permission
+                                group.principal, permission_target, allowed_permission
                             )
                     if "users" in permission_config:
                         for username in permission_config["users"]:

src/spiffworkflow_backend/services/background_processing_service.py

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

src/spiffworkflow_backend/services/data_setup_service.py

@@ -1,6 +1,5 @@
 """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
 

src/spiffworkflow_backend/services/email_service.py

@@ -24,8 +24,6 @@ class EmailService:
         """We will receive all data related to an email and send it."""
         mail = current_app.config["MAIL_APP"]
 
-        # Send mail
-        try:
         msg = Message(
             subject,
             sender=sender,
@@ -42,8 +40,3 @@ class EmailService:
                 msg.attach(file["name"], file["type"], file["data"])
 
         mail.send(msg)
-
-        except Exception as e:
-            # app.logger.error('An exception happened in EmailService', exc_info=True)
-            # app.logger.error(str(e))
-            raise e

src/spiffworkflow_backend/services/error_handling_service.py

@@ -5,7 +5,6 @@ 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

src/spiffworkflow_backend/services/file_system_service.py

@@ -7,7 +7,6 @@ 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

src/spiffworkflow_backend/services/git_service.py

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

src/spiffworkflow_backend/services/group_service.py

@@ -0,0 +1,23 @@
+"""Group_service."""
+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
+
+
+class GroupService:
+    """GroupService."""
+
+    @classmethod
+    def find_or_create_group(cls, group_identifier: str) -> GroupModel:
+        """Find_or_create_group."""
+        group: Optional[GroupModel] = GroupModel.query.filter_by(
+            identifier=group_identifier
+        ).first()
+        if group is None:
+            group = GroupModel(identifier=group_identifier)
+            db.session.add(group)
+            db.session.commit()
+            UserService.create_principal(group.id, id_column_name="group_id")
+        return group

src/spiffworkflow_backend/services/logging_service.py

@@ -8,7 +8,6 @@ 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
 
 

src/spiffworkflow_backend/services/message_service.py

@@ -3,10 +3,6 @@ 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,
@@ -23,6 +19,9 @@ 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):

src/spiffworkflow_backend/services/process_instance_processor.py

@@ -55,7 +55,6 @@ 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

src/spiffworkflow_backend/services/process_instance_service.py

@@ -10,7 +10,6 @@ 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
@@ -167,9 +166,7 @@ class ProcessInstanceService:
                     f"task {spiff_task.task_spec.name}, it is not in the task event model, "
                     f"and it should be."
                 )
-                current_app.logger.error(
+                current_app.logger.exception("missing_form_data", missing_form_error)
-                    "missing_form_data", missing_form_error, exc_info=True
-                )
                 return {}
         else:
             return {}

src/spiffworkflow_backend/services/process_model_service.py

@@ -8,7 +8,6 @@ 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,
 )

src/spiffworkflow_backend/services/script_unit_test_runner.py

@@ -8,7 +8,6 @@ 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,
 )

src/spiffworkflow_backend/services/secret_service.py

@@ -3,7 +3,6 @@ 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

src/spiffworkflow_backend/services/service_task_service.py

@@ -5,7 +5,6 @@ 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
 

src/spiffworkflow_backend/services/spec_file_service.py

@@ -11,7 +11,6 @@ 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

src/spiffworkflow_backend/services/user_service.py

@@ -6,7 +6,6 @@ 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

tests/spiffworkflow_backend/helpers/base_test.py

@@ -12,9 +12,6 @@ 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
@@ -27,6 +24,8 @@ 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
 

tests/spiffworkflow_backend/helpers/example_data.py

@@ -4,7 +4,6 @@ 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

tests/spiffworkflow_backend/helpers/test_data.py

@@ -1,14 +1,13 @@
 """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:

tests/spiffworkflow_backend/integration/test_authentication.py

@@ -2,11 +2,10 @@
 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):

tests/spiffworkflow_backend/integration/test_logging_service.py

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

tests/spiffworkflow_backend/integration/test_process_api.py

@@ -8,9 +8,6 @@ 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,
 )
@@ -33,6 +30,8 @@ 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
 

tests/spiffworkflow_backend/integration/test_secret_service.py

@@ -6,15 +6,14 @@ 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):

tests/spiffworkflow_backend/scripts/test_get_localtime.py

@@ -4,9 +4,6 @@ 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.scripts.get_localtime import GetLocaltime
 from spiffworkflow_backend.services.process_instance_processor import (
     ProcessInstanceProcessor,
@@ -14,6 +11,8 @@ 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):

tests/spiffworkflow_backend/unit/test_acceptance_test_fixtures.py

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

tests/spiffworkflow_backend/unit/test_authorization_service.py

@@ -1,9 +1,6 @@
 """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 (
@@ -12,6 +9,8 @@ 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):

tests/spiffworkflow_backend/unit/test_dot_notation.py

@@ -1,14 +1,13 @@
 """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):

tests/spiffworkflow_backend/unit/test_environment_var_script.py

@@ -1,10 +1,9 @@
 """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):

tests/spiffworkflow_backend/unit/test_message_instance.py

@@ -2,11 +2,10 @@
 import pytest
 from flask 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.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
 
 
 class TestMessageInstance(BaseTest):

tests/spiffworkflow_backend/unit/test_message_service.py

@@ -1,8 +1,5 @@
 """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,
@@ -16,6 +13,8 @@ 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):

tests/spiffworkflow_backend/unit/test_permission_target.py

@@ -2,12 +2,11 @@
 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):

tests/spiffworkflow_backend/unit/test_permissions.py

@@ -1,14 +1,13 @@
 """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.

tests/spiffworkflow_backend/unit/test_process_group.py

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

tests/spiffworkflow_backend/unit/test_process_instance_processor.py

@@ -2,9 +2,6 @@
 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
@@ -17,6 +14,8 @@ 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):

tests/spiffworkflow_backend/unit/test_process_instance_report.py

@@ -2,12 +2,11 @@
 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

tests/spiffworkflow_backend/unit/test_process_model.py

@@ -1,14 +1,13 @@
 """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):

tests/spiffworkflow_backend/unit/test_process_model_service.py

@@ -1,10 +1,9 @@
 """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."""

tests/spiffworkflow_backend/unit/test_restricted_script_engine.py

@@ -2,12 +2,11 @@
 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):

tests/spiffworkflow_backend/unit/test_script_unit_test_runner.py

@@ -1,13 +1,12 @@
 """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):

tests/spiffworkflow_backend/unit/test_service_task_delegate.py

@@ -1,9 +1,8 @@
 """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):

tests/spiffworkflow_backend/unit/test_spec_file_service.py

@@ -5,11 +5,10 @@ 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."""

tests/spiffworkflow_backend/unit/test_spiff_logging.py

@@ -3,11 +3,10 @@ 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."""

tests/spiffworkflow_backend/unit/test_various_bpmn_constructs.py

@@ -1,11 +1,10 @@
 """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):

tests/test_main.py

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