diff --git a/data/.gitignore b/data/.gitignore index 9649426cd..3bb809da1 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -24,3 +24,4 @@ /openpose /ModelScope /LyCORIS +/GLIGEN diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 0df273fb3..ac0556fc3 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -36,6 +36,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # add info COPY . /docker/ +RUN cp /docker/extra_model_paths.yaml ${ROOT} ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh index 5ffc6bc6b..f9faf7c46 100755 --- a/services/comfy/entrypoint.sh +++ b/services/comfy/entrypoint.sh @@ -2,34 +2,12 @@ set -Eeuo pipefail -declare -A MOUNTS - - mkdir -vp /data/config/comfy/ -# cache -MOUNTS["/root/.cache"]=/data/.cache -# ui specific -MOUNTS["${ROOT}/models/checkpoints"]="/data/StableDiffusion" -MOUNTS["${ROOT}/models/controlnet"]="/data/ControlNet" -MOUNTS["${ROOT}/models/upscale_models/RealESRGAN"]="/data/RealESRGAN" -MOUNTS["${ROOT}/models/upscale_models/GFPGAN"]="/data/GFPGAN" -MOUNTS["${ROOT}/models/upscale_models/SwinIR"]="/data/SwinIR" -MOUNTS["${ROOT}/models/vae"]="/data/VAE" - -# data -MOUNTS["${ROOT}/models/loras"]="/data/Lora" -MOUNTS["${ROOT}/models/embeddings"]="/data/embeddings" - -# config -# TODO: I am not sure if this is final, maybe it should change in the future -MOUNTS["${ROOT}/models/clip"]="/data/.cache/comfy/clip" -MOUNTS["${ROOT}/models/clip_vision"]="/data/.cache/comfy/clip_vision" -MOUNTS["${ROOT}/models/custom_nodes"]="/data/config/comfy/custom_nodes" -MOUNTS["${ROOT}/models/style_models"]="/data/config/comfy/style_models" -MOUNTS["${ROOT}/models/t2i_adapter"]="/data/config/comfy/t2i_adapter" +declare -A MOUNTS -# output +MOUNTS["/root/.cache"]="/data/.cache" +MOUNTS["${ROOT}/input"]="/data/config/comfy/input" MOUNTS["${ROOT}/output"]="/output/comfy" for to_path in "${!MOUNTS[@]}"; do diff --git a/services/comfy/extra_model_paths.yaml b/services/comfy/extra_model_paths.yaml new file mode 100644 index 000000000..ba27ae209 --- /dev/null +++ b/services/comfy/extra_model_paths.yaml @@ -0,0 +1,24 @@ +a111: + base_path: /data + + checkpoints: StableDiffusion + configs: StableDiffusion + vae: VAE + loras: Lora + upscale_models: | + RealESRGAN + ESRGAN + SwinIR + GFPGAN + embeddings: embeddings + hypernetworks: Hypernetworks + controlnet: ControlNet + gligen: GLIGEN + custom_nodes: config/comfy/custom_nodes + + # TODO: I am unsure about these, need more testing + # clip: .cache/clip + # 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/download.sh b/services/download/download.sh index 91e39d956..03835ac5e 100755 --- a/services/download/download.sh +++ b/services/download/download.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail # TODO: maybe just use the .gitignore file to create all of these -mkdir -vp /data/.cache /data/StableDiffusion /data/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/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 /data/GLIGEN echo "Downloading, this might take a while..."