From 161fd52c1663eabfd82d9bc5f73802fe687615d4 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Tue, 11 Oct 2022 20:00:58 +0200
Subject: [PATCH] Bump Versions (#127)

### Update versions

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/6a9ea5b41cf92cd9e980349bb5034439f4e7a58b
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/2215a3b40325ac53d65c22e181eb59ef22ff0586
- lstein:
https://github.com/invoke-ai/InvokeAI/commit/79e79b78aaeedb49afcc795e0e00eebfdbedee96
  - Now is back with v2!

Closes #123
---
 README.md                         | 13 +++++++++----
 data/.gitignore                   |  1 +
 services/AUTOMATIC1111/Dockerfile | 11 ++++++-----
 services/AUTOMATIC1111/mount.sh   |  1 +
 services/hlky/Dockerfile          |  2 +-
 services/lstein/Dockerfile        | 11 +++++------
 services/lstein/mount.sh          |  2 +-
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 7eaad7b..a905bfb 100644
--- a/README.md
+++ b/README.md
@@ -40,15 +40,20 @@ Screenshots:
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
 | ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
 
-<!--
+
+
 ### lstein
 
-[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential.
+[lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI.
+- Text to image, with many samplers
+- Image to image
+- 4GB GPU support
+- More coming!
+- [Full feature list here](https://github.com/invoke-ai/InvokeAI#features)
 
 | Text to image                                                                                              | Image to image                                                                                             | Extras                                                                                                     |
 | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| ![](https://user-images.githubusercontent.com/24505302/190662506-dabdc967-93af-4d78-8533-394604d29ba4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662557-7640d9f0-30d8-4527-97b0-07d3f48108d4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662588-37a01fad-f993-4674-9ae6-8714aa229f7b.jpg) |
--->
+| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) |
 
 ## Setup & Usage
 
diff --git a/data/.gitignore b/data/.gitignore
index c506004..c77902d 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -11,4 +11,5 @@
 /SwinIR
 /ScuNET
 /LDSR
+/Hypernetworks
 /embeddings
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index e354dc2..fb358f3 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -7,14 +7,15 @@ RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stabl
 
 RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af
 RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9
-RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
+# RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
 
 RUN <<EOF
 # because taming-transformers is huge
 git config --global http.postBuffer 1048576000
 git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
+cd repositories/taming-transformers
 git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
-rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
+rm -rf data assets
 EOF
 
 RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878
@@ -48,18 +49,18 @@ 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=050a6a798cec90ae2f881c2ddd3f0221e69907dc
+ARG SHA=6a9ea5b41cf92cd9e980349bb5034439f4e7a58b
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
 git reset --hard ${SHA}
 pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
-pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
 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
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
+  pyngrok
 #xformers
 
 
diff --git a/services/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/mount.sh
index 3b37de7..b99fa87 100755
--- a/services/AUTOMATIC1111/mount.sh
+++ b/services/AUTOMATIC1111/mount.sh
@@ -16,6 +16,7 @@ MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
 MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
 MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET"
 MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
+MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
 
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
 
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index 22fbda2..1ae069d 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -22,7 +22,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=dev  SHA=fe6e72fde79214aa848d47afe74487d9855b8643
+ARG BRANCH=dev SHA=2215a3b40325ac53d65c22e181eb59ef22ff0586
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile
index 164bf68..9d4490b 100644
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -17,15 +17,14 @@ ENV PIP_EXISTS_ACTION=w
 RUN <<EOF
 git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
 cd stable-diffusion
-git reset --hard 8a8be92eac17e0ef699528157596b2336bdee532
-sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
+git reset --hard 79e79b78aaeedb49afcc795e0e00eebfdbedee96
 git config --global http.postBuffer 1048576000
-conda env update --file environment.yaml -n base
+conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=31869885d9d3ee1e62c1109fb141e828e9a0e833
+ARG BRANCH=main SHA=79e79b78aaeedb49afcc795e0e00eebfdbedee96
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -36,7 +35,7 @@ conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
-RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.19.2
+RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless
 
 COPY . /docker/
 RUN <<EOF
@@ -50,4 +49,4 @@ WORKDIR /stable-diffusion
 EXPOSE 7860
 
 CMD /docker/mount.sh && \
-  python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+  python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
diff --git a/services/lstein/mount.sh b/services/lstein/mount.sh
index 808c468..c8cd0fc 100755
--- a/services/lstein/mount.sh
+++ b/services/lstein/mount.sh
@@ -9,7 +9,7 @@ MOUNTS["/root/.cache"]=/data/.cache
 # ui specific
 MOUNTS["${PWD}/models/ldm/stable-diffusion-v1/model.ckpt"]=/data/StableDiffusion/model.ckpt
 MOUNTS["${PWD}/src/gfpgan/experiments/pretrained_models/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${PWD}/ldm/dream/restoration/codeformer/weights"]=/data/CodeFormer
+MOUNTS["${PWD}/ldm/invoke/restoration/codeformer/weights"]=/data/CodeFormer
 # hacks
 MOUNTS["/opt/conda/lib/python3.9/site-packages/facexlib/weights"]=/data/.cache
 MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN