Matrix CI/CD (#68)

* Update auto

.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/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 ${{ matrix.profile }} build --progress plain
-      - run: docker compose --profile hlky build --progress plain
-      - run: docker compose --profile lstein build --progress plain

README.md

@@ -47,6 +47,9 @@ Screenshots:
 
 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.

docker-compose.yml

@@ -37,7 +37,7 @@ 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
 

services/AUTOMATIC1111/Dockerfile

@@ -2,10 +2,11 @@
 
 FROM alpine/git:2.36.2 as download
 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/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
@@ -40,7 +41,8 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
 
 # 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=2ddaeb318a9626502ef4bf949a312253d8021ff0
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -48,7 +50,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 +61,4 @@ 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 ${CLI_ARGS}

services/AUTOMATIC1111/config.json

@@ -1 +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", "__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
+}

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

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

services/hlky/Dockerfile

@@ -9,13 +9,13 @@ 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 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
@@ -26,7 +26,9 @@ 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=b4de6caf697d311c1238c15a4c863fa529a35522
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -56,4 +58,6 @@ 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 ${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,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

services/lstein/Dockerfile

@@ -9,7 +9,7 @@ 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