Merge fcb5988c24 into 70d7242e57

Update execution.py
2025-04-16 00:23:30 +00:00 · 2025-04-07 17:42:31 -03:00 · 2024-12-12 01:15:36 +03:00
1 changed files with 9 additions and 2 deletions
--- a/execution.py
+++ b/execution.py
@ -500,8 +500,15 @@ class PromptExecutor:
                if error is not None:
                    self.handle_execution_error(prompt_id, dynamic_prompt.original_prompt, current_outputs, executed, error, ex)
                    break
-
-                result, error, ex = execute(self.server, dynamic_prompt, self.caches, node_id, extra_data, executed, prompt_id, execution_list, pending_subgraph_results)
+                try:
+                    result, error, ex = execute(self.server, dynamic_prompt, self.caches, node_id, extra_data, executed, prompt_id, execution_list, pending_subgraph_results)
+                except Exception as e:
+                    typ, _, tb = sys.exc_info()
+                    exception_type = full_type_name(typ)
+                    logging.error(f"Unexpected error occurred, during nested error handling: {e}, please open an issue on github.")
+                    logging.error(traceback.format_exc())
+                    self.add_message("execution_error", {"prompt_id": prompt_id}, broadcast=True)
+                    break
                self.success = result != ExecutionResult.FAILURE
                if result == ExecutionResult.FAILURE:
                    self.handle_execution_error(prompt_id, dynamic_prompt.original_prompt, current_outputs, executed, error, ex)
Author	SHA1	Message	Date
Konin Oleg	7fb44a4a7c	Merge `fcb5988c24` into `70d7242e57`	2025-04-07 17:42:31 -03:00
Конин Олег Валерьевич	fcb5988c24	Update execution.py	2024-12-12 01:15:36 +03:00