diff --git a/TODO.md b/TODO.md index 556370885..a18ac0d0c 100644 --- a/TODO.md +++ b/TODO.md @@ -13,7 +13,6 @@ Stuff to be added... - Update `README.md` - Add Gradio theme maker -- Transformers version - Create new GitHub hooks/actions for CI/CD - Redo Extensions tab: - Stream-load models as option for slow storage diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py index ac3f3a8e5..3cbd91646 100644 --- a/extensions-builtin/Lora/lora.py +++ b/extensions-builtin/Lora/lora.py @@ -260,9 +260,6 @@ def lora_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn.Mu If not, restores orginal weights from backup and alters weights according to loras. """ - if len(loaded_loras) == 0: - return - lora_layer_name = getattr(self, 'lora_layer_name', None) if lora_layer_name is None: return diff --git a/extensions-builtin/a1111-sd-webui-lycoris b/extensions-builtin/a1111-sd-webui-lycoris index ce584a0ff..4d74a7b88 160000 --- a/extensions-builtin/a1111-sd-webui-lycoris +++ b/extensions-builtin/a1111-sd-webui-lycoris @@ -1 +1 @@ -Subproject commit ce584a0ff863de98233ee135dcc17f2fb44703c3 +Subproject commit 4d74a7b889f91499dd85b9ccd7de58350b8da195 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index cfc37659a..070d08f75 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit cfc37659aca364b37fc90943e039ceb2e7b6d8ba +Subproject commit 070d08f7524ae6d16973ee57b1e0bc6369d5388f diff --git a/javascript/black-orange.css b/javascript/black-orange.css index a055e2e51..703425ece 100644 --- a/javascript/black-orange.css +++ b/javascript/black-orange.css @@ -54,7 +54,7 @@ svg.feather.feather-image, .feather .feather-image { display: none } .py-6 { padding-bottom: 0; } .rounded-lg { border-radius: 0; } .tabs { background-color: black; } -.gradio-button.tool { border-radius: 0; height: 2em; } +.gradio-button.tool { border-radius: 0; height: 2.0em; } .block.token-counter span { background-color: #222 !important; box-shadow: 2px 2px 2px #111; border: none !important; border-radius: 0; font-size: 0.8rem; } .tab-nav { zoom: 130%; margin-bottom: 16px; border-bottom: 2px solid #CE6400 !important; padding-bottom: 2px; } .label-wrap { margin: 16px 0px 8px 0px; } @@ -80,7 +80,7 @@ svg.feather.feather-image, .feather .feather-image { display: none } #lightboxModal { background-color: rgba(20, 20, 20, 0.8) } #quicksettings .gr-button-tool { font-size: 1.6rem; box-shadow: none; margin-left: -20px; margin-top: -2px; height: 2.4em; } #quicksettings > div, #quicksettings > fieldset { min-width: 26em; max-width: 26em; line-height: 2em; } -#refresh_sd_model_checkpoint { height: 40px; margin-left: -14px; background: #333333; box-shadow: none; } +#refresh_sd_model_checkpoint { height: 48px; margin-left: -14px; background: #333333; box-shadow: none; } #refresh_txt2img_styles, #refresh_img2img_styles, #open_folder_txt2img, #open_folder_img2img, #open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_res_switch_btn, #img2img_res_switch_btn, #txt2img_seed_resize_from_w, #txt2img_seed_resize_from_h, #txt2img_tiling { display: none; } #save-animation { border-radius: 0 !important; margin-bottom: 16px; background-color: #111111; } #script_list { padding: 4px; margin-top: 20px; margin-bottom: 20px; } @@ -103,7 +103,8 @@ svg.feather.feather-image, .feather .feather-image { display: none } #txt2img_tools, #img2img_tools { margin-top: 54px; scale: 120%; margin-left: 26px; } #txtimg_hr_finalres { max-width: 200px; } #pnginfo_html2_info { margin-top: -18px; background-color: var(--input-background-fill); padding: var(--input-padding) } -#txt2img_extra_refresh, #txt2img_extra_close { height: 1.7em } +#txt2img_extra_refresh, #txt2img_extra_close { height: 1.7em; } +#extras_generate { margin-top: 8px; } /* custom elements overrides */ #steps-animation, #controlnet { border-width: 0; } diff --git a/modules/api/api.py b/modules/api/api.py index 2912e2cf2..fbe64a037 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -13,8 +13,8 @@ import piexif import piexif.helper import uvicorn import gradio as gr -from gradio.processing_utils import decode_base64_to_file -# from gradio_client.utils import decode_base64_to_file +# from gradio.processing_utils import decode_base64_to_file # gradio 3.23 +from gradio_client.utils import decode_base64_to_file # gradio 3.28 from modules import errors, shared, sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing from modules.api.models import * # pylint: disable=unused-wildcard-import, wildcard-import diff --git a/modules/cmd_args.py b/modules/cmd_args.py index e347c3532..80b11402d 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -31,6 +31,7 @@ group.add_argument("--cors-origins", type=str, help="Allowed CORS origins as com group.add_argument("--cors-regex", type=str, help="Allowed CORS origins as regular expression, default: %(default)s", default=None) group.add_argument("--tls-keyfile", type=str, help="Enable TLS and specify key file, default: %(default)s", default=None) group.add_argument("--tls-certfile", type=str, help="Enable TLS and specify cert file, default: %(default)s", default=None) +group.add_argument("--tls-selfsign", action="store_true", help="Enable TLS with self-signed certificates, default: %(default)s", default=None) group.add_argument("--server-name", type=str, help="Sets hostname of server, default: %(default)s", default=None) group.add_argument("--no-hashing", action='store_true', help="Disable hashing of checkpoints, default: %(default)s", default=False) group.add_argument("--no-download", action='store_true', help="Disable download of default model, default: %(default)s", default=False) diff --git a/requirements.txt b/requirements.txt index 3f7db3419..e87a63e85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,13 +51,13 @@ yapf scikit-image accelerate==0.18.0 opencv-python==4.7.0.72 -diffusers==0.15.0 +diffusers==0.16.1 einops==0.4.1 -gradio==3.23.0 +gradio==3.28.1 numexpr==2.8.4 pandas==1.5.3 protobuf==3.20.3 pytorch_lightning==1.9.4 -transformers==4.26.1 +transformers==4.28.1 timm==0.6.13 tomesd==0.1.2 diff --git a/webui.py b/webui.py index 8954cfbfe..81e196bac 100644 --- a/webui.py +++ b/webui.py @@ -215,6 +215,7 @@ def start_ui(): server_port=cmd_opts.port if cmd_opts.port != 7860 else None, ssl_keyfile=cmd_opts.tls_keyfile, ssl_certfile=cmd_opts.tls_certfile, + ssl_verify=False if cmd_opts.tls_selfsign else True, debug=False, auth=[tuple(cred.split(':')) for cred in gradio_auth_creds] if gradio_auth_creds else None, inbrowser=cmd_opts.autolaunch,