From 88a94ec6da168a8eb0bcfcfdb682d2251b64b887 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 5 Dec 2022 12:29:19 -0500 Subject: [PATCH] running py_pl -- mainly reordering imports. --- flask-bpmn/pyproject.toml | 1 - flask-bpmn/src/flask_bpmn/models/db.py | 4 ++-- .../bin/import_tickets_for_command_line.py | 1 - spiffworkflow-backend/conftest.py | 4 ++-- .../src/spiffworkflow_backend/__init__.py | 6 +++--- .../src/spiffworkflow_backend/config/default.py | 9 +++++++-- .../src/spiffworkflow_backend/helpers/db_helper.py | 2 +- .../src/spiffworkflow_backend/models/active_task.py | 4 ++-- .../src/spiffworkflow_backend/models/active_task_user.py | 2 +- .../src/spiffworkflow_backend/models/group.py | 4 ++-- .../spiffworkflow_backend/models/message_correlation.py | 4 ++-- .../models/message_correlation_message_instance.py | 2 +- .../models/message_correlation_property.py | 1 + .../src/spiffworkflow_backend/models/message_instance.py | 4 ++-- .../models/message_triggerable_process_model.py | 1 + .../models/permission_assignment.py | 4 ++-- .../spiffworkflow_backend/models/permission_target.py | 4 ++-- .../src/spiffworkflow_backend/models/principal.py | 2 +- .../src/spiffworkflow_backend/models/process_instance.py | 4 ++-- .../models/process_instance_metadata.py | 2 +- .../models/process_instance_report.py | 4 ++-- .../src/spiffworkflow_backend/models/refresh_token.py | 2 +- .../src/spiffworkflow_backend/models/secret_model.py | 2 +- .../src/spiffworkflow_backend/models/spec_reference.py | 2 +- .../src/spiffworkflow_backend/models/spiff_logging.py | 3 +-- .../spiffworkflow_backend/models/spiff_step_details.py | 4 ++-- .../src/spiffworkflow_backend/models/user.py | 6 +++--- .../models/user_group_assignment.py | 1 + .../routes/process_api_blueprint.py | 4 ++-- .../src/spiffworkflow_backend/routes/user.py | 2 +- .../src/spiffworkflow_backend/routes/user_blueprint.py | 4 ++-- .../src/spiffworkflow_backend/scripts/get_localtime.py | 2 +- .../scripts/save_process_instance_metadata.py | 3 +-- .../src/spiffworkflow_backend/scripts/script.py | 3 +-- .../services/acceptance_test_fixtures.py | 2 +- .../services/authentication_service.py | 4 ++-- .../services/authorization_service.py | 4 ++-- .../spiffworkflow_backend/services/data_setup_service.py | 3 ++- .../services/error_handling_service.py | 5 ++--- .../services/file_system_service.py | 2 +- .../src/spiffworkflow_backend/services/group_service.py | 3 +-- .../spiffworkflow_backend/services/logging_service.py | 2 +- .../spiffworkflow_backend/services/message_service.py | 2 +- .../services/process_instance_processor.py | 4 ++-- .../services/process_instance_service.py | 4 ++-- .../services/process_model_service.py | 3 +-- .../src/spiffworkflow_backend/services/secret_service.py | 3 +-- .../spiffworkflow_backend/services/spec_file_service.py | 2 +- .../src/spiffworkflow_backend/services/user_service.py | 4 ++-- .../tests/spiffworkflow_backend/helpers/base_test.py | 4 ++-- .../integration/test_process_api.py | 2 +- .../integration/test_secret_service.py | 2 +- .../scripts/test_get_group_members.py | 3 ++- .../spiffworkflow_backend/unit/test_message_instance.py | 3 ++- .../spiffworkflow_backend/unit/test_permission_target.py | 3 ++- .../tests/spiffworkflow_backend/unit/test_permissions.py | 3 ++- .../spiffworkflow_backend/unit/test_process_model.py | 3 ++- .../unit/test_restricted_script_engine.py | 3 ++- .../spiffworkflow_backend/unit/test_spec_file_service.py | 2 +- .../spiffworkflow_backend/unit/test_spiff_logging.py | 2 +- 60 files changed, 95 insertions(+), 89 deletions(-) diff --git a/flask-bpmn/pyproject.toml b/flask-bpmn/pyproject.toml index 3cb3217a5..105fa15d6 100644 --- a/flask-bpmn/pyproject.toml +++ b/flask-bpmn/pyproject.toml @@ -64,7 +64,6 @@ sphinx-click = "^4.3.0" Pygments = "^2.13.0" pyupgrade = "^3.2.2" furo = ">=2021.11.12" -MonkeyType = "^22.2.0" [tool.poetry.scripts] flask-bpmn = "flask_bpmn.__main__:main" diff --git a/flask-bpmn/src/flask_bpmn/models/db.py b/flask-bpmn/src/flask_bpmn/models/db.py index 643e1a85d..a288e6fda 100644 --- a/flask-bpmn/src/flask_bpmn/models/db.py +++ b/flask-bpmn/src/flask_bpmn/models/db.py @@ -8,8 +8,8 @@ from typing import Any from flask_migrate import Migrate # type: ignore from flask_sqlalchemy import SQLAlchemy # type: ignore from sqlalchemy import event # type: ignore -from sqlalchemy.engine.base import Connection # type: ignore -from sqlalchemy.orm.mapper import Mapper # type: ignore +from sqlalchemy.engine.base import Connection +from sqlalchemy.orm.mapper import Mapper db = SQLAlchemy() migrate = Migrate() diff --git a/spiffworkflow-backend/bin/import_tickets_for_command_line.py b/spiffworkflow-backend/bin/import_tickets_for_command_line.py index e193b5990..a993a3d30 100644 --- a/spiffworkflow-backend/bin/import_tickets_for_command_line.py +++ b/spiffworkflow-backend/bin/import_tickets_for_command_line.py @@ -1,6 +1,5 @@ """Grabs tickets from csv and makes process instances.""" import csv - from flask_bpmn.models.db import db from spiffworkflow_backend import get_hacked_up_app_for_script diff --git a/spiffworkflow-backend/conftest.py b/spiffworkflow-backend/conftest.py index c3af94332..2ded9053b 100644 --- a/spiffworkflow-backend/conftest.py +++ b/spiffworkflow-backend/conftest.py @@ -1,12 +1,12 @@ """Conftest.""" import os import shutil +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel import pytest from flask.app import Flask from flask.testing import FlaskClient -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel from tests.spiffworkflow_backend.helpers.base_test import BaseTest from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/__init__.py b/spiffworkflow-backend/src/spiffworkflow_backend/__init__.py index c2baf9b69..565047059 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/__init__.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/__init__.py @@ -1,5 +1,8 @@ """__init__.""" import os +from flask_bpmn.api.api_error import api_error_blueprint +from flask_bpmn.models.db import db +from flask_bpmn.models.db import migrate from typing import Any import connexion # type: ignore @@ -9,9 +12,6 @@ import sqlalchemy from apscheduler.schedulers.background import BackgroundScheduler # type: ignore from apscheduler.schedulers.base import BaseScheduler # type: ignore from flask.json.provider import DefaultJSONProvider -from flask_bpmn.api.api_error import api_error_blueprint -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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py b/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py index 79211c123..8643df768 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/config/default.py @@ -62,5 +62,10 @@ SPIFFWORKFLOW_BACKEND_LOG_LEVEL = environ.get( ) # Datbase Configuration -SPIFF_DATABASE_TYPE =environ.get("SPIFF_DATABASE_TYPE", default="mysql") # can also be sqlite, postgres -SPIFFWORKFLOW_BACKEND_DATABASE_URI=environ.get("SPIFFWORKFLOW_BACKEND_DATABASE_URI", default=None) # Overide above with specific sqlalchymy connection string. +SPIFF_DATABASE_TYPE = environ.get( + "SPIFF_DATABASE_TYPE", default="mysql" +) # can also be sqlite, postgres +# Overide above with specific sqlalchymy connection string. +SPIFFWORKFLOW_BACKEND_DATABASE_URI = environ.get( + "SPIFFWORKFLOW_BACKEND_DATABASE_URI", default=None +) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/helpers/db_helper.py b/spiffworkflow-backend/src/spiffworkflow_backend/helpers/db_helper.py index 45cd38f7a..2ceea1f44 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/helpers/db_helper.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/helpers/db_helper.py @@ -1,8 +1,8 @@ """Db_helper.""" import time +from flask_bpmn.models.db import db import sqlalchemy -from flask_bpmn.models.db import db def try_to_connect(start_time: float) -> None: diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task.py index ea9e10552..cf08394f4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task.py @@ -2,10 +2,10 @@ from __future__ import annotations from dataclasses import dataclass -from typing import TYPE_CHECKING - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import TYPE_CHECKING + from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship from sqlalchemy.orm import RelationshipProperty diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task_user.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task_user.py index f194c38e4..a14c08ce4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task_user.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/active_task_user.py @@ -2,9 +2,9 @@ from __future__ import annotations 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/group.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/group.py index 3b7edd6ce..b6db3cf34 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/group.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/group.py @@ -1,10 +1,10 @@ """Group.""" from __future__ import annotations -from typing import TYPE_CHECKING - from flask_bpmn.models.db import db from flask_bpmn.models.group import FlaskBpmnGroupModel +from typing import TYPE_CHECKING + from sqlalchemy.orm import relationship if TYPE_CHECKING: diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py index 08bc1cb12..65937a4fc 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py @@ -1,9 +1,9 @@ """Message_correlation.""" from dataclasses import dataclass -from typing import TYPE_CHECKING - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import TYPE_CHECKING + from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_message_instance.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_message_instance.py index 320dfba3e..dbbddb44f 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_message_instance.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_message_instance.py @@ -1,8 +1,8 @@ """Message_correlation_message_instance.""" 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_property.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_property.py index b84b7140c..c0c06925f 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_property.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation_property.py @@ -1,6 +1,7 @@ """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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py index 2559a6352..745d2c2d6 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py @@ -1,12 +1,12 @@ """Message_instance.""" import enum from dataclasses import dataclass +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Any from typing import Optional 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.event import listens_for from sqlalchemy.orm import relationship diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_triggerable_process_model.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_triggerable_process_model.py index cc8834654..29b742f7d 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_triggerable_process_model.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_triggerable_process_model.py @@ -1,6 +1,7 @@ """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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_assignment.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_assignment.py index 63295f74e..8aa2b5ade 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_assignment.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_assignment.py @@ -1,9 +1,9 @@ """PermissionAssignment.""" import enum -from typing import Any - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import Any + from sqlalchemy import ForeignKey from sqlalchemy.orm import validates diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_target.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_target.py index 53334baf0..3b4a10553 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_target.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/permission_target.py @@ -1,10 +1,10 @@ """PermissionTarget.""" import re from dataclasses import dataclass -from typing import Optional - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import Optional + from sqlalchemy.orm import validates diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/principal.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/principal.py index c7efa8609..1c267052d 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/principal.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/principal.py @@ -1,8 +1,8 @@ """Principal.""" from dataclasses import dataclass - 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.schema import CheckConstraint diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance.py index e6a5f6849..c2b003104 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance.py @@ -1,12 +1,12 @@ """Process_instance.""" from __future__ import annotations +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Any from typing import cast import marshmallow -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel from marshmallow import INCLUDE from marshmallow import Schema from marshmallow_enum import EnumField # type: ignore diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_metadata.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_metadata.py index 5a4d4ca5b..66db3fb04 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_metadata.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_metadata.py @@ -1,8 +1,8 @@ """Spiff_step_details.""" 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.process_instance import ProcessInstanceModel diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py index 5cccf4a59..8e4c3e583 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py @@ -2,13 +2,13 @@ from __future__ import annotations from dataclasses import dataclass +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Any from typing import cast from typing import Optional 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/refresh_token.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/refresh_token.py index 2e96b7f05..c5684f25a 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/refresh_token.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/refresh_token.py @@ -1,8 +1,8 @@ """Refresh_token.""" from dataclasses import dataclass - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel + from sqlalchemy import ForeignKey # from sqlalchemy.orm import relationship diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/secret_model.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/secret_model.py index 92fd470a3..1bb634cec 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/secret_model.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/secret_model.py @@ -1,8 +1,8 @@ """Secret_model.""" 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/spec_reference.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/spec_reference.py index 1e85f7229..ce083a483 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/spec_reference.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/spec_reference.py @@ -1,8 +1,8 @@ """Message_model.""" from dataclasses import dataclass - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel + from flask_marshmallow import Schema # type: ignore from marshmallow import INCLUDE from sqlalchemy import UniqueConstraint diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_logging.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_logging.py index b0b908877..e27daeb64 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_logging.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_logging.py @@ -1,9 +1,8 @@ """Spiff_logging.""" from dataclasses import dataclass -from typing import Optional - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import Optional @dataclass diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_step_details.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_step_details.py index 91d70116a..62dcd5957 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_step_details.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_step_details.py @@ -1,9 +1,9 @@ """Spiff_step_details.""" from dataclasses import dataclass -from typing import Optional - from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel +from typing import Optional + from sqlalchemy import ForeignKey from sqlalchemy.orm import deferred diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/user.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/user.py index b8c83d0f7..cdd2379b7 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/user.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/user.py @@ -1,14 +1,14 @@ """User.""" from __future__ import annotations +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Any import jwt import marshmallow from flask import current_app -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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/user_group_assignment.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/user_group_assignment.py index fa5b620c8..548a280b9 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/user_group_assignment.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/user_group_assignment.py @@ -1,6 +1,7 @@ """UserGroupAssignment.""" from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel + from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py index 78c12a90f..212d853dc 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -3,6 +3,8 @@ import json import random import string import uuid +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import Dict from typing import Optional @@ -21,8 +23,6 @@ from flask import make_response from flask import redirect from flask import request from flask.wrappers import Response -from flask_bpmn.api.api_error import ApiError -from flask_bpmn.models.db import db from lxml import etree # type: ignore from lxml.builder import ElementMaker # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/user.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/user.py index 2bbbc1374..f18dff3b3 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/user.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/user.py @@ -2,6 +2,7 @@ import ast import base64 import json +from flask_bpmn.api.api_error import ApiError from typing import Any from typing import Dict from typing import Optional @@ -12,7 +13,6 @@ from flask import current_app 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/user_blueprint.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/user_blueprint.py index 29bbddcd1..d1dea8c8e 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/user_blueprint.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/user_blueprint.py @@ -1,5 +1,7 @@ """Main.""" import json +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import Final @@ -7,8 +9,6 @@ import flask.wrappers from flask import Blueprint 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_localtime.py b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_localtime.py index 689b86d8c..c6680c9dd 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_localtime.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/get_localtime.py @@ -1,9 +1,9 @@ """Get_localtime.""" from datetime import datetime +from flask_bpmn.api.api_error import ApiError from typing import Any import pytz -from flask_bpmn.api.api_error import ApiError from spiffworkflow_backend.models.script_attributes_context import ( ScriptAttributesContext, diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/save_process_instance_metadata.py b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/save_process_instance_metadata.py index ae5fe00ef..588402fdf 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/save_process_instance_metadata.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/save_process_instance_metadata.py @@ -1,7 +1,6 @@ """Get_env.""" -from typing import Any - from flask_bpmn.models.db import db +from typing import Any from spiffworkflow_backend.models.process_instance_metadata import ( ProcessInstanceMetadataModel, diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/script.py b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/script.py index b744694a2..00f8de792 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/scripts/script.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/scripts/script.py @@ -5,11 +5,10 @@ import importlib import os import pkgutil from abc import abstractmethod +from flask_bpmn.api.api_error import ApiError 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, ) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/acceptance_test_fixtures.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/acceptance_test_fixtures.py index 81488910e..81cb2b3fa 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/acceptance_test_fixtures.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/acceptance_test_fixtures.py @@ -1,8 +1,8 @@ """Acceptance_test_fixtures.""" import time +from flask_bpmn.models.db import db 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/authentication_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/authentication_service.py index ad252d116..497af7ed0 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/authentication_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/authentication_service.py @@ -3,14 +3,14 @@ import base64 import enum import json import time +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Optional import jwt import requests 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/authorization_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/authorization_service.py index bde408308..5b0d0573b 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/authorization_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/authorization_service.py @@ -1,6 +1,8 @@ """Authorization_service.""" import inspect import re +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Optional from typing import Union @@ -10,8 +12,6 @@ from flask import current_app from flask import g from flask import request from flask import scaffold -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 or_ from sqlalchemy import text diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/data_setup_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/data_setup_service.py index c9c0647ed..b0179079e 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/data_setup_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/data_setup_service.py @@ -1,7 +1,8 @@ """Data_setup_service.""" -from flask import current_app from flask_bpmn.models.db import db +from flask import current_app + from spiffworkflow_backend.services.process_model_service import ProcessModelService from spiffworkflow_backend.services.spec_file_service import SpecFileService diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/error_handling_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/error_handling_service.py index 1e8b38f2d..a5be1b8e3 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/error_handling_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/error_handling_service.py @@ -1,11 +1,10 @@ """Error_handling_service.""" +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import List 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py index 5812748c7..29f118b63 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py @@ -1,12 +1,12 @@ """File_system_service.""" import os from datetime import datetime +from flask_bpmn.api.api_error import ApiError from typing import List 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/group_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/group_service.py index aa560009e..edc0e69a4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/group_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/group_service.py @@ -1,7 +1,6 @@ """Group_service.""" -from typing import Optional - from flask_bpmn.models.db import db +from typing import Optional from spiffworkflow_backend.models.group import GroupModel from spiffworkflow_backend.services.user_service import UserService diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/logging_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/logging_service.py index dd34cb3fd..fe56e104f 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/logging_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/logging_service.py @@ -2,12 +2,12 @@ import json import logging import re +from flask_bpmn.models.db import db from typing import Any 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py index cfb42c836..8e8f7a728 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py @@ -1,8 +1,8 @@ """Message_service.""" +from flask_bpmn.models.db import db 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 diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py index d1df67428..1a38259df 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py @@ -8,6 +8,8 @@ import re import time from datetime import datetime from datetime import timedelta +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import Callable from typing import Dict @@ -21,8 +23,6 @@ from typing import Union import dateparser import pytz from flask import current_app -from flask_bpmn.api.api_error import ApiError -from flask_bpmn.models.db import db from lxml import etree # type: ignore from RestrictedPython import safe_globals # type: ignore from SpiffWorkflow.bpmn.exceptions import WorkflowTaskExecException # type: ignore diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py index f98eaae18..f8df009de 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py @@ -1,11 +1,11 @@ """Process_instance_service.""" import time +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import List from flask import current_app -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_backend.models.active_task import ActiveTaskModel diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py index f009af688..9a88cb56a 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py @@ -2,14 +2,13 @@ import json import os import shutil +from flask_bpmn.api.api_error import ApiError from glob import glob from typing import Any from typing import List 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, ) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/secret_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/secret_service.py index e4dee4913..2362a1a5d 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/secret_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/secret_service.py @@ -1,8 +1,7 @@ """Secret_service.""" -from typing import Optional - from flask_bpmn.api.api_error import ApiError from flask_bpmn.models.db import db +from typing import Optional from spiffworkflow_backend.models.secret_model import SecretModel diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/spec_file_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/spec_file_service.py index c69f41c30..8057a7e14 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/spec_file_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/spec_file_service.py @@ -2,10 +2,10 @@ import os import shutil from datetime import datetime +from flask_bpmn.models.db import db from typing import List from typing import Optional -from flask_bpmn.models.db import db from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException # type: ignore from spiffworkflow_backend.models.file import File diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/user_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/user_service.py index 0e8e65c2c..009d0531b 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/user_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/user_service.py @@ -1,11 +1,11 @@ """User_service.""" +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import Optional 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/helpers/base_test.py b/spiffworkflow-backend/tests/spiffworkflow_backend/helpers/base_test.py index 8d56853b4..16b96830d 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/helpers/base_test.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/helpers/base_test.py @@ -3,14 +3,14 @@ import io import json import os import time +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from typing import Any from typing import Dict from typing import Optional from flask import current_app 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py index 5ee5ae9f2..0d996bcb8 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py @@ -3,12 +3,12 @@ import io import json import os import time +from flask_bpmn.models.db import db from typing import Any 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_secret_service.py b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_secret_service.py index c71f67f23..9d064173f 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_secret_service.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_secret_service.py @@ -1,11 +1,11 @@ """Test_secret_service.""" import json +from flask_bpmn.api.api_error import ApiError from typing import Optional 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/scripts/test_get_group_members.py b/spiffworkflow-backend/tests/spiffworkflow_backend/scripts/test_get_group_members.py index 8a6046b5b..a2e9f5ef8 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/scripts/test_get_group_members.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/scripts/test_get_group_members.py @@ -1,7 +1,8 @@ """Test_get_localtime.""" +from flask_bpmn.models.db import db + 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_instance.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_instance.py index 2c091eeb1..a28034144 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_instance.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_message_instance.py @@ -1,8 +1,9 @@ """Test_message_instance.""" +from flask_bpmn.models.db import db + import pytest from flask import Flask from flask.testing import FlaskClient -from flask_bpmn.models.db import db from tests.spiffworkflow_backend.helpers.base_test import BaseTest from spiffworkflow_backend.models.message_instance import MessageInstanceModel diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permission_target.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permission_target.py index 567681428..f0f693f09 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permission_target.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permission_target.py @@ -1,7 +1,8 @@ """Process Model.""" +from flask_bpmn.models.db import db + 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 ( diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permissions.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permissions.py index b66f32370..92f5c5002 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permissions.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_permissions.py @@ -1,7 +1,8 @@ """Test Permissions.""" +from flask_bpmn.models.db import db + 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model.py index 09421bc71..f8470743b 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_model.py @@ -1,7 +1,8 @@ """Process Model.""" +from flask_bpmn.models.db import db + 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 diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_restricted_script_engine.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_restricted_script_engine.py index d31ea424f..ae77a1fc6 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_restricted_script_engine.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_restricted_script_engine.py @@ -1,8 +1,9 @@ """Test_various_bpmn_constructs.""" +from flask_bpmn.api.api_error import ApiError + 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 tests.spiffworkflow_backend.helpers.test_data import load_test_spec diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py index 3cc353b52..5d67d2b22 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py @@ -1,10 +1,10 @@ """Test_message_service.""" import os +from flask_bpmn.models.db import db import pytest from flask import Flask from flask.testing import FlaskClient -from flask_bpmn.models.db import db from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException # type: ignore from tests.spiffworkflow_backend.helpers.base_test import BaseTest from tests.spiffworkflow_backend.helpers.test_data import load_test_spec diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spiff_logging.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spiff_logging.py index d8680b719..15a892c06 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spiff_logging.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spiff_logging.py @@ -1,8 +1,8 @@ """Process Model.""" from decimal import Decimal +from flask_bpmn.models.db import db 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