Auto Extensions (#176)

Closes #148 
Closes #172

.devscripts/chmod.sh

@@ -2,4 +2,4 @@
 
 set -Eeuo pipefail
 
-find . -name "*.sh" -exec git update-index --chmod=+x {} \;
+find services -name "*.sh" -exec git update-index --chmod=+x {} \;

.devscripts/migratev1tov2.sh

@@ -1,4 +1,4 @@
-mkdir -p data/.cache data/StableDiffusion data/Codeformer data/GFPGAN data/ESRGAN data/BSRGAN data/RealESRGAN data/SwinIR data/LDSR /data/embeddings
+mkdir -p data/.cache data/StableDiffusion data/Codeformer data/GFPGAN data/ESRGAN data/BSRGAN data/RealESRGAN data/SwinIR data/LDSR data/embeddings
 
 cp -vf cache/models/model.ckpt data/StableDiffusion/model.ckpt
 

.github/ISSUE_TEMPLATE/bug.md

@@ -7,30 +7,39 @@ assignees: ''
 
 ---
 
-**Has this issue been opened before? Check the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Main), the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=is%3Aissue)**
+<!--  PLEASE FILL THIS OUT, IT WILL MAKE BOTH OF OUR LIVES EASIER -->
 
+**Has this issue been opened before?**
+
+- [ ] It is not in the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ), I checked.
+- [ ] It is not in the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=), I searched.
 
 
 **Describe the bug**
 
+<!--  tried to run the app, my cat exploded -->
+
 
 **Which UI**
 
 hlky or auto or auto-cpu or lstein?
 
+
+**Hardware / Software**
+ - OS: [e.g. Windows 10 / Ubuntu ]
+ - OS version: <!--  on windows, use the command `winver` to find out, on ubuntu `lsb_release -d`  -->
+ - WSL version (if applicable): <!-- get using `wsl -l -v` -->
+ - Docker Version: <!--  get using `docker version` -->
+ - Docker compose version: <!--  get using `docker compose version` -->
+ - Repo version: <!-- tag, commit sha, or "from master" -->
+ - RAM:
+ - GPU/VRAM:
+
 **Steps to Reproduce**
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Hardware / Software:**
- - OS: [e.g. Windows / Ubuntu and version]
- - RAM:
- - GPU: [Nvidia 1660 / No GPU]
- - VRAM:
- - Docker Version, Docker compose version
- - Release version [e.g. 1.0.1]
-
 **Additional context**
 Any other context about the problem here. If applicable, add screenshots to help explain your problem.

.github/pull_request_template.md

@@ -1,5 +1,13 @@
+<!--
+Have you created an issue before opening a merge request???
+https://github.com/AbdBarho/stable-diffusion-webui-docker#contributing
+Please create one so we can discuss it, I don't want your effort to go to waste.
+-->
+
+Closes issue #
+
 ### Update versions
 
 - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/
 - hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/
-- lstein: https://github.com/lstein/stable-diffusion/commit/
+- lstein: https://github.com/invoke-ai/InvokeAI/commit/

.github/workflows/docker.yml

@@ -1,6 +1,12 @@
 name: Build Images
 
-on: [push]
+on:
+  push:
+    branches: master
+  pull_request:
+      paths:
+        - docker-compose.yml
+        - services
 
 jobs:
   build:

.github/workflows/executable.yml1

