Update Core to c84748a (#25)

* Add Latent Diffusion & Image Lab

* Update versions

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,29 @@
+---
+name: Bug
+about: Report a bug
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Has this issue been opened before? Check the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Main), the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=is%3Aissue) and in [the issues in the WebUI repo](https://github.com/hlky/stable-diffusion-webui)**
+
+
+
+**Describe the bug**
+
+
+**Steps to Reproduce**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Hardware / Software:**
+ - OS: [e.g. Windows / Ubuntu and version]
+ - GPU: [Nvidia 1660 / No GPU]
+ - Version [e.g. 22]
+
+**Additional context**
+Any other context about the problem here. If applicable, add screenshots to help explain your problem.

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "WebUI",
+      "type": "python",
+      "request": "launch",
+      "program": "${file}",
+      "cwd": "/stable-diffusion",
+      "args": ["--ckpt", "${workspaceFolder}/models/model.ckpt", "--gfpgan-dir", "${workspaceFolder}/models/", "--extra-models-cpu"],
+      "env": {
+        "TRANSFORMERS_CACHE":"${workspaceFolder}/cache/transformers",
+        "TORCH_HOME":"${workspaceFolder}/cache/torch"
+      },
+      "console": "integratedTerminal",
+      "justMyCode": false
+    }
+  ]
+}

build/Dockerfile

@@ -2,52 +2,61 @@
 
 FROM continuumio/miniconda3:4.12.0
 
-
 RUN conda install python=3.8.5 && conda clean -a -y
 RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
-RUN git clone https://github.com/hlky/stable-diffusion.git && cd stable-diffusion && git reset --hard 554bd068e6f2f6bc55449a67fe017ddd77090f28
+RUN git clone https://github.com/hlky/stable-diffusion.git && cd stable-diffusion && git reset --hard ff8c2d0b709f1e4180fb19fa5c27ec28c414cedd
 RUN conda env update --file stable-diffusion/environment.yaml --name base && conda clean -a -y
 
+
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
 # fonts for generating the grid
-RUN apt-get update && apt install fonts-dejavu-core && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
 
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
-RUN cd stable-diffusion && git pull && git reset --hard f3ab556a0c25389cf76f82e63073054e32313829 && \
+RUN cd stable-diffusion && git pull && git reset --hard c84748aa6802c2f934687883a79bde745d2a58a6 && \
-  conda env update --file environment.yaml --name base && conda clean -a -y
+  conda env update --file environment.yaml --name base && conda clean -a -y \
+  && pip install -U --no-cache-dir pyperclip
 
 # download dev UI version, update the sha below in case you want some other version
-RUN git clone https://github.com/hlky/stable-diffusion-webui.git && cd stable-diffusion-webui && \
+# RUN <<EOF
-  git reset --hard 083ffd9ad83d196100fd4b8edfa82c9378546327 && \
+# git clone https://github.com/hlky/stable-diffusion-webui.git
-  cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py relauncher.py && \
+# cd stable-diffusion-webui
-  cd frontend && \
+# # map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
-  cp -t /stable-diffusion/frontend/ __init__.py css_and_js.py frontend.py ui_functions.py && \
+# git reset --hard 49e6178fd82ca736f9bbc621c6b12487c300e493
-  cd / && rm -rf stable-diffusion-webui
+# cp -t /stable-diffusion/scripts/ webui.py relauncher.py txt2img.yaml
+# cp -t /stable-diffusion/configs/webui webui.yaml
+# cp -t /stable-diffusion/frontend/ frontend/*
+# cd / && rm -rf stable-diffusion-webui
+# EOF
 
+# Textual inversion
+RUN <<EOF
+git clone https://github.com/hlky/sd-enable-textual-inversion.git &&
+cd /sd-enable-textual-inversion && git reset --hard 08f9b5046552d17cf7327b30a98410222741b070 &&
+rsync -a /sd-enable-textual-inversion/ /stable-diffusion/ &&
+rm -rf /sd-enable-textual-inversion
+EOF
 
