Update xformers (#241)

8910bb5a65

.devscripts/chmod.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+find services -name "*.sh" -exec git update-index --chmod=+x {} \;

.devscripts/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.

.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/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request? Questions regarding some extension?
+    url: https://github.com/AbdBarho/stable-diffusion-webui-docker/discussions
+    about: Please use the discussions tab

.github/pull_request_template.md

@@ -0,0 +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/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/stale.yml

@@ -1,13 +1,13 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '30 1 * * *'
+    - cron: '0 0 * * *'
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         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.

.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,2 +1,2 @@
-/dev
 /.devcontainer
+/docker-compose.override.yml

LICENSE

@@ -86,4 +86,17 @@ 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/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

@@ -2,10 +2,19 @@
 
 Run Stable Diffusion on your machine with a nice UI without any hassle!
 
-This repository provides multiple UIs for you to play around with stable diffusion:
 
+## 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 a discussion first of what the problem is and what you want to contribute (before you implement anything)**
 ## Features
 
+This repository provides multiple UIs for you to play around with stable diffusion:
+
 ### AUTOMATIC1111
 
 [AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI:
@@ -16,22 +25,23 @@ 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                                                                                                     |
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](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:
 
@@ -39,21 +49,21 @@ 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
-
-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
 

cache/.gitignore

@@ -1,5 +0,0 @@
-/torch
-/transformers
-/weights
-/models
-/custom-models

data/.gitignore

@@ -0,0 +1,19 @@
+# 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
+/Codeformer
+/GFPGAN
+/ESRGAN
+/BSRGAN
+/RealESRGAN
+/SwinIR
+/ScuNET
+/LDSR
+/Deepdanbooru
+/Hypernetworks
+/VAE
+/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:
@@ -23,35 +23,35 @@ services:
     volumes:
       - *v1
 
-  hlky:
+  auto: &automatic
-    <<: *base_service
-    profiles: ["hlky"]
-    build: ./services/hlky/
-    environment:
-      - CLI_ARGS=--optimized-turbo
-
-  automatic1111: &automatic
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    volumes:
+    image: sd-auto:18
-      - *v1
-      - *v2
-      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
-      - CLI_ARGS=--medvram --opt-split-attention
+      - CLI_ARGS=--allow-code --medvram --xformers
 
-  automatic1111-cpu:
+  auto-cpu:
     <<: *automatic
     profiles: ["auto-cpu"]
     deploy: {}
     environment:
       - CLI_ARGS=--no-half --precision full
 
+  hlky:
+    <<: *base_service
+    profiles: ["hlky"]
+    build: ./services/hlky/
+    image: sd-hlky:9
+    environment:
+      - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
+
   lstein:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
+    image: sd-lstein:7
     environment:
-      - PRELOAD=false
+      - PRELOAD=true
-      - CLI_ARGS=
+      - CLI_ARGS=--max_loaded_models=1

scripts/chmod.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-find . -name "*.sh" -exec git update-index --chmod=+x {} \;

services/AUTOMATIC1111/Dockerfile

@@ -1,65 +1,96 @@
 # syntax=docker/dockerfile:1
 
 FROM alpine/git:2.36.2 as download
+
+SHELL ["/bin/sh", "-ceuxo", "pipefail"]
+
 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/sczhou/CodeFormer.git repositories/CodeFormer
+EOE
-git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
-git clone https://github.com/salesforce/BLIP.git repositories/BLIP
-git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
-rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
+RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \
+  && rm -rf data assets **/*.ipynb
 
-FROM continuumio/miniconda3:4.12.0
+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 60e5042ca0da89c14d1dd59d73883280f8fce991
+RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
+
+
+FROM alpine:3 as xformers
+RUN apk add aria2
+RUN aria2c -x 10 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/3.1.0/xformers-0.0.15.dev0+4e3631d.d20221125-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+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
-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 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
+git reset --hard 98947d173e3f1667eba29c904f681047dea9de90
-conda env update --file environment-wsl2.yaml -n base
+pip install -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=xformers /wheel.whl xformers-0.0.15-cp310-cp310-linux_x86_64.whl
+RUN pip install xformers-0.0.15-cp310-cp310-linux_x86_64.whl && rm xformers-0.0.15-cp310-cp310-linux_x86_64.whl
+
+
+ENV ROOT=/stable-diffusion-webui
+
 
 COPY --from=download /git/ ${ROOT}
-RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
+RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
+RUN pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
+
+
+ARG DEEPDANBOORU="0"
+RUN [[ "${DEEPDANBOORU:-0}" == "0" ]] && : || pip install tensorflow-cpu==2.10 tensorflow-io==0.27.0 git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26#egg=deepdanbooru
+
+RUN pip install opencv-python-headless \
+  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
+  pyngrok
 
 # 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=99585b3514e2d7e987651d5c6a0806f933af012b
+ARG SHA=47a44c7e421b98ca07e92dbf88769b04c9e28f86
 RUN <<EOF
 cd stable-diffusion-webui
-git pull --rebase
+git fetch
 git reset --hard ${SHA}
-pip install --prefer-binary --no-cache-dir -r requirements.txt
+pip install -r requirements_versions.txt
 EOF
 
-RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless
+RUN pip install opencv-python-headless
-
-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
+python3 /docker/info.py ${ROOT}/modules/ui.py
+mv  ${ROOT}/style.css ${ROOT}/user.css
+sed -i 's/os.rename(tmpdir, target_dir)/shutil.move(tmpdir,target_dir)/' ${ROOT}/modules/ui_extensions.py
+EOF
 
-WORKDIR ${WORKDIR}
+WORKDIR ${ROOT}
+ENV CLI_ARGS=""
 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 ${CLI_ARGS}
-  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir /cache/custom-models --ckpt /cache/models/model.ckpt ${CLI_ARGS}

services/AUTOMATIC1111/config.json

@@ -6,53 +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",
-
-  "samples_filename_format": "",
-  "outdir_grids": "",
-  "save_to_dirs": false,
-  "grid_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,
-  "add_model_hash_to_info": false,
-  "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": 7,
-  "multiple_tqdm": true,
-  "face_restoration_model": null,
-  "code_former_weight": 0.5,
-  "save_images_before_face_restoration": false,
-  "face_restoration_unload": false,
-  "interrogate_keep_models_in_memory": false,
-  "interrogate_use_builtin_artists": true,
-  "interrogate_clip_num_beams": 1,
-  "interrogate_clip_min_length": 24,
-  "interrogate_clip_max_length": 48,
-  "interrogate_clip_dict_limit": 1500.0,
-  "samples_filename_pattern": "",
-  "directories_filename_pattern": "",
-  "save_selected_only": false,
-  "filter_nsfw": false,
-  "img2img_color_correction": false,
-  "img2img_fix_steps": false,
-  "enable_quantization": false,
-  "enable_batch_seeds": true,
-  "memmon_poll_rate": 8,
-  "sd_model_checkpoint": null
 }

services/AUTOMATIC1111/entrypoint.sh

@@ -0,0 +1,63 @@
+#!/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/VAE"]="/data/VAE"
+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}/models/deepbooru"]="/data/Deepdanbooru"
+
+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,35 +0,0 @@
-#!/bin/bash
-
-set -e
-
-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_DIR}/${name}"
-  if test -f "${from_path}"; then
-    mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
-  else
-    echo "Skipping ${name}"
-  fi
-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
-
-mkdir -p /cache/torch /cache/transformers /cache/weights /cache/models /cache/custom-models

services/download/checksums.sha256

@@ -1,6 +1,8 @@
-fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /cache/models/model.ckpt
+cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-c953a88f2727c85c3d9ae72e2bd4846bbaf59fe6972ad94130e23e7017524a70  /cache/models/GFPGANv1.3.pth
+c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19  /data/StableDiffusion/sd-v1-5-inpainting.ckpt
-4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /cache/models/RealESRGAN_x4plus.pth
+c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab  /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
-f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /cache/models/RealESRGAN_x4plus_anime_6B.pth
+e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/GFPGAN/GFPGANv1.4.pth
-c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /cache/models/LDSR.ckpt
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/RealESRGAN/RealESRGAN_x4plus.pth
-9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /cache/models/LDSR.yaml
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/LDSR/model.ckpt
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/LDSR/project.yaml

services/download/download.sh

@@ -2,12 +2,27 @@
 
 set -Eeuo pipefail
 
-mkdir -p /cache/torch /cache/transformers /cache/weights /cache/models /cache/custom-models
+# TODO: maybe just use the .gitignore file to create all of these
+mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru
 
 echo "Downloading, this might take a while..."
 
-aria2c --input-file /docker/links.txt --dir /cache/models --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"
+
+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,12 +1,16 @@
-https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media
+https://huggingface.co/ZeroCool94/stable-diffusion-v1-5/resolve/main/Stable%20Diffusion%20v1-5-Pruned-ema%20only.ckpt
-  out=model.ckpt
+  out=StableDiffusion/v1-5-pruned-emaonly.ckpt
-https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth
+https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt
-  out=GFPGANv1.3.pth
+  out=VAE/vae-ft-mse-840000-ema-pruned.ckpt
+https://huggingface.co/ZeroCool94/stable-diffusion-v1-5/resolve/main/Stable%20Diffusion-v1-5-Inpainting.ckpt
+  out=StableDiffusion/sd-v1-5-inpainting.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_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_x4plus_anime_6B.pth
+  out=RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
 https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1
-  out=LDSR.yaml
+  out=LDSR/project.yaml
 https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1
-  out=LDSR.ckpt
+  out=LDSR/model.ckpt

services/hlky/Dockerfile

@@ -12,24 +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
 
-# new dependency, should be added to the environment.yaml
+RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
-RUN pip install -U --no-cache-dir pyperclip
 
-# Note: don't update the sha of previous versions because the install will take forever
+ARG BRANCH=dev SHA=269107a104fc9fee3201eb2c56cf7adb3d063e4b
-# instead, update the repo state in a later step
-ARG BRANCH=master
-ARG SHA=833a91047df999302f699637768741cecee9c37b
-# ARG BRANCH=dev
-# ARG SHA=5f3d7facdea58fc4f89b8c584d22a4639615a2f8
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -39,26 +35,17 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-# Latent diffusion
-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
+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 TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch 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 /cache/models/model.ckpt --ldsr-dir /latent-diffusion --inbrowser ${CLI_ARGS}
-# STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py

services/hlky/mount.sh

@@ -1,38 +1,32 @@
 #!/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
+MOUNTS["${PWD}/gfpgan/weights"]=/data/.cache
 
-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
-if test -f "${MODELS_DIR}/LDSR.yaml"; then
-  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/
-
 # streamlit config
-ln -sf /docker/webui_streamlit.yaml /stable-diffusion/configs/webui/webui_streamlit.yaml
+ln -sf /docker/userconfig_streamlit.yaml /stable-diffusion/configs/webui/userconfig_streamlit.yaml

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

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

services/hlky/webui_streamlit.yaml

@@ -1,155 +0,0 @@
-# UI defaults configuration file. It is automatically loaded if located at configs/webui/webui_streamlit.yaml.
-general:
-  gpu: 0
-  outdir: /outputs
-
-  default_model: "Stable Diffusion v1.4"
-  default_model_config: "configs/stable-diffusion/v1-inference.yaml"
-  default_model_path: "/cache/models/model.ckpt"
-  fp:
-    name:
-  GFPGAN_dir: "./src/gfpgan"
-  RealESRGAN_dir: "./src/realesrgan"
-  RealESRGAN_model: "RealESRGAN_x4plus"
-  outdir_txt2img: /outputs/txt2img-samples
-  outdir_img2img: /outputs/img2img-samples
-  gfpgan_cpu: False
-  esrgan_cpu: False
-  extra_models_cpu: False
-  extra_models_gpu: False
-  save_metadata: True
-  save_format: "png"
-  skip_grid: False
-  skip_save: False
-  grid_format: "jpg:95"
-  n_rows: -1
-  no_verify_input: False
-  no_half: False
-  use_float16: False
-  precision: "autocast"
-  optimized: False
-  optimized_turbo: True
-  optimized_config: "optimizedSD/v1-inference.yaml"
-  update_preview: True
-  update_preview_frequency: 5
-
-txt2img:
-  prompt:
-  height: 512
-  width: 512
-  cfg_scale: 7.5
-  seed: ""
-  batch_count: 1
-  batch_size: 1
-  sampling_steps: 30
-  default_sampler: "k_euler"
-  separate_prompts: False
-  update_preview: True
-  update_preview_frequency: 5
-  normalize_prompt_weights: True
-  save_individual_images: True
-  save_grid: True
-  group_by_prompt: True
-  save_as_jpg: False
-  use_GFPGAN: False
-  use_RealESRGAN: False
-  RealESRGAN_model: "RealESRGAN_x4plus"
-  variant_amount: 0.0
-  variant_seed: ""
-  write_info_files: True
-
-txt2vid:
-  default_model: "CompVis/stable-diffusion-v1-4"
-  custom_models_list:
-    [
-      "CompVis/stable-diffusion-v1-4",
-      "naclbit/trinart_stable_diffusion_v2",
-      "hakurei/waifu-diffusion",
-      "osanseviero/BigGAN-deep-128",
-    ]
-  prompt:
-  height: 512
-  width: 512
-  cfg_scale: 7.5
-  seed: ""
-  batch_count: 1
-  batch_size: 1
-  sampling_steps: 30
-  num_inference_steps: 200
-  default_sampler: "k_euler"
-  scheduler_name: "klms"
-  separate_prompts: False
-  update_preview: True
-  update_preview_frequency: 5
-  dynamic_preview_frequency: True
-  normalize_prompt_weights: True
-  save_individual_images: True
-  save_video: True
-  group_by_prompt: True
-  write_info_files: True
-  do_loop: False
-  save_as_jpg: False
-  use_GFPGAN: False
-  use_RealESRGAN: False
-  RealESRGAN_model: "RealESRGAN_x4plus"
-  variant_amount: 0.0
-  variant_seed: ""
-  beta_start: 0.00085
-  beta_end: 0.012
-  beta_scheduler_type: "linear"
-  max_frames: 1000
-
-img2img:
-  prompt:
-  sampling_steps: 30
-  # Adding an int to toggles enables the corresponding feature.
-  # 0: Create prompt matrix (separate multiple prompts using |, and get all combinations of them)
-  # 1: Normalize Prompt Weights (ensure sum of weights add up to 1.0)
-  # 2: Loopback (use images from previous batch when creating next batch)
-  # 3: Random loopback seed
-  # 4: Save individual images
-  # 5: Save grid
-  # 6: Sort samples by prompt
-  # 7: Write sample info files
-  # 8: jpg samples
-  # 9: Fix faces using GFPGAN
-  # 10: Upscale images using Real-ESRGAN
-  sampler_name: "k_euler"
-  denoising_strength: 0.45
-  # 0: Keep masked area
-  # 1: Regenerate only masked area
-  mask_mode: 0
-  mask_restore: False
-  # 0: Just resize
-  # 1: Crop and resize
-  # 2: Resize and fill
-  resize_mode: 0
-  # Leave blank for random seed:
-  seed: ""
-  ddim_eta: 0.0
-  cfg_scale: 7.5
-  batch_count: 1
-  batch_size: 1
-  height: 512
-  width: 512
-  # Textual inversion embeddings file path:
-  fp: ""
-  loopback: True
-  random_seed_loopback: True
-  separate_prompts: False
-  update_preview: True
-  update_preview_frequency: 5
-  normalize_prompt_weights: True
-  save_individual_images: True
-  save_grid: True
-  group_by_prompt: True
-  save_as_jpg: False
-  use_GFPGAN: False
-  use_RealESRGAN: False
-  RealESRGAN_model: "RealESRGAN_x4plus"
-  variant_amount: 0.0
-  variant_seed: ""
-  write_info_files: True
-
-gfpgan:
-  strength: 100

services/lstein/Dockerfile

@@ -1,44 +1,48 @@
 # syntax=docker/dockerfile:1
 
-FROM continuumio/miniconda3:4.12.0
+FROM python:3.10-slim
 
 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
 
-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 gcc -y && apt-get clean
+RUN pip install torch==1.13.0 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
 
+RUN apt-get update && apt-get install git -y && apt-get clean
+
+RUN git clone https://github.com/invoke-ai/InvokeAI.git /stable-diffusion
+
+WORKDIR /stable-diffusion
 
 RUN <<EOF
-git clone https://github.com/lstein/stable-diffusion.git
+git reset --hard 2b7e3abe57963d199f1d825ddef87ae154c81045
-cd stable-diffusion
+git config --global http.postBuffer 1048576000
-git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
+ln -sf environments-and-requirements/requirements-lin-cuda.txt requirements.txt
-conda env update --file environment.yaml -n base
+pip install -r requirements.txt
-conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=45af30f3a4c98b50c755717831c5fff75a3a8b43
+ARG BRANCH=development SHA=2b7e3abe57963d199f1d825ddef87ae154c81045
-# ARG BRANCH=main SHA=89da371f4841f7e05da5a1672459d700c3920784
 RUN <<EOF
-cd stable-diffusion
 git fetch
+git reset --hard
 git checkout ${BRANCH}
 git reset --hard ${SHA}
-conda env update --file environment.yaml -n base
+pip install -r requirements.txt
-conda clean -a -y
 EOF
 
-RUN pip uninstall opencv-python -y && pip install --prefer-binary --upgrade --force-reinstall --no-cache-dir opencv-python-headless
+RUN pip uninstall opencv-python -y && pip install --force-reinstall opencv-python-headless==4.5.5.64
 
 COPY . /docker/
-RUN python3 /docker/info.py /stable-diffusion/static/dream_web/index.html && chmod +x /docker/mount.sh
+RUN <<EOF
+python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
+EOF
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PRELOAD=false CLI_ARGS=""
+
-WORKDIR /stable-diffusion
+ENV ROOT=/stable-diffusion PRELOAD=false CLI_ARGS=""
 EXPOSE 7860
 
-CMD /docker/mount.sh && python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}

services/lstein/entrypoint.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+declare -A MOUNTS
+
+# cache
+MOUNTS["/root/.cache"]=/data/.cache
+
+# ui specific
+MOUNTS["${ROOT}/models/codeformer"]=/data/Codeformer/
+
+MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
+MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/.cache/
+
+MOUNTS["${ROOT}/models/realesrgan"]=/data/RealESRGAN/
+
+MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers
+MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers
+MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers
+
+MOUNTS["${ROOT}/configs/models.yaml"]=/docker/models.yaml
+# hacks
+MOUNTS["/opt/conda/lib/python3.10/site-packages/facexlib/weights"]=/data/.cache/
+MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
+
+# 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}")"
+  # ends with slash, make it!
+  if [[ "$from_path" == */ ]]; then
+    mkdir -vp "$from_path"
+  fi
+
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+if "${PRELOAD}" == "true"; then
+  python3 -u scripts/preload_models.py --no-interactive
+fi
+
+exec "$@"

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/models.yaml