@@ -1,22 +0,0 @@
-name: Check executable
-
-on: [push]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    name: Check all sh
-    steps:
-      - run: git config --global core.fileMode true
-      - uses: actions/checkout@v3
-      - shell: bash
-        run: |
-          shopt -s globstar;
-          FAIL=0
-          for file in **/*.sh; do
-              if [ -f "${file}" ] && [ -r "${file}" ] && [ ! -x "${file}" ]; then
-                  echo "$file" is not executable;
-                  FAIL=1
-              fi
-          done
-          exit ${FAIL}

.github/workflows/xformers.yml

@@ -0,0 +1,36 @@
+name: Build Xformers
+
+on:
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 180
+    container:
+      image: python:3.10-slim
+      env:
+        DEBIAN_FRONTEND: noninteractive
+        XFORMERS_DISABLE_FLASH_ATTN: 1
+        FORCE_CUDA: 1
+        TORCH_CUDA_ARCH_LIST: "6.0;6.1;6.2;7.0;7.2;7.5;8.0;8.6"
+        NVCC_FLAGS: --use_fast_math -DXFORMERS_MEM_EFF_ATTENTION_DISABLE_BACKWARD
+        MAX_JOBS: 4
+    steps:
+      - run: |
+          apt-get update
+          apt-get install gpg wget git -y
+          wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.0-1_all.deb
+          dpkg -i cuda-keyring_1.0-1_all.deb
+          apt-get update
+          apt-get install cuda-nvcc-11-8 cuda-libraries-dev-11-8 -y
+
+          export PIP_CACHE_DIR=$(pwd)/cache
+          pip install ninja install torch --extra-index-url https://download.pytorch.org/whl/cu113
+
+          pip wheel --wheel-dir=data git+https://github.com/facebookresearch/xformers.git@3633e1afc7bffbe61957f04e7bb1a742ee910ace#egg=xformers
+      - name: Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: xformers
+          path: data/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl

.gitignore

@@ -1,4 +1,2 @@
-/dev
 /.devcontainer
-embeddings/*
 /docker-compose.override.yml

LICENSE

@@ -92,5 +92,11 @@ use).
 
 By using this software, you also agree to the following licenses:
 https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
+https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
+https://github.com/cszn/BSRGAN/blob/main/LICENSE
+https://github.com/sczhou/CodeFormer/blob/master/LICENSE
 https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
 https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
+https://github.com/xinntao/ESRGAN/blob/master/LICENSE
+https://github.com/cszn/SCUNet/blob/main/LICENSE

README.md

@@ -23,16 +23,16 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](https://user-images.githubusercontent.com/24505302/189541954-46afd772-d0c8-4005-874c-e2eca40c02f2.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541956-5b528de7-1b5d-479f-a1db-d3f5a53afc59.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541957-cf78b352-a071-486d-8889-f26952779a61.jpg) |
 
-### hlky
+### hlky (sd-webui / sygil-webui)
 
-[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features:
+[hlky's fork](https://github.com/Sygil-Dev/sygil-webui) is one of the most popular UIs, with many features:
 
 - Text to image, with many samplers
 - Image to image, with masking, cropping, in-painting, variations.
 - GFPGAN, RealESRGAN, LDSR, GoBig, GoLatent
 - Loopback, prompt weighting
 - 6GB or even 4GB GPU support!
-- [Full feature list here](https://github.com/sd-webui/stable-diffusion-webui/blob/master/README.md)
+- [Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md)
 
 Screenshots:
 
@@ -40,15 +40,20 @@ Screenshots:
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
 
-<!--
-### lstein
 
-[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential.
+
+### lstein (InvokeAI)
+
+[lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI.
+- Text to image, with many samplers
+- Image to image
+- 4GB GPU support
+- More coming!
+- [Full feature list here](https://github.com/invoke-ai/InvokeAI#features)
 
 | Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](https://user-images.githubusercontent.com/24505302/190662506-dabdc967-93af-4d78-8533-394604d29ba4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662557-7640d9f0-30d8-4527-97b0-07d3f48108d4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662588-37a01fad-f993-4674-9ae6-8714aa229f7b.jpg) |
+| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) |
--->
 
 ## Setup & Usage
 
@@ -56,7 +61,9 @@ Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-do
 
 ## Contributing
 
-Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it.
+Contributions are welcome!
+
+### **Create an issue first of what you want to contribute (before you implement anything)**
 
 ## Disclaimer
 

data/.gitignore

@@ -1,5 +1,7 @@
 # for all of the stuff downloaded by transformers, pytorch, and others
 /.cache
+# for UIs
+/config
 # for all stable diffusion models (main, waifu diffusion, etc..)
 /StableDiffusion
 # others
@@ -9,5 +11,7 @@
 /BSRGAN
 /RealESRGAN
 /SwinIR
+/ScuNET
 /LDSR
-# TODO: add the embeddings folder here
+/Hypernetworks
+/embeddings

docker-compose.yml

@@ -27,19 +27,18 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
+    image: sd-hlky:4
     environment:
       - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
 
   auto: &automatic
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    volumes:
+    image: sd-auto:7
-      - *v1
-      - *v2
-      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
-      - CLI_ARGS=--allow-code --medvram
+      - CLI_ARGS=--allow-code --medvram --xformers
 
   auto-cpu:
     <<: *automatic
@@ -52,6 +51,7 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
+    image: sd-lstein:4
     environment:
-      - PRELOAD=false
+      - PRELOAD=true
       - CLI_ARGS=

services/AUTOMATIC1111/Dockerfile

@@ -2,74 +2,89 @@
 
 FROM alpine/git:2.36.2 as download
 
-
+SHELL ["/bin/sh", "-ceuxo", "pipefail"]
-RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion && cd repositories/stable-diffusion && git reset --hard 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc
-
-RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af
-RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9
-RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
 
 RUN <<EOF
-# because taming-transformers is huge
+cat <<'EOE' > /clone.sh
-git config --global http.postBuffer 1048576000
+mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git
-git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
+EOE
-git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
-rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
-RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard 9e3002b7cd64df7870e08527b7664eb2f2f5f3f5
+RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \
+  && rm -rf data assets **/*.ipynb
+
+RUN . /clone.sh stable-diffusion https://github.com/CompVis/stable-diffusion.git 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc \
+  && rm -rf assets data/**/*.png data/**/*.jpg data/**/*.gif
+
+RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba6214284d6acd5f1719b6c5d739af \
+  && rm -rf assets inputs
+
+RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9
+RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git f4e99857772fc3a126ba886aadf795a332774878
+RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
 
 
-FROM continuumio/miniconda3:4.12.0
+FROM alpine:3 as xformers
+RUN apk add aria2
+RUN aria2c --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/2.1.0/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl'
+
+FROM python:3.10-slim
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
 
