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

pyl w/ burnettk

This commit is contained in:
jasquat 2023-02-09 10:28:36 -05:00
parent bec263d24d
commit e9ee885efb
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,29 +556,28 @@ def process_instance_task_list(
get_task_data: bool = False, get_task_data: bool = False,
) -> flask.wrappers.Response: ) -> flask.wrappers.Response:
"""Process_instance_task_list.""" """Process_instance_task_list."""
step_detail_query = ( step_detail_query = db.session.query(SpiffStepDetailsModel).filter(
db.session.query(SpiffStepDetailsModel) SpiffStepDetailsModel.process_instance_id == process_instance.id,
.filter(
SpiffStepDetailsModel.process_instance_id == process_instance.id,
)
) )
if spiff_step > 0: if spiff_step > 0:
step_detail_query = step_detail_query.filter(SpiffStepDetailsModel.spiff_step <= spiff_step) step_detail_query = step_detail_query.filter(
SpiffStepDetailsModel.spiff_step <= spiff_step
)
step_details = step_detail_query.all() step_details = step_detail_query.all()
bpmn_json = json.loads(process_instance.bpmn_json) bpmn_json = json.loads(process_instance.bpmn_json or "{}")
tasks = bpmn_json['tasks'] tasks = bpmn_json["tasks"]
# if step_detail is not None and process_instance.bpmn_json is not None: # if step_detail is not None and process_instance.bpmn_json is not None:
for step_detail in step_details: for step_detail in step_details:
print(f"step_detail.task_id: {step_detail.task_id}")
print(f"step_detail.bpmn_task_identifier: {step_detail.bpmn_task_identifier}")
if step_detail.task_id in tasks: if step_detail.task_id in tasks:
task_data = step_detail.task_json['task_data'] | step_detail.task_json['python_env'] task_data = (
step_detail.task_json["task_data"] | step_detail.task_json["python_env"]
)
if task_data is None: if task_data is None:
task_data = {} task_data = {}
tasks[step_detail.task_id]['data'] = task_data tasks[step_detail.task_id]["data"] = task_data
process_instance.bpmn_json = json.dumps(bpmn_json) process_instance.bpmn_json = json.dumps(bpmn_json)

21
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py
View File

@ -682,7 +682,12 @@ class ProcessInstanceProcessor:
"lane_assignment_id": lane_assignment_id, "lane_assignment_id": lane_assignment_id,
} }
def spiff_step_details_mapping(self, spiff_task: Optional[SpiffTask]=None, start_in_seconds: Optional[float] = 0, end_in_seconds: Optional[float] = 0) -> dict: def spiff_step_details_mapping(
self,
spiff_task: Optional[SpiffTask] = None,
start_in_seconds: Optional[float] = 0,
end_in_seconds: Optional[float] = 0,
) -> dict:
"""SaveSpiffStepDetails.""" """SaveSpiffStepDetails."""
# bpmn_json = self.serialize() # bpmn_json = self.serialize()
# wf_json = json.loads(bpmn_json) # wf_json = json.loads(bpmn_json)
@ -696,8 +701,10 @@ class ProcessInstanceProcessor:
return {} return {}
task_data = default_registry.convert(spiff_task.data) task_data = default_registry.convert(spiff_task.data)
python_env = default_registry.convert(self._script_engine.environment.last_result()) python_env = default_registry.convert(
self._script_engine.environment.last_result()
)
task_json: Dict[str, Any] = { task_json: Dict[str, Any] = {
# "tasks": wf_json["tasks"], # "tasks": wf_json["tasks"],
# "subprocesses": wf_json["subprocesses"], # "subprocesses": wf_json["subprocesses"],
@ -1528,13 +1535,17 @@ class ProcessInstanceProcessor:
def will_complete_task(task: SpiffTask) -> None: def will_complete_task(task: SpiffTask) -> None:
if should_log(task): if should_log(task):
current_task_start_in_seconds['time'] = time.time() current_task_start_in_seconds["time"] = time.time()
self.increment_spiff_step() self.increment_spiff_step()
def did_complete_task(task: SpiffTask) -> None: def did_complete_task(task: SpiffTask) -> None:
if should_log(task): if should_log(task):
self._script_engine.environment.revise_state_with_task_data(task) self._script_engine.environment.revise_state_with_task_data(task)
step_details.append(self.spiff_step_details_mapping(task, current_task_start_in_seconds['time'], time.time())) step_details.append(
self.spiff_step_details_mapping(
task, current_task_start_in_seconds["time"], time.time()
)
)
try: try:
self.bpmn_process_instance.refresh_waiting_tasks() self.bpmn_process_instance.refresh_waiting_tasks()