Pin the sdkit version during fresh installs

Merge pull request #904 from JeLuF/patch-16
🔥 Installer: Fix ESRGAN anime model's path
2025-08-13 17:57:20 +02:00 · 2023-02-21 10:40:17 +05:30 · 2023-02-20 18:28:31 +05:30 · 2023-02-18 14:05:55 +01:00 · 2023-02-18 14:21:24 +05:30 · 2023-02-16 19:22:04 +05:30
7 changed files with 16 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -11,8 +11,8 @@ Does not require technical knowledge, does not require pre-installed software. 1
 Click the download button for your operating system:

 <p float="left">
-  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
-  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.15/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.15/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
 </p>

 ## On Windows:
--- a/scripts/bootstrap.bat
+++ b/scripts/bootstrap.bat
@ -1,4 +1,5 @@
@echo off
+setlocal enabledelayedexpansion

@rem This script will install git and conda (if not found on the PATH variable)
@rem  using micromamba (an 8mb static-linked single-file binary, conda replacement).
@ -28,10 +29,10 @@ if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" (
 )

 call git --version >.tmp1 2>.tmp2
-if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
+if "!ERRORLEVEL!" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git

 call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
-if "%ERRORLEVEL%" EQU "0" set umamba_exists=T
+if "!ERRORLEVEL!" EQU "0" set umamba_exists=T

