Update versions (#332)

### Update versions

- auto:
3715ece0ad
- invoke:
6551527fe2

Update xformers

data/.gitignore

@@ -19,3 +19,4 @@
 /Hypernetworks
 /VAE
 /embeddings
+/Lora

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,7 +28,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:31
+    image: sd-auto:45
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
@@ -36,13 +37,13 @@ services:
     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:17
+    image: sd-invoke:23
     environment:
       - PRELOAD=true
       - CLI_ARGS=

services/AUTOMATIC1111/Dockerfile

@@ -24,17 +24,17 @@ RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git 5b3af03
 RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
 
 
-FROM alpine:3 as xformers
+FROM alpine:3.17 as xformers
-RUN apk add aria2
+RUN apk add --no-cache aria2
-RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/4.0.0/xformers-0.0.16rc393-cp310-cp310-manylinux2014_x86_64.whl'
+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
 
-RUN PIP_NO_CACHE_DIR=1 pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
+RUN PIP_NO_CACHE_DIR=1 pip install torch==1.13.1+cu117 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
 
@@ -42,7 +42,7 @@ RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y &&
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 4af3ca5393151d61363c30eef4965e694eeac15e
+git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679
 pip install -r requirements_versions.txt
 EOF
 
@@ -59,16 +59,15 @@ RUN --mount=type=cache,target=/root/.cache/pip \
   pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install opencv-python-headless \
+  pip install pyngrok \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
-  git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b \
+  git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b
-  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=2b94ec78869db7d2beaad23bdff47340416edf85
+ARG SHA=3715ece0adce7bf7c5e9c5ab3710b2fdc3848f39
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -76,18 +75,19 @@ git reset --hard ${SHA}
 pip install -r requirements_versions.txt
 EOF
 
-RUN --mount=type=cache,target=/root/.cache/pip \
+RUN --mount=type=cache,target=/root/.cache/pip  pip install -U opencv-python-headless
-  pip install -U opencv-python-headless transformers>=4.24
 
 COPY . /docker
 
 RUN <<EOF
 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
 EOF
 
 WORKDIR ${ROOT}
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}

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,9 +15,6 @@ 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"
@@ -33,6 +34,7 @@ MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
 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}/embeddings"]="/data/embeddings"
 MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"

services/download/download.sh

@@ -3,7 +3,7 @@
 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 /data/MiDaS
+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 /data/MiDaS /data/Lora
 
 echo "Downloading, this might take a while..."
 
@@ -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

services/invoke/Dockerfile

@@ -1,13 +1,18 @@
 # 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
 
 
-RUN --mount=type=cache,target=/root/.cache/pip \
+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
-  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
 
@@ -16,9 +21,11 @@ RUN git clone https://github.com/invoke-ai/InvokeAI.git /stable-diffusion
 WORKDIR /stable-diffusion
 
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
-git reset --hard 5c31feb3a1096d437c94b6e1c3224eb7a7224a85
+git reset --hard f232068ab89bd80e4f5f3133dcdb62ea78f1d0f7
 git config --global http.postBuffer 1048576000
-pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
+egrep -v '^-e .' environments-and-requirements/requirements-lin-cuda.txt > req.txt
+pip install -r req.txt
+rm req.txt
 EOF
 
 
@@ -33,26 +40,33 @@ cd /usr/lib/x86_64-linux-gnu/pkgconfig/
 ln -sf opencv4.pc opencv.pc
 EOF
 
-ARG BRANCH=main SHA=26e413ae9cf8dc04c617ca451a91a1624bfdf0c0
+
+ARG BRANCH=main SHA=6551527fe249dc7a44e3fab9db9451c0dc3ad851
 RUN --mount=type=cache,target=/root/.cache/pip <<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
+pip install .
+# egrep -v '^-e .' environments-and-requirements/requirements-lin-cuda.txt > req.txt
+# pip install -r req.txt
+# rm req.txt
 EOF
 
+
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
+  pip install -U opencv-python-headless huggingface_hub triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl && \
   python3 -c "from patchmatch import patch_match"
 
 
 RUN touch invokeai.init
 COPY . /docker/
 
+# mkdir configs && cp invokeai/configs/INITIAL_MODELS.yaml configs/models.yaml
 
-ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
+ENV PYTHONUNBUFFERED=1 ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS="" HF_HOME=/root/.cache/huggingface
 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 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}

services/invoke/entrypoint.sh

@@ -38,9 +38,9 @@ for to_path in "${!MOUNTS[@]}"; do
   echo Mounted $(basename "${from_path}")
 done
 
-if "${PRELOAD}" == "true"; then
+# if "${PRELOAD}" == "true"; then
-  set -Eeuo pipefail
+#   set -Eeuo pipefail
-  python3 -u scripts/preload_models.py --skip-sd-weights --root ${ROOT} --config_file /docker/models.yaml
+#   python3 -u scripts/preload_models.py --skip-sd-weights --root ${ROOT} --config_file /docker/models.yaml
-fi
+# fi
 
 exec "$@"

services/invoke/models.yaml

@@ -9,7 +9,7 @@ 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
+  config: /stable-diffusion/invokeai/configs/stable-diffusion/v1-inference.yaml
   width: 512
   height: 512
   default: true
@@ -17,7 +17,7 @@ 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
+  config: /stable-diffusion/invokeai/configs/stable-diffusion/v1-inpainting-inference.yaml
   width: 512
   height: 512
   default: false

services/sygil/Dockerfile

@@ -28,7 +28,7 @@ git reset --hard ${SHA}
 pip install -r requirements.txt
 EOF
 
-RUN --mount=type=cache,target=/root/.cache/pip pip install transformers==4.24.0
+RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
 
 # add info
 COPY . /docker/