diff --git a/modules/launch_utils.py b/modules/launch_utils.py index dd2ff481..2191555b 100644 --- a/modules/launch_utils.py +++ b/modules/launch_utils.py @@ -380,14 +380,14 @@ def prepare_environment(): clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip") openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip") - assets_repo = os.environ.get('ASSETS_REPO', "https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git") + # assets_repo = os.environ.get('ASSETS_REPO', "https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git") # stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git") # stable_diffusion_xl_repo = os.environ.get('STABLE_DIFFUSION_XL_REPO', "https://github.com/Stability-AI/generative-models.git") # k_diffusion_repo = os.environ.get('K_DIFFUSION_REPO', 'https://github.com/crowsonkb/k-diffusion.git') # huggingface_guess_repo = os.environ.get('HUGGINGFACE_GUESS_REPO', 'https://github.com/lllyasviel/huggingface_guess.git') blip_repo = os.environ.get('BLIP_REPO', 'https://github.com/salesforce/BLIP.git') - assets_commit_hash = os.environ.get('ASSETS_COMMIT_HASH', "6f7db241d2f8ba7457bac5ca9753331f0c266917") + # assets_commit_hash = os.environ.get('ASSETS_COMMIT_HASH', "6f7db241d2f8ba7457bac5ca9753331f0c266917") # stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf") # stable_diffusion_xl_commit_hash = os.environ.get('STABLE_DIFFUSION_XL_COMMIT_HASH', "45c443b316737a4ab6e40413d7794a7f5657c19f") # k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "ab527a9a6d347f364e3d185ba6d714e22d80cb3c") @@ -447,7 +447,7 @@ def prepare_environment(): os.makedirs(os.path.join(script_path, dir_repos), exist_ok=True) - git_clone(assets_repo, repo_dir('stable-diffusion-webui-assets'), "assets", assets_commit_hash) + # git_clone(assets_repo, repo_dir('stable-diffusion-webui-assets'), "assets", assets_commit_hash) # git_clone(stable_diffusion_repo, repo_dir('stable-diffusion-stability-ai'), "Stable Diffusion", stable_diffusion_commit_hash) # git_clone(stable_diffusion_xl_repo, repo_dir('generative-models'), "Stable Diffusion XL", stable_diffusion_xl_commit_hash) # git_clone(k_diffusion_repo, repo_dir('k-diffusion'), "K-diffusion", k_diffusion_commit_hash) diff --git a/modules/ui.py b/modules/ui.py index 8657cab2..bc22896c 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -13,7 +13,7 @@ from PIL import Image, PngImagePlugin # noqa: F401 from modules.call_queue import wrap_gradio_gpu_call, wrap_queued_call, wrap_gradio_call, wrap_gradio_call_no_job # noqa: F401 from modules import gradio_extensions, sd_schedulers # noqa: F401 -from modules import sd_hijack, sd_models, script_callbacks, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, scripts, sd_samplers, processing, ui_extra_networks, ui_toprow, launch_utils +from modules import sd_hijack, sd_models, script_callbacks, paths_internal, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, scripts, sd_samplers, processing, ui_extra_networks, ui_toprow, launch_utils from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML, InputAccordion, ResizeHandleRow from modules.paths import script_path from modules.ui_common import create_refresh_button @@ -1082,4 +1082,4 @@ def setup_ui_api(app): app.add_api_route("/internal/sysinfo-download", lambda: download_sysinfo(attachment=True), methods=["GET"]) import fastapi.staticfiles - app.mount("/webui-assets", fastapi.staticfiles.StaticFiles(directory=launch_utils.repo_dir('stable-diffusion-webui-assets')), name="webui-assets") + app.mount("/webui-assets", fastapi.staticfiles.StaticFiles(directory=os.path.join(paths_internal.modules_path, "web")), name="webui-assets") diff --git a/modules/web/css/sourcesanspro.css b/modules/web/css/sourcesanspro.css new file mode 100644 index 00000000..2a796d9f --- /dev/null +++ b/modules/web/css/sourcesanspro.css @@ -0,0 +1,141 @@ +/* vietnamese */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/01.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/02.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} + + +/* greek-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/03.woff2) format('woff2'); + unicode-range: U+1F00-1FFF; +} + +/* latin-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/04.woff2) format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +/* greek */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/05.woff2) format('woff2'); + unicode-range: U+0370-03FF; +} + +/* latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/06.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* cyrillic */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(../fonts/sourcesanspro/07.woff2) format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + + +/* cyrillic */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/08.woff2) format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + +/* greek */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/09.woff2) format('woff2'); + unicode-range: U+0370-03FF; +} + +/* latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/10.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* vietnamese */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/11.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/12.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} + +/* latin-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/13.woff2) format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +/* greek-ext */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(../fonts/sourcesanspro/14.woff2) format('woff2'); + unicode-range: U+1F00-1FFF; +} diff --git a/modules/web/fonts/sourcesanspro/01.woff2 b/modules/web/fonts/sourcesanspro/01.woff2 new file mode 100644 index 00000000..f9915277 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/01.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/02.woff2 b/modules/web/fonts/sourcesanspro/02.woff2 new file mode 100644 index 00000000..5c9f701b Binary files /dev/null and b/modules/web/fonts/sourcesanspro/02.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/03.woff2 b/modules/web/fonts/sourcesanspro/03.woff2 new file mode 100644 index 00000000..69d26d80 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/03.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/04.woff2 b/modules/web/fonts/sourcesanspro/04.woff2 new file mode 100644 index 00000000..a61ec915 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/04.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/05.woff2 b/modules/web/fonts/sourcesanspro/05.woff2 new file mode 100644 index 00000000..33145f94 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/05.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/06.woff2 b/modules/web/fonts/sourcesanspro/06.woff2 new file mode 100644 index 00000000..b1986c23 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/06.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/07.woff2 b/modules/web/fonts/sourcesanspro/07.woff2 new file mode 100644 index 00000000..2462c511 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/07.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/08.woff2 b/modules/web/fonts/sourcesanspro/08.woff2 new file mode 100644 index 00000000..ccf6b8e6 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/08.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/09.woff2 b/modules/web/fonts/sourcesanspro/09.woff2 new file mode 100644 index 00000000..8b03f91b Binary files /dev/null and b/modules/web/fonts/sourcesanspro/09.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/10.woff2 b/modules/web/fonts/sourcesanspro/10.woff2 new file mode 100644 index 00000000..3ca3e26c Binary files /dev/null and b/modules/web/fonts/sourcesanspro/10.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/11.woff2 b/modules/web/fonts/sourcesanspro/11.woff2 new file mode 100644 index 00000000..daa43962 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/11.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/12.woff2 b/modules/web/fonts/sourcesanspro/12.woff2 new file mode 100644 index 00000000..5cf09980 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/12.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/13.woff2 b/modules/web/fonts/sourcesanspro/13.woff2 new file mode 100644 index 00000000..7916a329 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/13.woff2 differ diff --git a/modules/web/fonts/sourcesanspro/14.woff2 b/modules/web/fonts/sourcesanspro/14.woff2 new file mode 100644 index 00000000..de50d2b5 Binary files /dev/null and b/modules/web/fonts/sourcesanspro/14.woff2 differ