-RUN conda install python=3.8.5 && conda clean -a -y
+RUN pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113
-RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
 
-RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
 
 
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 15f333a266c20319e2b95a47a8834adf7b914aec
+git reset --hard d885a4a57b72152745ca76192ef1bdda29e6461d
-pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
+pip install -r requirements_versions.txt
 EOF
 
-ENV ROOT=/stable-diffusion-webui \
+
-  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
+COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
+RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl && rm xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
+
+
+ENV ROOT=/stable-diffusion-webui
 
 
 COPY --from=download /git/ ${ROOT}
+RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
 RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
+
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
 
-ARG SHA=3f417566b0bda8eab05d247567aebf001c1d1725
+ARG SHA=35c45df28b303a05d56a13cb56d4046f08cf8c25
 RUN <<EOF
 cd stable-diffusion-webui
-git pull --rebase
+git fetch
 git reset --hard ${SHA}
-pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
+pip install -r requirements_versions.txt
-pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
-RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless
+RUN pip install opencv-python-headless \
+  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
+  pyngrok \
+  gradio==3.4.1
+# gradio because #173 & https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/2858
 
 
 COPY . /docker
-RUN <<EOF
-chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
-EOF
 
+RUN chmod +x /docker/entrypoint.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+
+WORKDIR ${ROOT}/repositories/stable-diffusion
 ENV CLI_ARGS=""
-WORKDIR ${WORKDIR}
 EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && \
+CMD python3 -u ../../webui.py --listen --port 7860 --ckpt-dir ${ROOT}/models/Stable-diffusion --theme dark ${CLI_ARGS}
-  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
-#  --gfpgan-models-path /data/GFPGAN --codeformer-models-path /data/Codeformer --esrgan-models-path /data/ESRGAN --bsrgan-models-path /data/BSRGAN --realesrgan-models-path /data/RealESRGAN --swinir-models-path /data/SwinIR --ldsr-models-path /data/LDSR

services/AUTOMATIC1111/config.json

@@ -6,74 +6,5 @@
   "outdir_txt2img_grids": "/output/txt2img-grids",
   "outdir_img2img_grids": "/output/img2img-grids",
   "outdir_save": "/output/saved",