@@ -0,0 +1,23 @@
+# This file describes the alternative machine learning models
+# available to InvokeAI script.
+#
+# To add a new model, follow the examples below. Each
+# model requires a model config file, a weights file,
+# and the width and height of the images it
+# was trained on.
+stable-diffusion-1.5:
+  description: Stable Diffusion version 1.5
+  weights: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./configs/stable-diffusion/v1-inference.yaml
+  width: 512
+  height: 512
+  default: true
+inpainting-1.5:
+  description: RunwayML SD 1.5 model optimized for inpainting
+  weights: /data/StableDiffusion/sd-v1-5-inpainting.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./configs/stable-diffusion/v1-inpainting-inference.yaml
+  width: 512
+  height: 512
+  default: false

services/lstein/mount.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-ROOT=/stable-diffusion
-
-mkdir -p "${ROOT}/models/ldm/stable-diffusion-v1/"
-ln -sf /cache/models/model.ckpt "${ROOT}/models/ldm/stable-diffusion-v1/model.ckpt"
-
-if test -f /cache/models/GFPGANv1.3.pth; then
-  base="${ROOT}/src/gfpgan/experiments/pretrained_models/"
-  mkdir -p "${base}"
-  ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.3.pth"
-  echo "Mounted GFPGANv1.3.pth"
-fi
-
-# facexlib
-FACEX_WEIGHTS=/opt/conda/lib/python3.8/site-packages/facexlib/weights
-
-rm -rf "${FACEX_WEIGHTS}"
-mkdir -p /cache/weights
-ln -sf -T /cache/weights "${FACEX_WEIGHTS}"
-
-if "${PRELOAD}" == "true"; then
-  python3 -u scripts/preload_models.py
-fi