Update versions (#82)

### Update versions

- auto: dd911a47b3
- hlky: 17748cbc9c
- lstein: 50d607ffea

.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.

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+### 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/

.github/workflows/docker.yml

@@ -3,12 +3,17 @@ name: Build Images
 on: [push]
 
 jobs:
-  build_all:
+  build:
+    strategy:
+      matrix:
+        profile:
+          - auto
+          - hlky
+          - lstein
+          - download
     runs-on: ubuntu-latest
-    name: All
+    name: ${{ matrix.profile }}
     steps:
       - uses: actions/checkout@v3
       # better caching?
-      - run: docker compose --profile auto build --progress plain
-      - run: docker compose --profile hlky build --progress plain
-      - run: docker compose --profile lstein build --progress plain
+      - run: docker compose --profile ${{ matrix.profile }} build --progress plain

.github/workflows/stale.yml

@@ -0,0 +1,20 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        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.
+          stale-pr-message: This PR 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.
+          close-issue-message: This issue was closed because it has been stalled for 7 days with no activity.
+          close-pr-message: This PR was closed because it has been stalled for 7 days with no activity.
+          days-before-issue-stale: 14
+          days-before-pr-stale: 14
+          days-before-issue-close: 7
+          days-before-pr-close: 7

README.md

@@ -41,12 +41,20 @@ Screenshots:
 
 ### lstein
 
-[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, but less so for the WebUI.
+[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!
 
+## Contributing
+
+Contributions are welcome! create an issue first of what you want to contribute (before you implement anything) so we can talk about it.
+
 ## Disclaimer
 
 The authors of this project are not responsible for any content generated using this interface.

cache/.gitignore

@@ -2,3 +2,4 @@
 /transformers
 /weights
 /models
+/custom-models

docker-compose.yml

@@ -37,9 +37,9 @@ services:
     volumes:
       - *v1
       - *v2
-      - ./services/AUTOMATIC1111/config.json:/docker/config.json
+      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
-      - CLI_ARGS=--medvram --opt-split-attention
+      - CLI_ARGS=--medvram
 
   automatic1111-cpu:
     <<: *automatic
@@ -52,3 +52,6 @@ services:
     <<: *base_service
     profiles: ["lstein"]
     build: ./services/lstein/
+    environment:
+      - PRELOAD=false
+      - CLI_ARGS=

services/AUTOMATIC1111/Dockerfile

@@ -1,12 +1,16 @@
 # syntax=docker/dockerfile:1
 
 FROM alpine/git:2.36.2 as download
+
+
+RUN git clone --depth 1 https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
+RUN git clone --depth 1 https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
+RUN git clone --depth 1 https://github.com/salesforce/BLIP.git repositories/BLIP
+
 RUN <<EOF
-# who knows
+# 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/CompVis/taming-transformers.git repositories/taming-transformers
+git clone --depth 1 https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
 rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
@@ -26,21 +30,21 @@ 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
+git reset --hard 7e77938230d4fefb6edccdba0b80b61d8416673e
 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=b5d1af11b7dc718d4d91d379c75e46f4bd2e2fe6
+
+ARG SHA=dd911a47b3c3313b3938b700eb26cbd5bb3e1c95
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -48,7 +52,7 @@ 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 markupsafe==2.0.1
+RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless
 
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
@@ -59,4 +63,5 @@ 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 ${CLI_ARGS}
+CMD /docker/mount.sh && \
+  python3 -u ../../webui.py --listen --port 7860 --hide-ui-dir-config --ckpt-dir /cache/custom-models --ckpt /cache/models/model.ckpt ${CLI_ARGS}

services/AUTOMATIC1111/README.md

@@ -1,14 +0,0 @@
-# WebUI for AUTOMATIC1111
-
-The WebUI of [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui) as docker container!
-
-## Setup
-
-Clone this repo, download the `model.ckpt` and `GFPGANv1.3.pth` and put into the `models` folder as mentioned in [the main README](../README.md), then run
-
-```
-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)

services/AUTOMATIC1111/config.json

@@ -1 +1,58 @@
-{"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", "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS", "outdir_grids": "", "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, "font": "DejaVuSans.ttf", "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": 5, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5, "grid_save_to_dirs": false}
+{
+  "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,
+  "samples_filename_pattern": "",
+  "directories_filename_pattern": "",
+  "save_selected_only": false,
+  "filter_nsfw": false,
+  "img2img_color_correction": false,
+  "img2img_fix_steps": false,
+  "enable_quantization": false,
+  "enable_batch_seeds": true,
+  "memmon_poll_rate": 8,
+  "sd_model_checkpoint": null
+}

services/AUTOMATIC1111/info.py

@@ -7,7 +7,7 @@ file.write_text(
   .replace('    return demo', """
     with demo:
         gr.Markdown(
-          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/tree/master/AUTOMATIC1111)'
+          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
         )
     return demo
 """, 1)

services/AUTOMATIC1111/mount.sh

@@ -32,5 +32,4 @@ rm -rf ${ROOT}/repositories/CodeFormer/weights/CodeFormer ${ROOT}/repositories/C
 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
+mkdir -p /cache/torch /cache/transformers /cache/weights /cache/models /cache/custom-models

services/download/Dockerfile

@@ -1,6 +1,6 @@
 FROM bash:alpine3.15
 
-RUN apk add parallel
+RUN apk add parallel aria2
 COPY . /docker
 RUN chmod +x /docker/download.sh
 ENTRYPOINT ["/docker/download.sh"]

services/download/download.sh

@@ -2,32 +2,12 @@
 
 set -Eeuo pipefail
 
-# [[ "$(sha256sum -b $file | head -c 64)" == "$sha" ]]
+mkdir -p /cache/torch /cache/transformers /cache/weights /cache/models /cache/custom-models
 
-declare -A MODELS
+echo "Downloading, this might take a while..."
 
-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
+aria2c --input-file /docker/links.txt --dir /cache/models --continue
 
 echo "Checking SHAs..."
 
-time parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
+parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"

services/download/links.txt

@@ -0,0 +1,12 @@
+https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media
+  out=model.ckpt
+https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth
+  out=GFPGANv1.3.pth
+https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth
+  out=RealESRGAN_x4plus.pth
+https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth
+  out=RealESRGAN_x4plus_anime_6B.pth
+https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1
+  out=LDSR.yaml
+https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1
+  out=LDSR.ckpt

services/hlky/Dockerfile

@@ -9,24 +9,24 @@ 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
+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 2b1ac8daf7ea82c6c56eabab7e80ec1c33106a98
+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=2236e8b5854092054e2c30edc559006ace53bf96
+# ARG SHA=833a91047df999302f699637768741cecee9c37b
+# ARG BRANCH=dev
+ARG SHA=17748cbc9c34df44d0381c42e4f0fe1903089438
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -36,11 +36,12 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
+RUN pip uninstall transformers -y && pip install -U --no-cache-dir pyperclip transformers==4.22
+
 # Latent diffusion
 RUN <<EOF
-git clone https://github.com/Hafiidz/latent-diffusion.git
+git clone --depth 1 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
@@ -53,7 +54,9 @@ 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=""
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PYTHONPATH="${PYTHONPATH}:/stable-diffusion" 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 ${CLI_ARGS}
+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

services/hlky/mount.sh

@@ -33,3 +33,6 @@ 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

services/hlky/webui_streamlit.yaml

@@ -0,0 +1,155 @@
+# UI defaults configuration file. It is automatically loaded if located at configs/webui/webui_streamlit.yaml.
+general:
+  gpu: 0
+  outdir: /outputs
+
+  default_model: "Stable Diffusion v1.4"
+  default_model_config: "configs/stable-diffusion/v1-inference.yaml"
+  default_model_path: "/cache/models/model.ckpt"
+  fp:
+    name:
+  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
+  save_format: "png"
+  skip_grid: False
+  skip_save: False
+  grid_format: "jpg:95"
+  n_rows: -1
+  no_verify_input: False
+  no_half: False
+  use_float16: False
+  precision: "autocast"
+  optimized: False
+  optimized_turbo: True
+  optimized_config: "optimizedSD/v1-inference.yaml"
+  update_preview: True
+  update_preview_frequency: 5
+
+txt2img:
+  prompt:
+  height: 512
+  width: 512
+  cfg_scale: 7.5
+  seed: ""
+  batch_count: 1
+  batch_size: 1
+  sampling_steps: 30
+  default_sampler: "k_euler"
+  separate_prompts: False
+  update_preview: True
+  update_preview_frequency: 5
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_grid: True
+  group_by_prompt: True
+  save_as_jpg: False
+  use_GFPGAN: False
+  use_RealESRGAN: False
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+  write_info_files: True
+
+txt2vid:
+  default_model: "CompVis/stable-diffusion-v1-4"
+  custom_models_list:
+    [
+      "CompVis/stable-diffusion-v1-4",
+      "naclbit/trinart_stable_diffusion_v2",
+      "hakurei/waifu-diffusion",
+      "osanseviero/BigGAN-deep-128",
+    ]
+  prompt:
+  height: 512
+  width: 512
+  cfg_scale: 7.5
+  seed: ""
+  batch_count: 1
+  batch_size: 1
+  sampling_steps: 30
+  num_inference_steps: 200
+  default_sampler: "k_euler"
+  scheduler_name: "klms"
+  separate_prompts: False
+  update_preview: True
+  update_preview_frequency: 5
+  dynamic_preview_frequency: True
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_video: True
+  group_by_prompt: True
+  write_info_files: True
+  do_loop: False
+  save_as_jpg: False
+  use_GFPGAN: False
+  use_RealESRGAN: False
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+  beta_start: 0.00085
+  beta_end: 0.012
+  beta_scheduler_type: "linear"
+  max_frames: 1000
+
+img2img:
+  prompt:
+  sampling_steps: 30
+  # 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_euler"
+  denoising_strength: 0.45
+  # 0: Keep masked area
+  # 1: Regenerate only masked area
+  mask_mode: 0
+  mask_restore: False
+  # 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: 7.5
+  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
+  update_preview: True
+  update_preview_frequency: 5
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_grid: True
+  group_by_prompt: True
+  save_as_jpg: False
+  use_GFPGAN: False
+  use_RealESRGAN: False
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+  write_info_files: True
+
+gfpgan:
+  strength: 100

services/lstein/Dockerfile

@@ -6,26 +6,49 @@ SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN conda install python=3.8.5 && conda clean -a -y
+# 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 -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
 
 RUN <<EOF
 git clone https://github.com/lstein/stable-diffusion.git
 cd stable-diffusion
-git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
+git reset --hard e994073b5bdfa3c77313681c5944be1544eb65b6
+sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
 conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
+ARG BRANCH=development SHA=50d607ffea3734072a80e38b09ba0c3758af5d40
+# ARG BRANCH=main SHA=89da371f4841f7e05da5a1672459d700c3920784
+RUN <<EOF
+cd stable-diffusion
+git fetch
+git reset --hard
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+conda env update --file environment.yaml -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.22
+
+COPY . /docker/
+RUN <<EOF
+python3 /docker/info.py /stable-diffusion/static/dream_web/index.html
+chmod +x /docker/mount.sh
+sed -i -- 's/outputs\//\/output/g' /stable-diffusion/backend/server.py
+EOF
+
+
+ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PRELOAD=false CLI_ARGS=""
 WORKDIR /stable-diffusion
-
 EXPOSE 7860
-# run, -u to not buffer stdout / stderr
-CMD mkdir -p /stable-diffusion/models/ldm/stable-diffusion-v1/ && \
-  ln -sf /cache/models/model.ckpt /stable-diffusion/models/ldm/stable-diffusion-v1/model.ckpt && \
+
+CMD /docker/mount.sh && \
   python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+  #python3 -u backend/server.py

services/lstein/README.md

@@ -1,14 +0,0 @@
-# WebUI for lstein
-
-The WebUI of [lstein/stable-diffusion](https://github.com/lstein/stable-diffusion) as docker container!
-
-Although it is a simple UI, the project has a lot of potential.
-
-## Setup
-
-Clone this repo, download the `model.ckpt` and put into the `models` folder as mentioned in [the main README](../README.md), then run
-
-```
-cd lstein
-docker compose up --build
-```

services/lstein/info.py

@@ -0,0 +1,10 @@
+import sys
+from pathlib import Path
+
+file = Path(sys.argv[1])
+file.write_text(
+  file.read_text()\
+  .replace('GitHub site</a>', """
+  GitHub site</a>, Deployed with <a href="https://github.com/AbdBarho/stable-diffusion-webui-docker/">stable-diffusion-webui-docker</a>
+""", 1)
+)

services/lstein/mount.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -eu
+
+ROOT=/stable-diffusion
+
+mkdir -p "${ROOT}/models/ldm/stable-diffusion-v1/"
+ln -sf /cache/models/model.ckpt "${ROOT}/models/ldm/stable-diffusion-v1/model.ckpt"
+
+if test -f /cache/models/GFPGANv1.3.pth; then
+  base="${ROOT}/src/gfpgan/experiments/pretrained_models/"
+  mkdir -p "${base}"
+  ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.3.pth"
+  echo "Mounted GFPGANv1.3.pth"
+fi
+
+# facexlib
+FACEX_WEIGHTS=/opt/conda/lib/python3.9/site-packages/facexlib/weights
+
+rm -rf "${FACEX_WEIGHTS}"
+mkdir -p /cache/weights
+ln -sf -T /cache/weights "${FACEX_WEIGHTS}"
+
+REALESRGAN_WEIGHTS=/opt/conda/lib/python3.9/site-packages/realesrgan/weights
+rm -rf "${REALESRGAN_WEIGHTS}"
+ln -sf -T /cache/weights "${REALESRGAN_WEIGHTS}"
+
+if "${PRELOAD}" == "true"; then
+  python3 -u scripts/preload_models.py
+fi