[MAJOR] Update auto to torch 1.13.1 (#290 )

82725f0ac4 torch==1.13.1+cu117 This might break your extensions!
Update versions (#287 )
2025-10-31 02:03:32 -04:00 · 2023-01-13 21:27:55 +01:00 · 2023-01-09 19:04:40 +01:00 · 2023-01-07 18:58:50 +01:00 · 2023-01-06 10:24:20 +01:00 · 2023-01-04 20:36:49 +01:00
33 changed files with 461 additions and 437 deletions
--- a/.devscripts/chmod.sh
+++ b/.devscripts/chmod.sh
@@ -2,4 +2,5 @@

 set -Eeuo pipefail

-find . -name "*.sh" -exec git update-index --chmod=+x {} \;
+find services -name "*.sh" -exec git update-index --chmod=+x {} \;
+find .devscripts -name "*.sh" -exec git update-index --chmod=+x {} \;
--- a/.devscripts/migratev1tov2.sh
+++ b/.devscripts/migratev1tov2.sh
--- a/.devscripts/migratev3tov4.sh
+++ b/.devscripts/migratev3tov4.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "Moving everything in output to output/old..."
+mv output old
+mkdir output
+mv old/.gitignore output
+mv old output
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,36 +1,43 @@
 ---
 name: Bug
 about: Report a bug
-title: ''
+title: ""
 labels: bug
-assignees: ''
-
+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)**
+<!--  PLEASE FILL THIS OUT, IT WILL MAKE BOTH OF OUR LIVES EASIER -->

+**Has this issue been opened before?**

+- [ ] It is not in the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ), I checked.
+- [ ] It is not in the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=), I searched.

 **Describe the bug**

+<!--  tried to run the app, my cat exploded -->

 **Which UI**

-hlky or auto or auto-cpu or lstein?
+auto or auto-cpu or invoke or sygil?
+
+**Hardware / Software**
+
+- OS: [e.g. Windows 10 / Ubuntu 22.04]
+- OS version: <!--  on windows, use the command `winver` to find out, on ubuntu `lsb_release -d`  -->
+- WSL version (if applicable): <!-- get using `wsl -l -v` -->
+- Docker Version: <!--  get using `docker version` -->
+- Docker compose version: <!--  get using `docker compose version` -->
+- Repo version: <!-- tag, commit sha, or "from master" -->
+- RAM:
+- GPU/VRAM:

 **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]
- - RAM:
- - GPU: [Nvidia 1660 / No GPU]
- - VRAM:
- - Docker Version, Docker compose version
- - Release version [e.g. 1.0.1]
-
 **Additional context**
 Any other context about the problem here. If applicable, add screenshots to help explain your problem.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request? Questions regarding some extension?
+    url: https://github.com/AbdBarho/stable-diffusion-webui-docker/discussions
+    about: Please use the discussions tab
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,13 @@
+<!--
+Have you created an issue before opening a merge request???
+https://github.com/AbdBarho/stable-diffusion-webui-docker#contributing
+Please create one so we can discuss it, I don't want your effort to go to waste.
+-->
+
+Closes issue #
+
 ### Update versions

 - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/
- hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/
- lstein: https://github.com/lstein/stable-diffusion/commit/
+- sygil: https://github.com/Sygil-Dev/sygil-webui/commit/
+- invoke: https://github.com/invoke-ai/InvokeAI/commit/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,12 @@
 name: Build Images

-on: [push]
+on:
+  push:
+    branches: master
+  pull_request:
+      paths:
+        - docker-compose.yml
+        - services

 jobs:
  build:
@@ -8,12 +14,11 @@ jobs:
      matrix:
        profile:
          - auto
-          - hlky
-          - lstein
+          - sygil
+          - invoke
          - download
    runs-on: ubuntu-latest
    name: ${{ matrix.profile }}
    steps:
      - uses: actions/checkout@v3
-      # better caching?
      - run: docker compose --profile ${{ matrix.profile }} build --progress plain
