Merge ee10e058cc into 802d0bcd68

Fix *upscale_models* path for USE_KRITA=true
feat: Add support for Krita AI Diffusion support
2025-10-31 10:13:28 -04:00 · 2024-10-29 21:39:25 +00:00 · 2024-10-29 15:38:49 -06:00 · 2024-10-29 01:36:21 -06:00 · 2024-10-28 22:40:37 -06:00 · 2024-09-29 03:45:53 -06:00
27 changed files with 359 additions and 455 deletions
--- a/.devscripts/migratev7tov8.sh
+++ b/.devscripts/migratev7tov8.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "Renaming..."
+
+# compatible with default auto-names
+mv -v ./data/StableDiffusion ./data/Stable-diffusion
+mv -v ./data/Deepdanbooru ./data/torch_deepdanbooru
+
+# casing problem on windows
+mv -v ./data/Hypernetworks ./data/hypernetworks1
+mv -v ./data/hypernetworks1 ./data/hypernetworks
+
+mv -v ./data/MiDaS ./data/midas1
+mv -v ./data/midas1 ./data/midas
+
+
+echo "Moving folders..."
+
+mkdir -pv ./final
+
+mv -v ./data/config ./final/config
+mv -v ./data/.cache ./final/.cache
+mv -v ./data/embeddings ./final/embeddings
+mv -v ./data ./final/models
+
+mv -v ./final ./data
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -19,7 +19,7 @@ assignees: ""

 **Which UI**

-auto or auto-cpu or invoke or sygil?
+auto or auto-cpu or invoke or comfy?

 **Hardware / Software**

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,6 +9,5 @@ Closes issue #
 ### Update versions

 - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/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
@@ -14,8 +14,6 @@ jobs:
      matrix:
        profile:
          - auto
-          - sygil
-          - invoke
          - comfy
          - download
    runs-on: ubuntu-latest
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 /.devcontainer
 /docker-compose.override.yml
+
+# VSCode specific
+*.code-workspace
+/.vscode
--- a/README.md
+++ b/README.md
@@ -18,22 +18,6 @@ This repository provides multiple UIs for you to play around with stable diffusi
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](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) |