@rem (if necessary) install git and conda into a contained environment
 if "%PACKAGES_TO_INSTALL%" NEQ "" (
@ -42,7 +43,7 @@ if "%PACKAGES_TO_INSTALL%" NEQ "" (
        mkdir "%MAMBA_ROOT_PREFIX%"
        call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe"

-        if "%ERRORLEVEL%" NEQ "0" (
+        if "!ERRORLEVEL!" NEQ "0" (
            echo "There was a problem downloading micromamba. Cannot continue."
            pause
            exit /b
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@ -21,6 +21,7 @@ OS_ARCH=$(uname -m)
 case "${OS_ARCH}" in
    x86_64*)    OS_ARCH="64";;
    arm64*)     OS_ARCH="arm64";;
+    aarch64*)     OS_ARCH="arm64";;
    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
 esac

--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@ -92,7 +92,7 @@ if "%ERRORLEVEL%" EQU "0" (
        set PYTHONNOUSERSITE=1
        set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages

-        call python -m pip install --upgrade sdkit -q || (
+        call python -m pip install --upgrade sdkit==1.0.35 -q || (
            echo "Error updating sdkit"
        )
    )
@ -103,7 +103,7 @@ if "%ERRORLEVEL%" EQU "0" (
    set PYTHONNOUSERSITE=1
    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages

-    call python -m pip install sdkit || (
+    call python -m pip install sdkit==1.0.35 || (
        echo "Error installing sdkit. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
        pause
        exit /b
@ -113,7 +113,7 @@ if "%ERRORLEVEL%" EQU "0" (
 call python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"

@rem upgrade stable-diffusion-sdkit
-call python -m pip install --upgrade stable-diffusion-sdkit -q || (
+call python -m pip install --upgrade stable-diffusion-sdkit==2.1.1 -q || (
    echo "Error updating stable-diffusion-sdkit"
 )
 call python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
@ -279,7 +279,7 @@ call WHERE uvicorn > .tmp
    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth

    @if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
-        for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
+        for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
            echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo.
            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
            pause
--- a/scripts/on_sd_start.sh
+++ b/scripts/on_sd_start.sh
@ -80,7 +80,7 @@ if python ../scripts/check_modules.py sdkit sdkit.models ldm transformers numpy
        export PYTHONNOUSERSITE=1
        export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"

-        python -m pip install --upgrade sdkit -q
+        python -m pip install --upgrade sdkit==1.0.35 -q
    fi
 else
    echo "Installing sdkit: https://pypi.org/project/sdkit/"
@ -88,7 +88,7 @@ else
    export PYTHONNOUSERSITE=1
    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"

-    if python -m pip install sdkit ; then
+    if python -m pip install sdkit==1.0.35 ; then
        echo "Installed."
    else
        fail "sdkit install failed"
@ -98,7 +98,7 @@ fi
 python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"

 # upgrade stable-diffusion-sdkit
-python -m pip install --upgrade stable-diffusion-sdkit -q
+python -m pip install --upgrade stable-diffusion-sdkit==2.1.1 -q
 python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"

 # install rich
--- a/ui/easydiffusion/device_manager.py
+++ b/ui/easydiffusion/device_manager.py
@ -125,7 +125,7 @@ def needs_to_force_full_precision(context):
        return True

    device_name = context.device_name.lower()
-    return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name))
+    return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t500' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name)) or ('tesla k40m' in device_name)

 def get_max_vram_usage_level(device):
    if device != 'cpu':
--- a/ui/index.html
+++ b/ui/index.html
@ -97,7 +97,7 @@
                </div>

                <div id="editor-inputs-tags-container" class="row">
-                    <label>Image Modifiers <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip right">click an Image Modifier to remove it, right-click to temporarily disable it, use Ctrl+Mouse Wheel to adjust its weight</span></i>:</label>
+                    <label>Image Modifiers <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip right">click an Image Modifier to remove it, right-click to temporarily disable it, use Ctrl+Mouse Wheel to adjust its weight</span></i></label>
                    <div id="editor-inputs-tags-list"></div>
                </div>
Author	SHA1	Message	Date
cmdr2	91c4b5865c	Pin the sdkit version during fresh installs	2023-02-21 10:40:17 +05:30
cmdr2	14b0dabfdf	Merge pull request #904 from JeLuF/patch-16 🔥 Installer: Fix ESRGAN anime model's path	2023-02-20 18:28:31 +05:30
JeLuF	6a2c2152e2	🔥 Installer: Fix ESRGAN anime model's path The size check fails on every installation. The path name of the check wasn't changed when the model was moved to the models directory.	2023-02-18 14:05:55 +01:00
cmdr2	51b6a2fd2a	Pin the version of stable-diffusion-sdkit used, to avoid untested releases from getting used	2023-02-18 14:21:24 +05:30
cmdr2	f36b7ce016	Merge branch 'main' of github.com:cmdr2/stable-diffusion-ui	2023-02-16 19:22:04 +05:30
cmdr2	9fb5cac5d4	Bypass incorrect ERRORLEVEL values in nested code blocks by using something called delayedexpansion. Ugh	2023-02-16 19:21:51 +05:30
JeLuF	7ce223771d	Add k40m to list of FP32 cards (#863 ) https://discord.com/channels/1014774730907209781/1073819636329631754	2023-02-12 14:37:53 +05:30
cmdr2	ab7ba35639	Revert "sdkit message" This reverts commit `6ab3133b33`.	2023-02-10 22:54:45 +05:30
cmdr2	fe7e398eb4	sdkit message	2023-02-10 19:01:27 +05:30
cmdr2	071a4d6f37	Use a fixed sdkit version, to avoid bumping to the latest sdkit version in the main branch	2023-02-10 18:05:17 +05:30
cmdr2	a589d98cd4	Merge pull request #850 from JeLuF/patch-13 Link to LINUX.zip	2023-02-10 10:51:12 +05:30
JeLuF	14fb115fc8	Link to LINUX.zip	2023-02-09 20:25:27 +01:00
cmdr2	c35a731a60	Update README.md	2023-02-09 19:56:18 +05:30
cmdr2	69c8fc3236	Merge pull request #811 from patriceac/patch-23 Removing the ':' after the tooltip icon	2023-02-09 19:31:10 +05:30
cmdr2	840ff5c363	Merge branch 'main' into patch-23	2023-02-09 19:30:55 +05:30
cmdr2	8386cd5cf7	Merge pull request #817 from fernandoisnaldo/patch-1 Fix aarch64 (arm64) verification	2023-02-09 19:24:13 +05:30
cmdr2	63bf84fdd5	Merge pull request #845 from cmdr2/beta Changelog	2023-02-09 19:01:53 +05:30
cmdr2	50fd64150e	Merge pull request #844 from JeLuF/patch-12 Add T500 to list of full precision cards	2023-02-09 09:56:51 +05:30
JeLuF	63c5de2612	Add T500 to list of full precision cards	2023-02-09 01:46:32 +01:00
cmdr2	026a4b6c76	Merge pull request #842 from cmdr2/beta Don't force a user to 'low' VRAM usage, if their GPU has 4 GB or less VRAM	2023-02-08 19:46:57 +05:30
Fernando Isnaldo Silva de Faria	b7047dafb2	Fix aarch64 (arm64) verification	2023-02-03 16:36:49 -03:00
patriceac	6bff97d6fa	Removing the ':' after the tooltip icon This colon after the tooltip icon just feels out of place.	2023-01-30 23:09:36 -08:00