From 59ba27135592f0b5bcab94a4a3d44a8836e7dd1a Mon Sep 17 00:00:00 2001 From: Andrii Kotliar Date: Wed, 14 Aug 2024 00:27:13 +0200 Subject: [PATCH] Add provision scripts for comfyorg united FP8 FLUX.1 Models --- config/provisioning/flux1-dev-fp8.sh | 206 +++++++++++++++++++++++ config/provisioning/flux1-schnell-fp8.sh | 206 +++++++++++++++++++++++ 2 files changed, 412 insertions(+) create mode 100644 config/provisioning/flux1-dev-fp8.sh create mode 100644 config/provisioning/flux1-schnell-fp8.sh diff --git a/config/provisioning/flux1-dev-fp8.sh b/config/provisioning/flux1-dev-fp8.sh new file mode 100644 index 00000000..d2cbbe24 --- /dev/null +++ b/config/provisioning/flux1-dev-fp8.sh @@ -0,0 +1,206 @@ +#!/bin/bash + +# This file will be sourced in init.sh + +# https://raw.githubusercontent.com/ai-dock/comfyui/main/config/provisioning/default.sh + +# Packages are installed after nodes so we can fix them... + +#DEFAULT_WORKFLOW="https://..." + +APT_PACKAGES=( + #"package-1" + #"package-2" +) + +PIP_PACKAGES=( + #"package-1" + #"package-2" +) + +NODES=( + "https://github.com/ltdrdata/ComfyUI-Manager" + "https://github.com/cubiq/ComfyUI_essentials" +) + +CHECKPOINT_MODELS=( + https://huggingface.co/Comfy-Org/flux1-dev/resolve/main/flux1-dev-fp8.safetensors +) + +UNET_MODELS=( + +) + +LORA_MODELS=( + #"https://civitai.com/api/download/models/16576" +) + +VAE_MODELS=( +) + +ESRGAN_MODELS=( +) + +CONTROLNET_MODELS=( +) + +### DO NOT EDIT BELOW HERE UNLESS YOU KNOW WHAT YOU ARE DOING ### + +function provisioning_start() { + if [[ ! -d /opt/environments/python ]]; then + export MAMBA_BASE=true + fi + source /opt/ai-dock/etc/environment.sh + source /opt/ai-dock/bin/venv-set.sh comfyui + + provisioning_print_header + provisioning_get_apt_packages + provisioning_get_nodes + provisioning_get_pip_packages + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/ckpt" \ + "${CHECKPOINT_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/unet" \ + "${UNET_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/lora" \ + "${LORA_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/controlnet" \ + "${CONTROLNET_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/vae" \ + "${VAE_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/esrgan" \ + "${ESRGAN_MODELS[@]}" + provisioning_print_end +} + +function pip_install() { + if [[ -z $MAMBA_BASE ]]; then + "$COMFYUI_VENV_PIP" install --no-cache-dir "$@" + else + micromamba run -n comfyui pip install --no-cache-dir "$@" + fi +} + +function provisioning_get_apt_packages() { + if [[ -n $APT_PACKAGES ]]; then + sudo $APT_INSTALL ${APT_PACKAGES[@]} + fi +} + +function provisioning_get_pip_packages() { + if [[ -n $PIP_PACKAGES ]]; then + pip_install ${PIP_PACKAGES[@]} + fi +} + +function provisioning_get_nodes() { + for repo in "${NODES[@]}"; do + dir="${repo##*/}" + path="/opt/ComfyUI/custom_nodes/${dir}" + requirements="${path}/requirements.txt" + if [[ -d $path ]]; then + if [[ ${AUTO_UPDATE,,} != "false" ]]; then + printf "Updating node: %s...\n" "${repo}" + ( cd "$path" && git pull ) + if [[ -e $requirements ]]; then + pip_install -r "$requirements" + fi + fi + else + printf "Downloading node: %s...\n" "${repo}" + git clone "${repo}" "${path}" --recursive + if [[ -e $requirements ]]; then + pip_install -r "${requirements}" + fi + fi + done +} + +function provisioning_get_default_workflow() { + if [[ -n $DEFAULT_WORKFLOW ]]; then + workflow_json=$(curl -s "$DEFAULT_WORKFLOW") + if [[ -n $workflow_json ]]; then + echo "export const defaultGraph = $workflow_json;" > /opt/ComfyUI/web/scripts/defaultGraph.js + fi + fi +} + +function provisioning_get_models() { + if [[ -z $2 ]]; then return 1; fi + + dir="$1" + mkdir -p "$dir" + shift + arr=("$@") + printf "Downloading %s model(s) to %s...\n" "${#arr[@]}" "$dir" + for url in "${arr[@]}"; do + printf "Downloading: %s\n" "${url}" + provisioning_download "${url}" "${dir}" + printf "\n" + done +} + +function provisioning_print_header() { + printf "\n##############################################\n# #\n# Provisioning container #\n# #\n# This will take some time #\n# #\n# Your container will be ready on completion #\n# #\n##############################################\n\n" + if [[ $DISK_GB_ALLOCATED -lt $DISK_GB_REQUIRED ]]; then + printf "WARNING: Your allocated disk size (%sGB) is below the recommended %sGB - Some models will not be downloaded\n" "$DISK_GB_ALLOCATED" "$DISK_GB_REQUIRED" + fi +} + +function provisioning_print_end() { + printf "\nProvisioning complete: Web UI will start now\n\n" +} + +function provisioning_has_valid_hf_token() { + [[ -n "$HF_TOKEN" ]] || return 1 + url="https://huggingface.co/api/whoami-v2" + + response=$(curl -o /dev/null -s -w "%{http_code}" -X GET "$url" \ + -H "Authorization: Bearer $HF_TOKEN" \ + -H "Content-Type: application/json") + + # Check if the token is valid + if [ "$response" -eq 200 ]; then + return 0 + else + return 1 + fi +} + +function provisioning_has_valid_civitai_token() { + [[ -n "$CIVITAI_TOKEN" ]] || return 1 + url="https://civitai.com/api/v1/models?hidden=1&limit=1" + + response=$(curl -o /dev/null -s -w "%{http_code}" -X GET "$url" \ + -H "Authorization: Bearer $CIVITAI_TOKEN" \ + -H "Content-Type: application/json") + + # Check if the token is valid + if [ "$response" -eq 200 ]; then + return 0 + else + return 1 + fi +} + +# Download from $1 URL to $2 file path +function provisioning_download() { + if [[ -n $HF_TOKEN && $1 =~ ^https://([a-zA-Z0-9_-]+\.)?huggingface\.co(/|$|\?) ]]; then + auth_token="$HF_TOKEN" + elif + [[ -n $CIVITAI_TOKEN && $1 =~ ^https://([a-zA-Z0-9_-]+\.)?civitai\.com(/|$|\?) ]]; then + auth_token="$CIVITAI_TOKEN" + fi + if [[ -n $auth_token ]];then + wget --header="Authorization: Bearer $auth_token" -qnc --content-disposition --show-progress -e dotbytes="${3:-4M}" -P "$2" "$1" + else + wget -qnc --content-disposition --show-progress -e dotbytes="${3:-4M}" -P "$2" "$1" + fi +} + +provisioning_start diff --git a/config/provisioning/flux1-schnell-fp8.sh b/config/provisioning/flux1-schnell-fp8.sh new file mode 100644 index 00000000..fc0a2f03 --- /dev/null +++ b/config/provisioning/flux1-schnell-fp8.sh @@ -0,0 +1,206 @@ +#!/bin/bash + +# This file will be sourced in init.sh + +# https://raw.githubusercontent.com/ai-dock/comfyui/main/config/provisioning/default.sh + +# Packages are installed after nodes so we can fix them... + +#DEFAULT_WORKFLOW="https://..." + +APT_PACKAGES=( + #"package-1" + #"package-2" +) + +PIP_PACKAGES=( + #"package-1" + #"package-2" +) + +NODES=( + "https://github.com/ltdrdata/ComfyUI-Manager" + "https://github.com/cubiq/ComfyUI_essentials" +) + +CHECKPOINT_MODELS=( + https://huggingface.co/Comfy-Org/flux1-schnell/resolve/main/flux1-schnell-fp8.safetensors +) + +UNET_MODELS=( + +) + +LORA_MODELS=( + #"https://civitai.com/api/download/models/16576" +) + +VAE_MODELS=( +) + +ESRGAN_MODELS=( +) + +CONTROLNET_MODELS=( +) + +### DO NOT EDIT BELOW HERE UNLESS YOU KNOW WHAT YOU ARE DOING ### + +function provisioning_start() { + if [[ ! -d /opt/environments/python ]]; then + export MAMBA_BASE=true + fi + source /opt/ai-dock/etc/environment.sh + source /opt/ai-dock/bin/venv-set.sh comfyui + + provisioning_print_header + provisioning_get_apt_packages + provisioning_get_nodes + provisioning_get_pip_packages + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/ckpt" \ + "${CHECKPOINT_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/unet" \ + "${UNET_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/lora" \ + "${LORA_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/controlnet" \ + "${CONTROLNET_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/vae" \ + "${VAE_MODELS[@]}" + provisioning_get_models \ + "${WORKSPACE}/storage/stable_diffusion/models/esrgan" \ + "${ESRGAN_MODELS[@]}" + provisioning_print_end +} + +function pip_install() { + if [[ -z $MAMBA_BASE ]]; then + "$COMFYUI_VENV_PIP" install --no-cache-dir "$@" + else + micromamba run -n comfyui pip install --no-cache-dir "$@" + fi +} + +function provisioning_get_apt_packages() { + if [[ -n $APT_PACKAGES ]]; then + sudo $APT_INSTALL ${APT_PACKAGES[@]} + fi +} + +function provisioning_get_pip_packages() { + if [[ -n $PIP_PACKAGES ]]; then + pip_install ${PIP_PACKAGES[@]} + fi +} + +function provisioning_get_nodes() { + for repo in "${NODES[@]}"; do + dir="${repo##*/}" + path="/opt/ComfyUI/custom_nodes/${dir}" + requirements="${path}/requirements.txt" + if [[ -d $path ]]; then + if [[ ${AUTO_UPDATE,,} != "false" ]]; then + printf "Updating node: %s...\n" "${repo}" + ( cd "$path" && git pull ) + if [[ -e $requirements ]]; then + pip_install -r "$requirements" + fi + fi + else + printf "Downloading node: %s...\n" "${repo}" + git clone "${repo}" "${path}" --recursive + if [[ -e $requirements ]]; then + pip_install -r "${requirements}" + fi + fi + done +} + +function provisioning_get_default_workflow() { + if [[ -n $DEFAULT_WORKFLOW ]]; then + workflow_json=$(curl -s "$DEFAULT_WORKFLOW") + if [[ -n $workflow_json ]]; then + echo "export const defaultGraph = $workflow_json;" > /opt/ComfyUI/web/scripts/defaultGraph.js + fi + fi +} + +function provisioning_get_models() { + if [[ -z $2 ]]; then return 1; fi + + dir="$1" + mkdir -p "$dir" + shift + arr=("$@") + printf "Downloading %s model(s) to %s...\n" "${#arr[@]}" "$dir" + for url in "${arr[@]}"; do + printf "Downloading: %s\n" "${url}" + provisioning_download "${url}" "${dir}" + printf "\n" + done +} + +function provisioning_print_header() { + printf "\n##############################################\n# #\n# Provisioning container #\n# #\n# This will take some time #\n# #\n# Your container will be ready on completion #\n# #\n##############################################\n\n" + if [[ $DISK_GB_ALLOCATED -lt $DISK_GB_REQUIRED ]]; then + printf "WARNING: Your allocated disk size (%sGB) is below the recommended %sGB - Some models will not be downloaded\n" "$DISK_GB_ALLOCATED" "$DISK_GB_REQUIRED" + fi +} + +function provisioning_print_end() { + printf "\nProvisioning complete: Web UI will start now\n\n" +} + +function provisioning_has_valid_hf_token() { + [[ -n "$HF_TOKEN" ]] || return 1 + url="https://huggingface.co/api/whoami-v2" + + response=$(curl -o /dev/null -s -w "%{http_code}" -X GET "$url" \ + -H "Authorization: Bearer $HF_TOKEN" \ + -H "Content-Type: application/json") + + # Check if the token is valid + if [ "$response" -eq 200 ]; then + return 0 + else + return 1 + fi +} + +function provisioning_has_valid_civitai_token() { + [[ -n "$CIVITAI_TOKEN" ]] || return 1 + url="https://civitai.com/api/v1/models?hidden=1&limit=1" + + response=$(curl -o /dev/null -s -w "%{http_code}" -X GET "$url" \ + -H "Authorization: Bearer $CIVITAI_TOKEN" \ + -H "Content-Type: application/json") + + # Check if the token is valid + if [ "$response" -eq 200 ]; then + return 0 + else + return 1 + fi +} + +# Download from $1 URL to $2 file path +function provisioning_download() { + if [[ -n $HF_TOKEN && $1 =~ ^https://([a-zA-Z0-9_-]+\.)?huggingface\.co(/|$|\?) ]]; then + auth_token="$HF_TOKEN" + elif + [[ -n $CIVITAI_TOKEN && $1 =~ ^https://([a-zA-Z0-9_-]+\.)?civitai\.com(/|$|\?) ]]; then + auth_token="$CIVITAI_TOKEN" + fi + if [[ -n $auth_token ]];then + wget --header="Authorization: Bearer $auth_token" -qnc --content-disposition --show-progress -e dotbytes="${3:-4M}" -P "$2" "$1" + else + wget -qnc --content-disposition --show-progress -e dotbytes="${3:-4M}" -P "$2" "$1" + fi +} + +provisioning_start