-  "font": "DejaVuSans.ttf",
+  "font": "DejaVuSans.ttf"
-  "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS",
-
-  "add_model_hash_to_info": false,
-  "code_former_weight": 0.5,
-  "directories_filename_pattern": "",
-  "directories_max_prompt_words": 8,
-  "enable_batch_seeds": true,
-  "enable_emphasis": true,
-  "enable_pnginfo": true,
-  "enable_quantization": false,
-  "ESRGAN_tile": 192,
-  "ESRGAN_tile_overlap": 8,
-  "export_for_4chan": true,
-  "face_restoration_model": null,
-  "face_restoration_unload": false,
-  "filter_nsfw": false,
-  "grid_extended_filename": false,
-  "grid_format": "png",
-  "grid_only_if_multiple": true,
-  "grid_save": true,
-  "grid_save_to_dirs": false,
-  "img2img_color_correction": false,
-  "img2img_fix_steps": false,
-  "interrogate_clip_dict_limit": 1500,
-  "interrogate_clip_max_length": 48,
-  "interrogate_clip_min_length": 24,
-  "interrogate_clip_num_beams": 1,
-  "interrogate_keep_models_in_memory": false,
-  "interrogate_use_builtin_artists": true,
-  "jpeg_quality": 80,
-  "js_modal_lightbox": true,
-  "js_modal_lightbox_initialy_zoomed": true,
-  "ldsr_post_down": 1,
-  "ldsr_pre_down": 1,
-  "ldsr_steps": 30,
-  "memmon_poll_rate": 8,
-  "multiple_tqdm": true,
-  "n_rows": -1,
-  "outdir_grids": "",
-  "random_artist_categories": [],
-  "realesrgan_enabled_models": [
-    "Real-ESRGAN 4x plus",
-    "Real-ESRGAN 4x plus anime 6B",
-    "Real-ESRGAN 2x plus",
-    "Real-ESRGAN AnimeVideo",
-    "Real-ESRGAN General WDN x4x3",
-    "Real-ESRGAN General x4x3"
-  ],
-  "return_grid": true,
-  "samples_filename_format": "",
-  "samples_filename_pattern": "",
-  "samples_format": "png",
-  "samples_log_stdout": false,
-  "samples_save": true,
-  "save_images_before_color_correction": false,
-  "save_images_before_face_restoration": false,
-  "save_selected_only": false,
-  "save_to_dirs": false,
-  "save_to_dirs_prompt_len": 10,
-  "save_txt": false,
-  "sd_model_checkpoint": null,
-  "show_progress_every_n_steps": 7,
-  "show_progressbar": true,
-  "SWIN_tile": 192,
-  "SWIN_tile_overlap": 8,
-  "upscale_at_full_resolution_padding": 16,
-  "upscaler_for_hires_fix": null,
-  "upscaler_for_img2img": null,
-  "use_original_name_batch": false
 }

services/AUTOMATIC1111/entrypoint.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+# TODO: move all mkdir -p ?
+mkdir -p /data/config/auto/scripts/
+cp -n /docker/config.json /data/config/auto/config.json
+jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
+
+if [ ! -f /data/config/auto/ui-config.json ]; then
+  echo '{}' >/data/config/auto/ui-config.json
+fi
+
+# copy scripts, we cannot just mount the directory because it will override the already provided scripts in the repo
+cp -rfT /data/config/auto/scripts/ "${ROOT}/scripts"
+
+declare -A MOUNTS
+
+MOUNTS["/root/.cache"]="/data/.cache"
+
+# main
+MOUNTS["${ROOT}/models/Stable-diffusion"]="/data/StableDiffusion"
+MOUNTS["${ROOT}/models/Codeformer"]="/data/Codeformer"
+MOUNTS["${ROOT}/models/GFPGAN"]="/data/GFPGAN"
+MOUNTS["${ROOT}/models/ESRGAN"]="/data/ESRGAN"
+MOUNTS["${ROOT}/models/BSRGAN"]="/data/BSRGAN"
+MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
+MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
+MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET"
+MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
+MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
+
+MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
+MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
+MOUNTS["${ROOT}/ui-config.json"]="/data/config/auto/ui-config.json"
+MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions"
+
+# extra hacks
+MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  if [ ! -f "$from_path" ]; then
+    mkdir -vp "$from_path"
+  fi
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+mkdir -p /output/saved /output/txt2img-images/ /output/img2img-images /output/extras-images/ /output/grids/ /output/txt2img-grids/ /output/img2img-grids/
+
+if [ -f "/data/config/auto/startup.sh" ]; then
+  pushd ${ROOT}
+  . /data/config/auto/startup.sh
+  popd
+fi
+
+
+exec "$@"

