From 3682303355987de3cee361223836dfc1f3d2169c Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Fri, 14 Oct 2022 22:42:34 +0200
Subject: [PATCH] Update (#139)

### Update versions

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/03d62538aebeff51713619fe808c953bdb70193d
  - History Tab IS NOT WORKING YET! #138
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/fd51bab1ec03543eb57faa954caab879ef2bafe7
- lstein:
https://github.com/invoke-ai/InvokeAI/commit/fe2a2cfc8b6156805c420c026c5ef8bbb256899e

Closes #102 the config file has been moved to `data/config/auto`
---
 data/.gitignore                    |  2 +
 docker-compose.yml                 |  4 --
 services/AUTOMATIC1111/Dockerfile  |  8 +++-
 services/AUTOMATIC1111/config.json | 71 +-----------------------------
 services/AUTOMATIC1111/mount.sh    | 11 ++++-
 services/hlky/Dockerfile           |  2 +-
 services/lstein/Dockerfile         |  2 +-
 7 files changed, 20 insertions(+), 80 deletions(-)

diff --git a/data/.gitignore b/data/.gitignore
index c77902d..36b7867 100644
--- 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
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f1e392..a4e9412 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,10 +34,6 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    volumes:
-      - *v1
-      - *v2
-      - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
       - CLI_ARGS=--allow-code --medvram
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 43e1fd5..2b163c8 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -46,10 +46,14 @@ ENV ROOT=/stable-diffusion-webui \
 COPY --from=download /git/ ${ROOT}
 RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
+# TODO: move to top
+RUN apt-get install jq moreutils -y
+
+
 # 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=6a9ea5b41cf92cd9e980349bb5034439f4e7a58b
+ARG SHA=03d62538aebeff51713619fe808c953bdb70193d
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
@@ -61,7 +65,6 @@ 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 \
   pyngrok
-#xformers
 
 
 
@@ -70,6 +73,7 @@ RUN <<EOF
 chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
 EOF
 
+
 ENV CLI_ARGS=""
 WORKDIR ${WORKDIR}
 EXPOSE 7860
diff --git a/services/AUTOMATIC1111/config.json b/services/AUTOMATIC1111/config.json
index 6d9fc96..6f70386 100644
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -6,74 +6,5 @@
   "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"
 }
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/mount.sh
index b99fa87..e5c514e 100755
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -2,6 +2,10 @@
 
 set -Eeuo pipefail
 
+mkdir -p /data/config/auto/
+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
+
 declare -A MOUNTS
 
 MOUNTS["/root/.cache"]="/data/.cache"
@@ -19,6 +23,7 @@ MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
 MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
 
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
+MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
 
 # extra hacks
 MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
@@ -27,10 +32,12 @@ for to_path in "${!MOUNTS[@]}"; do
   set -Eeuo pipefail
   from_path="${MOUNTS[${to_path}]}"
   rm -rf "${to_path}"
-  mkdir -vp "$from_path"
+  if [ -d "$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
 
-mkdir -p /output/saved
+mkdir -p /output/saved /output/txt2img-images/ /output/img2img-images /output/extras-images/ /output/grids/ /output/txt2img-grids/ /output/img2img-grids/
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 1ae069d..146577e 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev SHA=2215a3b40325ac53d65c22e181eb59ef22ff0586
+ARG BRANCH=dev SHA=fd51bab1ec03543eb57faa954caab879ef2bafe7
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile
index 9d4490b..08f9e5c 100644
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -24,7 +24,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=main SHA=79e79b78aaeedb49afcc795e0e00eebfdbedee96
+ARG BRANCH=development SHA=fe2a2cfc8b6156805c420c026c5ef8bbb256899e
 RUN <<EOF
 cd stable-diffusion
 git fetch