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

queue instance with celery instead of running engine steps on task submit w/ burnettk

This commit is contained in:
jasquat 2024-01-18 13:29:10 -05:00
parent 2aa1278648
commit 11384c2a47
No known key found for this signature in database
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py
View File

@ -387,7 +387,8 @@ def _process_instance_task_list(
bpmn_process_ids = [p.id for p in bpmn_processes]
task_model_query = db.session.query(TaskModel).filter(
TaskModel.process_instance_id == process_instance.id, TaskModel.state.not_in(["LIKELY", "MAYBE"]) # type: ignore
TaskModel.process_instance_id == process_instance.id,
TaskModel.state.not_in(["LIKELY", "MAYBE"]), # type: ignore
)
to_task_model: TaskModel | None = None
@ -651,12 +652,11 @@ def _process_instance_run(
)
processor = None
task_runnability = None
try:
if queue_enabled_for_process_model(process_instance):
queue_process_instance_if_appropriate(process_instance)
elif not ProcessInstanceQueueService.is_enqueued_to_run_in_the_future(process_instance):
processor, task_runnability = ProcessInstanceService.run_process_instance_with_processor(process_instance)
processor, _ = ProcessInstanceService.run_process_instance_with_processor(process_instance)
except (
ApiError,
ProcessInstanceIsNotEnqueuedError,

15
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py
View File

@ -18,6 +18,12 @@ from SpiffWorkflow.bpmn.specs.event_definitions.timer import TimerEventDefinitio
from SpiffWorkflow.task import Task as SpiffTask # type: ignore
from SpiffWorkflow.util.task import TaskState # type: ignore
from spiffworkflow_backend.background_processing.celery_tasks.process_instance_task_producer import (
queue_enabled_for_process_model,
)
from spiffworkflow_backend.background_processing.celery_tasks.process_instance_task_producer import (
queue_process_instance_if_appropriate,
)
from spiffworkflow_backend.data_migrations.process_instance_migrator import ProcessInstanceMigrator
from spiffworkflow_backend.exceptions.api_error import ApiError
from spiffworkflow_backend.exceptions.error import HumanTaskAlreadyCompletedError
@ -470,9 +476,12 @@ class ProcessInstanceService:
# ProcessInstanceService.post_process_form(spiff_task) # some properties may update the data store.
processor.complete_task(spiff_task, human_task, user=user)
with sentry_sdk.start_span(op="task", description="backend_do_engine_steps"):
# maybe move this out once we have the interstitial page since this is here just so we can get the next human task
processor.do_engine_steps(save=True)
if queue_enabled_for_process_model(processor.process_instance_model):
queue_process_instance_if_appropriate(processor.process_instance_model)
else:
with sentry_sdk.start_span(op="task", description="backend_do_engine_steps"):
# maybe move this out once we have the interstitial page since this is here just so we can get the next human task
processor.do_engine_steps(save=True)
@staticmethod
def create_dot_dict(data: dict) -> dict[str, Any]: