Merge branch 'release_candidate'

5 files changed, 26 insertions, 28 deletions

diff --git a/modules/localization.py b/modules/localization.py
index f6a6f2fb..ee9c65e7 100644
--- a/modules/localization.py
+++ b/modules/localization.py
@@ -23,7 +23,7 @@ def list_localizations(dirname):
         localizations[fn] = file.path

 

 

-def localization_js(current_localization_name):

+def localization_js(current_localization_name: str) -> str:

     fn = localizations.get(current_localization_name, None)

     data = {}

     if fn is not None:

@@ -34,4 +34,4 @@ def localization_js(current_localization_name):
             print(f"Error loading localization from {fn}:", file=sys.stderr)

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

 

-    return f"var localization = {json.dumps(data)}\n"

+    return f"window.localization = {json.dumps(data)}"

diff --git a/modules/modelloader.py b/modules/modelloader.py
index cb85ac4f..a70aa0e3 100644
--- a/modules/modelloader.py
+++ b/modules/modelloader.py
@@ -117,20 +117,6 @@ def move_files(src_path: str, dest_path: str, ext_filter: str = None):
         pass
 
 
-builtin_upscaler_classes = []
-forbidden_upscaler_classes = set()
-
-
-def list_builtin_upscalers():
-    builtin_upscaler_classes.clear()
-    builtin_upscaler_classes.extend(Upscaler.__subclasses__())
-
-def forbid_loaded_nonbuiltin_upscalers():
-    for cls in Upscaler.__subclasses__():
-        if cls not in builtin_upscaler_classes:
-            forbidden_upscaler_classes.add(cls)
-
-
 def load_upscalers():
     # We can only do this 'magic' method to dynamically load upscalers if they are referenced,
     # so we'll try to import any _model.py files before looking in __subclasses__
@@ -146,10 +132,17 @@ def load_upscalers():
 
     datas = []
     commandline_options = vars(shared.cmd_opts)
-    for cls in Upscaler.__subclasses__():
-        if cls in forbidden_upscaler_classes:
-            continue
 
+    # some of upscaler classes will not go away after reloading their modules, and we'll end
+    # up with two copies of those classes. The newest copy will always be the last in the list,
+    # so we go from end to beginning and ignore duplicates
+    used_classes = {}
+    for cls in reversed(Upscaler.__subclasses__()):
+        classname = str(cls)
+        if classname not in used_classes:
+            used_classes[classname] = cls
+
+    for cls in reversed(used_classes.values()):
         name = cls.__name__
         cmd_name = f"{name.lower().replace('upscaler', '')}_models_path"
         scaler = cls(commandline_options.get(cmd_name, None))
diff --git a/modules/safe.py b/modules/safe.py
index e6c2f2c0..e1a67f73 100644
--- a/modules/safe.py
+++ b/modules/safe.py
@@ -40,7 +40,7 @@ class RestrictedUnpickler(pickle.Unpickler):
             return getattr(collections, name)

         if module == 'torch._utils' and name in ['_rebuild_tensor_v2', '_rebuild_parameter', '_rebuild_device_tensor_from_numpy']:

             return getattr(torch._utils, name)

-        if module == 'torch' and name in ['FloatStorage', 'HalfStorage', 'IntStorage', 'LongStorage', 'DoubleStorage', 'ByteStorage', 'float32']:

+        if module == 'torch' and name in ['FloatStorage', 'HalfStorage', 'IntStorage', 'LongStorage', 'DoubleStorage', 'ByteStorage', 'float32', 'BFloat16Storage']:

             return getattr(torch, name)

         if module == 'torch.nn.modules.container' and name in ['ParameterDict']:

             return getattr(torch.nn.modules.container, name)

diff --git a/modules/shared.py b/modules/shared.py
index 4631965b..b3508883 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -667,14 +667,19 @@ def reload_gradio_theme(theme_name=None):
     if not theme_name:

         theme_name = opts.gradio_theme

 

+    default_theme_args = dict(

+        font=["Source Sans Pro", 'ui-sans-serif', 'system-ui', 'sans-serif'],

+        font_mono=['IBM Plex Mono', 'ui-monospace', 'Consolas', 'monospace'],

+    )

+

     if theme_name == "Default":

-        gradio_theme = gr.themes.Default()

+        gradio_theme = gr.themes.Default(**default_theme_args)

     else:

         try:

             gradio_theme = gr.themes.ThemeClass.from_hub(theme_name)

         except Exception as e:

             errors.display(e, "changing gradio theme")

-            gradio_theme = gr.themes.Default()

+            gradio_theme = gr.themes.Default(**default_theme_args)

 

 

 

diff --git a/modules/ui.py b/modules/ui.py
index d02f6e82..f07bcc41 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1863,12 +1863,11 @@ def webpath(fn):
 

 

 def javascript_html():

-    script_js = os.path.join(script_path, "script.js")

-    head = f'<script type="text/javascript" src="{webpath(script_js)}"></script>\n'

+    # Ensure localization is in `window` before scripts

+    head = f'<script type="text/javascript">{localization.localization_js(shared.opts.localization)}</script>\n'

 

-    inline = f"{localization.localization_js(shared.opts.localization)};"

-    if cmd_opts.theme is not None:

-        inline += f"set_theme('{cmd_opts.theme}');"

+    script_js = os.path.join(script_path, "script.js")

+    head += f'<script type="text/javascript" src="{webpath(script_js)}"></script>\n'

 

     for script in modules.scripts.list_scripts("javascript", ".js"):

         head += f'<script type="text/javascript" src="{webpath(script.path)}"></script>\n'

@@ -1876,7 +1875,8 @@ def javascript_html():
     for script in modules.scripts.list_scripts("javascript", ".mjs"):

         head += f'<script type="module" src="{webpath(script.path)}"></script>\n'

 

-    head += f'<script type="text/javascript">{inline}</script>\n'

+    if cmd_opts.theme:

+        head += f'<script type="text/javascript">set_theme(\"{cmd_opts.theme}\");</script>\n'

 

     return head