services/AUTOMATIC1111/mount.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-MOUNTS["/root/.cache"]="/data/.cache"
-
-# main
-MOUNTS["${ROOT}/models/Stable-diffusion"]="/data/StableDiffusion"
-MOUNTS["${ROOT}/models/Codeformer"]="/data/Codeformer"
-MOUNTS["${ROOT}/models/GFPGAN"]="/data/GFPGAN"
-MOUNTS["${ROOT}/models/ESRGAN"]="/data/ESRGAN"
-MOUNTS["${ROOT}/models/BSRGAN"]="/data/BSRGAN"
-MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
-MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
-MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
-
-MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
-
-# extra hacks
-MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
-
-for to_path in "${!MOUNTS[@]}"; do
-  set -Eeuo pipefail
-  from_path="${MOUNTS[${to_path}]}"
-  rm -rf "${to_path}"
-  mkdir -p "$(dirname "${to_path}")"
-  ln -sT "${from_path}" "${to_path}"
-  echo Mounted $(basename "${from_path}")
-done

services/download/download.sh

@@ -2,22 +2,28 @@
 
 set -Eeuo pipefail
 
-mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR
+mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings
-
-cat <<EOF
-By using this software, you agree to the following licenses:
-https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
-https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
-https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
-EOF
 
 echo "Downloading, this might take a while..."
 
-aria2c --input-file /docker/links.txt --dir /data --continue
+aria2c --disable-ipv6 --input-file /docker/links.txt --dir /data --continue
 
 echo "Checking SHAs..."
 
 parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
 
-# fix potential permissions
+# aria2c already does hash check
-chmod -R 777 /data /output
+# cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
+cat <<EOF
+By using this software, you agree to the following licenses:
+https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/AbdBarho/stable-diffusion-webui-docker/blob/master/LICENSE
+https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
+https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
+https://github.com/cszn/BSRGAN/blob/main/LICENSE
+https://github.com/sczhou/CodeFormer/blob/master/LICENSE
+https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
+https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
+https://github.com/xinntao/ESRGAN/blob/master/LICENSE
+https://github.com/cszn/SCUNet/blob/main/LICENSE
+EOF

services/download/links.txt

@@ -1,4 +1,12 @@
-https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media
+# 'check-integrity=true' is the only way aria2c won't fail if the file already exists
+magnet:?xt=urn:btih:2daef5b5f63a16a9af9169a529b1a773fc452637&dn=v1-5-pruned-emaonly.ckpt&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce&tr=udp%3a%2f%2f9.rarbg.com%3a2810%2fannounce&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a6969%2fannounce&tr=udp%3a%2f%2fopentracker.i2p.rocks%3a6969%2fannounce&tr=https%3a%2f%2fopentracker.i2p.rocks%3a443%2fannounce&tr=http%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.torrent.eu.org%3a451%2fannounce&tr=udp%3a%2f%2fopen.stealth.si%3a80%2fannounce&tr=udp%3a%2f%2fvibe.sleepyinternetfun.xyz%3a1738%2fannounce&tr=udp%3a%2f%2ftracker2.dler.org%3a80%2fannounce&tr=udp%3a%2f%2ftracker1.bt.moack.co.kr%3a80%2fannounce&tr=udp%3a%2f%2ftracker.zemoj.com%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.tiny-vps.com%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.theoks.net%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.publictracker.xyz%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.monitorit4.me%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.moeking.me%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.lelux.fi%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.dler.org%3a6969%2fannounce&tr=udp%3a%2f%2ftracker.army%3a6969%2fannounce
+  select-file=1
+  index-out=1=StableDiffusion/v1-5-pruned-emaonly.ckpt
+  follow-torrent=mem
+  follow-metalink=mem
+  seed-time=0
+  check-integrity=true
+https://drive.yerf.org/wl/?id=EBfTrmcCCUAGaQBXVIj5lJmEhjoP1tgl&mode=grid&download=1
   out=StableDiffusion/model.ckpt
 https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth
   out=GFPGAN/GFPGANv1.4.pth