--- a/.github/workflows/executable.yml1
+++ b/.github/workflows/executable.yml1
@@ -1,22 +0,0 @@
-name: Check executable
-
-on: [push]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    name: Check all sh
-    steps:
-      - run: git config --global core.fileMode true
-      - uses: actions/checkout@v3
-      - shell: bash
-        run: |
-          shopt -s globstar;
-          FAIL=0
-          for file in **/*.sh; do
-              if [ -f "${file}" ] && [ -r "${file}" ] && [ ! -x "${file}" ]; then
-                  echo "$file" is not executable;
-                  FAIL=1
-              fi
-          done
-          exit ${FAIL}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,13 +1,13 @@
 name: 'Close stale issues and PRs'
 on:
  schedule:
-    - cron: '30 1 * * *'
+    - cron: '0 0 * * *'

 jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
        with:
          only-labels: awaiting-response
          stale-issue-message: This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days.
--- a/7
+++ b/7
@@ -87,10 +87,3 @@ processes, such as predicting an individual will commit fraud/crime
 commitment (e.g. by text profiling, drawing causal relationships between
 assertions made in documents, indiscriminate and arbitrarily-targeted
 use).
-
-
-
-By using this software, you also agree to the following licenses:
-https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
-https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
-https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
--- a/README.md
+++ b/README.md
@@ -2,61 +2,41 @@

 Run Stable Diffusion on your machine with a nice UI without any hassle!

-This repository provides multiple UIs for you to play around with stable diffusion:
-
-## Features
-
-### AUTOMATIC1111
-
-[AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI:
-
- Text to image, with many samplers and even negative prompts!
- Image to image, with masking, cropping, in-painting, out-painting, variations.
- GFPGAN, RealESRGAN, LDSR, CodeFormer.
- Loopback, prompt weighting, prompt matrix, X/Y plot
- Live preview of the generated images.
- Highly optimized 4GB GPU support, or even CPU only!
- Textual inversion allows you to use pretrained textual inversion embeddings
- [Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase)
-
-| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
-| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](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) |
-
-### hlky
-
-[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features:
-
- Text to image, with many samplers
- Image to image, with masking, cropping, in-painting, variations.
- GFPGAN, RealESRGAN, LDSR, GoBig, GoLatent
- Loopback, prompt weighting
- 6GB or even 4GB GPU support!
- [Full feature list here](https://github.com/sd-webui/stable-diffusion-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) |
-
-<!--
-### lstein
-
-[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential.
-
-| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
-| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](https://user-images.githubusercontent.com/24505302/190662506-dabdc967-93af-4d78-8533-394604d29ba4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662557-7640d9f0-30d8-4527-97b0-07d3f48108d4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662588-37a01fad-f993-4674-9ae6-8714aa229f7b.jpg) |
-->
-
 ## Setup & Usage

 Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue!

+## Features
+
+This repository provides multiple UIs for you to play around with stable diffusion:
+
+### [AUTOMATIC1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
+
+[Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase), Screenshots:
+
+| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
+| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| ![](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)
+
+[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots:
+
+| Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
+| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| ![](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) |
+
 ## Contributing

-Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it.
+Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**

 ## Disclaimer

@@ -68,10 +48,8 @@ This license of this software forbids you from sharing any content that violates

 Special thanks to everyone behind these awesome projects, without them, none of this would have been possible:

- [hlky/stable-diffusion-webui](https://github.com/hlky/stable-diffusion-webui)
 - [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
- [lstein/stable-diffusion](https://github.com/lstein/stable-diffusion)
+- [InvokeAI](https://github.com/invoke-ai/InvokeAI)
+- [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
 - [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
- [hlky/sd-enable-textual-inversion](https://github.com/hlky/sd-enable-textual-inversion)
- [devilismyfriend/latent-diffusion](https://github.com/devilismyfriend/latent-diffusion)
- [Hafiidz/latent-diffusion](https://github.com/Hafiidz/latent-diffusion)
+- and many many more.
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,5 +1,7 @@
 # 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
@@ -9,6 +11,11 @@
 /BSRGAN
 /RealESRGAN
 /SwinIR
+/MiDaS
+/BLIP
 /ScuNET
 /LDSR
+/Deepdanbooru
+/Hypernetworks
+/VAE
 /embeddings
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,23 +23,13 @@ services:
    volumes:
      - *v1

-  hlky:
-    <<: *base_service
-    profiles: ["hlky"]
-    build: ./services/hlky/
-    environment:
-      - CLI_ARGS=--optimized-turbo
-
  auto: &automatic
    <<: *base_service
    profiles: ["auto"]
    build: ./services/AUTOMATIC1111
-    volumes:
-      - *v1
-      - *v2
-      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
+    image: sd-auto:32
    environment:
-      - CLI_ARGS=--allow-code --medvram
+      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api

  auto-cpu:
    <<: *automatic
@@ -48,10 +38,27 @@ services:
    environment:
      - CLI_ARGS=--no-half --precision full

-  lstein:
+  invoke:
    <<: *base_service
-    profiles: ["lstein"]
-    build: ./services/lstein/
+    profiles: ["invoke"]
+    build: ./services/invoke/
+    image: sd-invoke:17
    environment:
-      - PRELOAD=false
+      - PRELOAD=true
      - CLI_ARGS=
+
+
+  sygil: &sygil
+    <<: *base_service
+    profiles: ["sygil"]
+    build: ./services/sygil/
+    image: sd-sygil:16
+    environment:
+      - CLI_ARGS=--optimized-turbo
+      - USE_STREAMLIT=0
+
+  sygil-sl:
+    <<: *sygil
+    profiles: ["sygil-sl"]
+    environment:
+      - USE_STREAMLIT=1
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -2,76 +2,92 @@

 FROM alpine/git:2.36.2 as download

-
-RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion && cd repositories/stable-diffusion && git reset --hard 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc
-
-RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af
-RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9
-RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
+SHELL ["/bin/sh", "-ceuxo", "pipefail"]

 RUN <<EOF
-# because taming-transformers is huge
-git config --global http.postBuffer 1048576000
-git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
-git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
-rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
+cat <<'EOE' > /clone.sh
+mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git
+EOE
 EOF

-RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878
+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 \
+  && 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


-FROM continuumio/miniconda3:4.12.0
+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/4.1.0/xformers-0.0.16.dev421-cp310-cp310-manylinux2014_x86_64.whl'
+
+FROM python:3.10.9-slim

 SHELL ["/bin/bash", "-ceuxo", "pipefail"]

-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1

-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 PIP_NO_CACHE_DIR=1 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 -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean


-RUN <<EOF
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
-pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
+git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679
+pip install -r requirements_versions.txt
 EOF

-ENV ROOT=/stable-diffusion-webui \
-  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
+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 /git/ ${ROOT}
-RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
+RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/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 opencv-python-headless \
+  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 \
+  pyngrok

 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step

-ARG SHA=2995107fa24cfd72b0a991e18271dcde148c2807
-RUN <<EOF
+ARG SHA=82725f0ac439f7e3b67858d55900e95330bbd326
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
-git pull --rebase
+git fetch
 git reset --hard ${SHA}
-pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
-pip install --prefer-binary --no-cache-dir -r requirements.txt
+pip install -r requirements_versions.txt
 EOF

-RUN pip install --prefer-binary --no-cache-dir opencv-python-headless \
-  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
-  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1
-
-
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install -U opencv-python-headless transformers>=4.24

 COPY . /docker
+
 RUN <<EOF
-chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+python3 /docker/info.py ${ROOT}/modules/ui.py
+mv ${ROOT}/style.css ${ROOT}/user.css
 EOF

+WORKDIR ${ROOT}
 ENV CLI_ARGS=""
-WORKDIR ${WORKDIR}
 EXPOSE 7860
-# run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && \
-  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir ${ROOT}/models/Stable-diffusion ${CLI_ARGS}
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -1,79 +1,10 @@
 {
-  "outdir_samples": "/output",
-  "outdir_txt2img_samples": "/output/txt2img-images",
-  "outdir_img2img_samples": "/output/img2img-images",
-  "outdir_extras_samples": "/output/extras-images",
+  "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",
-  "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS",
-
-  "add_model_hash_to_info": false,
-  "code_former_weight": 0.5,
-  "directories_filename_pattern": "",
-  "directories_max_prompt_words": 8,
-  "enable_batch_seeds": true,
-  "enable_emphasis": true,
-  "enable_pnginfo": true,
-  "enable_quantization": false,
-  "ESRGAN_tile": 192,
-  "ESRGAN_tile_overlap": 8,
-  "export_for_4chan": true,
-  "face_restoration_model": null,
-  "face_restoration_unload": false,
-  "filter_nsfw": false,
-  "grid_extended_filename": false,
-  "grid_format": "png",
-  "grid_only_if_multiple": true,
-  "grid_save": true,
-  "grid_save_to_dirs": false,
-  "img2img_color_correction": false,
-  "img2img_fix_steps": false,
-  "interrogate_clip_dict_limit": 1500,
-  "interrogate_clip_max_length": 48,
-  "interrogate_clip_min_length": 24,
-  "interrogate_clip_num_beams": 1,
-  "interrogate_keep_models_in_memory": false,
-  "interrogate_use_builtin_artists": true,
-  "jpeg_quality": 80,
-  "js_modal_lightbox": true,
-  "js_modal_lightbox_initialy_zoomed": true,
-  "ldsr_post_down": 1,
-  "ldsr_pre_down": 1,
-  "ldsr_steps": 30,
-  "memmon_poll_rate": 8,
-  "multiple_tqdm": true,
-  "n_rows": -1,
-  "outdir_grids": "",
-  "random_artist_categories": [],
-  "realesrgan_enabled_models": [
-    "Real-ESRGAN 4x plus",
-    "Real-ESRGAN 4x plus anime 6B",
-    "Real-ESRGAN 2x plus",
-    "Real-ESRGAN AnimeVideo",
-    "Real-ESRGAN General WDN x4x3",
-    "Real-ESRGAN General x4x3"
-  ],
-  "return_grid": true,
-  "samples_filename_format": "",
-  "samples_filename_pattern": "",
-  "samples_format": "png",
-  "samples_log_stdout": false,
-  "samples_save": true,
-  "save_images_before_color_correction": false,
-  "save_images_before_face_restoration": false,
-  "save_selected_only": false,
-  "save_to_dirs": false,
-  "save_to_dirs_prompt_len": 10,
-  "save_txt": false,
-  "sd_model_checkpoint": null,
-  "show_progress_every_n_steps": 7,
-  "show_progressbar": true,
-  "SWIN_tile": 192,
-  "SWIN_tile_overlap": 8,
-  "upscale_at_full_resolution_padding": 16,
-  "upscaler_for_hires_fix": null,
-  "upscaler_for_img2img": null,
-  "use_original_name_batch": false
+  "font": "DejaVuSans.ttf"
 }
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+# TODO: move all mkdir -p ?
+mkdir -p /data/config/auto/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
+
+if [ ! -f /data/config/auto/ui-config.json ]; then
+  echo '{}' >/data/config/auto/ui-config.json
+fi
+
+# copy scripts, we cannot just mount the directory because it will override the already provided scripts in the repo
+cp -rfT /data/config/auto/scripts/ "${ROOT}/scripts"
+
+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}/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}/extensions"]="/data/config/auto/extensions"
+
+# extra hacks
+MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  if [ ! -f "$from_path" ]; then
+    mkdir -vp "$from_path"
+  fi
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+if [ -f "/data/config/auto/startup.sh" ]; then
+  pushd ${ROOT}
+  . /data/config/auto/startup.sh
+  popd
+fi
+
+exec "$@"
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-MOUNTS["/root/.cache"]="/data/.cache"
-
-# main
-MOUNTS["${ROOT}/models/Stable-diffusion"]="/data/StableDiffusion"
-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}/embeddings"]="/data/embeddings"
-
-# extra hacks
-MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
-
-for to_path in "${!MOUNTS[@]}"; do
-  set -Eeuo pipefail
-  from_path="${MOUNTS[${to_path}]}"
-  rm -rf "${to_path}"
-  mkdir -vp "$from_path"
-  mkdir -vp "$(dirname "${to_path}")"
-  ln -sT "${from_path}" "${to_path}"
-  echo Mounted $(basename "${from_path}")
-done
--- a/services/download/checksums.sha256
+++ b/services/download/checksums.sha256
@@ -1,4 +1,6 @@
-fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /data/StableDiffusion/model.ckpt
+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
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -2,23 +2,27 @@

 set -Eeuo pipefail

-mkdir -p /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings
-
-cat <<EOF
-By using this software, you agree to the following licenses:
-https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
-https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
-https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
-EOF
+# 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

 echo "Downloading, this might take a while..."

-aria2c --input-file /docker/links.txt --dir /data --continue
+aria2c -x 10 --disable-ipv6 --input-file /docker/links.txt --dir /data --continue

 echo "Checking SHAs..."

 parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"

-# fix potential permissions
-# TODO: need something better than this:
-# chmod -R 777 /data /output
+cat <<EOF
+By using this software, you agree to the following licenses:
+https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/AbdBarho/stable-diffusion-webui-docker/blob/master/LICENSE
+https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
+https://github.com/invoke-ai/InvokeAI/blob/main/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
+EOF
--- a/services/download/links.txt
+++ b/services/download/links.txt
@@ -1,5 +1,9 @@
-https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media
-  out=StableDiffusion/model.ckpt
+https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
+  out=StableDiffusion/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
 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
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -1,50 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM continuumio/miniconda3:4.12.0
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-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 apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
-
-
-RUN <<EOF
-git config --global http.postBuffer 1048576000
-git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
-cd stable-diffusion
-git reset --hard 1a9c053cb7b6832695771db2555c0adc9b41e95f
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-
-# Note: don't update the sha of previous versions because the install will take forever
-# instead, update the repo state in a later step
-ARG BRANCH=master  SHA=1a9c053cb7b6832695771db2555c0adc9b41e95f
-# ARG BRANCH=dev SHA=1e7bdfe3f38a6dd37fc230f440ea1b0db0937240
-RUN <<EOF
-cd stable-diffusion
-git fetch
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-RUN pip install -U --no-cache-dir pyperclip
-
-# add info
-COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
-
-WORKDIR /stable-diffusion
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
-EXPOSE 7860
-# run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && \
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
-# sed -i -- 's/8501/7860/g' .streamlit/config.toml && STREAMLIT_SERVER_HEADLESS=true python -u -m streamlit run scripts/webui_streamlit.py  --theme.base dark
--- a/services/hlky/userconfig_streamlit.yaml
+++ b/services/hlky/userconfig_streamlit.yaml
@@ -1,8 +0,0 @@
-general:
-  outdir: /outputs
-  default_model: "Stable Diffusion v1.4"
-  default_model_path: /data/StableDiffusion/model.ckpt
-  outdir_txt2img: /outputs/txt2img-samples
-  outdir_img2img: /outputs/img2img-samples
-  optimized: True
-  optimized_turbo: True
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -0,0 +1,58 @@
+# syntax=docker/dockerfile:1
+
+FROM python:3.10-slim
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
+ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1
+
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install torch==1.12.0+cu116 --extra-index-url https://download.pytorch.org/whl/cu116
+
+RUN apt-get update && apt-get install git -y && apt-get clean
+
+RUN git clone https://github.com/invoke-ai/InvokeAI.git /stable-diffusion
+
+WORKDIR /stable-diffusion
+
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git reset --hard 5c31feb3a1096d437c94b6e1c3224eb7a7224a85
+git config --global http.postBuffer 1048576000
+pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
+EOF
+
+
+# patch match:
+# https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md
+RUN <<EOF
+apt-get update
+# apt-get install build-essential python3-opencv libopencv-dev -y
+apt-get install make g++ libopencv-dev -y
+apt-get clean
+cd /usr/lib/x86_64-linux-gnu/pkgconfig/
+ln -sf opencv4.pc opencv.pc
+EOF
+
+ARG BRANCH=main SHA=26e413ae9cf8dc04c617ca451a91a1624bfdf0c0
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git fetch
+git reset --hard
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+pip install -r binary_installer/py3.10-linux-x86_64-cuda-reqs.txt
+EOF
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+  pip install -U --force-reinstall opencv-python-headless huggingface_hub && \
+  python3 -c "from patchmatch import patch_match"
+
+
+RUN touch invokeai.init
+COPY . /docker/
+
+
+ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
+EXPOSE 7860
+
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}
--- a/services/invoke/entrypoint.sh
+++ b/services/invoke/entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+declare -A MOUNTS
+
+# cache
+MOUNTS["/root/.cache"]=/data/.cache/
+
+# 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/.cache/
+
+MOUNTS["${ROOT}/models/realesrgan"]=/data/RealESRGAN/
+
+MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers/
+MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers/
+MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers/
+
+MOUNTS["${ROOT}/embeddings"]=/data/embeddings/
+
+# hacks
+MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  mkdir -p "$(dirname "${to_path}")"
+  # ends with slash, make it!
+  if [[ "$from_path" == */ ]]; then
+    mkdir -vp "$from_path"
+  fi
+
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+if "${PRELOAD}" == "true"; then
+  set -Eeuo pipefail
+  python3 -u scripts/preload_models.py --skip-sd-weights --root ${ROOT} --config_file /docker/models.yaml
+fi
+
+exec "$@"
--- a/services/invoke/models.yaml
+++ b/services/invoke/models.yaml
@@ -0,0 +1,23 @@
+# This file describes the alternative machine learning models
+# available to InvokeAI script.
+#
+# To add a new model, follow the examples below. Each
+# model requires a model config file, a weights file,
+# and the width and height of the images it
+# was trained on.
+stable-diffusion-1.5:
+  description: Stable Diffusion version 1.5
+  weights: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./configs/stable-diffusion/v1-inference.yaml
+  width: 512
+  height: 512
+  default: true
+inpainting-1.5:
+  description: RunwayML SD 1.5 model optimized for inpainting
+  weights: /data/StableDiffusion/sd-v1-5-inpainting.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./configs/stable-diffusion/v1-inpainting-inference.yaml
+  width: 512
+  height: 512
+  default: false
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -1,57 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM continuumio/miniconda3:4.12.0
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# now it requires python3.9
-RUN conda install python=3.9 && 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 apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
-
-ENV PIP_EXISTS_ACTION=w
-
-RUN <<EOF
-git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
-cd stable-diffusion
-git reset --hard 8a8be92eac17e0ef699528157596b2336bdee532
-sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
-git config --global http.postBuffer 1048576000
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-
-ARG BRANCH=development SHA=4f247a3672474bd9c46060bab6087dbf9e2531f3
-RUN <<EOF
-cd stable-diffusion
-git fetch
-git reset --hard
-git checkout ${BRANCH}
-git reset --hard ${SHA}
-conda env update --file environment.yml -n base
-conda clean -a -y
-EOF
-
-RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.19.2
-
-COPY . /docker/
-RUN <<EOF
-python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
-chmod +x /docker/mount.sh
-EOF
-
-
-ENV PRELOAD=false CLI_ARGS=""
-WORKDIR /stable-diffusion
-EXPOSE 7860
-
-CMD /docker/mount.sh && \
-  # python3 -u backend/server.py --host 0.0.0.0 --port 7860 --cors http://localhost:7860
-  python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
-# echo The lstein webUI is currently deactivated due to implementation limitations: \
-# https://github.com/invoke-ai/InvokeAI/blob/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977/backend/modules/create_cmd_parser.py#L26 \
-# Once the path the output is fixed, the UI will be activated again
--- a/services/lstein/info.py
+++ b/services/lstein/info.py
@@ -1,13 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('  <div id="root"></div>', """
-    <div id="root"></div>
-    <div>
-      Deployed with <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker/">stable-diffusion-webui-docker</a>
-    </div>
-""", 1)
-)
--- a/services/lstein/mount.sh
+++ b/services/lstein/mount.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-declare -A MOUNTS
-
-# cache
-MOUNTS["/root/.cache"]=/data/.cache
-# ui specific
-MOUNTS["${PWD}/models/ldm/stable-diffusion-v1/model.ckpt"]=/data/StableDiffusion/model.ckpt
-MOUNTS["${PWD}/src/gfpgan/experiments/pretrained_models/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${PWD}/ldm/dream/restoration/codeformer/weights"]=/data/CodeFormer
-# hacks
-MOUNTS["/opt/conda/lib/python3.9/site-packages/facexlib/weights"]=/data/.cache
-MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN
-
-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
-
-if "${PRELOAD}" == "true"; then
-  python3 -u scripts/preload_models.py
-fi
--- a/services/sygil/Dockerfile
+++ b/services/sygil/Dockerfile
@@ -0,0 +1,46 @@
+# syntax=docker/dockerfile:1
+
+FROM python:3.8-slim
+
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
+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 <<EOF
+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
+EOF
+
+
+ARG BRANCH=master SHA=571fb897edd58b714bb385dfaa1ad59aecef8bc7
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+cd stable-diffusion
+git fetch
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+pip install -r requirements.txt
+EOF
+
+RUN --mount=type=cache,target=/root/.cache/pip pip install transformers==4.24.0
+
+# add info
+COPY . /docker/
+RUN <<EOF
+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
+EOF
+
+WORKDIR /stable-diffusion
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
+EXPOSE 7860
+
+CMD /docker/mount.sh && /docker/run.sh
--- a/services/sygil/info.py
+++ b/services/sygil/info.py
--- a/services/sygil/mount.sh
+++ b/services/sygil/mount.sh
@@ -16,6 +16,7 @@ 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
--- a/services/sygil/run.sh
+++ b/services/sygil/run.sh
@@ -0,0 +1,10 @@
+#!/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
--- a/services/sygil/userconfig_streamlit.yaml
+++ b/services/sygil/userconfig_streamlit.yaml
@@ -0,0 +1,11 @@
+# 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
Author	SHA1	Message	Date
AbdBarho	9b1ea3cacf	[MAJOR] Update auto to torch 1.13.1 (#290 ) `82725f0ac4` torch==1.13.1+cu117 This might break your extensions!	2023-01-13 21:27:55 +01:00
AbdBarho	b5cdf299ca	Update versions (#287 ) - auto: `2b94ec7886` - sygil: `571fb897ed`	2023-01-09 19:04:40 +01:00
AbdBarho	db831ece65	Bump versions (#286 ) - auto: `151233399c` - invoke: `26e413ae9c`	2023-01-07 18:58:50 +01:00
AbdBarho	ceeac61cb0	Update auto (#282 ) `683287d87f`	2023-01-06 10:24:20 +01:00
AbdBarho	19972f3cac	Update Versions (#281 ) - auto: `8149078094` - sygil: `e48482823b` - invoke: `21bf512056`	2023-01-04 20:36:49 +01:00
AbdBarho	0c16c105bc	Update auto (#280 ) `3e22e29413`	2023-01-03 21:19:37 +01:00
AbdBarho	78c90e5435	Update auto & invoke (#277 ) - auto: `524d532b38` - invoke: `524d532b38` Happy new Year!!!	2023-01-01 16:46:41 +01:00
AbdBarho	6a3826c80a	Update auto (#274 ) `4af3ca5393` Merry Christmas 🎄	2022-12-26 09:50:29 +01:00
AbdBarho	56d9763a73	Smaller xformers wheel (#271 ) Built with `Release` instead of `RelWithDebInfo` Related #270	2022-12-22 09:19:39 +01:00
AbdBarho	41e0dcc2f6	Auto: clean up interrogators (#265 )	2022-12-17 12:22:45 +01:00
AbdBarho	5a9d305e5c	Update Invoke (#264 ) `ffa54f4a35`	2022-12-16 09:57:33 +01:00
AbdBarho	d70e96da71	Update Invoke (#261 ) `5d20f47993`	2022-12-14 09:47:36 +01:00
AbdBarho	d97d257fd3	Update versions (#257 ) - auto: `685f9631b5` - sygil: `d3f9d054e8` - invoke: `e159bb3dce`	2022-12-12 09:25:44 +01:00
AbdBarho	c3cf8129a9	Expose API per default	2022-12-10 12:06:37 +01:00
AbdBarho	b8256cccd2	Update PR template	2022-12-10 11:42:04 +01:00
AbdBarho	4969906ec8	Update Download URLs	2022-12-10 11:40:25 +01:00
AbdBarho	8201e361fa	Alpha support for sd v2.x in auto (#244 ) `44c46f0ed3` Install sd 2 from [these instructions](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#stable-diffusion-20), put the downloaded files in `data/StableDiffusion/`, maybe create a subfolder `v2` and put the models in it, just to keep everything clean. There will be problems, so be warry.	2022-12-09 18:14:48 +01:00
AbdBarho	1423b274b1	Update Versions (#256 ) sygil: `5291437085` Also, switch to pip instead of conda because it is really slow invoke: `ed9186b099`	2022-12-09 16:50:46 +01:00
AbdBarho	87a51e9fd1	[BREAKING] Rename UIs (#254 ) Rename the UIs in docker compose to their new names Changes folder names Changes output folder structure Closes issue #263 Adds `sygil-sl` instead of docker compose flag.	2022-12-04 11:00:28 +01:00
AbdBarho	bdee804112	Fix mounting in Lstein (#253 ) Closes #251	2022-12-04 07:07:49 +01:00
AbdBarho	f1a1641add	Invoke 2.2.3 (#250 ) lstein: `5c31feb3a1`	2022-12-03 13:36:18 +01:00
AbdBarho	8df9d10a58	Update versions (#246 ) - hlky: `18a3b80927` - lstein: `a9aa4e45aa`	2022-11-30 19:33:44 +01:00
AbdBarho	7a1e52bc7a	Enable extensions by default (#243 ) Closes #242	2022-11-26 15:45:53 +01:00
AbdBarho	d20b8732b3	Update xformers (#241 ) `8910bb5a65`	2022-11-25 13:25:10 +01:00
AbdBarho	23757d2356	Update invoke (#234 ) `2b7e3abe57`	2022-11-20 11:35:56 +01:00
AbdBarho	9e7979b756	Update Versions (#230 ) - auto: `47a44c7e42` - hlky: `269107a104` Refs #216	2022-11-20 11:05:39 +01:00
AbdBarho	8623c73741	v1.5 Inpainting (#221 ) Also remove v1.4 Closes #217	2022-11-13 08:42:27 +01:00
AbdBarho	9b6750b2f6	Use cuda 11.6 for auto (#220 ) auto: `98947d173e` Closes #218 #219	2022-11-13 07:12:17 +01:00
AbdBarho	5e3f20ba43	Move contribution to the top	2022-11-12 18:33:59 +01:00
AbdBarho	53ac3601d7	Update versions (#213 ) - auto: `ac08562854` - hlky: `09b64d4f75` - lstein - On hold because of many breaking changes	2022-11-11 07:19:47 +01:00
AbdBarho	37feff58bb	Reorder Readme sections	2022-11-09 18:56:22 +01:00
AbdBarho	427320475b	Add Samplers (#205 ) `804d9fb83d` Closes #201 Closes #204	2022-11-07 07:02:31 +01:00
AbdBarho	9a60522244	Update stale.yml	2022-11-06 14:24:02 +01:00
AbdBarho	887a16ef35	Redirect to discussions	2022-11-06 11:10:21 +01:00
AbdBarho	0a4c2a34b8	Hack to allow installing extensions (#200 ) remember to remove it if its fixed upstream	2022-11-05 18:04:39 +01:00
AbdBarho	73cd69075e	Update versions (#198 ) - auto: `30b1bcc64e` - hlky: `6f6d7571ea`	2022-11-05 09:51:30 +01:00
AbdBarho	b33c0d4bcf	Fix UI Layout (#196 ) Closes #183	2022-11-04 23:29:44 +01:00
AbdBarho	5450583be1	Deepdanbooru Support (#194 ) Builds on top of #150 Thanks to @pirahtays Co-authored-by: Imaginator <mriegel@gmail.com> Co-authored-by: pirahtays <35934562+pirahtays@users.noreply.github.com>	2022-11-04 22:41:38 +01:00
AbdBarho	1cfb915d12	Invoke AI v2.1 (#195 ) `6b89adfa7e`	2022-11-04 22:35:44 +01:00
AbdBarho	fb9d1e579c	Update versions (#193 ) - auto: `cd5eafaf03` - hlky: `62f9706d6a`	2022-11-02 21:57:01 +01:00
AbdBarho	9092aa233b	Update versions (#189 ) - auto: `dd02889124` - hlky: `d8e61a5cd3`	2022-11-01 17:12:53 +01:00
AbdBarho	a5218b8639	Auto Extensions (#176 ) Closes #148 Closes #172	2022-10-30 10:01:18 +01:00
AbdBarho	d6cbafdca8	Scripts support (#187 ) Closes #186	2022-10-30 09:42:30 +01:00
AbdBarho	4464e9d9e9	Update versions (#185 ) - auto: `35c45df28b` - hlky: `091520bed0` - lstein: `fdf9b1c40c`	2022-10-29 22:02:35 +02:00
AbdBarho	fb5407a6bc	Smaller git clones (#179 ) Closes #135	2022-10-27 16:49:30 +02:00
AbdBarho	5b4acd605d	Contribution Info (#181 )	2022-10-26 23:57:29 +02:00
AbdBarho	48f8650fd8	Bump Versions (#178 ) - auto: `737eb28fac` - hlky: `5f6141ae7c` - lstein: `2b6d78e436`	2022-10-26 20:02:00 +02:00
Sebastian Piechowiak	31c21025ea	Aria fixes (#170 ) Fixes WARN / ERRORs addressed in https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/167 Closes #167	2022-10-26 19:13:31 +02:00
AbdBarho	1211e9c5de	Downgrade gradio (#175 ) Closes #173	2022-10-25 21:05:09 +02:00
AbdBarho	49ad173e95	Bump Versions (#171 ) - auto: `df0a1f8381` - hlky: `bb7fce1a87` - lstein: `3081b6b7dd`	2022-10-24 22:17:51 +02:00
ProducerMatt	5122f83c0f	Tags for CLIP interrogation (#166 ) This populates a folder with tags for the CLIP interrogator to label images with. I.e. artists, art styles, art mediums, moods and genres, etc.	2022-10-23 09:05:28 +02:00
AbdBarho	3c544dd7f4	SD 1.5 (#164 ) ### Update versions - auto: `f49c08ea56` - hlky: `8d1e42b9c5` - lstein: `554445a985`	2022-10-22 10:44:39 +02:00
AbdBarho	42cc17da74	New Url (#161 ) Closes #159 I am not sure how often we will face this problem again.	2022-10-21 04:28:25 +02:00
AbdBarho	31e4dec08f	Expose auto ui config (#149 ) Closes #147	2022-10-17 18:55:16 +02:00
AbdBarho	0148e5e109	hotfix CI/CD	2022-10-16 17:08:24 +02:00
AbdBarho	111825ac25	xformers for auto (#136 ) Closes #128	2022-10-16 16:35:14 +02:00
AbdBarho	c1e13867d9	Update versions (#146 ) - auto: `36a0ba357a` - History tab should be working, closes #138 - hlky: `bd57d22f2e` - experimental support for the streamlit UI, use the env var `USE_STREAMLIT`, see the `docker-compose.yml` file, closes #105 - Don't create issues if it fails, it is still very early in dev.	2022-10-16 16:27:20 +02:00
AbdBarho	463f332d14	update condition (#141 ) Closes #140	2022-10-15 08:08:36 +02:00
AbdBarho	3682303355	Update (#139 ) ### Update versions - auto: `03d62538ae` - History Tab IS NOT WORKING YET! #138 - hlky: `fd51bab1ec` - lstein: `fe2a2cfc8b` Closes #102 the config file has been moved to `data/config/auto`	2022-10-14 22:42:34 +02:00
Mou Lai	402c691a49	Fix & Update to use lstein (#131 ) 1. Update `docker-compose.yml`: use `PRELOAD=true` for lstein. See the [note](`94bad8555a/docs/installation/INSTALL_LINUX.md (L60)`) in the installation guide of InvokeAI. 3. Fix `services/lstein/mount.sh`: change `CodeFormer` to `Codeformer`. 4. Update `services/lstein/mount.sh`: avoid having to re-download the `${PWD}/gfpgan/weights/...` every time the container is started.	2022-10-14 15:52:01 +02:00
AbdBarho	b36113b7d8	Update shell (#134 ) Closes #133	2022-10-13 20:27:32 +02:00
AbdBarho	b60c787474	Update bug.md	2022-10-12 09:11:06 +02:00
AbdBarho	161fd52c16	Bump Versions (#127 ) ### Update versions - auto: `6a9ea5b41c` - hlky: `2215a3b403` - lstein: `79e79b78aa` - Now is back with v2! Closes #123	2022-10-11 20:00:58 +02:00
AbdBarho	3b3c244c31	Add Empty dir for saving (#126 ) Fixes #124 Creates empty dir for saving, should be done by the UI...	2022-10-11 18:18:52 +02:00
AbdBarho	5698c49653	Update versions (#121 ) - auto: `050a6a798c` - Now uses python 3.10 - requires a complete re-install - Image is now smaller (5.7GB vs 9.8GB) - hlky: `fe6e72fde7` - lstein: `31869885d9` - img2img now works	2022-10-09 11:39:31 +02:00