Add & use modules.errors.print_error where currently printing exception info by hand

1 files changed, 12 insertions, 23 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index c902804b..a7168fd1 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -1,12 +1,12 @@
 import os

 import re

 import sys

-import traceback

 from collections import namedtuple

 

 import gradio as gr

 

 from modules import shared, paths, script_callbacks, extensions, script_loading, scripts_postprocessing

+from modules.errors import print_error

 

 AlwaysVisible = object()

 

@@ -264,8 +264,7 @@ def load_scripts():
             register_scripts_from_module(script_module)

 

         except Exception:

-            print(f"Error loading script: {scriptfile.filename}", file=sys.stderr)

-            print(traceback.format_exc(), file=sys.stderr)

+            print_error(f"Error loading script: {scriptfile.filename}", exc_info=True)

 

         finally:

             sys.path = syspath

@@ -280,11 +279,9 @@ def load_scripts():
 

 def wrap_call(func, filename, funcname, *args, default=None, **kwargs):

     try:

-        res = func(*args, **kwargs)

-        return res

+        return func(*args, **kwargs)

     except Exception:

-        print(f"Error calling: {filename}/{funcname}", file=sys.stderr)

-        print(traceback.format_exc(), file=sys.stderr)

+        print_error(f"Error calling: {filename}/{funcname}", exc_info=True)

 

     return default

 

@@ -450,8 +447,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.process(p, *script_args)

             except Exception:

-                print(f"Error running process: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running process: {script.filename}", exc_info=True)

 

     def before_process_batch(self, p, **kwargs):

         for script in self.alwayson_scripts:

@@ -459,8 +455,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.before_process_batch(p, *script_args, **kwargs)

             except Exception:

-                print(f"Error running before_process_batch: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running before_process_batch: {script.filename}", exc_info=True)

 

     def process_batch(self, p, **kwargs):

         for script in self.alwayson_scripts:

@@ -468,8 +463,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.process_batch(p, *script_args, **kwargs)

             except Exception:

-                print(f"Error running process_batch: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running process_batch: {script.filename}", exc_info=True)

 

     def postprocess(self, p, processed):

         for script in self.alwayson_scripts:

@@ -477,8 +471,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess(p, processed, *script_args)

             except Exception:

-                print(f"Error running postprocess: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running postprocess: {script.filename}", exc_info=True)

 

     def postprocess_batch(self, p, images, **kwargs):

         for script in self.alwayson_scripts:

@@ -486,8 +479,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess_batch(p, *script_args, images=images, **kwargs)

             except Exception:

-                print(f"Error running postprocess_batch: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running postprocess_batch: {script.filename}", exc_info=True)

 

     def postprocess_image(self, p, pp: PostprocessImageArgs):

         for script in self.alwayson_scripts:

@@ -495,24 +487,21 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess_image(p, pp, *script_args)

             except Exception:

-                print(f"Error running postprocess_batch: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running postprocess_image: {script.filename}", exc_info=True)

 

     def before_component(self, component, **kwargs):

         for script in self.scripts:

             try:

                 script.before_component(component, **kwargs)

             except Exception:

-                print(f"Error running before_component: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running before_component: {script.filename}", exc_info=True)

 

     def after_component(self, component, **kwargs):

         for script in self.scripts:

             try:

                 script.after_component(component, **kwargs)

             except Exception:

-                print(f"Error running after_component: {script.filename}", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error(f"Error running after_component: {script.filename}", exc_info=True)

 

     def reload_sources(self, cache):

         for si, script in list(enumerate(self.scripts)):