hugging face space fixes

Dockerfile

@@ -1,6 +1,3 @@
-# GPU should be set to either "A10G" or "T4"
-ARG GPU=A10G
-
 FROM nvidia/cuda:11.7.1-cudnn8-devel-ubuntu22.04
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -74,14 +71,6 @@ WORKDIR /app
 COPY pyproject.toml poetry.lock /app/
 RUN poetry install
 
-# Install xformers for the specified GPU
-ARG GPU
-RUN case "$GPU" in \
-        [aA]10[gG]) /opt/venv/bin/pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230119.A10G-cp310-cp310-linux_x86_64.whl;; \
-        [tT]4) /opt/venv/bin/pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230118-cp310-cp310-linux_x86_64.whl;; \
-        *) echo "invalid GPU setting"; exit 1;; \
-    esac
-
 # WebUI + extensions
 RUN git clone -b v2.0 https://github.com/camenduru/stable-diffusion-webui
 RUN wget https://raw.githubusercontent.com/camenduru/stable-diffusion-webui-scripts/main/run_n_times.py -O /app/stable-diffusion-webui/scripts/run_n_times.py
@@ -98,6 +87,10 @@ WORKDIR /app/stable-diffusion-webui
 COPY config.json ui-config.json /app/stable-diffusion-webui/
 RUN python launch.py --exit --skip-torch-cuda-test
 
+RUN sed -i -e 's/                show_progress=False,/                show_progress=True,/g' modules/ui.py
+RUN sed -i -e 's/shared.demo.launch/shared.demo.queue().launch/g' webui.py
+RUN sed -i -e 's/ outputs=\[/queue=False, &/g' modules/ui.py
+
 # Copy startup scripts
 COPY run.py on_start.sh /app/stable-diffusion-webui/
 RUN chmod +x on_start.sh
@@ -109,4 +102,4 @@ USER user
 
 EXPOSE 7860
 
-CMD ["python", "run.py", "--force-enable-xformers", "--ui-config-file", "ui-config.json", "--ui-settings-file", "config.json", "--disable-console-progressbars", "--cors-allow-origins", "huggingface.co,hf.space", "--no-progressbar-hiding", "--no-download-sd-model", "--api", "--skip-version-check"]
+CMD ["/opt/venv/bin/python", "run.py", "--force-enable-xformers", "--xformers", "--listen", "--enable-insecure-extension-access", "--ui-config-file", "ui-config.json", "--ui-settings-file", "config.json", "--disable-console-progressbars", "--cors-allow-origins", "huggingface.co,hf.space", "--no-progressbar-hiding", "--enable-console-prompts", "--no-download-sd-model", "--api", "--skip-version-check"]

README.md

@@ -6,6 +6,10 @@ colorTo: yellow
 sdk: docker
 app_port: 7860
 pinned: true
+tags:
+  - stable-diffusion
+  - stable-diffusion-diffusers
+  - text-to-image
 models:
   - stabilityai/stable-diffusion-2-1
   - runwayml/stable-diffusion-v1-5
