diff --git a/.devscripts/migratev7tov8.sh b/.devscripts/migratev7tov8.sh new file mode 100644 index 0000000..421da1e --- /dev/null +++ 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 diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 2c2c54f..a475834 100644 --- 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** diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6fd8686..38bdfd8 100644 --- 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/ diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0955d69..8bb5799 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,6 @@ jobs: matrix: profile: - auto - - sygil - invoke - comfy - download diff --git a/.gitignore b/.gitignore index cc26ad9..5f2408b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /.devcontainer /docker-compose.override.yml +*.code-workspace +/.vscode data/ diff --git a/README.md b/README.md index a4a7240..6671d43 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 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) +### [InvokeAI](https://github.com/invoke-ai/InvokeAI) [Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots: @@ -29,14 +29,6 @@ This repository provides multiple UIs for you to play around with stable diffusi | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | | ![](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: @@ -61,7 +53,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. diff --git a/data/.gitignore b/data/.gitignore index 5194313..946349a 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,24 +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 +/models diff --git a/docker-compose.yml b/docker-compose.yml index 0665ebe..11efbf3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,18 +2,19 @@ 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 @@ -34,7 +35,7 @@ services: profiles: ["auto"] mem_limit: 16g build: ./services/AUTOMATIC1111 - image: sd-auto:51 + image: sd-auto:72 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api --listen @@ -47,16 +48,16 @@ services: environment: - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api - invoke: + invoke: &invoke <<: *base_service container_name: invoke restart: on-failure profiles: ["invoke"] build: ./services/invoke/ - image: sd-invoke:27 + image: sd-invoke:30 environment: - PRELOAD=true - - CLI_ARGS=--no-nsfw_checker --no-safety_checker --xformers + - CLI_ARGS=--xformers sygil: &sygil <<: *base_service @@ -77,15 +78,22 @@ services: environment: - USE_STREAMLIT=1 + # invoke-cpu: + # <<: *invoke + # profiles: ["invoke-cpu"] + # environment: + # - PRELOAD=true + # - CLI_ARGS=--always_use_cpu + + comfy: &comfy <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:1 + image: sd-comfy:6 environment: - CLI_ARGS= - comfy-cpu: <<: *comfy profiles: ["comfy-cpu"] diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index a610d0c..4c478b3 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -2,84 +2,66 @@ 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-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 -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.1.2-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 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 cf2772fab0af5573da775e7437e6acdca424f26e && \ 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 mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate 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 pyngrok \ + pip install pyngrok xformers==0.0.23.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=a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 -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 diff --git a/services/AUTOMATIC1111/config.json b/services/AUTOMATIC1111/config.json deleted file mode 100644 index 7fff2b7..0000000 --- a/services/AUTOMATIC1111/config.json +++ /dev/null @@ -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" -} diff --git a/services/AUTOMATIC1111/config.py b/services/AUTOMATIC1111/config.py new file mode 100644 index 0000000..b8d699e --- /dev/null +++ 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) + diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index c6df995..35023af 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -5,43 +5,41 @@ 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 fi +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/ControlNet"]="/data/ControlNet" -MOUNTS["${ROOT}/models/openpose"]="/data/openpose" +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" @@ -58,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 diff --git a/services/AUTOMATIC1111/info.py b/services/AUTOMATIC1111/info.py deleted file mode 100644 index edfa7b0..0000000 --- a/services/AUTOMATIC1111/info.py +++ /dev/null @@ -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) -) diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 0df273f..f813c68 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -1,14 +1,7 @@ -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.1.2-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 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 @@ -16,29 +9,14 @@ 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 && \ + git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \ 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/ +RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT} -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} diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh old mode 100644 new mode 100755 index 5ffc6bc..b4299a7 --- a/services/comfy/entrypoint.sh +++ b/services/comfy/entrypoint.sh @@ -2,34 +2,12 @@ set -Eeuo pipefail +mkdir -vp /data/config/comfy/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["/root/.cache"]="/data/.cache" +MOUNTS["${ROOT}/input"]="/data/config/comfy/input" MOUNTS["${ROOT}/output"]="/output/comfy" for to_path in "${!MOUNTS[@]}"; do @@ -44,4 +22,10 @@ for to_path in "${!MOUNTS[@]}"; do echo Mounted $(basename "${from_path}") done +if [ -f "/data/config/comfy/startup.sh" ]; then + pushd ${ROOT} + . /data/config/comfy/startup.sh + popd +fi + exec "$@" diff --git a/services/comfy/extra_model_paths.yaml b/services/comfy/extra_model_paths.yaml new file mode 100644 index 0000000..eb374eb --- /dev/null +++ b/services/comfy/extra_model_paths.yaml @@ -0,0 +1,25 @@ +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 + + 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 + # clip_vision: config/comfy/clip_vision + # diffusers: config/comfy/diffusers diff --git a/services/download/Dockerfile b/services/download/Dockerfile index 9c111b1..a95ad03 100644 --- 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"] diff --git a/services/download/checksums.sha256 b/services/download/checksums.sha256 index a64d6a4..ec4ed16 100644 --- 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 diff --git a/services/download/download.sh b/services/download/download.sh index 54176d0..fbe5a70 100755 --- 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/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 /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 diff --git a/services/download/links.txt b/services/download/links.txt index 693c911..3616449 100644 --- 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 diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile index 514d525..209c368 100644 --- a/services/invoke/Dockerfile +++ b/services/invoke/Dockerfile @@ -1,16 +1,11 @@ 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' +RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl' +FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-runtime -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 - +ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 # patch match: # https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md @@ -22,37 +17,37 @@ RUN --mount=type=cache,target=/var/cache/apt \ 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 . + git reset --hard f3b2e02921927d9317255b1c3811f47bd40a2bf9 && \ + pip install -e . -ARG BRANCH=main SHA=50eb02f68be912276a9c106d5e8038a5671a0386 +ARG BRANCH=main SHA=f3b2e02921927d9317255b1c3811f47bd40a2bf9 RUN --mount=type=cache,target=/root/.cache/pip \ git fetch && \ git reset --hard && \ git checkout ${BRANCH} && \ git reset --hard ${SHA} && \ - pip install -U . + pip install -U -e . 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 && \ + --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ + pip install -U opencv-python-headless triton /xformers-0.0.21-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 +CMD invokeai --web --host 0.0.0.0 --port 7860 --root_dir ${ROOT} --config ${CONFIG_DIR}/models.yaml \ + --outdir /output/invoke --embedding_directory /data/embeddings/ --lora_directory /data/models/Lora \ + --no-nsfw_checker --no-safety_checker ${CLI_ARGS} + diff --git a/services/invoke/entrypoint.sh b/services/invoke/entrypoint.sh index 3594c85..348bb2b 100755 --- a/services/invoke/entrypoint.sh +++ b/services/invoke/entrypoint.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail declare -A MOUNTS -mkdir -p ${CONFIG_DIR} +mkdir -p ${CONFIG_DIR} ${ROOT}/configs/stable-diffusion/ # cache MOUNTS["/root/.cache"]=/data/.cache/ @@ -13,15 +13,13 @@ MOUNTS["/root/.cache"]=/data/.cache/ 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/codeformer"]=/data/models/Codeformer/ +MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/models/GFPGAN/GFPGANv1.4.pth +MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/models/GFPGAN/ +MOUNTS["${ROOT}/models/realesrgan"]=/data/models/RealESRGAN/ MOUNTS["${ROOT}/models/ldm"]=/data/.cache/invoke/ldm/ -MOUNTS["${ROOT}/embeddings"]=/data/embeddings/ - # hacks for to_path in "${!MOUNTS[@]}"; do diff --git a/services/sygil/Dockerfile b/services/sygil/Dockerfile deleted file mode 100644 index 7ed2b5e..0000000 --- a/services/sygil/Dockerfile +++ /dev/null @@ -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 diff --git a/services/sygil/info.py b/services/sygil/info.py deleted file mode 100644 index a8b418c..0000000 --- a/services/sygil/info.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys -from pathlib import Path - -file = Path(sys.argv[1]) -file.write_text( - file.read_text()\ - .replace('

For help and advanced usage guides,', """ -

- Created using stable-diffusion-webui-docker. -

-

For help and advanced usage guides, -""", 1) -) diff --git a/services/sygil/mount.sh b/services/sygil/mount.sh deleted file mode 100755 index cc0dc9d..0000000 --- a/services/sygil/mount.sh +++ /dev/null @@ -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 diff --git a/services/sygil/run.sh b/services/sygil/run.sh deleted file mode 100755 index 89f7959..0000000 --- a/services/sygil/run.sh +++ /dev/null @@ -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 diff --git a/services/sygil/userconfig_streamlit.yaml b/services/sygil/userconfig_streamlit.yaml deleted file mode 100644 index 07a20af..0000000 --- a/services/sygil/userconfig_streamlit.yaml +++ /dev/null @@ -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