services/hlky/Dockerfile

@@ -12,20 +12,20 @@ RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorc
 RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
 
+ENV PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
+
 RUN <<EOF
 git config --global http.postBuffer 1048576000
-git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
+git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
 cd stable-diffusion
-git reset --hard 7623a5734740025d79b710f3744bff9276e1467b
+git reset --hard 091520bed06f913c9f432f9f47ccbe22b46068d7
 conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
+RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
 
-# Note: don't update the sha of previous versions because the install will take forever
+ARG BRANCH=master SHA=091520bed06f913c9f432f9f47ccbe22b46068d7
-# instead, update the repo state in a later step
-# ARG BRANCH=master  SHA=d0bb60a139d60e6c2b9be4e18e0e29a86aa5af59
-ARG BRANCH=dev SHA=aaa3be16e0e66f07c63dbdb49b9b7cac8fef5cfb
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -35,16 +35,17 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-RUN pip install -U --no-cache-dir pyperclip
-
 # add info
 COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
+RUN <<EOF
+python /docker/info.py /stable-diffusion/frontend/frontend.py
+chmod +x /docker/mount.sh /docker/run.sh
+# streamlit
+sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
+EOF
 
 WORKDIR /stable-diffusion
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
 EXPOSE 7860
-# run, -u to not buffer stdout / stderr
+
-CMD /docker/mount.sh && \
+CMD /docker/mount.sh && /docker/run.sh
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
-# sed -i -- 's/8501/7860/g' .streamlit/config.toml && STREAMLIT_SERVER_HEADLESS=true python -u -m streamlit run scripts/webui_streamlit.py  --theme.base dark

services/hlky/mount.sh

@@ -9,11 +9,15 @@ ROOT=/stable-diffusion/src
 # cache
 MOUNTS["/root/.cache"]=/data/.cache
 # ui specific
