From 56c69891c3f118e4e3b09a5e27368fb2fb221ca3 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sat, 22 Oct 2022 09:57:42 +0200
Subject: [PATCH] hlky (still very buggy)

---
 docker-compose.yml                      |  1 +
 services/hlky/Dockerfile                |  2 +-
 services/hlky/run.sh                    |  2 +-
 services/hlky/userconfig_streamlit.yaml | 13 +++++++------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4a9c3b9..3639086 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,7 @@ services:
     <<: *base_service
     profiles: ["hlky"]
     build: ./services/hlky/
+    image: sd-hlky:1
     environment:
       - CLI_ARGS=--optimized-turbo
       - USE_STREAMLIT=0
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 33afb27..c271ece 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev SHA=bd57d22f2e0ec7eed084bdf2a4c0dcc0ed745daf
+ARG BRANCH=dev SHA=8d1e42b9c50c747d056b0a98f3c2eb7652fb73a7
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/hlky/run.sh b/services/hlky/run.sh
index 0c5dbdd..89f7959 100755
--- a/services/hlky/run.sh
+++ b/services/hlky/run.sh
@@ -6,5 +6,5 @@ echo "USE_STREAMLIT = ${USE_STREAMLIT}"
 if [ "${USE_STREAMLIT}" == "1" ]; then
   python -u -m streamlit run scripts/webui_streamlit.py
 else
-  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
+  python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/v1-5-pruned-emaonly.ckpt ${CLI_ARGS}
 fi
diff --git a/services/hlky/userconfig_streamlit.yaml b/services/hlky/userconfig_streamlit.yaml
index 80b59fb..ad48b38 100644
--- a/services/hlky/userconfig_streamlit.yaml
+++ b/services/hlky/userconfig_streamlit.yaml
@@ -1,8 +1,9 @@
 general:
-  outdir: /outputs
-  default_model: "Stable Diffusion v1.4"
-  default_model_path: /data/StableDiffusion/model.ckpt
-  outdir_txt2img: /outputs/txt2img-samples
-  outdir_img2img: /outputs/img2img-samples
-  optimized: True
+  version: 1.20.0
+  outdir: /output
+  default_model: "Stable Diffusion v1.5"
+  default_model_path: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
+  outdir_txt2img: /output/txt2img-samples
+  outdir_img2img: /output/img2img-samples
+  outdir_img2txt: /output/img2txt
   optimized_turbo: True