diff --git a/bin/import_tickets_for_command_line.py b/bin/import_tickets_for_command_line.py index 19fa4116..bc71878d 100644 --- a/bin/import_tickets_for_command_line.py +++ b/bin/import_tickets_for_command_line.py @@ -1,6 +1,7 @@ """Grabs tickets from csv and makes process instances.""" import csv import os + from flask_bpmn.models.db import db from spiffworkflow_backend import create_app diff --git a/bin/import_tickets_for_script_task.py b/bin/import_tickets_for_script_task.py index 7365c6bf..249c631e 100644 --- a/bin/import_tickets_for_script_task.py +++ b/bin/import_tickets_for_script_task.py @@ -1,5 +1,6 @@ """Import tickets, for use in script task.""" import csv + from flask_bpmn.models.db import db from spiffworkflow_backend.models.process_instance import ProcessInstanceModel diff --git a/conftest.py b/conftest.py index b0e31dca..97886841 100644 --- a/conftest.py +++ b/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 from typing import Iterator import pytest from flask.app import Flask +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from spiffworkflow_backend.services.process_model_service import ProcessModelService diff --git a/migrations/env.py b/migrations/env.py index 68feded2..630e381a 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -1,5 +1,3 @@ -from __future__ import with_statement - import logging from logging.config import fileConfig diff --git a/src/spiffworkflow_backend/__init__.py b/src/spiffworkflow_backend/__init__.py index cee289d9..f3ec1aea 100644 --- a/src/spiffworkflow_backend/__init__.py +++ b/src/spiffworkflow_backend/__init__.py @@ -1,15 +1,15 @@ """__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 import flask.app import flask.json +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 typing import Any import spiffworkflow_backend.load_database_models # noqa: F401 from spiffworkflow_backend.config import setup_config diff --git a/src/spiffworkflow_backend/helpers/fixture_data.py b/src/spiffworkflow_backend/helpers/fixture_data.py index d68b9ad3..1ca43312 100644 --- a/src/spiffworkflow_backend/helpers/fixture_data.py +++ b/src/spiffworkflow_backend/helpers/fixture_data.py @@ -1,7 +1,8 @@ """Fixture_data.""" -from flask_bpmn.models.db import db from typing import Any +from flask_bpmn.models.db import db + from spiffworkflow_backend.models.principal import PrincipalModel from spiffworkflow_backend.models.user import UserModel diff --git a/src/spiffworkflow_backend/models/active_task.py b/src/spiffworkflow_backend/models/active_task.py index 4477eaad..2a78fc61 100644 --- a/src/spiffworkflow_backend/models/active_task.py +++ b/src/spiffworkflow_backend/models/active_task.py @@ -2,11 +2,12 @@ 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 sqlalchemy.orm import RelationshipProperty, relationship +from sqlalchemy.orm import relationship +from sqlalchemy.orm import RelationshipProperty from spiffworkflow_backend.models.principal import PrincipalModel from spiffworkflow_backend.models.process_instance import ProcessInstanceModel @@ -25,7 +26,9 @@ class ActiveTaskModel(SpiffworkflowBaseDBModel): form_json: str | None = "" bpmn_json: str = "" - assigned_principal: RelationshipProperty[PrincipalModel] = relationship(PrincipalModel) + assigned_principal: RelationshipProperty[PrincipalModel] = relationship( + PrincipalModel + ) id: int = db.Column(db.Integer, primary_key=True) spiffworkflow_task_id: str = db.Column(db.String(50), nullable=False) process_instance_id: int = db.Column( diff --git a/src/spiffworkflow_backend/models/data_store.py b/src/spiffworkflow_backend/models/data_store.py index b466c6eb..abbfcf34 100644 --- a/src/spiffworkflow_backend/models/data_store.py +++ b/src/spiffworkflow_backend/models/data_store.py @@ -1,7 +1,6 @@ """Data_store.""" from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel - from flask_marshmallow.sqla import SQLAlchemyAutoSchema # type: ignore diff --git a/src/spiffworkflow_backend/models/file.py b/src/spiffworkflow_backend/models/file.py index 91920eaa..eb49b873 100644 --- a/src/spiffworkflow_backend/models/file.py +++ b/src/spiffworkflow_backend/models/file.py @@ -2,10 +2,10 @@ from dataclasses import dataclass from dataclasses import field from datetime import datetime -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Optional +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 diff --git a/src/spiffworkflow_backend/models/group.py b/src/spiffworkflow_backend/models/group.py index 89ff66f7..08171cf2 100644 --- a/src/spiffworkflow_backend/models/group.py +++ b/src/spiffworkflow_backend/models/group.py @@ -1,10 +1,10 @@ """Group.""" from __future__ import annotations -from flask_bpmn.models.db import db -from flask_bpmn.models.group import FlaskBpmnGroupModel from typing import TYPE_CHECKING +from flask_bpmn.models.db import db +from flask_bpmn.models.group import FlaskBpmnGroupModel from sqlalchemy.orm import relationship if TYPE_CHECKING: diff --git a/src/spiffworkflow_backend/models/permission_assignment.py b/src/spiffworkflow_backend/models/permission_assignment.py index 284fabfa..4cc26324 100644 --- a/src/spiffworkflow_backend/models/permission_assignment.py +++ b/src/spiffworkflow_backend/models/permission_assignment.py @@ -1,8 +1,8 @@ """PermissionAssignment.""" import enum + from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel - from sqlalchemy import Enum from sqlalchemy import ForeignKey diff --git a/src/spiffworkflow_backend/models/permission_target.py b/src/spiffworkflow_backend/models/permission_target.py index 8c476a9f..07380127 100644 --- a/src/spiffworkflow_backend/models/permission_target.py +++ b/src/spiffworkflow_backend/models/permission_target.py @@ -1,7 +1,6 @@ """PermissionTarget.""" from flask_bpmn.models.db import db from flask_bpmn.models.db import SpiffworkflowBaseDBModel - from sqlalchemy.schema import CheckConstraint # from sqlalchemy import ForeignKey # type: ignore diff --git a/src/spiffworkflow_backend/models/principal.py b/src/spiffworkflow_backend/models/principal.py index 817c6558..4b652b03 100644 --- a/src/spiffworkflow_backend/models/principal.py +++ b/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.schema import CheckConstraint diff --git a/src/spiffworkflow_backend/models/process_instance.py b/src/spiffworkflow_backend/models/process_instance.py index 5da778f6..1449aa14 100644 --- a/src/spiffworkflow_backend/models/process_instance.py +++ b/src/spiffworkflow_backend/models/process_instance.py @@ -2,16 +2,15 @@ from __future__ import annotations from dataclasses import dataclass -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel -from SpiffWorkflow.navigation import NavItem # type: ignore from typing import Any -from typing import Optional 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 +from SpiffWorkflow.navigation import NavItem # type: ignore from sqlalchemy import ForeignKey from sqlalchemy.orm import deferred from sqlalchemy.orm import relationship @@ -145,7 +144,7 @@ class ProcessInstanceApi: self, id: int, status: ProcessInstanceStatus, - next_task: Optional[Task], + next_task: Task | None, process_model_identifier: str, process_group_identifier: str, total_tasks: int, diff --git a/src/spiffworkflow_backend/models/process_instance_report.py b/src/spiffworkflow_backend/models/process_instance_report.py index a748aac8..84d88572 100644 --- a/src/spiffworkflow_backend/models/process_instance_report.py +++ b/src/spiffworkflow_backend/models/process_instance_report.py @@ -1,8 +1,8 @@ """Process_instance.""" -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import Union +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/src/spiffworkflow_backend/models/task.py b/src/spiffworkflow_backend/models/task.py index b78628b4..9c039c05 100644 --- a/src/spiffworkflow_backend/models/task.py +++ b/src/spiffworkflow_backend/models/task.py @@ -1,13 +1,13 @@ """Task.""" import enum -from SpiffWorkflow.camunda.specs.UserTask import Form # type: ignore from typing import Any -from typing import Optional import marshmallow from marshmallow import Schema from marshmallow_enum import EnumField # type: ignore +# from SpiffWorkflow.camunda.specs.UserTask import Form # type: ignore + class MultiInstanceType(enum.Enum): """MultiInstanceType.""" diff --git a/src/spiffworkflow_backend/models/task_event.py b/src/spiffworkflow_backend/models/task_event.py index 940385f5..339ed458 100644 --- a/src/spiffworkflow_backend/models/task_event.py +++ b/src/spiffworkflow_backend/models/task_event.py @@ -2,10 +2,10 @@ from __future__ import annotations import enum -from flask_bpmn.models.db import db -from flask_bpmn.models.db import SpiffworkflowBaseDBModel from typing import TYPE_CHECKING +from flask_bpmn.models.db import db +from flask_bpmn.models.db import SpiffworkflowBaseDBModel from marshmallow import fields from marshmallow import INCLUDE from marshmallow import Schema diff --git a/src/spiffworkflow_backend/models/user.py b/src/spiffworkflow_backend/models/user.py index 2ed039c6..b47dabd5 100644 --- a/src/spiffworkflow_backend/models/user.py +++ b/src/spiffworkflow_backend/models/user.py @@ -1,12 +1,12 @@ """User.""" -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 Union 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 diff --git a/src/spiffworkflow_backend/models/user_group_assignment.py b/src/spiffworkflow_backend/models/user_group_assignment.py index 9128ce3d..77e4505c 100644 --- a/src/spiffworkflow_backend/models/user_group_assignment.py +++ b/src/spiffworkflow_backend/models/user_group_assignment.py @@ -1,7 +1,6 @@ """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/src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py b/src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py index 132b72a9..31d8d2d6 100644 --- a/src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py +++ b/src/spiffworkflow_backend/routes/admin_blueprint/admin_blueprint.py @@ -1,5 +1,4 @@ """APIs for dealing with process groups, process models, and process instances.""" -from flask_bpmn.models.db import db from typing import Any from typing import Union @@ -10,6 +9,7 @@ from flask import redirect from flask import render_template from flask import request from flask import url_for +from flask_bpmn.models.db import db from werkzeug.wrappers.response import Response from spiffworkflow_backend.models.principal import PrincipalModel diff --git a/src/spiffworkflow_backend/routes/api_blueprint.py b/src/spiffworkflow_backend/routes/api_blueprint.py index bbfc9028..8c383f16 100644 --- a/src/spiffworkflow_backend/routes/api_blueprint.py +++ b/src/spiffworkflow_backend/routes/api_blueprint.py @@ -1,14 +1,14 @@ """Api.""" import json import os -from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore -from SpiffWorkflow.camunda.serializer.task_spec_converters import UserTaskConverter # type: ignore -from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter # type: ignore from flask import Blueprint from flask import current_app from flask import request from flask import Response +from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore +from SpiffWorkflow.camunda.serializer.task_spec_converters import UserTaskConverter # type: ignore +from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter # type: ignore from spiffworkflow_backend.models.process_instance import ProcessInstanceModel from spiffworkflow_backend.spiff_workflow_connector import parse diff --git a/src/spiffworkflow_backend/routes/process_api_blueprint.py b/src/spiffworkflow_backend/routes/process_api_blueprint.py index a48cf0b7..f64bd7d9 100644 --- a/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -1,7 +1,5 @@ """APIs for dealing with process groups, process models, and process instances.""" import json -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 @@ -14,6 +12,8 @@ from flask import g from flask import jsonify from flask import make_response from flask.wrappers import Response +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from sqlalchemy import desc from spiffworkflow_backend.exceptions.process_entity_not_found_error import ( @@ -518,7 +518,9 @@ def task_submit_user_data( ) ) - process_instance = ProcessInstanceModel.query.filter_by(process_instance_id=active_task_assigned_to_me.process_instance.id) + process_instance = ProcessInstanceModel.query.filter_by( + process_instance_id=active_task_assigned_to_me.process_instance.id + ) if process_instance is None: raise ( ApiError( @@ -529,6 +531,7 @@ def task_submit_user_data( ) return Response(json.dumps({"ok": True}), status=200, mimetype="application/json") + # def update_task(workflow_id, task_id, body, terminate_loop=None, update_all=False): # workflow_model = session.query(WorkflowModel).filter_by(id=workflow_id).first() # if workflow_model is None: @@ -576,7 +579,7 @@ def task_submit_user_data( # def __update_task(processor, task, data, user): # """All the things that need to happen when we complete a form, abstracted # here because we need to do it multiple times when completing all tasks in -# a multi-instance task""" +# a multi-instance task.""" # task.update_data(data) # WorkflowService.post_process_form(task) # some properties may update the data store. # processor.complete_task(task) @@ -588,7 +591,6 @@ def task_submit_user_data( # processor.save() - def get_file_from_request() -> Any: """Get_file_from_request.""" request_file = connexion.request.files.get("file") diff --git a/src/spiffworkflow_backend/routes/user.py b/src/spiffworkflow_backend/routes/user.py index 30131417..bbd15709 100644 --- a/src/spiffworkflow_backend/routes/user.py +++ b/src/spiffworkflow_backend/routes/user.py @@ -1,9 +1,9 @@ """User.""" -from flask_bpmn.api.api_error import ApiError from typing import Dict from typing import Optional from flask import g +from flask_bpmn.api.api_error import ApiError from spiffworkflow_backend.models.user import UserModel diff --git a/src/spiffworkflow_backend/routes/user_blueprint.py b/src/spiffworkflow_backend/routes/user_blueprint.py index 27e160e5..2555c5c7 100644 --- a/src/spiffworkflow_backend/routes/user_blueprint.py +++ b/src/spiffworkflow_backend/routes/user_blueprint.py @@ -1,7 +1,5 @@ """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 @@ -9,6 +7,8 @@ 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/src/spiffworkflow_backend/scripts/script.py b/src/spiffworkflow_backend/scripts/script.py index 5c17da15..1724eb5c 100644 --- a/src/spiffworkflow_backend/scripts/script.py +++ b/src/spiffworkflow_backend/scripts/script.py @@ -5,10 +5,11 @@ 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.task import Task diff --git a/src/spiffworkflow_backend/services/acceptance_test_fixtures.py b/src/spiffworkflow_backend/services/acceptance_test_fixtures.py index 27c9dcf1..a1a79cc9 100644 --- a/src/spiffworkflow_backend/services/acceptance_test_fixtures.py +++ b/src/spiffworkflow_backend/services/acceptance_test_fixtures.py @@ -1,6 +1,7 @@ """Acceptance_test_fixtures.""" import json import time + from flask_bpmn.models.db import db from spiffworkflow_backend.helpers.fixture_data import find_or_create_user diff --git a/src/spiffworkflow_backend/services/error_handling_service.py b/src/spiffworkflow_backend/services/error_handling_service.py index a5144d61..26d24da4 100644 --- a/src/spiffworkflow_backend/services/error_handling_service.py +++ b/src/spiffworkflow_backend/services/error_handling_service.py @@ -1,10 +1,11 @@ """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/src/spiffworkflow_backend/services/file_system_service.py b/src/spiffworkflow_backend/services/file_system_service.py index f3d0dc9e..abc51fd1 100644 --- a/src/spiffworkflow_backend/services/file_system_service.py +++ b/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/src/spiffworkflow_backend/services/process_instance_processor.py b/src/spiffworkflow_backend/services/process_instance_processor.py index 96c141f6..cf93b673 100644 --- a/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/src/spiffworkflow_backend/services/process_instance_processor.py @@ -1,8 +1,16 @@ """Process_instance_processor.""" import json import time +from typing import Any +from typing import Dict +from typing import List +from typing import Optional +from typing import Union + +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 SpiffWorkflow import Task as SpiffTask # type: ignore from SpiffWorkflow import TaskState from SpiffWorkflow import WorkflowException @@ -23,14 +31,6 @@ from SpiffWorkflow.exceptions import WorkflowTaskExecException # type: ignore from SpiffWorkflow.serializer.exceptions import MissingSpecError # type: ignore from SpiffWorkflow.specs import WorkflowSpec # type: ignore from SpiffWorkflow.task import Task # type: ignore -from typing import Any -from typing import Dict -from typing import List -from typing import Optional -from typing import Union - -from flask import current_app -from lxml import etree # type: ignore from spiffworkflow_backend.models.active_task import ActiveTaskModel from spiffworkflow_backend.models.file import File diff --git a/src/spiffworkflow_backend/services/process_instance_service.py b/src/spiffworkflow_backend/services/process_instance_service.py index 612e353e..8590cb1c 100644 --- a/src/spiffworkflow_backend/services/process_instance_service.py +++ b/src/spiffworkflow_backend/services/process_instance_service.py @@ -1,5 +1,11 @@ """Process_instance_service.""" import time +from typing import Any +from typing import Dict +from typing import List +from typing import Optional + +from flask import current_app from flask_bpmn.api.api_error import ApiError from flask_bpmn.models.db import db from SpiffWorkflow.bpmn.specs.events import EndEvent # type: ignore @@ -13,12 +19,6 @@ from SpiffWorkflow.specs import CancelTask # type: ignore from SpiffWorkflow.specs import StartTask from SpiffWorkflow.task import Task as SpiffTask # type: ignore from SpiffWorkflow.util.deep_merge import DeepMerge # type: ignore -from typing import Any -from typing import Dict -from typing import List -from typing import Optional - -from flask import current_app from spiffworkflow_backend.models.process_instance import ProcessInstanceApi from spiffworkflow_backend.models.process_instance import ProcessInstanceModel diff --git a/src/spiffworkflow_backend/services/process_model_service.py b/src/spiffworkflow_backend/services/process_model_service.py index 4fb8f7b4..1c7f4cb0 100644 --- a/src/spiffworkflow_backend/services/process_model_service.py +++ b/src/spiffworkflow_backend/services/process_model_service.py @@ -2,13 +2,14 @@ import json import os import shutil -from flask_bpmn.api.api_error import ApiError from typing import Any from typing import List from typing import Optional from typing import TypeVar from typing import Union +from flask_bpmn.api.api_error import ApiError + from spiffworkflow_backend.exceptions.process_entity_not_found_error import ( ProcessEntityNotFoundError, ) diff --git a/src/spiffworkflow_backend/services/spec_file_service.py b/src/spiffworkflow_backend/services/spec_file_service.py index 51ffd550..282df692 100644 --- a/src/spiffworkflow_backend/services/spec_file_service.py +++ b/src/spiffworkflow_backend/services/spec_file_service.py @@ -2,15 +2,15 @@ import os import shutil from datetime import datetime -from flask_bpmn.api.api_error import ApiError -from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException # type: ignore from typing import List from typing import Optional from typing import Union +from flask_bpmn.api.api_error import ApiError 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.file import File from spiffworkflow_backend.models.file import FileType diff --git a/src/spiffworkflow_backend/services/user_service.py b/src/spiffworkflow_backend/services/user_service.py index 508b6797..ba479304 100644 --- a/src/spiffworkflow_backend/services/user_service.py +++ b/src/spiffworkflow_backend/services/user_service.py @@ -1,10 +1,10 @@ """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 g +from flask_bpmn.api.api_error import ApiError +from flask_bpmn.models.db import db from spiffworkflow_backend.models.principal import PrincipalModel from spiffworkflow_backend.models.user import AdminSessionModel diff --git a/src/spiffworkflow_backend/spiff_workflow_connector.py b/src/spiffworkflow_backend/spiff_workflow_connector.py index 9406c5c9..c267f6fa 100755 --- a/src/spiffworkflow_backend/spiff_workflow_connector.py +++ b/src/spiffworkflow_backend/spiff_workflow_connector.py @@ -1,4 +1,10 @@ """Spiff Workflow Connector.""" +from typing import Any +from typing import Dict +from typing import List +from typing import Optional +from typing import Union + from flask_bpmn.models.db import db from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore from SpiffWorkflow.bpmn.specs.events.event_types import CatchingEvent # type: ignore @@ -14,12 +20,6 @@ from SpiffWorkflow.dmn.parser.BpmnDmnParser import BpmnDmnParser # type: ignore from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter # type: ignore from SpiffWorkflow.task import Task # type: ignore from SpiffWorkflow.task import TaskState -from typing import Any -from typing import Dict -from typing import List -from typing import Optional -from typing import Union - from typing_extensions import TypedDict from spiffworkflow_backend.models.process_instance import ProcessInstanceModel diff --git a/tests/spiffworkflow_backend/helpers/test_data.py b/tests/spiffworkflow_backend/helpers/test_data.py index 96fc7052..9afee257 100644 --- a/tests/spiffworkflow_backend/helpers/test_data.py +++ b/tests/spiffworkflow_backend/helpers/test_data.py @@ -1,8 +1,9 @@ """User.""" -from tests.spiffworkflow_backend.helpers.example_data import ExampleDataLoader from typing import Dict from typing import Optional +from tests.spiffworkflow_backend.helpers.example_data import ExampleDataLoader + from spiffworkflow_backend.exceptions.process_entity_not_found_error import ( ProcessEntityNotFoundError, ) diff --git a/tests/spiffworkflow_backend/integration/test_process_api.py b/tests/spiffworkflow_backend/integration/test_process_api.py index 052cd87f..f5e2597b 100644 --- a/tests/spiffworkflow_backend/integration/test_process_api.py +++ b/tests/spiffworkflow_backend/integration/test_process_api.py @@ -2,9 +2,6 @@ import io import json import time -from flask_bpmn.models.db import db -from tests.spiffworkflow_backend.helpers.test_data import load_test_spec -from tests.spiffworkflow_backend.helpers.test_data import logged_in_headers from typing import Any from typing import Dict from typing import Optional @@ -12,6 +9,9 @@ from typing import Optional import pytest from flask.app import Flask from flask.testing import FlaskClient +from flask_bpmn.models.db import db +from tests.spiffworkflow_backend.helpers.test_data import load_test_spec +from tests.spiffworkflow_backend.helpers.test_data import logged_in_headers from werkzeug.test import TestResponse from spiffworkflow_backend.exceptions.process_entity_not_found_error import (