-MOUNTS["${ROOT}/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${PWD}/models/realesrgan"]=/data/RealESRGAN
-MOUNTS["${ROOT}/realesrgan/experiments/pretrained_models"]=/data/RealESRGAN
+MOUNTS["${PWD}/models/ldsr"]=/data/LDSR
-MOUNTS["${ROOT}/latent-diffusion/experiments/pretrained_models"]=/data/LDSR
+MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
-# hacks
+
-MOUNTS["/stable-diffusion/gfpgan/weights"]=/data/.cache
+# hack
+MOUNTS["${PWD}/models/gfpgan/GFPGANv1.3.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${PWD}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
+
 
 for to_path in "${!MOUNTS[@]}"; do
   set -Eeuo pipefail

services/hlky/run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "USE_STREAMLIT = ${USE_STREAMLIT}"
+if [ "${USE_STREAMLIT}" == "1" ]; then
+  python -u -m streamlit run scripts/webui_streamlit.py
+else
+  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/v1-5-pruned-emaonly.ckpt ${CLI_ARGS}
+fi

services/hlky/userconfig_streamlit.yaml

@@ -1,8 +1,9 @@
 general:
-  outdir: /outputs
+  version: 1.24.6
-  default_model: "Stable Diffusion v1.4"
+  outdir: /output
-  default_model_path: /data/StableDiffusion/model.ckpt
+  default_model: "Stable Diffusion v1.5"
-  outdir_txt2img: /outputs/txt2img-samples
+  default_model_path: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-  outdir_img2img: /outputs/img2img-samples
+  outdir_txt2img: /output/txt2img-samples
-  optimized: True
+  outdir_img2img: /output/img2img-samples
+  outdir_img2txt: /output/img2txt
   optimized_turbo: True

services/lstein/Dockerfile

@@ -4,29 +4,25 @@ FROM continuumio/miniconda3:4.12.0
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
 
 # now it requires python3.9
 RUN conda install python=3.9 && conda clean -a -y
 RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
 
-RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core -y && apt-get clean
-
 
 RUN <<EOF
 git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
 cd stable-diffusion
-git reset --hard a1739a73b48bfe98b6abcb67f5a0197a9ad270e0
+git reset --hard 986cc49d7a8441a70c709c04a55016a1c783f2ed
-sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
+git config --global http.postBuffer 1048576000
-conda env update --file environment.yaml -n base
+# conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=8c9f2ae705cf723d4a8a73c416e8d8bf2d746977
+ARG BRANCH=development SHA=fdf9b1c40c243d6806e787877e42ae4c115790ee
-# this breaks on generation:
-# there is a new UI anyway, but it is not by any means ready.
-# ARG BRANCH=development SHA=bdbc76fcd4bd3362312dc91b087d9af66de423b1
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -37,23 +33,18 @@ conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
-RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.19.2
+RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless
 
 COPY . /docker/
 RUN <<EOF
-python3 /docker/info.py /stable-diffusion/static/dream_web/index.html
+python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
 chmod +x /docker/mount.sh
-sed -i -- 's/outputs\//\/output/g' /stable-diffusion/backend/server.py
 EOF
 
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PRELOAD=false CLI_ARGS=""
+ENV PRELOAD=false CLI_ARGS=""
 WORKDIR /stable-diffusion
 EXPOSE 7860
 
 CMD /docker/mount.sh && \
-  # python3 -u backend/server.py --host 0.0.0.0 --port 7860 --cors http://localhost:7860
+  python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
-  # python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
-  echo The lstein webUI is currently deactivated due to implementation limitations: \
-  https://github.com/invoke-ai/InvokeAI/blob/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977/backend/modules/create_cmd_parser.py#L26 \
-  Once the path the output is fixed, the UI will be activated again

services/lstein/info.py

@@ -4,7 +4,10 @@ from pathlib import Path
 file = Path(sys.argv[1])
 file.write_text(
   file.read_text()\
-  .replace('GitHub site</a>', """
+  .replace('  <div id="root"></div>', """
-  GitHub site</a>, Deployed with <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker/">stable-diffusion-webui-docker</a>
+    <div id="root"></div>
+    <div>
+      Deployed with <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker/">stable-diffusion-webui-docker</a>
+    </div>
 """, 1)
 )

services/lstein/mount.sh

@@ -1,28 +1,28 @@
 #!/bin/bash
 
-set -eu
+set -Eeuo pipefail
 
-ROOT=/stable-diffusion
+declare -A MOUNTS
 
-mkdir -p "${ROOT}/models/ldm/stable-diffusion-v1/"
+# cache
-ln -sf /cache/models/model.ckpt "${ROOT}/models/ldm/stable-diffusion-v1/model.ckpt"
+MOUNTS["/root/.cache"]=/data/.cache
+# ui specific
+MOUNTS["${PWD}/models/ldm/stable-diffusion-v1/model.ckpt"]=/data/StableDiffusion/model.ckpt
+MOUNTS["${PWD}/src/gfpgan/experiments/pretrained_models/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${PWD}/ldm/invoke/restoration/codeformer/weights"]=/data/Codeformer
+# hacks
+MOUNTS["/opt/conda/lib/python3.9/site-packages/facexlib/weights"]=/data/.cache
+MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN
+MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
 
-base="${ROOT}/src/gfpgan/experiments/pretrained_models/"
+for to_path in "${!MOUNTS[@]}"; do
-mkdir -p "${base}"
+  set -Eeuo pipefail
-# TODO: "real" GFPGANv1.4.pth
+  from_path="${MOUNTS[${to_path}]}"
-ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.4.pth"
+  rm -rf "${to_path}"
-echo "Mounted GFPGANv1.3.pth"
+  mkdir -p "$(dirname "${to_path}")"
-
+  ln -sT "${from_path}" "${to_path}"
-# facexlib
+  echo Mounted $(basename "${from_path}")
-FACEX_WEIGHTS=/opt/conda/lib/python3.9/site-packages/facexlib/weights
+done
-
-rm -rf "${FACEX_WEIGHTS}"
-mkdir -p /cache/weights
-ln -sf -T /cache/weights "${FACEX_WEIGHTS}"
-
-REALESRGAN_WEIGHTS=/opt/conda/lib/python3.9/site-packages/realesrgan/weights
-rm -rf "${REALESRGAN_WEIGHTS}"
-ln -sf -T /cache/weights "${REALESRGAN_WEIGHTS}"
 
 if "${PRELOAD}" == "true"; then
   python3 -u scripts/preload_models.py