-# For testing different versions:
+# Latent diffusion
-# RUN git clone https://github.com/AbdBarho/stable-diffusion-webui.git && cd stable-diffusion-webui && \
+RUN <<EOF
-#   git checkout respect-cli-params &&\
+git clone https://github.com/devilismyfriend/latent-diffusion &&
-#   cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py && \
+cd /latent-diffusion &&
-#   cd / && rm -rf stable-diffusion-webui
+git reset --hard 6d61fc03f15273a457950f2cdc10dddf53ba6809 &&
+# hacks all the way down
+mv ldm ldm_latent &&
+sed -i -- 's/from ldm/from ldm_latent/g' *.py
+# dont forget to update the yaml!!
+EOF
 
 
 # add info
-COPY info.py /info.py
+COPY . /docker/
-RUN  python /info.py /stable-diffusion/frontend/frontend.py
+RUN python /docker/info.py /stable-diffusion/frontend/frontend.py
 
 WORKDIR /stable-diffusion
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS="" \
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
-  GFPGAN_PATH=/stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth \
-  RealESRGAN_PATH=/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth \
-  RealESRGAN_ANIME_PATH=/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth
 EXPOSE 7860
-CMD \
+# run, -u to not buffer stdout / stderr
-  (test -f /models/GFPGANv1.3.pth && ln -sf /models/GFPGANv1.3.pth "${GFPGAN_PATH}" && echo "Mounted GFPGAN"); \
+CMD /docker/mount.sh && python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}
-  (test -f /models/RealESRGAN_x4plus.pth && ln -sf /models/RealESRGAN_x4plus.pth "${RealESRGAN_PATH}" && echo "Mounted RealESRGAN");\
-  (test -f /models/RealESRGAN_x4plus_anime_6B.pth && ln -sf /models/RealESRGAN_x4plus_anime_6B.pth "${RealESRGAN_ANIME_PATH}" && echo "Mounted RealESRGAN_ANIME"); \
-  # force facexlib cache
-  mkdir -p /cache/weights/ && rm -rf /opt/conda/lib/python3.8/site-packages/facexlib/weights && \
-  ln -sf  /cache/weights/ /opt/conda/lib/python3.8/site-packages/facexlib/ && \
-  # run, -u to not buffer stdout / stderr
-  python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --save-metadata ${CLI_ARGS}

build/info.py

@@ -3,7 +3,8 @@ from pathlib import Path
 
 file = Path(sys.argv[1])
 file.write_text(
-  file.read_text().replace('<p>For help and advanced usage guides,', """
+  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>

build/mount.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+declare -A MODELS
+MODELS["/stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=GFPGANv1.3.pth
+MODELS["/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth"]=RealESRGAN_x4plus.pth
+MODELS["/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth"]=RealESRGAN_x4plus_anime_6B.pth
+MODELS["/latent-diffusion/experiments/pretrained_models/model.ckpt"]=LDSR.ckpt
+# MODELS["/latent-diffusion/experiments/pretrained_models/project.yaml"]=LDSR.yaml
+
+for path in "${!MODELS[@]}"; do
+  name=${MODELS[$path]}
+  base=$(dirname "${path}")
+  from_path="/models/${name}"
+  if test -f "${from_path}"; then
+    mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
+  else
+    echo "Skipping ${name}"
+  fi
+done
+
+# hack for latent-diffusion
+if test -f /models/LDSR.yaml; then
+  sed 's/ldm\./ldm_latent\./g' /models/LDSR.yaml >/latent-diffusion/experiments/pretrained_models/project.yaml
+fi
+
+# force facexlib cache
+mkdir -p /cache/weights/
+rm -rf /stable-diffusion/src/facexlib/facexlib/weights
+ln -sf /cache/weights/ /stable-diffusion/src/facexlib/facexlib/

models/.gitignore

@@ -2,3 +2,5 @@
 /GFPGANv1.3.pth
 /RealESRGAN_x4plus.pth
 /RealESRGAN_x4plus_anime_6B.pth
+/LDSR.ckpt
+/LDSR.yaml