-### [InvokeAI (lstein)](https://github.com/invoke-ai/InvokeAI)
-
-[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots:
-
-| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
-| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](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) |
-
-### [Sygil (sd-webui / hlky)](https://github.com/Sygil-Dev/sygil-webui)
-
-[Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md), Screenshots:
-
-| Text to image                                                                                              | Image to image                                                                                             | Image Lab                                                                                                  |
-| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
-
 ### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)

 [Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot:
@@ -58,7 +42,7 @@ 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)
+- [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
 - and many many more.
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,26 +1,4 @@
-# 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
-/MiDaS
-/BLIP
-/ScuNET
-/LDSR
-/Deepdanbooru
-/Hypernetworks
-/VAE
 /embeddings
-/Lora
-/ControlNet
-/openpose
-/ModelScope
-/LyCORIS
+/models
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,18 @@
-version: '3.9'
-
 x-base_service: &base_service
    ports:
-      - "7860:7860"
+      - "${WEBUI_PORT:-7860}:7860"
    volumes:
      - &v1 ./data:/data
      - &v2 ./output:/output
-    stop_signal: SIGINT
+    stop_signal: SIGKILL
+    tty: true
    deploy:
      resources:
        reservations:
          devices:
              - driver: nvidia
                device_ids: ['0']
-                capabilities: [gpu]
+                capabilities: [compute, utility]

 name: webui-docker

@@ -28,7 +27,7 @@ services:
    <<: *base_service
    profiles: ["auto"]
    build: ./services/AUTOMATIC1111
-    image: sd-auto:54
+    image: sd-auto:78
    environment:
      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

@@ -39,36 +38,11 @@ services:
    environment:
      - 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:16
-    environment:
-      - CLI_ARGS=--optimized-turbo
-      - USE_STREAMLIT=0
-
-  sygil-sl:
-    <<: *sygil
-    profiles: ["sygil-sl"]
-    environment:
-      - USE_STREAMLIT=1
-
  comfy: &comfy
    <<: *base_service
    profiles: ["comfy"]
    build: ./services/comfy/
-    image: sd-comfy:1
-    tty: true
+    image: sd-comfy:7
    environment:
      - CLI_ARGS=

--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -2,86 +2,63 @@ FROM alpine/git:2.36.2 as download

 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-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git 6f7db241d2f8ba7457bac5ca9753331f0c266917

-RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git 47b6b607fdd31875c9279cd2f4f16b92e4ea958e \
+RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf \
  && 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 5b3af030dd83e0297272d861c19477735d0317ec
-RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
+RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git ab527a9a6d347f364e3d185ba6d714e22d80cb3c
+RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2cf03aaf6e704197fd0dae7c7f96aa59cf1b11c9
+RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
+RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets 6f7db241d2f8ba7457bac5ca9753331f0c266917


-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
+FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime

 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=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 --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 --mount=type=cache,target=/var/cache/apt \
+  apt-get update && \
+  # we need those
+  apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 \
+  # extensions needs those
+  ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential


+WORKDIR /
 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 && \
+  git reset --hard v1.9.4 && \
  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 /repositories/ ${ROOT}/repositories/
-RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
+RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate

 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install pyngrok \
+  pip install pyngrok xformers==0.0.26.post1 \
  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@v2.20.0

-# Note: don't update the sha of previous versions because the install will take forever
-# instead, update the repo state in a later step
-
-# TODO: either remove if fixed in A1111 (unlikely) or move to the top with other apt stuff
+# there seems to be a memory leak (or maybe just memory not being freed fast enough) that is fixed by this version of malloc
+# maybe move this up to the dependencies list.
 RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
 ENV LD_PRELOAD=libtcmalloc.so

-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 \
-  python3 /docker/info.py ${ROOT}/modules/ui.py && \
-  mv ${ROOT}/style.css ${ROOT}/user.css && \
+  # 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 && \
+  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/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
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -1,10 +0,0 @@
-{
-  "outdir_samples": "",
-  "outdir_txt2img_samples": "/output/txt2img",
-  "outdir_img2img_samples": "/output/img2img",
-  "outdir_extras_samples": "/output/extras",
-  "outdir_txt2img_grids": "/output/txt2img-grids",
-  "outdir_img2img_grids": "/output/img2img-grids",
-  "outdir_save": "/output/saved",
-  "font": "DejaVuSans.ttf"
-}
--- a/services/AUTOMATIC1111/config.py
+++ b/services/AUTOMATIC1111/config.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+"""Checks and sets default values for config.json before starting the container."""
+
+import json
+import re
+import os.path
+import sys
+
+DEFAULT_FILEPATH = '/data/config/auto/config.json'
+
+DEFAULT_OUTDIRS = {
+  "outdir_samples": "",
+  "outdir_txt2img_samples": "/output/txt2img",
+  "outdir_img2img_samples": "/output/img2img",
+  "outdir_extras_samples": "/output/extras",
+  "outdir_grids": "",
+  "outdir_txt2img_grids": "/output/txt2img-grids",
+  "outdir_img2img_grids": "/output/img2img-grids",
+  "outdir_save": "/output/saved",
+  "outdir_init_images": "/output/init-images",
+}
+RE_VALID_OUTDIR = re.compile(r"(^/output(/\.?[\w\-\_]+)+/?$)|(^\s?$)")
+
+DEFAULT_OTHER = {
+  "font": "DejaVuSans.ttf",
+}
+
+def dict_to_json_file(target_file: str, data: dict):
+  """Write dictionary to specified json file"""
+
+  with open(target_file, 'w') as f:
+    json.dump(data, f)
+
+def json_file_to_dict(config_file: str) -> dict|None:
+   """Load json file into a dictionary. Return None if file does not exist."""
+
+   if os.path.isfile(config_file):
+    with open(config_file, 'r') as f:
+      return json.load(f)
+   else:
+      return None
+
+def replace_if_invalid(value: str, replacement: str, pattern: str|re.Pattern[str]) -> str:
+  """Returns original value if valid, fallback value if invalid"""
+
+  if re.match(pattern, value):
+    return value
+  else:
+    return replacement
+
+def check_and_replace_config(config_file: str, target_file: str = None):
+  """Checks given file for invalid values. Replaces those with fallback values (default: overwrites file)."""
+
+  # Get current user config, or empty if file does not exists
+  data = json_file_to_dict(config_file) or {}
+
+  # Check and fix output directories
+  for k, def_val in DEFAULT_OUTDIRS.items():
+    if k not in data:
+      data[k] = def_val
+    else:
+      data[k] = replace_if_invalid(value=data[k], replacement=def_val, pattern=RE_VALID_OUTDIR)
+
+  # Check and fix other default settings
+  for k, def_val in DEFAULT_OTHER.items():
+    if k not in data:
+      data[k] = def_val
+
+  # Write results to file
+  dict_to_json_file(target_file or config_file, data)
+
+if __name__ == '__main__':
+  if len(sys.argv) > 1:
+    check_and_replace_config(*sys.argv[1:])
+  else:
+    check_and_replace_config(DEFAULT_FILEPATH)
+
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -5,11 +5,15 @@ set -Eeuo pipefail
 # TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
 # mount scripts individually
+
+echo $ROOT
+ls -lha $ROOT
+
 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
+# Set up config file
+python /docker/config.py /data/config/auto/config.json

 if [ ! -f /data/config/auto/ui-config.json ]; then
  echo '{}' >/data/config/auto/ui-config.json
@@ -19,36 +23,23 @@ if [ ! -f /data/config/auto/styles.csv ]; then
  touch /data/config/auto/styles.csv
 fi

+# copy models from original models folder
+mkdir -p /data/models/VAE-approx/ /data/models/karlo/
+
+rsync -a --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/
+rsync -a --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/
+
 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/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}/models"]="/data/models"

 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"
