sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

run_pyl

This commit is contained in:
Dan 2023-04-26 16:05:27 -04:00
parent 85c34de9df
commit d63aac09b6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
View File

@ -20,7 +20,7 @@ from flask import make_response
from flask import stream_with_context from flask import stream_with_context
from flask.wrappers import Response from flask.wrappers import Response
from jinja2 import TemplateSyntaxError from jinja2 import TemplateSyntaxError
from SpiffWorkflow.bpmn.workflow import BpmnWorkflow from SpiffWorkflow.bpmn.workflow import BpmnWorkflow # type: ignore
from SpiffWorkflow.exceptions import WorkflowTaskException # type: ignore from SpiffWorkflow.exceptions import WorkflowTaskException # type: ignore
from SpiffWorkflow.task import Task as SpiffTask # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore
from SpiffWorkflow.task import TaskState from SpiffWorkflow.task import TaskState
@ -388,7 +388,7 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st
processor = ProcessInstanceProcessor(process_instance) processor = ProcessInstanceProcessor(process_instance)
reported_ids = [] # A list of all the ids reported by this endpoint so far. reported_ids = [] # A list of all the ids reported by this endpoint so far.
def get_reportable_tasks(): def get_reportable_tasks() -> Any:
return processor.bpmn_process_instance.get_tasks( return processor.bpmn_process_instance.get_tasks(
TaskState.WAITING | TaskState.STARTED | TaskState.READY | TaskState.ERROR TaskState.WAITING | TaskState.STARTED | TaskState.READY | TaskState.ERROR
) )
@ -435,7 +435,8 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st
spiff_task = processor.next_task() spiff_task = processor.next_task()
task_model = TaskModel.query.filter_by(guid=str(spiff_task.id)).first() task_model = TaskModel.query.filter_by(guid=str(spiff_task.id)).first()
def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow):
def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow) -> int:
return len( return len(
list( list(
[ [
@ -446,6 +447,7 @@ def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow):
) )
) )
def _dequeued_interstitial_stream(process_instance_id: int) -> Generator[str, Optional[str], None]: def _dequeued_interstitial_stream(process_instance_id: int) -> Generator[str, Optional[str], None]:
process_instance = _find_process_instance_by_id_or_raise(process_instance_id) process_instance = _find_process_instance_by_id_or_raise(process_instance_id)
with ProcessInstanceQueueService.dequeued(process_instance): with ProcessInstanceQueueService.dequeued(process_instance):

1
spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py
View File

@ -320,7 +320,6 @@ class RunUntilUserTaskOrMessageExecutionStrategy(ExecutionStrategy):
if hasattr(task.task_spec, "extensions") and task.task_spec.extensions.get( if hasattr(task.task_spec, "extensions") and task.task_spec.extensions.get(
"instructionsForEndUser", None "instructionsForEndUser", None
): ):
should_continue = False
break break
self.delegate.will_complete_task(task) self.delegate.will_complete_task(task)
task.run() task.run()