Matrix CI/CD (#68 )

Update auto (#67 )
* Update auto
2025-10-27 08:14:26 -04:00 · 2022-09-15 22:02:38 +02:00 · 2022-09-15 21:05:31 +02:00 · 2022-09-15 20:45:21 +02:00 · 2022-09-14 19:48:00 +02:00 · 2022-09-13 21:40:10 +02:00
28 changed files with 519 additions and 292 deletions
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,13 +7,17 @@ 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)**
+**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)**



 **Describe the bug**


+**Which UI**
+
+hlky or auto or auto-cpu or lstein?
+
 **Steps to Reproduce**
 1. Go to '...'
 2. Click on '....'
@@ -22,8 +26,11 @@ assignees: ''

 **Hardware / Software:**
 - OS: [e.g. Windows / Ubuntu and version]
+ - RAM:
 - GPU: [Nvidia 1660 / No GPU]
- - Version [e.g. 22]
+ - 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/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,24 +1,19 @@
-name: Build Image
+name: Build Images

 on: [push]

-# TODO: how to cache intermediate images?
 jobs:
-  build_hlky:
+  build:
+    strategy:
+      matrix:
+        profile:
+          - auto
+          - hlky
+          - lstein
+          - download
    runs-on: ubuntu-latest
-    name: Build hlky
+    name: ${{ matrix.profile }}
    steps:
      - uses: actions/checkout@v3
-      - run: docker compose build --progress plain
-  build_AUTOMATIC1111:
-    runs-on: ubuntu-latest
-    name: Build AUTOMATIC1111
-    steps:
-      - uses: actions/checkout@v3
-      - run: cd AUTOMATIC1111 && docker compose build --progress plain
-  build_lstein:
-    runs-on: ubuntu-latest
-    name: Build lstein
-    steps:
-      - uses: actions/checkout@v3
-      - run: cd lstein && docker compose build --progress plain
+      # better caching?
+      - run: docker compose --profile ${{ matrix.profile }} build --progress plain
--- a/.github/workflows/executable.yml1
+++ b/.github/workflows/executable.yml1
@@ -0,0 +1,22 @@
+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/AUTOMATIC1111/Dockerfile
+++ b/AUTOMATIC1111/Dockerfile
@@ -1,44 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM alpine/git:2.36.2 as download
-RUN <<EOF
-# who knows
-git config --global http.postBuffer 1048576000
-git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
-git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
-rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
-EOF
-
-FROM pytorch/pytorch:1.12.1-cuda11.3-cudnn8-runtime
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install git -y && apt-get clean
-
-RUN <<EOF
-git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
-cd stable-diffusion-webui
-git reset --hard 064965c4660f57f24e2d51a9854defaeabf8c0cf
-pip install -U --prefer-binary --no-cache-dir -r requirements.txt
-EOF
-
-RUN <<EOF
-pip install --prefer-binary -U --no-cache-dir diffusers numpy invisible-watermark git+https://github.com/crowsonkb/k-diffusion.git \
-  git+https://github.com/TencentARC/GFPGAN.git markupsafe==2.0.1 opencv-python-headless
-EOF
-
-
-ENV ROOT=/workspace/stable-diffusion-webui \
-  WORKDIR=/workspace/stable-diffusion-webui/repositories/stable-diffusion \
-  TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
-
-COPY --from=download /git/ ${ROOT}
-
-
-COPY . /docker
-
-WORKDIR ${WORKDIR}
-EXPOSE 7860
-# run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u ../../webui.py --listen ${CLI_ARGS}
--- a/AUTOMATIC1111/config.json
+++ b/AUTOMATIC1111/config.json
@@ -1,3 +0,0 @@
-{
-  "outdir_samples": "/output"
-}
--- a/AUTOMATIC1111/docker-compose.yml
+++ b/AUTOMATIC1111/docker-compose.yml
@@ -1,20 +0,0 @@
-version: '3.9'
-
-services:
-  model:
-    build: .
-    ports:
-      - "7860:7860"
-    volumes:
-      - ../cache:/cache
-      - ../output:/output
-      - ../models:/models
-    environment:
-      - CLI_ARGS=--medvram --opt-split-attention
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ['0']
-                capabilities: [gpu]
--- a/README.md
+++ b/README.md
@@ -1,83 +1,62 @@
-# Stable Diffusion WebUI Docker
+# Stable Diffusion WebUI Docker

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