+MOUNTS["${ROOT}/config_states"]="/data/config/auto/config_states"

 # extra hacks
 MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
@@ -65,8 +56,28 @@ for to_path in "${!MOUNTS[@]}"; do
  echo Mounted $(basename "${from_path}")
 done

+echo "Installing extension dependencies (if any)"
+
+# because we build our container as root:
+chown -R root ~/.cache/
+chmod 766 ~/.cache/
+
+shopt -s nullglob
+# For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy
+list=(./extensions/*/install.py)
+for installscript in "${list[@]}"; do
+  EXTNAME=$(echo $installscript | cut -d '/' -f 3)
+  # Skip installing dependencies if extension is disabled in config
+  if $(jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json); then
+    echo "Skipping disabled extension ($EXTNAME)"
+    continue
+  fi
+  PYTHONPATH=${ROOT} python "$installscript"
+done
+
 if [ -f "/data/config/auto/startup.sh" ]; then
  pushd ${ROOT}
+  echo "Running startup script"
  . /data/config/auto/startup.sh
  popd
 fi
--- a/services/AUTOMATIC1111/info.py
+++ b/services/AUTOMATIC1111/info.py
@@ -1,14 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('    return demo', """
-    with demo:
-        gr.Markdown(
-          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
-        )
-    return demo
-""", 1)
-)
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -1,44 +1,95 @@
-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 pytorch/pytorch:2.3.1-cuda12.1-cudnn8-runtime

+# Limited system user UID
+ARG USE_UID=991
+# Limited system user GID
+ARG USE_GID=991
+# Latest tag or bleeding edge commit
+ARG USE_EDGE=false
+# ComfyUI-GGUF
+ARG USE_GGUF=false
+# x-flux-comfyui
+ARG USE_XFLUX=false
+# comfyui_controlnet_aux
+ARG USE_CNAUX=false
+# krita-ai-diffusion
+ARG USE_KRITA=false
+# ComfyUI_IPAdapter_plus
+ARG USE_IPAPLUS=false
+# comfyui-inpaint-nodes
+ARG USE_INPAINT=false
+# comfyui-tooling-nodes
+ARG USE_TOOLING=false

-FROM python:3.10.9-slim
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 USE_EDGE=$USE_EDGE
+ENV USE_GGUF=$USE_GGUF USE_XFLUX=$USE_XFLUX ROOT=/stable-diffusion
+ENV CACHE=/home/app/.cache USE_CNAUX=$USE_CNAUX USE_KRITA=$USE_KRITA
+ENV USE_IPAPLUS=$USE_IPAPLUS USE_INPAINT=$USE_INPAINT USE_TOOLING=$USE_TOOLING

-ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
+# User/Group
+RUN groupadd -r app -g ${USE_GID} && useradd --no-log-init -m -r -g app app -u ${USE_UID} && \
+  mkdir -p ${ROOT} && chown ${USE_UID}:${USE_GID} ${ROOT} && mkdir -p ${CACHE}/pip && chown -R ${USE_UID}:${USE_GID} ${CACHE}
+RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} chown -R ${USE_UID}:${USE_UID} ${CACHE}

-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 && ([ "${USE_XFLUX}" = "true" ] && apt-get install -y libgl1-mesa-glx python3-opencv) && apt-get clean

-RUN apt-get update && apt-get install -y git && apt-get clean
+USER app:app
+ENV PATH="${PATH}:/home/app/.local/bin"

-ENV ROOT=/stable-diffusion
-RUN --mount=type=cache,target=/root/.cache/pip \
+RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} pip --cache-dir=${CACHE}/pip install -U pip
+
+RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} \
  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
-
+  bash -c 'VERSION=$(git describe --tags --abbrev=0) && \
+  if [ "${USE_EDGE}" = "true" ]; then VERSION=$(git describe --abbrev=7); fi && \
+  git reset --hard ${VERSION}' && \
+  pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
+  if [ "${USE_KRITA}" = "true" ]; then \
+    pip --cache-dir=${CACHE}/pip install aiohttp tqdm && \
+    git clone https://github.com/Acly/krita-ai-diffusion.git && \
+    cd krita-ai-diffusion && git checkout main && \
+    git submodule update --init && cd ..; \
+    export USE_CNAUX="true" USE_IPAPLUS="true" \
+    USE_INPAINT="true" USE_TOOLING="true"; \
+  fi; \
+  if [ "${USE_GGUF}" = "true" ]; then \
+    git clone https://github.com/city96/ComfyUI-GGUF.git && \
+    cd ComfyUI-GGUF && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && cd ..; \
+  fi; \
+  if [ "${USE_XFLUX}" = "true" ]; then \
+    git clone https://github.com/XLabs-AI/x-flux-comfyui.git && \
+    cd x-flux-comfyui && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && cd ..; \
+  fi; \
+  if [ "${USE_CNAUX}" = "true" ]; then \
+    git clone https://github.com/Fannovel16/comfyui_controlnet_aux.git && \
+    cd comfyui_controlnet_aux && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
+    # This extra step to separate onnxruntime installation is required to restore onnx cuda support \
+    pip --cache-dir=${CACHE}/pip install onnxruntime && pip --cache-dir=${CACHE}/pip install onnxruntime-gpu && cd ..; \
+  fi; \
+  if [ "${USE_IPAPLUS}" = "true" ]; then \
+    git clone https://github.com/cubiq/ComfyUI_IPAdapter_plus.git && \
+    cd ComfyUI_IPAdapter_plus && git checkout main && cd ..; \
+  fi; \
+  if [ "${USE_INPAINT}" = "true" ]; then \
+    git clone https://github.com/Acly/comfyui-inpaint-nodes.git && \
+    cd comfyui-inpaint-nodes && git checkout main && \
+    pip --cache-dir=${CACHE}/pip install opencv-python && cd ..; \
+  fi; \
+  if [ "${USE_TOOLING}" = "true" ]; then \
+    git clone https://github.com/Acly/comfyui-tooling-nodes.git && \
+    cd comfyui-tooling-nodes && git checkout main && cd ..; \
+  fi

 WORKDIR ${ROOT}
+COPY --chown=${USE_UID}:${USE_GID} . /docker/
+RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${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=""
+ENV NVIDIA_VISIBLE_DEVICES=all 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
@@ -2,34 +2,13 @@

 set -Eeuo pipefail

+CUSTOM_NODES="/data/config/comfy/custom_nodes"
+mkdir -vp "${CUSTOM_NODES}"
+
 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["${CACHE}"]="/data/.cache"
+MOUNTS["${ROOT}/input"]="/data/config/comfy/input"
 MOUNTS["${ROOT}/output"]="/output/comfy"

 for to_path in "${!MOUNTS[@]}"; do
@@ -44,4 +23,51 @@ for to_path in "${!MOUNTS[@]}"; do
  echo Mounted $(basename "${from_path}")
 done

+
+if [ "${USE_KRITA}" = "true" ]; then
+  if [ "${KRITA_DOWNLOAD_MODELS:-false}" = "true" ]; then
+    cd "${ROOT}/krita-ai-diffusion/scripts" && python scripts/download_models.py --recommended /data && cd ..
+  fi
+  [ -d "${ROOT}/models/upscale_models" ] && mv -v "${ROOT}/models/upscale_models" "${ROOT}/models/upscale_models.stock"
+  if [ ! -L "${ROOT}/models/upscale_models" ]; then
+    cd "${ROOT}/models"
+    ln -sfT /data/models/upscale_models upscale_models
+  fi
+  export USE_CNAUX="true" USE_IPAPLUS="true" USE_INPAINT="true"; USE_TOOLING="true"
+fi
+if [ "${USE_GGUF}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/ComfyUI-GGUF" ] && mv "${ROOT}/ComfyUI-GGUF" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_XFLUX}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/x-flux-comfyui" ] && mv "${ROOT}/x-flux-comfyui" "${CUSTOM_NODES}"/
+  [ ! -e "/data/models/clip_vision" ] && mkdir -p /data/models/clip_vision
+  [ ! -e "/data/models/clip_vision/model.safetensors" ] && cd /data/models/clip_vision && \
+    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen("".join([sys.argv[1],sys.argv[2]])).read())' \
+    "https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/" "model.safetensors"
+  [ ! -e "/data/models/xlabs" ] && mkdir -p /data/models/xlabs/{ipadapters,loras,controlnets}
+  [ ! -e "/data/models/xlabs/ipadapters/flux-ip-adapter.safetensors" ] && cd /data/models/xlabs/ipadapters && \
+    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen("".join([sys.argv[1],sys.argv[2]])).read())' \
+    "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/" "flux-ip-adapter.safetensors"
+  [ -d "${ROOT}/models/xlabs" ] && rm -rf "${ROOT}/models/xlabs"
+  [ ! -e "${ROOT}/models/xlabs" ] && cd "${ROOT}/models" && ln -sT /data/models/xlabs xlabs && cd ..
+fi
+if [ "${USE_CNAUX}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui_controlnet_aux" ] && mv "${ROOT}/comfyui_controlnet_aux" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_IPAPLUS}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/ComfyUI_IPAdapter_plus" ] && mv "${ROOT}/ComfyUI_IPAdapter_plus" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_INPAINT}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-inpaint-nodes" ] && mv "${ROOT}/comfyui-inpaint-nodes" "${CUSTOM_NODES}"/
+fi
+if [ "${USE_TOOLING}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-tooling-nodes" ] && mv "${ROOT}/comfyui-tooling-nodes" "${CUSTOM_NODES}"/
+fi
+
+if [ -f "/data/config/comfy/startup.sh" ]; then
+  pushd ${ROOT}
+  . /data/config/comfy/startup.sh
+  popd
+fi
+
 exec "$@"
--- a/services/comfy/extra_model_paths.yaml
+++ b/services/comfy/extra_model_paths.yaml
@@ -0,0 +1,29 @@
+a111:
+  base_path: /data
+
+  checkpoints: models/Stable-diffusion
+  configs: models/Stable-diffusion
+  vae: models/VAE
+  loras: models/Lora
+  upscale_models: |
+    models/RealESRGAN
+    models/ESRGAN
+    models/SwinIR
+    models/GFPGAN
+  hypernetworks: models/hypernetworks
+  controlnet: models/ControlNet
+  gligen: models/GLIGEN
+  clip: models/CLIPEncoder
+  embeddings: embeddings
+  unet: models/unet
+  clip_vision: models/clip_vision
+  xlabs: models/xlabs
+  inpaint: models/inpaint
+  ipadapter: models/ipadapter
+
+  custom_nodes: config/comfy/custom_nodes
+
+  # TODO: I am unsure about these, need more testing
+  # style_models: config/comfy/style_models
+  # t2i_adapter: config/comfy/t2i_adapter
+  # diffusers: config/comfy/diffusers
--- a/services/download/Dockerfile
+++ b/services/download/Dockerfile
@@ -1,6 +1,6 @@
-FROM bash:alpine3.15
+FROM bash:alpine3.19

-RUN apk add parallel aria2
+RUN apk update && apk add parallel aria2
 COPY . /docker
 RUN chmod +x /docker/download.sh
 ENTRYPOINT ["/docker/download.sh"]
--- a/services/download/checksums.sha256
+++ b/services/download/checksums.sha256
@@ -1,8 +1,8 @@
-cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
-c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19  /data/StableDiffusion/sd-v1-5-inpainting.ckpt
-c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab  /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
-e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/GFPGAN/GFPGANv1.4.pth
-4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/RealESRGAN/RealESRGAN_x4plus.pth
-f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
-c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/LDSR/model.ckpt
-9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/LDSR/project.yaml
+cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516  /data/models/Stable-diffusion/v1-5-pruned-emaonly.ckpt
+c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19  /data/models/Stable-diffusion/sd-v1-5-inpainting.ckpt
+c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab  /data/models/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad  /data/models/GFPGAN/GFPGANv1.4.pth
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /data/models/RealESRGAN/RealESRGAN_x4plus.pth
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /data/models/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /data/models/LDSR/model.ckpt
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /data/models/LDSR/project.yaml
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -3,11 +3,19 @@
 set -Eeuo pipefail

 # TODO: maybe just use the .gitignore file to create all of these
-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
+mkdir -vp /data/.cache \
+  /data/embeddings \
+  /data/config/ \
+  /data/models/ \
+  /data/models/Stable-diffusion \
+  /data/models/GFPGAN \
+  /data/models/RealESRGAN \
+  /data/models/LDSR \
+  /data/models/VAE

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

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

 echo "Checking SHAs..."

@@ -19,11 +27,5 @@ https://github.com/AbdBarho/stable-diffusion-webui-docker/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
-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
+And licenses of all UIs, third party libraries, and extensions.
 EOF
--- a/services/download/links.txt
+++ b/services/download/links.txt
@@ -1,9 +1,9 @@
 https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-  out=StableDiffusion/v1-5-pruned-emaonly.ckpt
+  out=Stable-diffusion/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/runwayml/stable-diffusion-inpainting/resolve/main/sd-v1-5-inpainting.ckpt
-  out=StableDiffusion/sd-v1-5-inpainting.ckpt
+  out=Stable-diffusion/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
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -1,58 +0,0 @@
-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
-
-ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=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
-
-
-# patch match:
-# https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md
-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
-
-
-
-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/
-
-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 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
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-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/GFPGAN/
-MOUNTS["${ROOT}/models/realesrgan"]=/data/RealESRGAN/
-
-MOUNTS["${ROOT}/models/ldm"]=/data/.cache/invoke/ldm/
-
-MOUNTS["${ROOT}/embeddings"]=/data/embeddings/
-
-# hacks
-
-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
-  set -Eeuo pipefail
-  invokeai-configure --root ${ROOT} --yes
-  cp ${ROOT}/configs/models.yaml ${CONFIG_DIR}/models.yaml
-fi
-
-exec "$@"
--- a/services/sygil/Dockerfile
+++ b/services/sygil/Dockerfile
@@ -1,40 +0,0 @@
-FROM python:3.8-slim
-
-ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
-
-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
-
-RUN apt-get update && apt install gcc libsndfile1 ffmpeg build-essential zip unzip git -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
-
-
-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 --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
-
-# add info
-COPY . /docker/
-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
-
-CMD /docker/mount.sh && /docker/run.sh
--- a/services/sygil/info.py
+++ b/services/sygil/info.py
@@ -1,13 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('<p>For help and advanced usage guides,', """
-  <p>
-    Created using <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker">stable-diffusion-webui-docker</a>.
-  </p>
-  <p>For help and advanced usage guides,
-""", 1)
-)
--- a/services/sygil/mount.sh
+++ b/services/sygil/mount.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-ROOT=/stable-diffusion/src
-
-# cache
-MOUNTS["/root/.cache"]=/data/.cache
-# ui specific
-MOUNTS["${PWD}/models/realesrgan"]=/data/RealESRGAN
-MOUNTS["${PWD}/models/ldsr"]=/data/LDSR
-MOUNTS["${PWD}/models/custom"]=/data/StableDiffusion
-
-# 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 to_path in "${!MOUNTS[@]}"; do
-  set -Eeuo pipefail
-  from_path="${MOUNTS[${to_path}]}"
-  rm -rf "${to_path}"
-  mkdir -p "$(dirname "${to_path}")"
-  ln -sT "${from_path}" "${to_path}"
-  echo Mounted $(basename "${from_path}")
-done
-
-# streamlit config
-ln -sf /docker/userconfig_streamlit.yaml /stable-diffusion/configs/webui/userconfig_streamlit.yaml
--- a/services/sygil/run.sh
+++ b/services/sygil/run.sh
@@ -1,10 +0,0 @@
-#!/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
--- a/services/sygil/userconfig_streamlit.yaml
+++ b/services/sygil/userconfig_streamlit.yaml
@@ -1,11 +0,0 @@
-# https://github.com/Sygil-Dev/sygil-webui/blob/master/configs/webui/webui_streamlit.yaml
-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
-  outdir_img2img: /output/img2img
-  outdir_img2txt: /output/img2txt
-  optimized: True
-  optimized_turbo: True
Author	SHA1	Message	Date
lainedfles	6451b223f6	Merge `ee10e058cc` into `802d0bcd68`	2024-10-29 21:39:25 +00:00
Self Denial	ee10e058cc	Fix upscale_models path for `USE_KRITA=true`	2024-10-29 15:38:49 -06:00
Self Denial	0f3187505b	feat: Add support for Krita AI Diffusion support This commit adds support for integrating Krita AI Diffusion models and nodes into the Comfy image editing application. It includes the following changes: - Downloads recommended models for Krita AI Diffusion if enabled - Symlinks the downloaded upscale models into the models directory - Adds environment variables to enable/disable dependancy node packs - Clones and sets up the required Git repositories for those node packs if enabled - Installs additional dependencies like aiohttp and tqdm if Krita AI Diffusion is used These changes allow Comfy to leverage the powerful image generation and editing capabilities provided by the Krita AI Diffusion project. Users can now access advanced features like outpainting, inpainting, upscaling, etc. within the Comfy UI. The commit also improves the build process by using a cache for pip installs and specifying types for mounted volumes in Docker for better performance and reproducibility.	2024-10-29 01:36:21 -06:00
Self Denial	25d8d0c008	Update, more ComfyUI Dockerfile features & bugfix - Update base image to pytorch 2.3.1 - Fix missing comment line escape - Support [krita-ai-diffusion](https://github.com/Acly/krita-ai-diffusion/wiki/ComfyUI-Setup) (`USE_KRITA=true`) This enables the following custom nodes (including comfyui_controlnet_aux): * ComfyUI_IPAdapter_plus (`USE_IPAPLUS=true`) * comfyui-inpaint-nodes (`USE_INPAINT=true`) * comfyui-tooling-nodes (`USE_TOOLING=true`)	2024-10-28 22:40:37 -06:00
Self Denial	6a0366cf45	New ComfyUI Dockerfile features - Non-root default - Use `git describe` to automatically use latest ComfyUI tag (or `USE_EDGE=true` variable for latest commit) - Support custom_nodes: * ComfyUI-GGUF support (`USE_GGUF=true`) * x-flux-comfyui support (`USE_XFLUX=true`) * comfyui_controlnet_aux support (`USE_CNAUX=false`)	2024-09-29 03:45:53 -06:00
AbdBarho	802d0bcd68	Remove invoke (#705 ) The invoke team already maintains a docker setup for their service, this copy here was maybe relevant 2 years ago when all of this started, but I don't think it makes sense anymore. Refer to invoke's docs to install using docker https://invoke-ai.github.io/InvokeAI/installation/040_INSTALL_DOCKER/	2024-06-23 11:16:21 +02:00
mohamednabiel717	b1a26b8041	Update Auto to 1.9.4 (#700 ) `feee37d75f` --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-06-07 19:10:28 +02:00
AbdBarho	f1bf3b0943	Bump pytorch containers (#697 ) Closes #696 Closes #694	2024-05-28 19:39:33 +02:00
AbdBarho	35a18b3d46	Update Comfy (#693 ) `276f8fce9f` Closes #676 Closes #674 Refs #686	2024-05-20 14:44:41 +02:00
神楽坂·喵	887e49c495	Add missing assets to auto1111 (#684 ) Closes #683 Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-05-20 13:41:54 +02:00
Derek Palmer (Creative)	7051ce0a44	Updated docker-compose to remove obsolete version syntax (#692 ) Removes `version:` syntax in `docker-compose` file. If left in, it throws an obsolete warning. I removed it from the docker-compose file to reduce unnecessary warnings and to keep the code up to current standards. See [Version top-level element (obsolete)](https://docs.docker.com/compose/compose-file/04-version-and-name/#version-top-level-element-obsolete) for reference.	2024-05-20 13:41:36 +02:00
SachiaLanlus	ac94eac2b5	Update Auto v1.9.3 (#673 ) Closes issue #672 ### Update versions - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.9.3	2024-05-20 13:35:07 +02:00
AbdBarho	015c2ec829	Pin xformers (for now) (#651 ) Closes #648 Closes #649	2024-02-03 08:50:40 +01:00
AbdBarho	245d1d443f	Update package index (#650 ) Closes #622	2024-02-03 08:17:45 +01:00
Johannes Sjölund	60c4832185	Update open_clip to v2.20.0 in Auto (#617 ) Fixes #615. Updates `open-clip-torch` to the one specified in auto's [requirements_versions.txt](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/requirements_versions.txt#L18). --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-01-01 11:34:46 +01:00
Adam Florizone	f613639748	Update Auto v1.7.0 (#632 ) Update Auto v1.7.0 https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.7.0 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-01-01 11:30:40 +01:00
simonmcnair	fbc5c359d0	Resolve memory usage situation in Auto (#620 ) Fixes https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/612 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-01-01 11:13:01 +01:00
sejoung kim	90affeb72a	Bump Comfy (#603 ) `d1f3637a5a` --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2024-01-01 11:04:02 +01:00
AbdBarho	3e67f559d4	Update Auto (#610 ) Closes #609 `4afaaf8a02`	2023-11-13 21:12:07 +01:00
cococig	a2561f2659	Update automatic1111 webui base image (#601 ) Update the minor version of Python in the base image for AUTOMATIC1111 web UI. Closes issue #600	2023-11-13 19:35:24 +01:00
cloudaxes	6a34739135	Update Automatic1111 to v1.6.0 (#585 ) Update Automatic1111 Stable Diffusion Webui to v1.6.0. Closes #583 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-09-09 16:10:05 +02:00
Sebastian Piechowiak	630980b1bf	Skipping installation of requirements for disabled extensions (#582 ) Closes #563	2023-09-09 15:34:06 +02:00
66li	84740598bc	Update generative-models version (#581 ) Upgrade a dependent library https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/v1.5.2/modules/launch_utils.py#L288C90-L288C130 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-08-31 20:04:32 +02:00
AbdBarho	59b9762ac7	Update Comfy (#580 ) `7e941f9f24`	2023-08-30 20:00:48 +02:00
AbdBarho	70357bf01e	Auto 1.5.2 (#579 ) `c9c8485bc1`	2023-08-30 19:55:06 +02:00
Manuel Schmid	def76291f8	Update Automatic1111 to 1.5.1 to add compatibility for SDXL (#560 ) Uses the latest release of https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f Tested with the official SDXL 1.0 model from https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/sd_xl_base_1.0.safetensors and official refiner from https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/blob/main/sd_xl_refiner_1.0.safetensors. VAE: https://huggingface.co/stabilityai/sdxl-vae/blob/main/sdxl_vae.safetensors Closes #558 Closes #559 `68f336bd99` --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-07-30 15:42:32 +02:00
AbdBarho	09a0f11946	Add startup script for comfy (#552 ) Closes #451 --------- Co-authored-by: PassiveLemon <lemonl3mn@protonmail.com>	2023-07-22 08:31:17 +02:00
cloudaxes	6de45b1984	Upgrade k-diffusion to Release 0.0.15 to get access to DPM++ (2M) SDE sampler. (#537 ) Closes issue #536	2023-07-22 07:23:30 +02:00
AbdBarho	103e11493b	Auto 1.4.0 (#507 ) `394ffa7b0a` Maybe bug: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/11040	2023-07-02 08:15:51 +02:00
AbdBarho	95e96602f9	Bump auto	2023-06-26 21:57:45 +02:00
神楽坂·喵	37a82af4b7	Add build-essential package (#522 ) Fix the problem that some extensions need to be installed from src Now, because the step of installing extensions is moved forward in `entrypoint.sh` instead of `startup.sh`, we cannot install some required packages before executing `install.py` When installing the extension `sd-webui-roop`, it relies on `insightface==0.7.3`, and when installing this pypi package, it is found that when building the wheel package, an error will be reported because `gcc` cannot be found `ddc02ee1a9/requirements.txt (L1)` Therefore, considering that not all pypi packages are distributed in wheel, those pypi packages distributed in src need `build-essential` to build	2023-06-26 21:37:37 +02:00
AbdBarho	5e28222332	Allow setting port through env WEBUI_PORT (#521 ) I am actually not happy with this solution, I would prefer if it was possible to customize the ports within `docker-compose.override.yml`	2023-06-25 20:33:57 +02:00
AbdBarho	6c45e0c2ef	Create dirs if not exist (#520 ) Closes #519	2023-06-25 20:21:41 +02:00
神楽坂·喵	6365811f35	Modify installation extension dependencies (#518 ) Perform a full extension installation process instead of just installing dependencies Some extensions do not include `requirements.txt` but install dependencies in `install.py`, and all extensions include `install.py`, so it is safe to use it for extended dependency installation This is because the extension development of AUTOMATIC1111's webui does not require the existence of `requirements.txt` but uses `install.py` to initialize the extension https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy	2023-06-25 12:42:04 +02:00
AbdBarho	cdde93b8bb	v8 (#516 ) `8607c2d42d`	2023-06-24 10:06:30 +02:00
AbdBarho	660c098da0	Change capabilities in docker-compose (#497 ) #479	2023-06-02 21:29:00 +02:00
AbdBarho	6695c23150	InvokeAI 2.3.5.post2 (#491 ) `f3b2e02921` #489	2023-05-29 19:07:01 +02:00
AbdBarho	a3ecd4a79c	Update auto to 1.3.0 (#490 ) `20ae71faa8` Pytorch 2.0.1 #489	2023-05-29 15:17:06 +02:00
AbdBarho	1df18b803c	Add extension dependencies (#485 ) It seems that users are struggling to follow the instructions on the wiki https://github.com/AbdBarho/stable-diffusion-webui-docker/pull/483#issuecomment-1561241372	2023-05-24 16:53:59 +02:00
AbdBarho	110627415d	Deprecate Sygil (#450 ) It has been a long and wonderful journey	2023-05-16 18:58:52 +02:00
AbdBarho	87b1509dc2	Update Auto to 1.2.1 (#466 ) `89f9faa633` Fix #448	2023-05-16 18:56:36 +02:00
AbdBarho	71f4abb2db	Create custom_nodes dir (#461 ) Closes #460	2023-05-10 07:32:58 +02:00
AbdBarho	c836f41921	Add ClipEncoder (#458 ) https://github.com/AbdBarho/stable-diffusion-webui-docker/pull/432#issuecomment-1537380951	2023-05-08 19:29:38 +02:00
LEv145	d47e77f19c	Update/fix mounts for comfyUI (#432 ) I updated the paths to make all paths work Now paths in ComfyUI are working Added: - `input` - `models/configs` - `models/gligen` - `models/diffusers` - `models/hypernetworks` Was broken: - `custom_nodes` - `models/clip_vision` - `models/clip` --------- Co-authored-by: LEv145 <you@example.com> Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-05-07 11:11:30 +02:00
AbdBarho	7fb8b97b90	Invoke 2.3.5 (#449 ) `d73f1c363c`	2023-05-06 09:48:38 +02:00
Mat	9ac33db795	Fix overwriting existing values in config.json in auto (#418 ) `jq` merge direction in this case is right to left so if the user had set up custom paths it would replace them with the default ones. This PR switches the direction to use the defaults as fallback instead of overwriting user settings. ---- Didn't want to create an issue for the tiny change. Thanks for your work on the repo, it saved me a lot of time, 👍 --------- Co-authored-by: AbdBarho <ka70911@gmail.com>	2023-05-06 07:38:36 +02:00
AbdBarho	a68734c9f9	Revert "Only run if changed (#444 )" This reverts commit `36f39043de`.	2023-05-04 23:00:46 +02:00
AbdBarho	36f39043de	Only run if changed (#444 )	2023-05-04 22:54:37 +02:00
AbdBarho	0e5801e9d6	Update auto to pytorch 2 (#442 ) Closes #410	2023-05-04 22:41:51 +02:00