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

1 files changed, 3 insertions, 9 deletions

diff --git a/modules/gfpgan_model.py b/modules/gfpgan_model.py
index 0131dea4..6ecd295c 100644
--- a/modules/gfpgan_model.py
+++ b/modules/gfpgan_model.py
@@ -1,12 +1,10 @@
 import os

-import sys

-import traceback

 

 import facexlib

 import gfpgan

 

 import modules.face_restoration

-from modules import paths, shared, devices, modelloader

+from modules import paths, shared, devices, modelloader, errors

 

 model_dir = "GFPGAN"

 user_path = None

@@ -72,11 +70,8 @@ gfpgan_constructor = None
 

 

 def setup_model(dirname):

-    global model_path

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

-        os.makedirs(model_path)

-

     try:

+        os.makedirs(model_path, exist_ok=True)

         from gfpgan import GFPGANer

         from facexlib import detection, parsing  # noqa: F401

         global user_path

@@ -112,5 +107,4 @@ def setup_model(dirname):
 

         shared.face_restorers.append(FaceRestorerGFPGAN())

     except Exception:

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

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

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