Major refactor (#49)

* update folders * Update CI * Update CI * Unify base docker images * Remove dead config * Update permissions * Remove CPU Hack * Update hlky * Add Download Service * Adapt services * executable * remove buggy parameter * rename to SHA * Update README
AbdBarho · Sep 11, 2022 · ab651fe · ab651fe
1 parent f76f8d4
commit ab651fe
Show file tree

Hide file tree

Showing 21 changed files with 164 additions and 164 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,24 +1,14 @@
-name: Build Image
+name: Build Images
 
 on: [push]
 
-# TODO: how to cache intermediate images?
 jobs:
-  build_hlky:
+  build_all:
     runs-on: ubuntu-latest
-    name: hlky
+    name: All
     steps:
       - uses: actions/checkout@v3
-      - run: docker compose build --progress plain
-  build_AUTOMATIC1111:
-    runs-on: ubuntu-latest
-    name: AUTOMATIC1111
-    steps:
-      - uses: actions/checkout@v3
-      - run: cd AUTOMATIC1111 && docker compose build --progress plain
-  build_lstein:
-    runs-on: ubuntu-latest
-    name: lstein
-    steps:
-      - uses: actions/checkout@v3
-      - run: cd lstein && docker compose build --progress plain
+      # better caching?
+      - run: docker compose --profile auto build --progress plain
+      - run: docker compose --profile hlky build --progress plain
+      - run: docker compose --profile lstein build --progress plain
diff --git a/AUTOMATIC1111/docker-compose.yml b/AUTOMATIC1111/docker-compose.yml
diff --git a/README.md b/README.md
@@ -2,84 +2,58 @@
 
 Run Stable Diffusion on your machine with a nice UI without any hassle!
 
-This repository provides the [WebUI](https://github.com/hlky/stable-diffusion-webui) as a docker image for easy setup and deployment.
-
-Now with experimental support for 2 other forks:
-
-- [AUTOMATIC1111](./AUTOMATIC1111/) (Stable, very few bugs!)
-- [lstein](./lstein/)
-
-NOTE: big update coming up!
+This repository provides multiple UIs for you to play around with stable diffusion:
 
 ## Features
 
-- Interactive UI with many features, and more on the way!
-- Support for 6GB GPU cards.
-- GFPGAN for face reconstruction, RealESRGAN for super-sampling.
-- Experimental:
-  - Latent Diffusion Super Resolution
-  - GoBig
-  - GoLatent
-- many more!
-
-## Setup
-
-Make sure you have an **up to date** version of docker installed. Download this repo and run:
-
-```
-docker compose build
-```
-
-you can let it build in the background while you download the different models
-
-- [Stable Diffusion v1.4 (4GB)](https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media), rename to `model.ckpt`
-- (Optional) [GFPGANv1.3.pth (333MB)](https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth).
-- (Optional) [RealESRGAN_x4plus.pth (64MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth) and [RealESRGAN_x4plus_anime_6B.pth (18MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth).
-- (Optional) [LDSR (2GB)](https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1) and [its configuration](https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1), rename to `LDSR.ckpt` and `LDSR.yaml` respectively.
-<!-- - (Optional) [RealESRGAN_x2plus.pth (64MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.1/RealESRGAN_x2plus.pth)
-- TODO: (I still need to find the RealESRGAN_x2plus_6b.pth) -->
+### AUTOMATIC1111
 
-Put all of the downloaded files in the `models` folder, it should look something like this:
+[AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI:
 
-```
-models/
-├── model.ckpt
-├── GFPGANv1.3.pth
-├── RealESRGAN_x4plus.pth
-├── RealESRGAN_x4plus_anime_6B.pth
-├── LDSR.ckpt
-└── LDSR.yaml
-```
+- Text to image, with many samplers and even negative prompts!
+- Image to image, with masking, cropping, in-painting, out-painting, variations.
+- GFPGAN, RealESRGAN, LDSR, CodeFormer.
+- Loopback, prompt weighting, prompt matrix, X/Y plot
+- Live preview of the generated images.
+- Highly optimized 4GB GPU support, or even CPU only!
+- [Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase)
 
-## Run
+| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
+| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| ![](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) |
 
-After the build is done, you can run the app with:
+### hlky
 
-```
-docker compose up --build
-```
+[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features:
 
-Will start the app on http://localhost:7860/
+- 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)
 
-Note: the first start will take sometime as some other models will be downloaded, these will be cached in the `cache` folder, so next runs are faster.
+Screenshots:
 
-### FAQ
+| Text to image                                                                                              | Image to image                                                                                             | Image Lab                                                                                                  |
+| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| ![](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) |
 
-You can find fixes to common issues [in the wiki page.](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ)
+### lstein
 
-## Config
+[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, but less so for the WebUI.
 
-in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. [You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion-webui/blob/2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98/scripts/webui.py)
+## Setup & Usage
 
-You can set the `WEBUI_SHA` to [any SHA from the main repo](https://github.com/hlky/stable-diffusion/commits/main), this will build the container against that commit. Use at your own risk.
+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!
 
-# Disclaimer
+## Disclaimer
 
 The authors of this project are not responsible for any content generated using this interface.
 
 This license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, spread misinformation and target vulnerable groups. For the full list of restrictions please read [the license](./LICENSE).
 
-# Thanks
+## Thanks
 
 Special thanks to everyone behind these awesome projects, without them, none of this would have been possible:
 
@@ -89,3 +63,4 @@ Special thanks to everyone behind these awesome projects, without them, none of
 - [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
 - [hlky/sd-enable-textual-inversion](https://github.com/hlky/sd-enable-textual-inversion)
 - [devilismyfriend/latent-diffusion](https://github.com/devilismyfriend/latent-diffusion)
+- [Hafiidz/latent-diffusion](https://github.com/Hafiidz/latent-diffusion)
diff --git a/cache/.gitignore b/cache/.gitignore
@@ -1,3 +1,4 @@
 /torch
 /transformers
-/weights
+/weights
+/models
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,26 +1,54 @@
 version: '3.9'
 
-services:
-  model:
-    build:
-      context: ./hlky/
-      args:
-        # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main
-        # USE AT YOUR OWN RISK! otherwise just leave it empty.
-        BRANCH:
-        WEBUI_SHA:
+x-base_service: &base_service
     ports:
       - "7860:7860"
     volumes:
-      - ./cache:/cache
-      - ./output:/output
-      - ./models:/models
-    environment:
-      - CLI_ARGS=--extra-models-cpu --optimized-turbo
+      - &v1 ./cache:/cache
+      - &v2 ./output:/output
     deploy:
       resources:
         reservations:
           devices:
               - driver: nvidia
                 device_ids: ['0']
                 capabilities: [gpu]
+
+name: webui-docker
+
+services:
+  download:
+    build: ./services/download/
+    profiles: ["download"]
+    volumes:
+      - *v1
+
+  hlky:
+    <<: *base_service
+    profiles: ["hlky"]
+    build: ./services/hlky/
+    environment:
+      - CLI_ARGS=--optimized-turbo
+
+  automatic1111: &automatic
+    <<: *base_service
+    profiles: ["auto"]
+    build: ./services/AUTOMATIC1111
+    volumes:
+      - *v1
+      - *v2
+      - ./services/AUTOMATIC1111/config.json:/docker/config.json
+    environment:
+      - CLI_ARGS=--medvram --opt-split-attention
+
+  automatic1111-cpu:
+    <<: *automatic
+    profiles: ["auto-cpu"]
+    deploy: {}
+    environment:
+      - CLI_ARGS=--no-half --precision full
+
+  lstein:
+    <<: *base_service
+    profiles: ["lstein"]
+    build: ./services/lstein/
diff --git a/lstein/docker-compose.yml b/lstein/docker-compose.yml
diff --git a/models/.gitignore b/models/.gitignore
diff --git a/scripts/chmod.sh b/scripts/chmod.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+find . -name "*.sh" -exec git update-index --chmod=+x {} \;
diff --git a/AUTOMATIC1111/Dockerfile → services/AUTOMATIC1111/Dockerfile b/AUTOMATIC1111/Dockerfile → services/AUTOMATIC1111/Dockerfile
@@ -40,10 +40,10 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
 
 # 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=06fadd2dc5c2753558a9f3971568c2673819f48c
+ARG SHA=b5d1af11b7dc718d4d91d379c75e46f4bd2e2fe6
 RUN <<EOF
 cd stable-diffusion-webui
-git pull
+git pull --rebase
 git reset --hard ${SHA}
 pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
@@ -55,6 +55,7 @@ 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
 
+
 WORKDIR ${WORKDIR}
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr

diff --git a/AUTOMATIC1111/README.md → services/AUTOMATIC1111/README.md b/AUTOMATIC1111/README.md → services/AUTOMATIC1111/README.md
diff --git a/AUTOMATIC1111/config.json → services/AUTOMATIC1111/config.json b/AUTOMATIC1111/config.json → services/AUTOMATIC1111/config.json
@@ -1 +1 @@
-{"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": 0, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5}
+{"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}
diff --git a/AUTOMATIC1111/info.py → services/AUTOMATIC1111/info.py b/AUTOMATIC1111/info.py → services/AUTOMATIC1111/info.py
diff --git a/AUTOMATIC1111/mount.sh → services/AUTOMATIC1111/mount.sh b/AUTOMATIC1111/mount.sh → services/AUTOMATIC1111/mount.sh
@@ -7,10 +7,12 @@ declare -A MODELS
 MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
 MODELS["${ROOT}/GFPGANv1.3.pth"]=GFPGANv1.3.pth
 
+MODELS_DIR=/cache/models
+
 for path in "${!MODELS[@]}"; do
   name=${MODELS[$path]}
   base=$(dirname "${path}")
-  from_path="/models/${name}"
+  from_path="${MODELS_DIR}/${name}"
   if test -f "${from_path}"; then
     mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
   else
@@ -20,7 +22,7 @@ done
 
 # force realesrgan cache
 rm -rf /opt/conda/lib/python3.8/site-packages/realesrgan/weights
-ln -s -T /models /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/

diff --git a/services/download/Dockerfile b/services/download/Dockerfile
@@ -0,0 +1,6 @@
+FROM bash:alpine3.15
+
+RUN apk add parallel
+COPY . /docker
+RUN chmod +x /docker/download.sh
+ENTRYPOINT ["/docker/download.sh"]
diff --git a/services/download/checksums.sha256 b/services/download/checksums.sha256
@@ -0,0 +1,6 @@
+fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /cache/models/model.ckpt
+c953a88f2727c85c3d9ae72e2bd4846bbaf59fe6972ad94130e23e7017524a70  /cache/models/GFPGANv1.3.pth
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /cache/models/RealESRGAN_x4plus.pth
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /cache/models/RealESRGAN_x4plus_anime_6B.pth
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /cache/models/LDSR.ckpt
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /cache/models/LDSR.yaml
diff --git a/services/download/download.sh b/services/download/download.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+# [[ "$(sha256sum -b $file | head -c 64)" == "$sha" ]]
+
+declare -A MODELS
+
+MODELS['model.ckpt']='https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media'
+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..."
+
+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"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"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": 0, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5}
		{"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}