diff --git a/NSIS/sdui.nsi b/NSIS/sdui.nsi index aabe6775..5361512f 100644 --- a/NSIS/sdui.nsi +++ b/NSIS/sdui.nsi @@ -7,9 +7,9 @@ RequestExecutionLevel user !AddPluginDir /amd64-unicode "." ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Easy Diffusion" -!define PRODUCT_VERSION "2.5" +!define PRODUCT_VERSION "3.0" !define PRODUCT_PUBLISHER "cmdr2 and contributors" -!define PRODUCT_WEB_SITE "https://stable-diffusion-ui.github.io" +!define PRODUCT_WEB_SITE "https://easydiffusion.github.io" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Easy Diffusion\App Paths\installer.exe" ; MUI 1.67 compatible ------ @@ -215,24 +215,30 @@ Section "MainSection" SEC01 File "..\LICENSE" File "..\scripts\Start Stable Diffusion UI.cmd" File /r "${EXISTING_INSTALLATION_DIR}\installer_files" - File /r "${EXISTING_INSTALLATION_DIR}\profile" File /r "${EXISTING_INSTALLATION_DIR}\sd-ui-files" + SetOutPath "$INSTDIR\installer_files" File "cyborg_flower_girl.ico" + SetOutPath "$INSTDIR\scripts" File "${EXISTING_INSTALLATION_DIR}\scripts\install_status.txt" File "..\scripts\on_env_start.bat" File "C:\windows\system32\curl.exe" - CreateDirectory "$INSTDIR\models" + CreateDirectory "$INSTDIR\models\stable-diffusion" CreateDirectory "$INSTDIR\models\gfpgan" CreateDirectory "$INSTDIR\models\realesrgan" CreateDirectory "$INSTDIR\models\vae" + + CreateDirectory "$INSTDIR\profile\.cache\huggingface\hub" + SetOutPath "$INSTDIR\profile\.cache\huggingface\hub" + File /r /x pytorch_model.bin "${EXISTING_INSTALLATION_DIR}\profile\.cache\huggingface\hub\models--openai--clip-vit-large-patch14" + CreateDirectory "$SMPROGRAMS\Easy Diffusion" CreateShortCut "$SMPROGRAMS\Easy Diffusion\Easy Diffusion.lnk" "$INSTDIR\Start Stable Diffusion UI.cmd" "" "$INSTDIR\installer_files\cyborg_flower_girl.ico" - DetailPrint 'Downloading the Stable Diffusion 1.4 model...' - NScurl::http get "https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt" "$INSTDIR\models\stable-diffusion\sd-v1-4.ckpt" /CANCEL /INSIST /END + DetailPrint 'Downloading the Stable Diffusion 1.5 model...' + NScurl::http get "https://github.com/easydiffusion/sdkit-test-data/releases/download/assets/sd-v1-5.safetensors" "$INSTDIR\models\stable-diffusion\sd-v1-5.safetensors" /CANCEL /INSIST /END DetailPrint 'Downloading the GFPGAN model...' NScurl::http get "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth" "$INSTDIR\models\gfpgan\GFPGANv1.4.pth" /CANCEL /INSIST /END diff --git a/patch.patch b/patch.patch deleted file mode 100644 index a452181b..00000000 Binary files a/patch.patch and /dev/null differ diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 29d43761..719a3bf7 100644 --- a/scripts/check_modules.py +++ b/scripts/check_modules.py @@ -16,9 +16,9 @@ import traceback os_name = platform.system() modules_to_check = { - "torch": ("1.11.0", "1.13.1", "2.0.0"), - "torchvision": ("0.12.0", "0.14.1", "0.15.1"), - "sdkit": "2.0.3", + "torch": ("1.11.0", "1.13.1", "2.0.0", "2.0.1"), + "torchvision": ("0.12.0", "0.14.1", "0.15.1", "0.15.2"), + "sdkit": "2.0.4", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", diff --git a/ui/easydiffusion/model_manager.py b/ui/easydiffusion/model_manager.py index e57584ca..6d19912e 100644 --- a/ui/easydiffusion/model_manager.py +++ b/ui/easydiffusion/model_manager.py @@ -37,7 +37,7 @@ MODEL_EXTENSIONS = { } DEFAULT_MODELS = { "stable-diffusion": [ - {"file_name": "sd-v1-4.ckpt", "model_id": "1.4"}, + {"file_name": "sd-v1-5.safetensors", "model_id": "1.5-pruned-emaonly-fp16"}, ], "gfpgan": [ {"file_name": "GFPGANv1.4.pth", "model_id": "1.4"}, @@ -305,7 +305,7 @@ def is_malicious_model(file_path): def getModels(scan_for_malicious: bool = True): models = { "options": { - "stable-diffusion": [{"sd-v1-4": "SD 1.4"}], + "stable-diffusion": [], "vae": [], "hypernetwork": [], "lora": [], diff --git a/ui/index.html b/ui/index.html index 8ce5f820..57683bbf 100644 --- a/ui/index.html +++ b/ui/index.html @@ -155,11 +155,11 @@
Image Settings - + - - - - + + + - + @@ -383,7 +383,7 @@
+ - +
@@ -318,9 +318,9 @@ Advanced sizes
Custom size:
- + × -
+
Resize:

    
@@ -342,9 +342,9 @@
Small image sizes can cause bad image quality


@@ -358,7 +358,7 @@


- +
@@ -393,7 +393,7 @@
  • - +
  • @@ -410,7 +410,7 @@ - +
  • @@ -455,7 +455,7 @@
    @@ -712,7 +712,7 @@ Expand Categories - +