Add styles.csv support (#440 )

Follow up to #386 after https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/9334 has been merged. Closes #435
Update Auto (#379 )
2025-10-30 17:53:23 -04:00 · 2023-05-04 07:48:19 +02:00 · 2023-05-04 07:29:49 +02:00 · 2023-05-04 06:55:01 +02:00 · 2023-04-28 19:55:06 +02:00 · 2023-04-28 15:42:12 +02:00
17 changed files with 290 additions and 194 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,5 +9,6 @@ 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/
+- sygil: https://github.com/Sygil-Dev/sygil-webui/commit/
+- invoke: https://github.com/invoke-ai/InvokeAI/commit/
+- comfy: https://github.com/comfyanonymous/ComfyUI/commit/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,6 +16,7 @@ jobs:
          - auto
          - sygil
          - invoke
+          - comfy
          - download
    runs-on: ubuntu-latest
    name: ${{ matrix.profile }}
--- a/README.md
+++ b/README.md
@@ -34,6 +34,14 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](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) |

+### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
+
+[Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot:
+
+| Workflow                                                                         |
+| -------------------------------------------------------------------------------- |
+| ![](https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png) |
+
 ## Contributing

 Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**
@@ -51,5 +59,6 @@ Special thanks to everyone behind these awesome projects, without them, none of
 - [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
 - [InvokeAI](https://github.com/invoke-ai/InvokeAI)
 - [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
+- [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
 - [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
 - and many many more.
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -11,9 +11,16 @@
 /BSRGAN
 /RealESRGAN
 /SwinIR
+/MiDaS
+/BLIP
 /ScuNET
 /LDSR
 /Deepdanbooru
 /Hypernetworks
 /VAE
 /embeddings
+/Lora
+/ControlNet
+/openpose
+/ModelScope
+/LyCORIS
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ x-base_service: &base_service
    volumes:
      - &v1 ./data:/data
      - &v2 ./output:/output
+    stop_signal: SIGINT
    deploy:
      resources:
        reservations:
@@ -27,37 +28,54 @@ services:
    <<: *base_service
    profiles: ["auto"]
    build: ./services/AUTOMATIC1111
-    image: sd-auto:20
+    image: sd-auto:54
    environment:
-      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access
+      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

  auto-cpu:
    <<: *automatic
    profiles: ["auto-cpu"]
    deploy: {}
    environment:
-      - CLI_ARGS=--no-half --precision full
+      - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
+
+  invoke:
+    <<: *base_service
+    profiles: ["invoke"]
+    build: ./services/invoke/
+    image: sd-invoke:27
+    environment:
+      - PRELOAD=true
+      - CLI_ARGS=--no-nsfw_checker --no-safety_checker --xformers

  sygil: &sygil
    <<: *base_service
    profiles: ["sygil"]
    build: ./services/sygil/
-    image: sd-sygil:12
+    image: sd-sygil:16
    environment:
      - CLI_ARGS=--optimized-turbo
      - USE_STREAMLIT=0

  sygil-sl:
    <<: *sygil
+    profiles: ["sygil-sl"]
    environment:
      - USE_STREAMLIT=1

-
-  invoke:
+  comfy: &comfy
    <<: *base_service
-    profiles: ["invoke"]
-    build: ./services/invoke/
-    image: sd-invoke:10
+    profiles: ["comfy"]
+    build: ./services/comfy/
+    image: sd-comfy:1
+    tty: true
    environment:
-      - PRELOAD=true
      - CLI_ARGS=
+
+
+  comfy-cpu:
+    <<: *comfy
+    profiles: ["comfy-cpu"]
+    deploy: {}
+    environment:
+      - CLI_ARGS=--cpu
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -1,96 +1,89 @@
-# syntax=docker/dockerfile:1
-
 FROM alpine/git:2.36.2 as download

-SHELL ["/bin/sh", "-ceuxo", "pipefail"]
-
-RUN <<EOF
-cat <<'EOE' > /clone.sh
-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
-EOE
-EOF
+COPY clone.sh /clone.sh

 RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \
  && rm -rf data assets **/*.ipynb

-RUN . /clone.sh stable-diffusion https://github.com/CompVis/stable-diffusion.git 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc \
+RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git 47b6b607fdd31875c9279cd2f4f16b92e4ea958e \
  && 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 k-diffusion https://github.com/crowsonkb/k-diffusion.git 5b3af030dd83e0297272d861c19477735d0317ec
 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 alpine:3.17 as xformers
+RUN apk add --no-cache aria2
+RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.0/xformers-0.0.17.dev449-cp310-cp310-manylinux2014_x86_64.whl'

-FROM python:3.10-slim
+FROM python:3.10.9-slim

-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1

-ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
+RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117

-RUN pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
+# RUN --mount=type=cache,target=/root/.cache/pip pip install torch==2.0.0+cu118 torchvision --extra-index-url https://download.pytorch.org/whl/cu117

 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 98947d173e3f1667eba29c904f681047dea9de90
-pip install -r requirements_versions.txt
-EOF
-
-
-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
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
+  cd stable-diffusion-webui && \
+  git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679 && \
+  pip install -r requirements_versions.txt

+RUN --mount=type=cache,target=/root/.cache/pip  \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
+  pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl

 ENV ROOT=/stable-diffusion-webui


-COPY --from=download /git/ ${ROOT}
+COPY --from=download /repositories/ ${ROOT}/repositories/
 RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
-RUN pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip \
+  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 \
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install pyngrok \
  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
-  pyngrok
+  git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b

 # 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=47a44c7e421b98ca07e92dbf88769b04c9e28f86
-RUN <<EOF
-cd stable-diffusion-webui
-git fetch
-git reset --hard ${SHA}
-pip install -r requirements_versions.txt
-EOF
+# TODO: either remove if fixed in A1111 (unlikely) or move to the top with other apt stuff
+RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
+ENV LD_PRELOAD=libtcmalloc.so

-RUN pip install opencv-python-headless transformers==4.24.0
+ARG SHA=5ab7f213bec2f816f9c5644becb32eb72c8ffb89
+RUN --mount=type=cache,target=/root/.cache/pip \
+  cd stable-diffusion-webui && \
+  git fetch && \
+  git reset --hard ${SHA} && \
+  pip install -r requirements_versions.txt
+
+RUN --mount=type=cache,target=/root/.cache/pip  pip install -U opencv-python-headless

 COPY . /docker

-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
+RUN \
+  python3 /docker/info.py ${ROOT}/modules/ui.py && \
+  mv ${ROOT}/style.css ${ROOT}/user.css && \
+  # one of the ugliest hacks I ever wrote \
+  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py && \
+  git config --global --add safe.directory '*'

 WORKDIR ${ROOT}
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
+ENV NVIDIA_VISIBLE_DEVICES=all
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-# run, -u to not buffer stdout / stderr
-CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}
--- a/services/AUTOMATIC1111/clone.sh
+++ b/services/AUTOMATIC1111/clone.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -Eeuox pipefail
+
+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
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -4,6 +4,10 @@ set -Eeuo pipefail

 # TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
+# mount scripts individually
+find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
+cp -vrfTs /data/config/auto/scripts/ "${ROOT}/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

@@ -11,8 +15,9 @@ 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"
+if [ ! -f /data/config/auto/styles.csv ]; then
+  touch /data/config/auto/styles.csv
+fi

 declare -A MOUNTS

@@ -30,11 +35,19 @@ 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}/models/torch_deepdanbooru"]="/data/Deepdanbooru"
+MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP"
+MOUNTS["${ROOT}/models/midas"]="/data/MiDaS"
+MOUNTS["${ROOT}/models/Lora"]="/data/Lora"
+MOUNTS["${ROOT}/models/LyCORIS"]="/data/LyCORIS"
+MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet"
+MOUNTS["${ROOT}/models/openpose"]="/data/openpose"
+MOUNTS["${ROOT}/models/ModelScope"]="/data/ModelScope"

 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}/styles.csv"]="/data/config/auto/styles.csv"
 MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions"

 # extra hacks
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -0,0 +1,44 @@
+FROM alpine:3.17 as xformers
+RUN apk add --no-cache aria2
+RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.0/xformers-0.0.17.dev449-cp310-cp310-manylinux2014_x86_64.whl'
+
+
+FROM python:3.10.9-slim
+
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
+
+RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
+
+RUN apt-get update && apt-get install -y git && apt-get clean
+
+ENV ROOT=/stable-diffusion
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
+  cd ${ROOT} && \
+  git checkout master && \
+  git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
+  pip install -r requirements.txt
+
+
+RUN --mount=type=cache,target=/root/.cache/pip  \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.17-cp310-cp310-linux_x86_64.whl \
+  pip install triton /xformers-0.0.17-cp310-cp310-linux_x86_64.whl
+
+
+WORKDIR ${ROOT}
+
+ARG BRANCH=master SHA=884ea653c8d6fe19b3724f45a04a0d74cd881f2f
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git fetch && \
+  git checkout ${BRANCH} && \
+  git reset --hard ${SHA} && \
+  pip install -r requirements.txt
+
+# add info
+COPY . /docker/
+
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
--- a/services/comfy/entrypoint.sh
+++ b/services/comfy/entrypoint.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+declare -A MOUNTS
+
+
+mkdir -vp /data/config/comfy/
+
+# cache
+MOUNTS["/root/.cache"]=/data/.cache
+# ui specific
+MOUNTS["${ROOT}/models/checkpoints"]="/data/StableDiffusion"
+MOUNTS["${ROOT}/models/controlnet"]="/data/ControlNet"
+MOUNTS["${ROOT}/models/upscale_models/RealESRGAN"]="/data/RealESRGAN"
+MOUNTS["${ROOT}/models/upscale_models/GFPGAN"]="/data/GFPGAN"
+MOUNTS["${ROOT}/models/upscale_models/SwinIR"]="/data/SwinIR"
+MOUNTS["${ROOT}/models/vae"]="/data/VAE"
+
+# data
+MOUNTS["${ROOT}/models/loras"]="/data/Lora"
+MOUNTS["${ROOT}/models/embeddings"]="/data/embeddings"
+
+# config
+# TODO: I am not sure if this is final, maybe it should change in the future
+MOUNTS["${ROOT}/models/clip"]="/data/.cache/comfy/clip"
+MOUNTS["${ROOT}/models/clip_vision"]="/data/.cache/comfy/clip_vision"
+MOUNTS["${ROOT}/models/custom_nodes"]="/data/config/comfy/custom_nodes"
+MOUNTS["${ROOT}/models/style_models"]="/data/config/comfy/style_models"
+MOUNTS["${ROOT}/models/t2i_adapter"]="/data/config/comfy/t2i_adapter"
+
+# output
+MOUNTS["${ROOT}/output"]="/output/comfy"
+
+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
+
+exec "$@"
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -3,11 +3,11 @@
 set -Eeuo pipefail

 # 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
+mkdir -vp /data/.cache /data/StableDiffusion /data/LyCORIS /data/Codeformer /data/ModelScope /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora /data/ControlNet /data/openpose

 echo "Downloading, this might take a while..."

-aria2c --disable-ipv6 --input-file /docker/links.txt --dir /data --continue
+aria2c -x 10 --disable-ipv6 --input-file /docker/links.txt --dir /data --continue

 echo "Checking SHAs..."

@@ -15,10 +15,11 @@ 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/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/LICENSE.txt
 https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
+https://github.com/sd-webui/stable-diffusion-webui/blob/master/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
--- a/services/download/links.txt
+++ b/services/download/links.txt
@@ -1,8 +1,8 @@
-https://huggingface.co/ZeroCool94/stable-diffusion-v1-5/resolve/main/Stable%20Diffusion%20v1-5-Pruned-ema%20only.ckpt
+https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
  out=StableDiffusion/v1-5-pruned-emaonly.ckpt
 https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt
  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
+https://huggingface.co/runwayml/stable-diffusion-inpainting/resolve/main/sd-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
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -1,58 +1,58 @@
-# syntax=docker/dockerfile:1
+FROM alpine:3.17 as xformers
+RUN apk add --no-cache aria2
+RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.0/xformers-0.0.17.dev449-cp310-cp310-manylinux2014_x86_64.whl'
+
+

 FROM python:3.10-slim
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]

-ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
+ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1


-RUN pip install torch==1.12.0+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
-
-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 reset --hard 5c31feb3a1096d437c94b6e1c3224eb7a7224a85
-git config --global http.postBuffer 1048576000
-pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
-EOF
+RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117


 # patch match:
 # https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md
-RUN <<EOF
-apt-get update
-# apt-get install build-essential python3-opencv libopencv-dev -y
-apt-get install make g++ libopencv-dev -y
-apt-get clean
-cd /usr/lib/x86_64-linux-gnu/pkgconfig/
-ln -sf opencv4.pc opencv.pc
-EOF
+RUN --mount=type=cache,target=/var/cache/apt \
+  apt-get update && \
+  apt-get install make g++ git libopencv-dev -y && \
+  apt-get clean && \
+  cd /usr/lib/x86_64-linux-gnu/pkgconfig/ && \
+  ln -sf opencv4.pc opencv.pc

-ARG BRANCH=main SHA=38cd968130e386d188bdef68f9fbfbbbfabb2da0
-RUN <<EOF
-git fetch
-git reset --hard
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
-EOF

-RUN pip install --force-reinstall opencv-python-headless && python3 -c "from patchmatch import patch_match"
+
+ENV ROOT=/InvokeAI
+RUN git clone https://github.com/invoke-ai/InvokeAI.git ${ROOT}
+WORKDIR ${ROOT}
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git reset --hard 4463124bddd221c333d4c70e73aa2949ad35453d && \
+  pip install .
+
+
+ARG BRANCH=main SHA=50eb02f68be912276a9c106d5e8038a5671a0386
+RUN --mount=type=cache,target=/root/.cache/pip \
+  git fetch && \
+  git reset --hard && \
+  git checkout ${BRANCH} && \
+  git reset --hard ${SHA} && \
+  pip install -U .
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.17-cp310-cp310-linux_x86_64.whl \
+  pip install -U opencv-python-headless triton /xformers-0.0.17-cp310-cp310-linux_x86_64.whl && \
+  python3 -c "from patchmatch import patch_match"


 COPY . /docker/
-RUN <<EOF
-python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
-touch ~/.invokeai
-EOF

-
-ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
+ENV NVIDIA_VISIBLE_DEVICES=all
+ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS=""
 EXPOSE 7860

 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}
+CMD invokeai --web --host 0.0.0.0 --port 7860 --root_dir ${ROOT} --config ${CONFIG_DIR}/models.yaml --outdir /output/invoke ${CLI_ARGS}
+# TODO: make sure the config is persisted between sessions
--- a/services/invoke/entrypoint.sh
+++ b/services/invoke/entrypoint.sh
@@ -4,26 +4,25 @@ set -Eeuo pipefail

 declare -A MOUNTS

+mkdir -p ${CONFIG_DIR}
+
 # cache
 MOUNTS["/root/.cache"]=/data/.cache/

+# this is really just a hack to avoid migrations
+rm -rf ${HF_HOME}/diffusers
+
 # 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/gfpgan/weights"]=/data/GFPGAN/
 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}/models/ldm"]=/data/.cache/invoke/ldm/

 MOUNTS["${ROOT}/embeddings"]=/data/embeddings/

 # hacks
-MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/

 for to_path in "${!MOUNTS[@]}"; do
  set -Eeuo pipefail
@@ -41,7 +40,8 @@ done

 if "${PRELOAD}" == "true"; then
  set -Eeuo pipefail
-  python3 -u scripts/preload_models.py --no-interactive --root ${ROOT} --config_file /docker/models.yaml
+  invokeai-configure --root ${ROOT} --yes
+  cp ${ROOT}/configs/models.yaml ${CONFIG_DIR}/models.yaml
 fi

 exec "$@"
--- a/services/invoke/info.py
+++ b/services/invoke/info.py
@@ -1,13 +0,0 @@
-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)
-)
--- a/services/invoke/models.yaml
+++ b/services/invoke/models.yaml
@@ -1,23 +0,0 @@
-# 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
--- a/services/sygil/Dockerfile
+++ b/services/sygil/Dockerfile
@@ -1,52 +1,39 @@
-# syntax=docker/dockerfile:1
+FROM python:3.8-slim

-FROM continuumio/miniconda3:4.12.0
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1

-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117

-ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt install gcc libsndfile1 ffmpeg build-essential zip unzip git -y && apt-get clean

-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 --mount=type=cache,target=/root/.cache/pip \
+  git config --global http.postBuffer 1048576000 && \
+  git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion && \
+  cd stable-diffusion && \
+  git reset --hard 5291437085bddd16d752f811b6552419a2044d12 && \
+  pip install -r requirements.txt


-ENV PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
+ARG BRANCH=master SHA=571fb897edd58b714bb385dfaa1ad59aecef8bc7
+RUN --mount=type=cache,target=/root/.cache/pip \
+  cd stable-diffusion && \
+  git fetch && \
+  git checkout ${BRANCH} && \
+  git reset --hard ${SHA} && \
+  pip install -r requirements.txt

-RUN <<EOF
-git config --global http.postBuffer 1048576000
-git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
-cd stable-diffusion
-git reset --hard 091520bed06f913c9f432f9f47ccbe22b46068d7
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean
-
-ARG BRANCH=dev SHA=18a3b809275c395b9a2730c78d6bc0f9b06671e1
-RUN <<EOF
-cd stable-diffusion
-git fetch
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-RUN pip install transformers==4.24.0
+RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'

 # add info
 COPY . /docker/
-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
+RUN 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

 WORKDIR /stable-diffusion
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
+ENV NVIDIA_VISIBLE_DEVICES=all
 ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
 EXPOSE 7860
Author	SHA1	Message	Date
AbdBarho	2efaeb41cd	Add styles.csv support (#440 ) Follow up to #386 after https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/9334 has been merged. Closes #435	2023-05-04 07:48:19 +02:00
AbdBarho	56b942237e	Update Auto (#379 ) Last version before pytorch 2 `5ab7f213be`	2023-05-04 07:29:49 +02:00
AbdBarho	7b8bc3d74a	LyCORIS - ModelScope (#439 ) Follow up to #401 Closes #401 Closes #437 --------- Co-authored-by: svupper <56261963+svupper@users.noreply.github.com> Co-authored-by: Ubuntu <ubuntu@ip-10-123-2-162.eu-west-3.compute.internal>	2023-05-04 06:55:01 +02:00
divens	445f3f8bac	Add tty to comfy service (#429 ) Closes issue #428 Co-authored-by: Dylan Ivens <12586504+divens@users.noreply.github.com>	2023-04-28 19:55:06 +02:00
LEv145	076b5747d3	Fix file permissions (#425 ) https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/424 Co-authored-by: LEv145 <you@example.com>	2023-04-28 15:42:12 +02:00
PassiveLemon	2a0de025e2	Support for ComfyUI (#384 ) As discussed in Discussion [#367](https://github.com/AbdBarho/stable-diffusion-webui-docker/discussions/367), this adds support for the newer ComfyUI. I forked the fork that would already add this but the maintainer of that fork hasn't implemented the changes needed to properly get the output function working, which I did. I believe everything is functional though I have not tested every single node. I changed the table format for the README and a few other minor things for aesthetic reasons but if you want me to revert those, I will. --------- Co-authored-by: Jonathan Kovacs <jkovacs-dev@users.noreply.github.com> Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-04-21 21:34:17 +02:00
AbdBarho	10c16e1971	Refactor invoke (#405 ) Fixes a problem with cross attention class missing from diffusers models are now taken from the huggingFace cache. `50eb02f68b`	2023-04-16 10:56:27 +02:00
AJ Walter	555c26b7ce	Make Dockerfiles OCI compliant (#408 ) ## Justification Closes issue #352 This update makes the Dockerfiles OCI compliant, making it easier to use Buildah or other image building techniques that require it ## Implementation This changes a few things, listed below: * auto: Download container is switched to alpine. The `git` container specified the `/git` directory as a volume. As such, all the files under `/git` would be lost after each script invoke. Alpine is used later in the build process anyway, so it shouldn't be any extra cost to switch to it * auto: "New" clone.sh script is copied into the container, which is basically just the previous clone script that was embedded in the Dockerfile. * all: `<<EOF` heredoc styles have been switched to `&& \` * all: I added NVIDIA_DRIVER_CAPABILITIES and NVIDIA_VISIBLE_DEVICES to expose my Nvidia card. This is most likely a selinux/podman problem, but shouldn't change anything with docker to add it. * docker-compose: I added selinux labeling. I tested this with real docker (not just podman!) and it seems to work fine. Though I suggest you try it too. ## Testing Locally builds with buildah. Note: for caching to work properly, you still need to replace `/root/.cache/pip` with `/root/.cache/pip,Z` on selinux systems. Note: I was having some trouble running invoke. Thought it was this PR, but it's a known issue. See https://github.com/invoke-ai/InvokeAI/issues/3182 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-04-16 10:32:03 +02:00
Simon Oelerich	5d379bf7bc	Add mounts for `openpose` (#387 ) Upon enabling the ControlNet addon from https://github.com/AbdBarho/stable-diffusion-webui-docker/pull/385 one might want to use the `openpose` preprocessors. Those are downloaded by the addon the first time they are used. Without proper mounts those networks will be downloaded on usage after each container start. This PR enables those mounts to reduce data traffic.	2023-04-05 19:09:07 +02:00
Simon Oelerich	d2c1e551d7	Enable ControlNet mounts for AUTOMATIC1111 (#385 ) The ControlNet addon [sd-webui-controlnet](https://github.com/Mikubill/sd-webui-controlnet) requires the `data/ControlNet` folder to be mounted into `models/ControlNet`. This PR enables said mount and adds the ControlNet folder to `.gitignore` file. --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-04-04 18:55:14 +02:00
AbdBarho	063665eae1	Update Auto (#365 ) `a9fed7c364`	2023-03-14 18:30:08 +01:00
AbdBarho	bb54e89b34	Update Auto (#363 ) `27e319dc4f`	2023-03-11 22:35:11 +01:00
AbdBarho	aa69f11230	Fix preload for Invoke (#346 ) Refs #345	2023-02-27 19:59:36 +01:00
AbdBarho	c54e26348e	Update Invoke (#343 ) `6e0c6d9cc9`	2023-02-26 10:53:57 +01:00
AbdBarho	b36de9ef2b	Add libgoogle-perftools-dev (#341 ) - auto: `0cc0ee1bcb` Closes #326	2023-02-23 21:50:16 +01:00
AbdBarho	70d8d7f37f	Update versions (#338 ) - auto: `076d624a29` - invoke: `d3c1b747ee`	2023-02-19 16:25:06 +01:00
AbdBarho	67c9d118d9	Update versions (#332 ) ### Update versions - auto: `3715ece0ad` - invoke: `6551527fe2` Update xformers	2023-02-17 09:22:34 +01:00
AbdBarho	2829ef3581	Auto: hot fix fastapi (#328 ) Closes #327	2023-02-11 11:13:41 +01:00
AbdBarho	1e0561c5cb	Update Auto (#323 ) `3993aa43e9`	2023-02-05 11:04:32 +01:00
AbdBarho	3c860d6eaa	Update versions (#320 ) - auto: `226d840e84` - invoke: `80c5322ccc` Remove `accelerate` for startup. Refs #317 Use `SIGINT` Fixes #319	2023-02-02 19:53:48 +01:00
AbdBarho	15e9841860	Update versions (#316 ) - auto: `00dab8f10d` - invoke: `07e03b31b7`	2023-01-29 20:07:41 +01:00
AbdBarho	eeb410f2de	Update versions (#315 ) auto: `7a14c8ab45` invoke: `e4cd66216e` Also, fix script mounting in auto #295	2023-01-27 07:55:22 +01:00
AbdBarho	9d2a3388c3	Always serve static files (#314 ) #308	2023-01-25 18:17:10 +01:00
AbdBarho	95e489afec	Revert #309 (#313 ) Closes #312	2023-01-25 17:38:25 +01:00
AbdBarho	00518a0340	Add missing mkdir (#310 )	2023-01-24 23:25:07 +01:00
AbdBarho	f8de9190ed	Sync Scripts (#309 ) Refs #308	2023-01-24 23:11:15 +01:00
AbdBarho	8713163a3c	Update Auto (#307 ) `93fad28a97`	2023-01-24 19:52:15 +01:00
AbdBarho	e2b0fb905b	Add Lora support (#306 ) Refs #305 #303 Co-authored-by: repligator <114337591+repligator@users.noreply.github.com>	2023-01-24 19:17:34 +01:00
AbdBarho	510f9fab2b	Update versions (#302 ) Closes #301 - auto: `c98cb0f8ec` - invoke: `89791d91e8`	2023-01-22 20:32:03 +01:00
AbdBarho	042d5c561c	Fix link / mkdir order (#299 ) Fixes `c9153faff7 (commitcomment-97285124)`	2023-01-19 06:37:53 +01:00
AbdBarho	66846377a6	Mount scripts instead of copy (#298 ) Refs #295	2023-01-18 18:50:56 +01:00
AbdBarho	c9153faff7	Update versions (#297 ) - auto: `6faae23239` - invoke: `f232068ab8`	2023-01-18 18:48:34 +01:00
AbdBarho	13dfd4eba5	Update auto (#293 ) `d97f467c0d` This version has a hash computation of models, so expect slower start up & loading times.	2023-01-15 11:50:16 +01:00
AbdBarho	9b1ea3cacf	[MAJOR] Update auto to torch 1.13.1 (#290 ) `82725f0ac4` torch==1.13.1+cu117 This might break your extensions!	2023-01-13 21:27:55 +01:00
AbdBarho	b5cdf299ca	Update versions (#287 ) - auto: `2b94ec7886` - sygil: `571fb897ed`	2023-01-09 19:04:40 +01:00
AbdBarho	db831ece65	Bump versions (#286 ) - auto: `151233399c` - invoke: `26e413ae9c`	2023-01-07 18:58:50 +01:00
AbdBarho	ceeac61cb0	Update auto (#282 ) `683287d87f`	2023-01-06 10:24:20 +01:00
AbdBarho	19972f3cac	Update Versions (#281 ) - auto: `8149078094` - sygil: `e48482823b` - invoke: `21bf512056`	2023-01-04 20:36:49 +01:00
AbdBarho	0c16c105bc	Update auto (#280 ) `3e22e29413`	2023-01-03 21:19:37 +01:00
AbdBarho	78c90e5435	Update auto & invoke (#277 ) - auto: `524d532b38` - invoke: `524d532b38` Happy new Year!!!	2023-01-01 16:46:41 +01:00
AbdBarho	6a3826c80a	Update auto (#274 ) `4af3ca5393` Merry Christmas 🎄	2022-12-26 09:50:29 +01:00
AbdBarho	56d9763a73	Smaller xformers wheel (#271 ) Built with `Release` instead of `RelWithDebInfo` Related #270	2022-12-22 09:19:39 +01:00
AbdBarho	41e0dcc2f6	Auto: clean up interrogators (#265 )	2022-12-17 12:22:45 +01:00
AbdBarho	5a9d305e5c	Update Invoke (#264 ) `ffa54f4a35`	2022-12-16 09:57:33 +01:00
AbdBarho	d70e96da71	Update Invoke (#261 ) `5d20f47993`	2022-12-14 09:47:36 +01:00
AbdBarho	d97d257fd3	Update versions (#257 ) - auto: `685f9631b5` - sygil: `d3f9d054e8` - invoke: `e159bb3dce`	2022-12-12 09:25:44 +01:00
AbdBarho	c3cf8129a9	Expose API per default	2022-12-10 12:06:37 +01:00
AbdBarho	b8256cccd2	Update PR template	2022-12-10 11:42:04 +01:00
AbdBarho	4969906ec8	Update Download URLs	2022-12-10 11:40:25 +01:00
AbdBarho	8201e361fa	Alpha support for sd v2.x in auto (#244 ) `44c46f0ed3` Install sd 2 from [these instructions](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#stable-diffusion-20), put the downloaded files in `data/StableDiffusion/`, maybe create a subfolder `v2` and put the models in it, just to keep everything clean. There will be problems, so be warry.	2022-12-09 18:14:48 +01:00
AbdBarho	1423b274b1	Update Versions (#256 ) sygil: `5291437085` Also, switch to pip instead of conda because it is really slow invoke: `ed9186b099`	2022-12-09 16:50:46 +01:00