-This repository provides the [WebUI](https://github.com/hlky/stable-diffusion-webui) as a docker image for easy setup and deployment.
-
-Now with experimental support for 2 other forks:
-
- [AUTOMATIC1111](./AUTOMATIC1111/) (Stable, very few bugs!)
- [lstein](./lstein/)
+This repository provides multiple UIs for you to play around with stable diffusion:

 ## Features

- Interactive UI with many features, and more on the way!
- Support for 6GB GPU cards.
- GFPGAN for face reconstruction, RealESRGAN for super-sampling.
- Experimental:
-  - Latent Diffusion Super Resolution
-  - GoBig
-  - GoLatent
- many more!
+### AUTOMATIC1111

-## Setup
+[AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI:

-Make sure you have an **up to date** version of docker installed. Download this repo and run:
+- 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!
+- [Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase)

-```
-docker compose build
-```
+| 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) |

-you can let it build in the background while you download the different models
+### hlky

- [Stable Diffusion v1.4 (4GB)](https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media), rename to `model.ckpt`
- (Optional) [GFPGANv1.3.pth (333MB)](https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth).
- (Optional) [RealESRGAN_x4plus.pth (64MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth) and [RealESRGAN_x4plus_anime_6B.pth (18MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth).
- (Optional) [LDSR (2GB)](https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1) and [its configuration](https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1), rename to `LDSR.ckpt` and `LDSR.yaml` respectively.
-<!-- - (Optional) [RealESRGAN_x2plus.pth (64MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.1/RealESRGAN_x2plus.pth)
- TODO: (I still need to find the RealESRGAN_x2plus_6b.pth) -->
+[hlky's fork](https://github.com/hlky/stable-diffusion-webui) is one of the most popular UIs, with many features:

-Put all of the downloaded files in the `models` folder, it should look something like this:
+- 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)

-```
-models/
-├── model.ckpt
-├── GFPGANv1.3.pth
-├── RealESRGAN_x4plus.pth
-├── RealESRGAN_x4plus_anime_6B.pth
-├── LDSR.ckpt
-└── LDSR.yaml
-```
+Screenshots:

-## Run
+| 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) |

-After the build is done, you can run the app with:
+### lstein

-```
-docker compose up --build
-```
+[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, but less so for the WebUI.

-Will start the app on http://localhost:7860/
+## Setup & Usage

-Note: the first start will take sometime as some other models will be downloaded, these will be cached in the `cache` folder, so next runs are faster.
+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!

-### FAQ
+## Contributing
+Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it.

-You can find fixes to common issues [in the wiki page.](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ)
-
-## Config
-
-in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. [You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion/blob/bb765f1897c968495ffe12a06b421d97b56d5ae1/scripts/webui.py)
-
-You can set the `WEBUI_SHA` to [any SHA from the main repo](https://github.com/hlky/stable-diffusion/commits/main), this will build the container against that commit. Use at your own risk.
-
-# Disclaimer
+## Disclaimer

 The authors of this project are not responsible for any content generated using this interface.

 This license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, spread misinformation and target vulnerable groups. For the full list of restrictions please read [the license](./LICENSE).

-# Thanks
+## Thanks

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

@@ -87,3 +66,4 @@ Special thanks to everyone behind these awesome projects, without them, none of
 - [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)
--- a/cache/.gitignore
+++ b/cache/.gitignore
@@ -1,3 +1,4 @@
 /torch
 /transformers
-/weights
+/weights
+/models
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,11 @@
 version: '3.9'

-services:
-  model:
-    build:
-      context: ./hlky/
-      args:
-        # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main
-        # USE AT YOUR OWN RISK! otherwise just leave it empty.
-        WEBUI_SHA:
-    restart: on-failure
+x-base_service: &base_service
    ports:
      - "7860:7860"
    volumes:
-      - ./cache:/cache
-      - ./output:/output
-      - ./models:/models
-    environment:
-      - CLI_ARGS=--extra-models-cpu --optimized-turbo
+      - &v1 ./cache:/cache
+      - &v2 ./output:/output
    deploy:
      resources:
        reservations:
@@ -24,3 +13,42 @@ services:
              - driver: nvidia
                device_ids: ['0']
                capabilities: [gpu]
+
+name: webui-docker
+
+services:
+  download:
+    build: ./services/download/
+    profiles: ["download"]
+    volumes:
+      - *v1
+
+  hlky:
+    <<: *base_service
+    profiles: ["hlky"]
+    build: ./services/hlky/
+    environment:
+      - CLI_ARGS=--optimized-turbo
+
+  automatic1111: &automatic
+    <<: *base_service
+    profiles: ["auto"]
+    build: ./services/AUTOMATIC1111
+    volumes:
+      - *v1
+      - *v2
+      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
+    environment:
+      - CLI_ARGS=--medvram --opt-split-attention
+
+  automatic1111-cpu:
+    <<: *automatic
+    profiles: ["auto-cpu"]
+    deploy: {}
+    environment:
+      - CLI_ARGS=--no-half --precision full
+
+  lstein:
+    <<: *base_service
+    profiles: ["lstein"]
+    build: ./services/lstein/
--- a/hlky/Dockerfile
+++ b/hlky/Dockerfile
@@ -1,71 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM continuumio/miniconda3:4.12.0
-
-SHELL ["/bin/bash", "-ceuxo", "pipefail"]
-
-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 -y && apt-get clean
-
-
-RUN <<EOF
-git clone https://github.com/hlky/stable-diffusion.git
-cd stable-diffusion
-git reset --hard c84748aa6802c2f934687883a79bde745d2a58a6
-conda env update --file environment.yaml -n base
-conda clean -a -y
-EOF
-
-# new dependency, should be added to the environment.yaml
-RUN pip install -U --no-cache-dir pyperclip
-
-# 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 WEBUI_SHA=bb765f1897c968495ffe12a06b421d97b56d5ae1
-RUN cd stable-diffusion && git pull && git reset --hard ${WEBUI_SHA} && \
-  conda env update --file environment.yaml --name base && conda clean -a -y
-
-
-# download dev UI version, update the sha below in case you want some other version
-# RUN <<EOF
-# git clone https://github.com/hlky/stable-diffusion-webui.git
-# cd stable-diffusion-webui
-# # map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
-# git reset --hard 49e6178fd82ca736f9bbc621c6b12487c300e493
-# 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
-
-# Latent diffusion
-RUN <<EOF
-git clone https://github.com/devilismyfriend/latent-diffusion &&
-cd /latent-diffusion &&
-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 . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py
-
-WORKDIR /stable-diffusion
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
-EXPOSE 7860
-# run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}
--- a/hlky/mount.sh
+++ b/hlky/mount.sh
@@ -1,31 +0,0 @@
-#!/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/
--- a/lstein/docker-compose.yml
+++ b/lstein/docker-compose.yml
@@ -1,21 +0,0 @@
-version: '3.9'
-
-services:
-  model:
-    build: .
-    restart: on-failure
-    ports:
-      - "7860:7860"
-    volumes:
-      - ../cache:/cache
-      - ../output:/output
-      - ../models:/models
-    environment:
-      - CLI_ARGS=
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ['0']
-                capabilities: [gpu]
--- a/models/.gitignore
+++ b/models/.gitignore
@@ -1,7 +0,0 @@
-/model.ckpt
-/GFPGANv1.3.pth
-/RealESRGAN_x2plus.pth
-/RealESRGAN_x4plus.pth
-/RealESRGAN_x4plus_anime_6B.pth
-/LDSR.ckpt
-/LDSR.yaml
--- a/scripts/chmod.sh
+++ b/scripts/chmod.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+find . -name "*.sh" -exec git update-index --chmod=+x {} \;
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -0,0 +1,64 @@
+# syntax=docker/dockerfile:1
+
+FROM alpine/git:2.36.2 as download
+RUN <<EOF
+# because taming-transformers is huge
+git config --global http.postBuffer 1048576000
+git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
+git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
+git clone https://github.com/salesforce/BLIP.git repositories/BLIP
+git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
+rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
+EOF
+
+
+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 -y && apt-get clean
+
+
+RUN <<EOF
+git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
+cd stable-diffusion-webui
+git reset --hard 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
+conda env update --file environment-wsl2.yaml -n base
+conda clean -a -y
+pip install --prefer-binary --no-cache-dir -r requirements.txt
+EOF
+
+ENV ROOT=/stable-diffusion-webui \
+  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
+
+COPY --from=download /git/ ${ROOT}
+RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
+
+# 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=2ddaeb318a9626502ef4bf949a312253d8021ff0
+RUN <<EOF
+cd stable-diffusion-webui
+git pull --rebase
+git reset --hard ${SHA}
+pip install --prefer-binary --no-cache-dir -r requirements.txt
+EOF
+
+RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless
+
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
+
+COPY . /docker
+RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+
+
+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 ${CLI_ARGS}
--- a/services/AUTOMATIC1111/README.md
+++ b/services/AUTOMATIC1111/README.md
@@ -10,3 +10,5 @@ Clone this repo, download the `model.ckpt` and `GFPGANv1.3.pth` and put into the
 cd AUTOMATIC1111
 docker compose up --build
 ```
+
+You can change the cli parameters in `AUTOMATIC1111/docker-compose.yml`. The full list of cil parameters can be found [here](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/modules/shared.py)
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -0,0 +1,48 @@
+{
+  "outdir_samples": "/output",
+  "outdir_txt2img_samples": "/output/txt2img-images",
+  "outdir_img2img_samples": "/output/img2img-images",
+  "outdir_extras_samples": "/output/extras-images",
+  "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",
+
+  "samples_filename_format": "",
+  "outdir_grids": "",
+  "save_to_dirs": false,
+  "grid_save_to_dirs": false,
+  "save_to_dirs_prompt_len": 10,
+  "samples_save": true,
+  "samples_format": "png",
+  "grid_save": true,
+  "return_grid": true,
+  "grid_format": "png",
+  "grid_extended_filename": false,
+  "grid_only_if_multiple": true,
+  "n_rows": -1,
+  "jpeg_quality": 80,
+  "export_for_4chan": true,
+  "enable_pnginfo": true,
+  "add_model_hash_to_info": false,
+  "enable_emphasis": true,
+  "save_txt": false,
+  "ESRGAN_tile": 192,
+  "ESRGAN_tile_overlap": 8,
+  "random_artist_categories": [],
+  "upscale_at_full_resolution_padding": 16,
+  "show_progressbar": true,
+  "show_progress_every_n_steps": 7,
+  "multiple_tqdm": true,
+  "face_restoration_model": null,
+  "code_former_weight": 0.5,
+  "save_images_before_face_restoration": false,
+  "face_restoration_unload": false,
+  "interrogate_keep_models_in_memory": false,
+  "interrogate_use_builtin_artists": true,
+  "interrogate_clip_num_beams": 1,
+  "interrogate_clip_min_length": 24,
+  "interrogate_clip_max_length": 48,
+  "interrogate_clip_dict_limit": 1500.0
+}
--- a/services/AUTOMATIC1111/info.py
+++ b/services/AUTOMATIC1111/info.py
@@ -0,0 +1,14 @@
+import sys
+from pathlib import Path
+
+file = Path(sys.argv[1])
+file.write_text(
+  file.read_text()\
+  .replace('    return demo', """
+    with demo:
+        gr.Markdown(
+          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
+        )
+    return demo
+""", 1)
+)
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -1,14 +1,18 @@
 #!/bin/bash

+set -e
+
 declare -A MODELS

 MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
 MODELS["${ROOT}/GFPGANv1.3.pth"]=GFPGANv1.3.pth

+MODELS_DIR=/cache/models
+
 for path in "${!MODELS[@]}"; do
  name=${MODELS[$path]}
  base=$(dirname "${path}")
-  from_path="/models/${name}"
+  from_path="${MODELS_DIR}/${name}"
  if test -f "${from_path}"; then
    mkdir -p "${base}" && ln -sf "${from_path}" "${path}" && echo "Mounted ${name}"
  else
@@ -17,12 +21,16 @@ for path in "${!MODELS[@]}"; do
 done

 # force realesrgan cache
-rm -rf /opt/conda/lib/python3.7/site-packages/realesrgan/weights
-ln -s -T /models /opt/conda/lib/python3.7/site-packages/realesrgan/weights
+rm -rf /opt/conda/lib/python3.8/site-packages/realesrgan/weights
+ln -s -T "${MODELS_DIR}" /opt/conda/lib/python3.8/site-packages/realesrgan/weights

 # force facexlib cache
 mkdir -p /cache/weights/ ${WORKDIR}/gfpgan/
 ln -sf /cache/weights/ ${WORKDIR}/gfpgan/
+# code former cache
+rm -rf ${ROOT}/repositories/CodeFormer/weights/CodeFormer ${ROOT}/repositories/CodeFormer/weights/facelib
+ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/CodeFormer
+ln -sf -T /cache/weights ${ROOT}/repositories/CodeFormer/weights/facelib

 # mount config
-ln -sf /docker/config.json ${WORKDIR}/config.json
+# ln -sf /docker/config.json ${WORKDIR}/config.json
--- a/services/download/Dockerfile
+++ b/services/download/Dockerfile
@@ -0,0 +1,6 @@
+FROM bash:alpine3.15
+
+RUN apk add parallel
+COPY . /docker
+RUN chmod +x /docker/download.sh
+ENTRYPOINT ["/docker/download.sh"]
--- a/services/download/checksums.sha256
+++ b/services/download/checksums.sha256
@@ -0,0 +1,6 @@
+fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556  /cache/models/model.ckpt
+c953a88f2727c85c3d9ae72e2bd4846bbaf59fe6972ad94130e23e7017524a70  /cache/models/GFPGANv1.3.pth
+4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1  /cache/models/RealESRGAN_x4plus.pth
+f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da  /cache/models/RealESRGAN_x4plus_anime_6B.pth
+c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13  /cache/models/LDSR.ckpt
+9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba  /cache/models/LDSR.yaml
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+# [[ "$(sha256sum -b $file | head -c 64)" == "$sha" ]]
+
+declare -A MODELS
+
+MODELS['model.ckpt']='https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media'
+MODELS['GFPGANv1.3.pth']='https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth'
+MODELS['RealESRGAN_x4plus.pth']='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth'
+MODELS['RealESRGAN_x4plus_anime_6B.pth']='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth'
+MODELS['LDSR.yaml']='https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1'
+MODELS['LDSR.ckpt']='https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1'
+
+echo "Downloading..."
+
+for file in "${!MODELS[@]}"; do
+  url=${MODELS[$file]}
+  full_path="/cache/models/$file"
+
+  if [[ -f "$full_path" ]]; then
+    echo "- $file exists"
+    continue
+  fi
+
+  mkdir -p $(dirname $full_path)
+  wget --tries=10 -c -O $full_path $url
+done
+
+echo "Checking SHAs..."
+
+time parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -0,0 +1,63 @@
+# 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 clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
+cd stable-diffusion
+git reset --hard 7623a5734740025d79b710f3744bff9276e1467b
+conda env update --file environment.yaml -n base
+conda clean -a -y
+EOF
+
+# new dependency, should be added to the environment.yaml
+RUN pip install -U --no-cache-dir pyperclip
+
+# 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
+ARG SHA=833a91047df999302f699637768741cecee9c37b
+# ARG BRANCH=dev
+# ARG SHA=b4de6caf697d311c1238c15a4c863fa529a35522
+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
+
+# Latent diffusion
+RUN <<EOF
+git clone https://github.com/Hafiidz/latent-diffusion.git
+cd latent-diffusion
+git reset --hard e1a84a89fcbb49881546cf2acf1e7e250923dba0
+# 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 . /docker/
+RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
+
+WORKDIR /stable-diffusion
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
+EXPOSE 7860
+# run, -u to not buffer stdout / stderr
+CMD /docker/mount.sh && \
+  python3 -u scripts/webui.py --outdir /output --ckpt /cache/models/model.ckpt --ldsr-dir /latent-diffusion --inbrowser ${CLI_ARGS}
+  # STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py
--- a/services/hlky/info.py
+++ b/services/hlky/info.py
--- a/services/hlky/mount.sh
+++ b/services/hlky/mount.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+declare -A MODELS
+
+ROOT=/stable-diffusion/src
+
+MODELS["${ROOT}/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=GFPGANv1.3.pth
+MODELS["${ROOT}/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth"]=RealESRGAN_x4plus.pth
+MODELS["${ROOT}/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
+
+MODELS_DIR=/cache/models
+
+for path in "${!MODELS[@]}"; do
+  name=${MODELS[$path]}
+  base=$(dirname "${path}")
+  from_path="${MODELS_DIR}/${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_DIR}/LDSR.yaml"; then
+  sed 's/ldm\./ldm_latent\./g' "${MODELS_DIR}/LDSR.yaml" >/latent-diffusion/experiments/pretrained_models/project.yaml
+fi
+
+# force facexlib cache
+mkdir -p /cache/weights/ /stable-diffusion/gfpgan/
+ln -sf /cache/weights/ /stable-diffusion/gfpgan/
+
+# streamlit config
+ln -sf /docker/webui_streamlit.yaml /stable-diffusion/configs/webui/webui_streamlit.yaml
--- a/services/hlky/webui_streamlit.yaml
+++ b/services/hlky/webui_streamlit.yaml
@@ -0,0 +1,102 @@
+# UI defaults configuration file. It is automatically loaded if located at configs/webui/webui_streamlit.yaml.
+general:
+  gpu: 0
+  outdir: /outputs
+  ckpt: "/cache/models/model.ckpt"
+  fp:
+    name: "embeddings/alex/embeddings_gs-11000.pt"
+  GFPGAN_dir: "./src/gfpgan"
+  RealESRGAN_dir: "./src/realesrgan"
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  outdir_txt2img: /outputs/txt2img-samples
+  outdir_img2img: /outputs/img2img-samples
+  gfpgan_cpu: False
+  esrgan_cpu: False
+  extra_models_cpu: False
+  extra_models_gpu: False
+  save_metadata: True
+  skip_grid: False
+  skip_save: False
+  grid_format: "jpg:95"
+  save_format: "png"
+  n_rows: -1
+  no_verify_input: False
+  no_half: False
+  precision: "autocast"
+  optimized: False
+  optimized_turbo: False
+  update_preview: True
+  update_preview_frequency: 1
+
+txt2img:
+  prompt:
+  height: 512
+  width: 512
+  cfg_scale: 5.0
+  seed: ""
+  batch_count: 1
+  batch_size: 1
+  sampling_steps: 50
+  default_sampler: "k_lms"
+  separate_prompts: False
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_grid: True
+  group_by_prompt: True
+  save_as_jpg: False
+  use_GFPGAN: True
+  use_RealESRGAN: True
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+
+img2img:
+  prompt:
+  sampling_steps: 50
+  # Adding an int to toggles enables the corresponding feature.
+  # 0: Create prompt matrix (separate multiple prompts using |, and get all combinations of them)
+  # 1: Normalize Prompt Weights (ensure sum of weights add up to 1.0)
+  # 2: Loopback (use images from previous batch when creating next batch)
+  # 3: Random loopback seed
+  # 4: Save individual images
+  # 5: Save grid
+  # 6: Sort samples by prompt
+  # 7: Write sample info files
+  # 8: jpg samples
+  # 9: Fix faces using GFPGAN
+  # 10: Upscale images using Real-ESRGAN
+  sampler_name: k_lms
+  denoising_strength: 0.45
+  # 0: Keep masked area
+  # 1: Regenerate only masked area
+  mask_mode: 0
+  # 0: Just resize
+  # 1: Crop and resize
+  # 2: Resize and fill
+  resize_mode: 0
+  # Leave blank for random seed:
+  seed: ""
+  ddim_eta: 0.0
+  cfg_scale: 5.0
+  batch_count: 1
+  batch_size: 1
+  height: 512
+  width: 512
+  # Textual inversion embeddings file path:
+  fp: ""
+  loopback: True
+  random_seed_loopback: True
+  separate_prompts: False
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_grid: True
+  group_by_prompt: True
+  save_as_jpg: False
+  use_GFPGAN: True
+  use_RealESRGAN: True
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+
+gfpgan:
+  strength: 100
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -4,10 +4,12 @@ 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 -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean


 RUN <<EOF
@@ -25,5 +27,5 @@ WORKDIR /stable-diffusion
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
 CMD mkdir -p /stable-diffusion/models/ldm/stable-diffusion-v1/ && \
-  ln -sf /models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
+  ln -sf /cache/models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
  python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
--- a/services/lstein/README.md
+++ b/services/lstein/README.md
Author	SHA1	Message	Date
AbdBarho	a1c16942ff	Matrix CI/CD (#68 )	2022-09-15 22:02:38 +02:00
AbdBarho	6ae3473214	Update auto (#67 ) * Update auto	2022-09-15 21:05:31 +02:00
AbdBarho	5d731cb43c	Add gcc (#66 ) * update auto * add gcc	2022-09-15 20:45:21 +02:00
AbdBarho	c1fa2f1457	Updates & Prepare hlky streamlit (#59 )	2022-09-14 19:48:00 +02:00
AbdBarho	d8cfdd3af5	Update Versions (#58 ) * Update Versions	2022-09-13 21:40:10 +02:00
AbdBarho	03d12cbcd9	Update README.md	2022-09-13 20:24:27 +02:00
AbdBarho	2e76b6c4e7	Update README.md	2022-09-13 19:51:58 +02:00
AbdBarho	5eae2076ce	Update Automatic (#55 ) * Update Automatic	2022-09-12 22:46:38 +02:00
AbdBarho	725e1f39ba	Update (#54 ) * Update hlky * Update auto	2022-09-12 22:21:03 +02:00
AbdBarho	ab651fe0d7	Major refactor (#49 ) * update folders * Update CI * Update CI * Unify base docker images * Remove dead config * Update permissions * Remove CPU Hack * Update hlky * Add Download Service * Adapt services * executable * remove buggy parameter * rename to SHA * Update README	2022-09-11 20:18:50 +02:00
AbdBarho	f76f8d4671	Update Versions (#45 ) * Update Automatic to 1b963c20 * Update hlky to dev branch * Update automatic	2022-09-11 05:25:45 +02:00
AbdBarho	e32a48f42a	Update Versions (#43 )	2022-09-09 19:05:19 +02:00
AbdBarho	76989b39a6	Update Versions (#42 ) * Update hlky * Update automatic	2022-09-08 17:56:15 +02:00
AbdBarho	4d9fc381bb	Remove restart on failure (#41 )	2022-09-07 22:38:02 +02:00
AbdBarho	bcee253fe0	Update README.md	2022-09-07 19:52:43 +02:00
AbdBarho	499143009a	Update Versions (#39 )	2022-09-07 19:45:03 +02:00
AbdBarho	c614625f04	Update AUTOMATIC1111 (#37 )	2022-09-06 20:16:28 +02:00
abdullah	ccd6e238b2	executable	2022-09-06 12:17:19 +02:00
Abdullah Barhoum	829864af9b	Add Font	2022-09-05 21:05:43 +02:00