Merge branch 'dev' into 10141-gradio-user-exif

1 files changed, 5 insertions, 10 deletions

diff --git a/modules/codeformer_model.py b/modules/codeformer_model.py
index ececdbae..d974e4b8 100644
--- a/modules/codeformer_model.py
+++ b/modules/codeformer_model.py
@@ -1,13 +1,11 @@
 import os

-import sys

-import traceback

 

 import cv2

 import torch

 

 import modules.face_restoration

 import modules.shared

-from modules import shared, devices, modelloader

+from modules import shared, devices, modelloader, errors

 from modules.paths import models_path

 

 # codeformer people made a choice to include modified basicsr library to their project which makes

@@ -22,9 +20,7 @@ codeformer = None
 

 

 def setup_model(dirname):

-    global model_path

-    if not os.path.exists(model_path):

-        os.makedirs(model_path)

+    os.makedirs(model_path, exist_ok=True)

 

     path = modules.paths.paths.get("CodeFormer", None)

     if path is None:

@@ -105,8 +101,8 @@ def setup_model(dirname):
                             restored_face = tensor2img(output, rgb2bgr=True, min_max=(-1, 1))

                         del output

                         torch.cuda.empty_cache()

-                    except Exception as error:

-                        print(f'\tFailed inference for CodeFormer: {error}', file=sys.stderr)

+                    except Exception:

+                        errors.report('Failed inference for CodeFormer', exc_info=True)

                         restored_face = tensor2img(cropped_face_t, rgb2bgr=True, min_max=(-1, 1))

 

                     restored_face = restored_face.astype('uint8')

@@ -135,7 +131,6 @@ def setup_model(dirname):
         shared.face_restorers.append(codeformer)

 

     except Exception:

-        print("Error setting up CodeFormer:", file=sys.stderr)

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

+        errors.report("Error setting up CodeFormer", exc_info=True)

 

    # sys.path = stored_sys_path