From e4bf5b86bccb6d64150db20b8f4ec8e1d91cda86 Mon Sep 17 00:00:00 2001 From: jasquat Date: Fri, 12 May 2023 09:50:04 -0400 Subject: [PATCH 1/2] updated spiffworkflow imports w/ burnettk --- .../services/process_instance_processor.py | 4 ++-- .../services/process_instance_service.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 c044228f7..99d1813e4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py @@ -39,8 +39,8 @@ from SpiffWorkflow.bpmn.serializer.task_spec import ( # type: ignore EventBasedGatewayConverter, ) from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore -from SpiffWorkflow.bpmn.specs.BpmnProcessSpec import BpmnProcessSpec # type: ignore -from SpiffWorkflow.bpmn.specs.SubWorkflowTask import SubWorkflowTask # type: ignore +from SpiffWorkflow.bpmn.specs.bpmn_process_spec import BpmnProcessSpec # type: ignore +from SpiffWorkflow.bpmn.specs.mixins.subworkfow_task import SubWorkflowTask # type: ignore from SpiffWorkflow.bpmn.workflow import BpmnWorkflow # type: ignore from SpiffWorkflow.exceptions import WorkflowException # type: ignore from SpiffWorkflow.serializer.exceptions import MissingSpecError # 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 3315c3327..73e2bdb8f 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py @@ -15,8 +15,8 @@ from urllib.parse import unquote import sentry_sdk from flask import current_app from flask import g -from SpiffWorkflow.bpmn.specs.events.event_definitions import TimerEventDefinition # type: ignore -from SpiffWorkflow.bpmn.specs.events.IntermediateEvent import _BoundaryEventParent # type: ignore +from SpiffWorkflow.bpmn.specs.event_definitions import TimerEventDefinition # type: ignore +from SpiffWorkflow.bpmn.specs.control import _BoundaryEventParent # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore from spiffworkflow_backend import db From 1066ae4b8adec8b9eaeaaa049cd8be968e24347e Mon Sep 17 00:00:00 2001 From: jasquat Date: Fri, 12 May 2023 09:55:10 -0400 Subject: [PATCH 2/2] updated spiffworkflow to fix typo w/ burnettk --- spiffworkflow-backend/poetry.lock | 2 +- .../src/spiffworkflow_backend/routes/tasks_controller.py | 1 - .../services/process_instance_processor.py | 2 +- .../spiffworkflow_backend/services/process_instance_service.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spiffworkflow-backend/poetry.lock b/spiffworkflow-backend/poetry.lock index bc9840f8f..dada36ea0 100644 --- a/spiffworkflow-backend/poetry.lock +++ b/spiffworkflow-backend/poetry.lock @@ -3089,7 +3089,7 @@ lxml = "*" type = "git" url = "https://github.com/sartography/SpiffWorkflow" reference = "main" -resolved_reference = "23d54e524db2ebfccd9a05c6f988af26179248b6" +resolved_reference = "4644f2810f49127e004309f60198cf5d53d99ac5" [[package]] name = "sqlalchemy" diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py index 88b6bca81..0c0b2c7a3 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py @@ -403,7 +403,6 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st return_hash[return_type] = entity return f"data: {current_app.json.dumps(return_hash)} \n\n" - processor = ProcessInstanceProcessor(process_instance) reported_ids = [] # A list of all the ids reported by this endpoint so far. tasks = get_reportable_tasks() 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 99d1813e4..6e294570e 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py @@ -40,7 +40,7 @@ from SpiffWorkflow.bpmn.serializer.task_spec import ( # type: ignore ) from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore from SpiffWorkflow.bpmn.specs.bpmn_process_spec import BpmnProcessSpec # type: ignore -from SpiffWorkflow.bpmn.specs.mixins.subworkfow_task import SubWorkflowTask # type: ignore +from SpiffWorkflow.bpmn.specs.mixins.subworkflow_task import SubWorkflowTask # type: ignore from SpiffWorkflow.bpmn.workflow import BpmnWorkflow # type: ignore from SpiffWorkflow.exceptions import WorkflowException # type: ignore from SpiffWorkflow.serializer.exceptions import MissingSpecError # 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 73e2bdb8f..84c62f12c 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py @@ -15,8 +15,8 @@ from urllib.parse import unquote import sentry_sdk from flask import current_app from flask import g -from SpiffWorkflow.bpmn.specs.event_definitions import TimerEventDefinition # type: ignore from SpiffWorkflow.bpmn.specs.control import _BoundaryEventParent # type: ignore +from SpiffWorkflow.bpmn.specs.event_definitions import TimerEventDefinition # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore from spiffworkflow_backend import db