From 80086cb4683c7d7fbbc7361a7467e9e68d6e465c Mon Sep 17 00:00:00 2001
From: Abdullah Barhoum <ka70911@gmail.com>
Date: Sun, 11 Sep 2022 14:35:12 +0200
Subject: [PATCH] Update hlky

---
 README.md                |  1 +
 services/hlky/Dockerfile | 18 +++++-------------
 services/hlky/mount.sh   |  9 ++++++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 6468a01..e992f2e 100644
--- a/README.md
+++ b/README.md
@@ -89,3 +89,4 @@ Special thanks to everyone behind these awesome projects, without them, none of
 - [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
 - [hlky/sd-enable-textual-inversion](https://github.com/hlky/sd-enable-textual-inversion)
 - [devilismyfriend/latent-diffusion](https://github.com/devilismyfriend/latent-diffusion)
+- [Hafiidz/latent-diffusion](https://github.com/Hafiidz/latent-diffusion)
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 8e9eadd..79c5f03 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -25,8 +25,8 @@ 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=dev
-ARG WEBUI_SHA=be2ece06837e37d90181a17340c7e1aac91ba4fb
+ARG BRANCH=master
+ARG WEBUI_SHA=2236e8b5854092054e2c30edc559006ace53bf96
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -36,19 +36,11 @@ conda env update --file environment.yaml -n base
 conda clean -a -y
 EOF
 
-# Textual inversion
-RUN <<EOF
-git clone https://github.com/hlky/sd-enable-textual-inversion.git &&
-cd /sd-enable-textual-inversion && git reset --hard 08f9b5046552d17cf7327b30a98410222741b070 &&
-rsync -a /sd-enable-textual-inversion/ /stable-diffusion/ &&
-rm -rf /sd-enable-textual-inversion
-EOF
-
 # Latent diffusion
 RUN <<EOF
-git clone https://github.com/devilismyfriend/latent-diffusion &&
-cd /latent-diffusion &&
-git reset --hard 6d61fc03f15273a457950f2cdc10dddf53ba6809 &&
+git clone 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
diff --git a/services/hlky/mount.sh b/services/hlky/mount.sh
index 4edad8d..d3b769d 100755
--- a/services/hlky/mount.sh
+++ b/services/hlky/mount.sh
@@ -3,9 +3,12 @@
 set -e
 
 declare -A MODELS
-MODELS["/stable-diffusion/src/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=GFPGANv1.3.pth
-MODELS["/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth"]=RealESRGAN_x4plus.pth
-MODELS["/stable-diffusion/src/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth"]=RealESRGAN_x4plus_anime_6B.pth
+
+ROOT=/stable-diffusion/src
+
+MODELS["${ROOT}/gfpgan/experiments/pretrained_models/GFPGANv1.3.pth"]=GFPGANv1.3.pth
+MODELS["${ROOT}/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus.pth"]=RealESRGAN_x4plus.pth
+MODELS["${ROOT}/realesrgan/experiments/pretrained_models/RealESRGAN_x4plus_anime_6B.pth"]=RealESRGAN_x4plus_anime_6B.pth
 MODELS["/latent-diffusion/experiments/pretrained_models/model.ckpt"]=LDSR.ckpt
 # MODELS["/latent-diffusion/experiments/pretrained_models/project.yaml"]=LDSR.yaml