From 87f651ea6758b6939fb8cf4e2fc5478efe94a15d Mon Sep 17 00:00:00 2001 From: huchenlei Date: Thu, 22 Aug 2024 16:55:52 -0400 Subject: [PATCH 1/3] Fix task.status.status_str caused by 2666 regression --- execution.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/execution.py b/execution.py index 05a662cde37..99f2757afce 100644 --- a/execution.py +++ b/execution.py @@ -450,7 +450,7 @@ def handle_execution_error(self, prompt_id, prompt, current_outputs, executed, e "current_outputs": list(current_outputs), } self.add_message("execution_error", mes, broadcast=False) - + def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]): nodes.interrupt_processing(False) @@ -494,6 +494,7 @@ def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]): result, error, ex = execute(self.server, dynamic_prompt, self.caches, node_id, extra_data, executed, prompt_id, execution_list, pending_subgraph_results) if result == ExecutionResult.FAILURE: self.handle_execution_error(prompt_id, dynamic_prompt.original_prompt, current_outputs, executed, error, ex) + self.success = False break elif result == ExecutionResult.PENDING: execution_list.unstage_node_execution() From 65ea3171df1f4721b7bf35ae2e14d67d9592e780 Mon Sep 17 00:00:00 2001 From: huchenlei Date: Thu, 22 Aug 2024 17:35:23 -0400 Subject: [PATCH 2/3] fix --- execution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution.py b/execution.py index 99f2757afce..4a5b7f04c7d 100644 --- a/execution.py +++ b/execution.py @@ -492,9 +492,9 @@ def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]): break result, error, ex = execute(self.server, dynamic_prompt, self.caches, node_id, extra_data, executed, prompt_id, execution_list, pending_subgraph_results) + self.success = result == ExecutionResult.SUCCESS if result == ExecutionResult.FAILURE: self.handle_execution_error(prompt_id, dynamic_prompt.original_prompt, current_outputs, executed, error, ex) - self.success = False break elif result == ExecutionResult.PENDING: execution_list.unstage_node_execution() From d197c97dc0c0ff4cb1d019948c6f7329f507479d Mon Sep 17 00:00:00 2001 From: huchenlei Date: Thu, 22 Aug 2024 17:36:13 -0400 Subject: [PATCH 3/3] fix --- execution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution.py b/execution.py index 4a5b7f04c7d..e66aabbcc37 100644 --- a/execution.py +++ b/execution.py @@ -492,7 +492,7 @@ def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]): break result, error, ex = execute(self.server, dynamic_prompt, self.caches, node_id, extra_data, executed, prompt_id, execution_list, pending_subgraph_results) - self.success = result == ExecutionResult.SUCCESS + self.success = result != ExecutionResult.FAILURE if result == ExecutionResult.FAILURE: self.handle_execution_error(prompt_id, dynamic_prompt.original_prompt, current_outputs, executed, error, ex) break