From b899f4e5161a377642f02258d383b4a986f9a148 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Fri, 23 Sep 2022 10:34:01 +0200
Subject: [PATCH] Update (#87)

### Update versions

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/d6fd71f36f33763f3a8d1d98f815e1e6a979e13e
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/2a911049aa07a1a79f8cfc8e05d13b906c23efcf
---
 services/AUTOMATIC1111/Dockerfile       |   2 +-
 services/AUTOMATIC1111/config.json      |  12 +-
 services/hlky/Dockerfile                |   8 +-
 services/hlky/mount.sh                  |   2 +-
 services/hlky/userconfig_streamlit.yaml |   8 ++
 services/hlky/webui_streamlit.yaml      | 155 ------------------------
 6 files changed, 25 insertions(+), 162 deletions(-)
 create mode 100644 services/hlky/userconfig_streamlit.yaml
 delete mode 100644 services/hlky/webui_streamlit.yaml

diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 1c5c6d9..8f48c53 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -47,7 +47,7 @@ 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=5a1951f17567022612aef5302fb650923a06fb54
+ARG SHA=d6fd71f36f33763f3a8d1d98f815e1e6a979e13e
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
diff --git a/services/AUTOMATIC1111/config.json b/services/AUTOMATIC1111/config.json
index 5ebde7c..8bab40a 100644
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -63,5 +63,15 @@
   "upscaler_for_hires_fix": null,
   "js_modal_lightbox": true,
   "js_modal_lightbox_initialy_zoomed": true,
-  "use_original_name_batch": false
+  "use_original_name_batch": false,
+  "directories_max_prompt_words": 8,
+  "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"
+  ],
+  "samples_log_stdout": false
 }
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 9fc9746..77fafc5 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -23,8 +23,8 @@ 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=833a91047df999302f699637768741cecee9c37b
-ARG BRANCH=dev SHA=fa6a31b23c38b41541ed9af19201e6f8355ac165
+# ARG BRANCH=master  SHA=d0bb60a139d60e6c2b9be4e18e0e29a86aa5af59
+ARG BRANCH=dev SHA=2a911049aa07a1a79f8cfc8e05d13b906c23efcf
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -56,5 +56,5 @@ ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PYTHONPATH="$
 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
+  python3 -u scripts/webui.py --outdir /output --ckpt /cache/models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}
+# STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py  --theme.base dark
diff --git a/services/hlky/mount.sh b/services/hlky/mount.sh
index dd93f6f..b83d965 100755
--- a/services/hlky/mount.sh
+++ b/services/hlky/mount.sh
@@ -35,4 +35,4 @@ 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
+ln -sf /docker/userconfig_streamlit.yaml /stable-diffusion/configs/webui/userconfig_streamlit.yaml
diff --git a/services/hlky/userconfig_streamlit.yaml b/services/hlky/userconfig_streamlit.yaml
new file mode 100644
index 0000000..7cf0020
--- /dev/null
+++ b/services/hlky/userconfig_streamlit.yaml
@@ -0,0 +1,8 @@
+general:
+  outdir: /outputs
+  default_model: "Stable Diffusion v1.4"
+  default_model_path: "/cache/models/model.ckpt"
+  outdir_txt2img: /outputs/txt2img-samples
+  outdir_img2img: /outputs/img2img-samples
+  optimized_turbo: true
+  enable_minimal_memory_usage : True
diff --git a/services/hlky/webui_streamlit.yaml b/services/hlky/webui_streamlit.yaml
deleted file mode 100644
index 589f464..0000000
--- a/services/hlky/webui_streamlit.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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