Merge branch 'dev' into improve-frontend-responsiveness

1 files changed, 17 insertions, 7 deletions

diff --git a/modules/realesrgan_model.py b/modules/realesrgan_model.py
index aad4a629..c24d8dbb 100644
--- a/modules/realesrgan_model.py
+++ b/modules/realesrgan_model.py
@@ -9,7 +9,7 @@ from realesrgan import RealESRGANer
 

 from modules.upscaler import Upscaler, UpscalerData

 from modules.shared import cmd_opts, opts

-

+from modules import modelloader

 

 class UpscalerRealESRGAN(Upscaler):

     def __init__(self, path):

@@ -17,13 +17,21 @@ class UpscalerRealESRGAN(Upscaler):
         self.user_path = path

         super().__init__()

         try:

-            from basicsr.archs.rrdbnet_arch import RRDBNet

-            from realesrgan import RealESRGANer

-            from realesrgan.archs.srvgg_arch import SRVGGNetCompact

+            from basicsr.archs.rrdbnet_arch import RRDBNet  # noqa: F401

+            from realesrgan import RealESRGANer  # noqa: F401

+            from realesrgan.archs.srvgg_arch import SRVGGNetCompact  # noqa: F401

             self.enable = True

             self.scalers = []

             scalers = self.load_models(path)

+

+            local_model_paths = self.find_models(ext_filter=[".pth"])

             for scaler in scalers:

+                if scaler.local_data_path.startswith("http"):

+                    filename = modelloader.friendly_name(scaler.local_data_path)

+                    local_model_candidates = [local_model for local_model in local_model_paths if local_model.endswith(f"{filename}.pth")]

+                    if local_model_candidates:

+                        scaler.local_data_path = local_model_candidates[0]

+

                 if scaler.name in opts.realesrgan_enabled_models:

                     self.scalers.append(scaler)

 

@@ -39,7 +47,7 @@ class UpscalerRealESRGAN(Upscaler):
 

         info = self.load_model(path)

         if not os.path.exists(info.local_data_path):

-            print("Unable to load RealESRGAN model: %s" % info.name)

+            print(f"Unable to load RealESRGAN model: {info.name}")

             return img

 

         upsampler = RealESRGANer(

@@ -64,7 +72,9 @@ class UpscalerRealESRGAN(Upscaler):
                 print(f"Unable to find model info: {path}")

                 return None

 

-            info.local_data_path = load_file_from_url(url=info.data_path, model_dir=self.model_path, progress=True)

+            if info.local_data_path.startswith("http"):

+                info.local_data_path = load_file_from_url(url=info.data_path, model_dir=self.model_path, progress=True)

+

             return info

         except Exception as e:

             print(f"Error making Real-ESRGAN models list: {e}", file=sys.stderr)

@@ -124,6 +134,6 @@ def get_realesrgan_models(scaler):
             ),

         ]

         return models

-    except Exception as e:

+    except Exception:

         print("Error making Real-ESRGAN models list:", file=sys.stderr)

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