Update versions (#120)

- auto:
2995107fa2
  - More samplers
  - Textual inversion training
- hlky:
1a9c053cb7
  - Build times are SLOW
- lstein:
4f247a3672
  - Prepare for 2.0 release
  - very cool new UI!

.github/ISSUE_TEMPLATE/bug.md

@@ -7,13 +7,17 @@ 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) and in [the issues in the WebUI repo](https://github.com/hlky/stable-diffusion-webui)**
+**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)**
 
 
 
 **Describe the bug**
 
 
+**Which UI**
+
+hlky or auto or auto-cpu or lstein?
+
 **Steps to Reproduce**
 1. Go to '...'
 2. Click on '....'
@@ -22,8 +26,11 @@ assignees: ''
 
 **Hardware / Software:**
  - OS: [e.g. Windows / Ubuntu and version]
+ - RAM:
  - GPU: [Nvidia 1660 / No GPU]
- - Version [e.g. 22]
+ - 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

@@ -0,0 +1,5 @@
+### 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/

.github/workflows/docker.yml

@@ -3,12 +3,17 @@ name: Build Images
 on: [push]
 
 jobs:
-  build_all:
+  build:
+    strategy:
+      matrix:
+        profile:
+          - auto
+          - hlky
+          - lstein
+          - download
     runs-on: ubuntu-latest
-    name: All
+    name: ${{ matrix.profile }}
     steps:
       - uses: actions/checkout@v3
       # better caching?
-      - run: docker compose --profile auto build --progress plain
+      - run: docker compose --profile ${{ matrix.profile }} build --progress plain
-      - run: docker compose --profile hlky build --progress plain
-      - run: docker compose --profile lstein build --progress plain

.github/workflows/stale.yml

@@ -0,0 +1,20 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          only-labels: awaiting-response
+          stale-issue-message: This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days.
+          stale-pr-message: This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days.
+          close-issue-message: This issue was closed because it has been stalled for 7 days with no activity.
+          close-pr-message: This PR was closed because it has been stalled for 7 days with no activity.
+          days-before-issue-stale: 14
+          days-before-pr-stale: 14
+          days-before-issue-close: 7
+          days-before-pr-close: 7

.gitignore

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

LICENSE

@@ -86,4 +86,11 @@ administration of justice, law enforcement, immigration or asylum
 processes, such as predicting an individual will commit fraud/crime
 commitment (e.g. by text profiling, drawing causal relationships between
 assertions made in documents, indiscriminate and arbitrarily-targeted
-use).
+use).
+
+
+
+By using this software, you also 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

README.md

@@ -16,6 +16,7 @@ This repository provides multiple UIs for you to play around with stable diffusi
 - Loopback, prompt weighting, prompt matrix, X/Y plot
 - Live preview of the generated images.
 - Highly optimized 4GB GPU support, or even CPU only!
+- Textual inversion allows you to use pretrained textual inversion embeddings
 - [Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase)
 
 | Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
@@ -39,14 +40,24 @@ 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, but less so for the WebUI.
+[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential.
+
+| 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) |
+-->
 
 ## Setup & Usage
 
 Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue!
 
+## Contributing
+
+Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it.
+
 ## Disclaimer
 
 The authors of this project are not responsible for any content generated using this interface.

cache/.gitignore

@@ -1,4 +0,0 @@
-/torch
-/transformers
-/weights
-/models

data/.gitignore

@@ -0,0 +1,14 @@
+# for all of the stuff downloaded by transformers, pytorch, and others
+/.cache
+# for all stable diffusion models (main, waifu diffusion, etc..)
+/StableDiffusion
+# others
+/Codeformer
+/GFPGAN
+/ESRGAN
+/BSRGAN
+/RealESRGAN
+/SwinIR
+/ScuNET
+/LDSR
+/embeddings

docker-compose.yml

@@ -4,7 +4,7 @@ x-base_service: &base_service
     ports:
       - "7860:7860"
     volumes:
-      - &v1 ./cache:/cache
+      - &v1 ./data:/data
       - &v2 ./output:/output
     deploy:
       resources:
@@ -30,18 +30,18 @@ services:
     environment:
       - CLI_ARGS=--optimized-turbo
 
