From e566fed3a15e725cc494997ece29f7b1e51ffdd2 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 3 May 2023 08:00:26 -0400 Subject: [PATCH] fonts and upscale fix --- .../multidiffusion-upscaler-for-automatic1111 | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- javascript/notification.js | 3 ++- modules/lora | 2 +- modules/postprocessing.py | 2 +- modules/scripts.py | 3 +++ modules/shared.py | 10 +++++----- modules/styles.py | 10 ++++++---- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/extensions-builtin/multidiffusion-upscaler-for-automatic1111 b/extensions-builtin/multidiffusion-upscaler-for-automatic1111 index 860f8a405..8d8be4c33 160000 --- a/extensions-builtin/multidiffusion-upscaler-for-automatic1111 +++ b/extensions-builtin/multidiffusion-upscaler-for-automatic1111 @@ -1 +1 @@ -Subproject commit 860f8a405193bcd992e21d82e43fa18137bc4923 +Subproject commit 8d8be4c3390b7356d06645b1f8eb486a09663b71 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index a482867ee..8fd1fcdc5 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit a482867ee5e82b08b221c53662ff0c70c2f18d09 +Subproject commit 8fd1fcdc536792a957fc4734636765550edbbfcc diff --git a/javascript/notification.js b/javascript/notification.js index 9f7c2e439..712d64258 100644 --- a/javascript/notification.js +++ b/javascript/notification.js @@ -16,7 +16,8 @@ onUiUpdate(function(){ if (headImg.search(regExpTempImage) != -1) return; lastHeadImg = headImg; // play notification sound if available - gradioApp().querySelector('#audio_notification audio')?.play(); + const audioNotification = gradioApp().querySelector('#audio_notification audio'); + if (audioNotification) audioNotification.play(); if (document.hasFocus()) return; // Multiple copies of the images are in the DOM when one is selected. Dedup with a Set to get the real number generated. const imgs = new Set(Array.from(galleryPreviews).map(img => img.src)); diff --git a/modules/lora b/modules/lora index bc803e01c..b9085fc80 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit bc803e01c7028471efc8db5bc9aa183fde06080c +Subproject commit b9085fc80a618dfec1e92aeda445e6867813635a diff --git a/modules/postprocessing.py b/modules/postprocessing.py index 6b6fe3b07..4e0ee9489 100644 --- a/modules/postprocessing.py +++ b/modules/postprocessing.py @@ -84,7 +84,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp return outputs, ui_common.plaintext_to_html(infotext), '' -def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, gfpgan_visibility, codeformer_visibility, codeformer_weight, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, _upscale_first: bool, save_output: bool = True): +def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, gfpgan_visibility, codeformer_visibility, codeformer_weight, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, upscale_first: bool, save_output: bool = True): #pylint: disable=unused-argument """old handler for API""" args = scripts.scripts_postproc.create_args_for_run({ diff --git a/modules/scripts.py b/modules/scripts.py index fa8a3cef8..47da0309b 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -4,6 +4,7 @@ import sys from collections import namedtuple import gradio as gr from modules import paths, script_callbacks, extensions, script_loading, scripts_postprocessing, errors +from installer import log AlwaysVisible = object() @@ -189,6 +190,7 @@ def list_scripts(scriptdirname, extension): else: priority = priority + script.priority priority_list.append(ScriptFile(script.basedir, script.filename, script.path, priority)) + # log.debug(f'Adding script: {script.basedir} {script.filename} {script.path} {priority}') priority_sort = sorted(priority_list, key=lambda item: item.priority + item.path.lower(), reverse=False) return priority_sort @@ -217,6 +219,7 @@ def load_scripts(): for _key, script_class in module.__dict__.items(): if type(script_class) != type: continue + log.debug(f'Registering script: {scriptfile.path}') if issubclass(script_class, Script): scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module)) elif issubclass(script_class, scripts_postprocessing.ScriptPostprocessing): diff --git a/modules/shared.py b/modules/shared.py index 499b11b83..3c74d0b99 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -3,9 +3,9 @@ import sys import time import json import datetime +import urllib.request import gradio as gr import tqdm -import urllib.request from modules import errors, ui_components, shared_items, cmd_args from modules.paths_internal import models_path, script_path, data_path, sd_configs_path, sd_default_config, sd_model_file, default_sd_model_file, extensions_dir, extensions_builtin_dir # pylint: disable=W0611 import modules.interrogate @@ -625,13 +625,13 @@ def reload_gradio_theme(theme_name=None): if not theme_name: theme_name = opts.gradio_theme default_font_params = {} - ret_code = 0 + res = 0 try: req = urllib.request.Request("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono", method="HEAD") - ret_code = urllib.request.urlopen(req, timeout=3.0).get_code() + res = urllib.request.urlopen(req, timeout=3.0).status except: - ret_code = 0 - if (ret_code != 200): + res = 0 + if res != 200: log.info('No internet access detected, using default fonts') default_font_params = { 'font':['Helvetica', 'ui-sans-serif', 'system-ui', 'sans-serif'], diff --git a/modules/styles.py b/modules/styles.py index fb151da96..22d1a7f92 100644 --- a/modules/styles.py +++ b/modules/styles.py @@ -52,10 +52,12 @@ class StyleDatabase: with open(self.path, "r", encoding="utf-8-sig", newline='') as file: reader = csv.DictReader(file) for row in reader: - # Support loading old CSV format with "name, text"-columns - prompt = row["prompt"] if "prompt" in row else row["text"] - negative_prompt = row.get("negative_prompt", "") - self.styles[row["name"]] = PromptStyle(row["name"], prompt, negative_prompt) + try: + prompt = row["prompt"] if "prompt" in row else row["text"] + negative_prompt = row.get("negative_prompt", "") + self.styles[row["name"]] = PromptStyle(row["name"], prompt, negative_prompt) + except: + pass def get_style_prompts(self, styles): return [self.styles.get(x, self.no_style).prompt for x in styles]