diff --git a/crc/models/study.py b/crc/models/study.py index 287fe73f..b62a10ce 100644 --- a/crc/models/study.py +++ b/crc/models/study.py @@ -1,6 +1,4 @@ -import datetime import enum -import json import marshmallow from marshmallow import INCLUDE, fields @@ -9,13 +7,11 @@ from sqlalchemy import func from crc import db, ma from crc.api.common import ApiErrorSchema, ApiError -from crc.models.file import FileModel, SimpleFileSchema, FileSchema +from crc.models.file import FileSchema from crc.models.ldap import LdapModel, LdapSchema from crc.models.protocol_builder import ProtocolBuilderCreatorStudy -from crc.models.workflow import WorkflowSpecCategoryModel, WorkflowState, WorkflowStatus, WorkflowSpecModel, \ - WorkflowModel +from crc.models.workflow import WorkflowSpecCategoryModel, WorkflowState, WorkflowStatus, WorkflowModel from crc.services.file_service import FileService -from crc.services.user_service import UserService class StudyStatus(enum.Enum): diff --git a/crc/models/workflow.py b/crc/models/workflow.py index ca848cf7..ced02aac 100644 --- a/crc/models/workflow.py +++ b/crc/models/workflow.py @@ -1,13 +1,13 @@ import enum import marshmallow -from marshmallow import EXCLUDE,fields +from marshmallow import EXCLUDE from marshmallow_sqlalchemy import SQLAlchemyAutoSchema from sqlalchemy import func from sqlalchemy.orm import backref from crc import db -from crc.models.file import FileModel, FileDataModel +from crc.models.file import FileDataModel class WorkflowSpecCategoryModel(db.Model): diff --git a/crc/services/workflow_service.py b/crc/services/workflow_service.py index 8cd56c37..838d10c2 100755 --- a/crc/services/workflow_service.py +++ b/crc/services/workflow_service.py @@ -1,9 +1,7 @@ import copy import json -import string import sys import traceback -from datetime import datetime import random import string from datetime import datetime @@ -14,26 +12,22 @@ from SpiffWorkflow import Task as SpiffTask, WorkflowException, NavItem from SpiffWorkflow.bpmn.PythonScriptEngine import Box from SpiffWorkflow.bpmn.specs.EndEvent import EndEvent from SpiffWorkflow.bpmn.specs.ManualTask import ManualTask -from SpiffWorkflow.bpmn.specs.MultiInstanceTask import MultiInstanceTask from SpiffWorkflow.bpmn.specs.ScriptTask import ScriptTask from SpiffWorkflow.bpmn.specs.StartEvent import StartEvent from SpiffWorkflow.bpmn.specs.UserTask import UserTask from SpiffWorkflow.dmn.specs.BusinessRuleTask import BusinessRuleTask -from SpiffWorkflow.specs import CancelTask, StartTask, MultiChoice +from SpiffWorkflow.specs import CancelTask, StartTask from SpiffWorkflow.util.deep_merge import DeepMerge from SpiffWorkflow.util.metrics import timeit -from jinja2 import Template - -from crc import db, app, session, connexion_app +from crc import db, app, session from crc.api.common import ApiError from crc.models.api_models import Task, MultiInstanceType, WorkflowApi -from crc.models.data_store import DataStoreModel from crc.models.file import LookupDataModel, FileModel, File, FileSchema from crc.models.ldap import LdapModel from crc.models.study import StudyModel from crc.models.task_event import TaskEventModel -from crc.models.user import UserModel, UserModelSchema +from crc.models.user import UserModel from crc.models.workflow import WorkflowModel, WorkflowStatus, WorkflowSpecModel, WorkflowSpecCategoryModel from crc.services.data_store_service import DataStoreBase