-  automatic1111: &automatic
+  auto: &automatic
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
     volumes:
       - *v1
       - *v2
-      - ./services/AUTOMATIC1111/config.json:/docker/config.json
+      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
-      - CLI_ARGS=--medvram --opt-split-attention
+      - CLI_ARGS=--allow-code --medvram
 
-  automatic1111-cpu:
+  auto-cpu:
     <<: *automatic
     profiles: ["auto-cpu"]
     deploy: {}
@@ -52,3 +52,6 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
+    environment:
+      - PRELOAD=false
+      - CLI_ARGS=

scripts/migratev1tov2.sh

@@ -0,0 +1,30 @@
+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
+
+cp -vf cache/models/LDSR.ckpt data/LDSR/model.ckpt
+cp -vf cache/models/LDSR.yaml data/LDSR/project.yaml
+
+cp -vf cache/models/RealESRGAN_x4plus.pth data/RealESRGAN/
+cp -vf cache/models/RealESRGAN_x4plus_anime_6B.pth data/RealESRGAN/
+
+cp -vrf cache/torch data/.cache/
+
+mkdir -p data/.cache/huggingface/transformers/
+cp -vrf cache/transformers/* data/.cache/huggingface/transformers/
+
+cp -v cache/custom-models/* data/StableDiffusion/
+
+mkdir -p data/.cache/clip/
+cp -vf cache/weights/ViT-L-14.pt data/.cache/clip/
+
+cp -vf cache/weights/codeformer.pth data/Codeformer/codeformer-v0.1.0.pth
+
+cp -vf cache/weights/detection_Resnet50_Final.pth data/.cache/
+cp -vf cache/weights/parsing_parsenet.pth data/.cache/
+
+cp -v embeddings/* data/embeddings/
+
+echo this script was created 10/2022
+echo Dont forget to run: docker compose --profile download up --build
+echo the cache and embeddings folders can be deleted, but its not necessary.

services/AUTOMATIC1111/Dockerfile

@@ -1,15 +1,24 @@
 # syntax=docker/dockerfile:1
 
 FROM alpine/git:2.36.2 as download
+
+
+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
-# who knows
+# because taming-transformers is huge
 git config --global http.postBuffer 1048576000
-git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
-git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
 git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
+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 f4e99857772fc3a126ba886aadf795a332774878
+
 
 FROM continuumio/miniconda3:4.12.0
 
@@ -26,37 +35,43 @@ RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
+git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
-conda env update --file environment-wsl2.yaml -n base
+pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
-conda clean -a -y
-pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
 ENV ROOT=/stable-diffusion-webui \
   WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
 
+
 COPY --from=download /git/ ${ROOT}
 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=b5d1af11b7dc718d4d91d379c75e46f4bd2e2fe6
+
+ARG SHA=2995107fa24cfd72b0a991e18271dcde148c2807
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
 git reset --hard ${SHA}
+pip install --prefer-binary --no-cache-dir -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 markupsafe==2.0.1
+RUN pip install --prefer-binary --no-cache-dir opencv-python-headless \
+  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1
+
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 COPY . /docker
-RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+RUN <<EOF
-
+chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+EOF
 
+ENV CLI_ARGS=""
 WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u ../../webui.py --listen --port 7860 ${CLI_ARGS}
+CMD /docker/mount.sh && \
+  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}

services/AUTOMATIC1111/README.md

@@ -1,14 +0,0 @@
-# WebUI for AUTOMATIC1111
-
-The WebUI of [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui) as docker container!
-
-## Setup
-
-Clone this repo, download the `model.ckpt` and `GFPGANv1.3.pth` and put into the `models` folder as mentioned in [the main README](../README.md), then run
-
-```
-cd AUTOMATIC1111
-docker compose up --build
-```
-
-You can change the cli parameters in `AUTOMATIC1111/docker-compose.yml`. The full list of cil parameters can be found [here](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/modules/shared.py)

services/AUTOMATIC1111/config.json

@@ -1 +1,79 @@
-{"outdir_samples": "/output", "outdir_txt2img_samples": "/output/txt2img-images", "outdir_img2img_samples": "/output/img2img-images", "outdir_extras_samples": "/output/extras-images", "outdir_txt2img_grids": "/output/txt2img-grids", "outdir_img2img_grids": "/output/img2img-grids", "outdir_save": "/output/saved", "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS", "outdir_grids": "", "save_to_dirs": false, "save_to_dirs_prompt_len": 10, "samples_save": true, "samples_format": "png", "grid_save": true, "return_grid": true, "grid_format": "png", "grid_extended_filename": false, "grid_only_if_multiple": true, "n_rows": -1, "jpeg_quality": 80, "export_for_4chan": true, "enable_pnginfo": true, "font": "DejaVuSans.ttf", "enable_emphasis": true, "save_txt": false, "ESRGAN_tile": 192, "ESRGAN_tile_overlap": 8, "random_artist_categories": [], "upscale_at_full_resolution_padding": 16, "show_progressbar": true, "show_progress_every_n_steps": 5, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5, "grid_save_to_dirs": false}
+{
+  "outdir_samples": "/output",
+  "outdir_txt2img_samples": "/output/txt2img-images",
+  "outdir_img2img_samples": "/output/img2img-images",
+  "outdir_extras_samples": "/output/extras-images",
+  "outdir_txt2img_grids": "/output/txt2img-grids",
+  "outdir_img2img_grids": "/output/img2img-grids",
+  "outdir_save": "/output/saved",
+  "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/info.py

@@ -7,7 +7,7 @@ file.write_text(
   .replace('    return demo', """
     with demo:
         gr.Markdown(
-          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/tree/master/AUTOMATIC1111)'
+          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
         )
     return demo
 """, 1)

services/AUTOMATIC1111/mount.sh

@@ -1,36 +1,33 @@
 #!/bin/bash
 
-set -e
+set -Eeuo pipefail
 
-declare -A MODELS
+declare -A MOUNTS
 
-MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
+MOUNTS["/root/.cache"]="/data/.cache"
-MODELS["${ROOT}/GFPGANv1.3.pth"]=GFPGANv1.3.pth
 
-MODELS_DIR=/cache/models
+# 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"
 
-for path in "${!MODELS[@]}"; do
+MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
-  name=${MODELS[$path]}
+
-  base=$(dirname "${path}")
+# extra hacks
-  from_path="${MODELS_DIR}/${name}"
+MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
-  if test -f "${from_path}"; then
+
-    mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
+for to_path in "${!MOUNTS[@]}"; do
-  else
+  set -Eeuo pipefail
-    echo "Skipping ${name}"
+  from_path="${MOUNTS[${to_path}]}"
-  fi
+  rm -rf "${to_path}"
+  mkdir -vp "$from_path"
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
 done
-
-# force realesrgan cache
-rm -rf /opt/conda/lib/python3.8/site-packages/realesrgan/weights
-ln -s -T "${MODELS_DIR}" /opt/conda/lib/python3.8/site-packages/realesrgan/weights
-
-# force facexlib cache
-mkdir -p /cache/weights/ ${WORKDIR}/gfpgan/
-ln -sf /cache/weights/ ${WORKDIR}/gfpgan/
-# code former cache
-rm -rf ${ROOT}/repositories/CodeFormer/weights/CodeFormer ${ROOT}/repositories/CodeFormer/weights/facelib
-ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/CodeFormer
-ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/facelib
-
-# mount config
-ln -sf /docker/config.json ${WORKDIR}/config.json

services/download/Dockerfile

@@ -1,6 +1,6 @@
 FROM bash:alpine3.15
 
-RUN apk add parallel
+RUN apk add parallel aria2
 COPY . /docker
 RUN chmod +x /docker/download.sh
 ENTRYPOINT ["/docker/download.sh"]

services/download/checksums.sha256

@@ -1,6 +1,6 @@
-fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /cache/models/model.ckpt
+fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /data/StableDiffusion/model.ckpt
-c953a88f2727c85c3d9ae72e2bd4846bbaf59fe6972ad94130e23e7017524a70  /cache/models/GFPGANv1.3.pth
+e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/GFPGAN/GFPGANv1.4.pth
-4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /cache/models/RealESRGAN_x4plus.pth
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/RealESRGAN/RealESRGAN_x4plus.pth
-f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /cache/models/RealESRGAN_x4plus_anime_6B.pth
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
-c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /cache/models/LDSR.ckpt
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/LDSR/model.ckpt
-9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /cache/models/LDSR.yaml
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/LDSR/project.yaml

services/download/download.sh

@@ -2,32 +2,23 @@
 
 set -Eeuo pipefail
 
-# [[ "$(sha256sum -b $file | head -c 64)" == "$sha" ]]
+mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings
 
-declare -A MODELS
+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
 
-MODELS['model.ckpt']='https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media'
+echo "Downloading, this might take a while..."
-MODELS['GFPGANv1.3.pth']='https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth'
-MODELS['RealESRGAN_x4plus.pth']='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth'
-MODELS['RealESRGAN_x4plus_anime_6B.pth']='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth'
-MODELS['LDSR.yaml']='https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1'
-MODELS['LDSR.ckpt']='https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1'
 
-echo "Downloading..."
+aria2c --input-file /docker/links.txt --dir /data --continue
-
-for file in "${!MODELS[@]}"; do
-  url=${MODELS[$file]}
-  full_path="/cache/models/$file"
-
-  if [[ -f "$full_path" ]]; then
-    echo "- $file exists"
-    continue
-  fi
-
-  mkdir -p $(dirname $full_path)
-  wget --tries=10 -c -O $full_path $url
-done
 
 echo "Checking SHAs..."
 
-time parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
+parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
+
+# fix potential permissions
+# TODO: need something better than this:
+# chmod -R 777 /data /output

services/download/links.txt

@@ -0,0 +1,12 @@
+https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media
+  out=StableDiffusion/model.ckpt
+https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth
+  out=GFPGAN/GFPGANv1.4.pth
+https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth
+  out=RealESRGAN/RealESRGAN_x4plus.pth
+https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth
+  out=RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
+https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1
+  out=LDSR/project.yaml
+https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1
+  out=LDSR/model.ckpt

services/hlky/Dockerfile

@@ -9,24 +9,23 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN conda install python=3.8.5 && 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 -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
 
 RUN <<EOF
+git config --global http.postBuffer 1048576000
 git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
 cd stable-diffusion
-git reset --hard 2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98
+git reset --hard 1a9c053cb7b6832695771db2555c0adc9b41e95f
 conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-# new dependency, should be added to the environment.yaml
-RUN pip install -U --no-cache-dir pyperclip
 
 # 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 BRANCH=master
+ARG BRANCH=master  SHA=1a9c053cb7b6832695771db2555c0adc9b41e95f
-ARG SHA=2236e8b5854092054e2c30edc559006ace53bf96
+# ARG BRANCH=dev SHA=1e7bdfe3f38a6dd37fc230f440ea1b0db0937240
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -36,24 +35,16 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-# Latent diffusion
+RUN pip install -U --no-cache-dir pyperclip
-RUN <<EOF
-git clone https://github.com/Hafiidz/latent-diffusion.git
-cd latent-diffusion
-git reset --hard e1a84a89fcbb49881546cf2acf1e7e250923dba0
-# hacks all the way down
-mv ldm ldm_latent &&
-sed -i -- 's/from ldm/from ldm_latent/g' *.py
-# dont forget to update the yaml!!
-EOF
-
 
 # add info
 COPY . /docker/
 RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
 
 WORKDIR /stable-diffusion
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u scripts/webui.py --outdir /output --ckpt /cache/models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}
+CMD /docker/mount.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

@@ -1,35 +1,31 @@
 #!/bin/bash
 
-set -e
+set -Eeuo pipefail
 
-declare -A MODELS
+declare -A MOUNTS
 
 ROOT=/stable-diffusion/src
 
-MODELS["${ROOT}/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=GFPGANv1.3.pth
+# cache
-MODELS["${ROOT}/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth"]=RealESRGAN_x4plus.pth
+MOUNTS["/root/.cache"]=/data/.cache
-MODELS["${ROOT}/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth"]=RealESRGAN_x4plus_anime_6B.pth
+# ui specific
-MODELS["/latent-diffusion/experiments/pretrained_models/model.ckpt"]=LDSR.ckpt
+MOUNTS["${PWD}/models/realesrgan"]=/data/RealESRGAN
-# MODELS["/latent-diffusion/experiments/pretrained_models/project.yaml"]=LDSR.yaml
+MOUNTS["${PWD}/models/ldsr"]=/data/LDSR
+MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
 
-MODELS_DIR=/cache/models
+# 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
 
-for path in "${!MODELS[@]}"; do
+
-  name=${MODELS[$path]}
+for to_path in "${!MOUNTS[@]}"; do
-  base=$(dirname "${path}")
+  set -Eeuo pipefail
-  from_path="${MODELS_DIR}/${name}"
+  from_path="${MOUNTS[${to_path}]}"
-  if test -f "${from_path}"; then
+  rm -rf "${to_path}"
-    mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
+  mkdir -p "$(dirname "${to_path}")"
-  else
+  ln -sT "${from_path}" "${to_path}"
-    echo "Skipping ${name}"
+  echo Mounted $(basename "${from_path}")
-  fi
 done
 
-# hack for latent-diffusion
+# streamlit config
-if test -f "${MODELS_DIR}/LDSR.yaml"; then
+ln -sf /docker/userconfig_streamlit.yaml /stable-diffusion/configs/webui/userconfig_streamlit.yaml
-  sed 's/ldm\./ldm_latent\./g' "${MODELS_DIR}/LDSR.yaml" >/latent-diffusion/experiments/pretrained_models/project.yaml
-fi
-
-# force facexlib cache
-mkdir -p /cache/weights/ /stable-diffusion/gfpgan/
-ln -sf /cache/weights/ /stable-diffusion/gfpgan/

services/hlky/userconfig_streamlit.yaml

@@ -0,0 +1,8 @@
+general:
+  outdir: /outputs
+  default_model: "Stable Diffusion v1.4"
+  default_model_path: /data/StableDiffusion/model.ckpt
+  outdir_txt2img: /outputs/txt2img-samples
+  outdir_img2img: /outputs/img2img-samples
+  optimized: True
+  optimized_turbo: True

services/lstein/Dockerfile

@@ -6,26 +6,52 @@ SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN conda install python=3.8.5 && conda clean -a -y
+# 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 -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
+ENV PIP_EXISTS_ACTION=w
 
 RUN <<EOF
-git clone https://github.com/lstein/stable-diffusion.git
+git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
 cd stable-diffusion
-git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
+git reset --hard 8a8be92eac17e0ef699528157596b2336bdee532
+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 clean -a -y
 EOF
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
+ARG BRANCH=development SHA=4f247a3672474bd9c46060bab6087dbf9e2531f3
+RUN <<EOF
+cd stable-diffusion
+git fetch
+git reset --hard
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+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
+
+COPY . /docker/
+RUN <<EOF
+python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
+chmod +x /docker/mount.sh
+EOF
+
+
+ENV PRELOAD=false CLI_ARGS=""
 WORKDIR /stable-diffusion
-
 EXPOSE 7860
-# run, -u to not buffer stdout / stderr
+
-CMD mkdir -p /stable-diffusion/models/ldm/stable-diffusion-v1/ && \
+CMD /docker/mount.sh && \
-  ln -sf /cache/models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
+  # python3 -u backend/server.py --host 0.0.0.0 --port 7860 --cors http://localhost:7860
   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/README.md

@@ -1,14 +0,0 @@
-# WebUI for lstein
-
-The WebUI of [lstein/stable-diffusion](https://github.com/lstein/stable-diffusion) as docker container!
-
-Although it is a simple UI, the project has a lot of potential.
-
-## Setup
-
-Clone this repo, download the `model.ckpt` and put into the `models` folder as mentioned in [the main README](../README.md), then run
-
-```
-cd lstein
-docker compose up --build
-```

services/lstein/info.py

@@ -0,0 +1,13 @@
+import sys
+from pathlib import Path
+
+file = Path(sys.argv[1])
+file.write_text(
+  file.read_text()\
+  .replace('  <div id="root"></div>', """
+    <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

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+declare -A MOUNTS
+
+# cache
+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/dream/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
+
+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
+
+if "${PRELOAD}" == "true"; then
+  python3 -u scripts/preload_models.py
+fi