@@ -23,15 +27,8 @@ Uses Stable Diffusion 2.1 models. Comes with several popular extensions to [AUTO
 ### Setup on Hugging Face
 
 1. Duplicate this space to your Hugging Face account or clone this repo to your account.
-
-2. Within your duplicated space under *"Files and versions"*, specify the GPU model in the first lines of the [`Dockerfile`](./Dockerfile#L2) to match the hardware you're going to be using for your space.
-
-   ```Dockerfile
-   # GPU should be set to either "A10G" or "T4"
-   ARG GPU=A10G
-   ```
-
-3. Under the *"Settings"* tab of your space you can choose which hardware for your space, that you will also be billed for.
+2. Under the *"Settings"* tab of your space you can choose which hardware for your space, that you will also be billed for.
+3. The [`on_start.sh`](./on_start.sh) file will be run when the container is started, right before the webui is initiated. This is where you can install any additional extensions or models you may need.
 
 ---
 

on_start.sh

@@ -1,6 +1,18 @@
 #!/bin/bash
 set -euo pipefail
 
+echo "\$ nvidia smi"
+nvidia-smi
+
+# Install xformers matching the GPU (only for Nvidia A10G and T4 GPUs)
+if nvidia-smi --query-gpu=gpu_name --format=csv,noheader | grep -q A10G; then
+    /opt/venv/bin/pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230119.A10G-cp310-cp310-linux_x86_64.whl
+elif nvidia-smi --query-gpu=gpu_name --format=csv,noheader | grep -q T4; then
+    /opt/venv/bin/pip install https://github.com/camenduru/stable-diffusion-webui-colab/releases/download/0.0.16/xformers-0.0.16+814314d.d20230118-cp310-cp310-linux_x86_64.whl
+else
+    /opt/venv/bin/pip install --pre xformers
+fi
+
 # SD 2.1 768 base model
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/36a01dc742066de2e8c91e7cf0b8f6b53ef53da1/v2-1_768-ema-pruned.safetensors -d /app/stable-diffusion-webui/models/Stable-diffusion -o v2-1_768-ema-pruned.safetensors
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://raw.githubusercontent.com/Stability-AI/stablediffusion/fc1488421a2761937b9d54784194157882cbc3b1/configs/stable-diffusion/v2-inference-v.yaml -d /app/stable-diffusion-webui/models/Stable-diffusion -o v2-1_768-ema-pruned.yaml
@@ -9,6 +21,9 @@ aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://raw.githubusercont
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors -d /app/stable-diffusion-webui/models/Stable-diffusion -o v1-5-pruned-emaonly.safetensors
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-inference.yaml -d /app/stable-diffusion-webui/models/Stable-diffusion -o v1-5-pruned-emaonly.yaml
 
+# VAE
+aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -d /app/stable-diffusion-webui/models/VAE -o vae-ft-mse-840000-ema-pruned.safetensors
+
 # Dreamlike Diffusion 1.0 model
 aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/dreamlike-art/dreamlike-diffusion-1.0/resolve/00cbe4d56fd56f45e952a5be4d847f21b9782546/dreamlike-diffusion-1.0.safetensors -d /app/stable-diffusion-webui/models/Stable-diffusion -o dreamlike-diffusion-1.0.safetensors
 

run.py

@@ -13,6 +13,7 @@ def on_start():
 def start():
     on_start()
 
+    print("---------------")
     print(f"Launching {'API server' if '--nowebui' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")
     import webui  # type: ignore  # noqa
     if '--nowebui' in sys.argv:
@@ -22,4 +23,4 @@ def start():
 
 
 if __name__ == "__main__":
-    start()
+    start()

ui-config.json

@@ -2,7 +2,7 @@
     "txt2img/Prompt/visible": true,
     "txt2img/Prompt/value": "",
     "txt2img/Negative prompt/visible": true,
-    "txt2img/Negative prompt/value": "",
+    "txt2img/Negative prompt/value": "(worst quality:1.4), (low quality:1.4), (monochrome:1.1), (bad_prompt_version2:0.8), bad art, text, jpeg, watermark, artist sign, blurry, out of frame, ((disfigured)), deformations, extra limb, missing limbs, floating limbs, poorly drawn face, poorly drawn hands, missing fingers, split screen, bad hands, missing fingers, (malformed limbs), ((missing arms)), ((missing legs)), (((extra arms))), (((extra legs))), mutation, mutated hands, (fused fingers), (too many fingers), (((long neck))), roothand, crabhand, vinehand, pincers, [low_resolution], normal quality, cross eyed, bad anatomy, very thin legs, very thin arms, deformed, surreal, ",
     "txt2img/Style 1/value": "None",
     "txt2img/Style 1/visible": true,
     "txt2img/Style 2/value": "None",
@@ -106,7 +106,7 @@
     "img2img/Prompt/visible": true,
     "img2img/Prompt/value": "",
     "img2img/Negative prompt/visible": true,
-    "img2img/Negative prompt/value": "",
+    "img2img/Negative prompt/value": "(worst quality:1.4), (low quality:1.4), (monochrome:1.1), (bad_prompt_version2:0.8), bad art, text, jpeg, watermark, artist sign, blurry, out of frame, ((disfigured)), deformations, extra limb, missing limbs, floating limbs, poorly drawn face, poorly drawn hands, missing fingers, split screen, bad hands, missing fingers, (malformed limbs), ((missing arms)), ((missing legs)), (((extra arms))), (((extra legs))), mutation, mutated hands, (fused fingers), (too many fingers), (((long neck))), roothand, crabhand, vinehand, pincers, [low_resolution], normal quality, cross eyed, bad anatomy, very thin legs, very thin arms, deformed, surreal, ",
     "img2img/Style 1/value": "None",
     "img2img/Style 1/visible": true,
     "img2img/Style 2/value": "None",