From 28f171e64dea22632c108372d6876dcb9e6dc155 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Fri, 30 Sep 2022 09:37:27 +0200
Subject: [PATCH] Update / Disable lstein Temporarily (#106)

- auto:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/f80c3696f63a181f720105559d42ee53453ed0eb
- model merger now works! the resulting model is saved in
`cache/custom-models`
- hlky:
https://github.com/sd-webui/stable-diffusion-webui/commit/aaa3be16e0e66f07c63dbdb49b9b7cac8fef5cfb
- lstein:
https://github.com/lstein/stable-diffusion/commit/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977
- This UI has been temporarely disabled due to limitation in the output
path:
https://github.com/invoke-ai/InvokeAI/blob/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977/backend/modules/create_cmd_parser.py#L26
---
 README.md                         |  2 ++
 services/AUTOMATIC1111/Dockerfile |  8 +++++---
 services/hlky/Dockerfile          |  2 +-
 services/lstein/Dockerfile        | 11 +++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 962b937..7eaad7b 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ 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.
@@ -47,6 +48,7 @@ Screenshots:
 | 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) |
+-->
 
 ## Setup & Usage
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 105f92c..e11d0a5 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -17,6 +17,8 @@ git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
 rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
+RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard 9e3002b7cd64df7870e08527b7664eb2f2f5f3f5
+
 
 FROM continuumio/miniconda3:4.12.0
 
@@ -34,7 +36,7 @@ RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
 git reset --hard 15f333a266c20319e2b95a47a8834adf7b914aec
-pip install --prefer-binary --no-cache-dir -r requirements.txt
+pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
 EOF
 
 ENV ROOT=/stable-diffusion-webui \
@@ -47,13 +49,13 @@ 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=15f333a266c20319e2b95a47a8834adf7b914aec
+ARG SHA=f80c3696f63a181f720105559d42ee53453ed0eb
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
 git reset --hard ${SHA}
-pip install --prefer-binary --no-cache-dir -r requirements.txt
 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 -U --no-cache-dir opencv-python-headless
diff --git a/services/hlky/Dockerfile b/services/hlky/Dockerfile
index a5e15dc..c0fa6b1 100644
--- a/services/hlky/Dockerfile
+++ b/services/hlky/Dockerfile
@@ -25,7 +25,7 @@ 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=d0bb60a139d60e6c2b9be4e18e0e29a86aa5af59
-ARG BRANCH=dev SHA=7bd785d28f974c6e268604794acc549607e33090
+ARG BRANCH=dev SHA=aaa3be16e0e66f07c63dbdb49b9b7cac8fef5cfb
 RUN <<EOF
 cd stable-diffusion
 git fetch
diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile
index 8464c6c..5944b13 100644
--- a/services/lstein/Dockerfile
+++ b/services/lstein/Dockerfile
@@ -23,7 +23,7 @@ conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=b40bfb5116b7fc618f78a0d152005ceb46153443
+ARG BRANCH=development SHA=8c9f2ae705cf723d4a8a73c416e8d8bf2d746977
 # this breaks on generation:
 # there is a new UI anyway, but it is not by any means ready.
 # ARG BRANCH=development SHA=bdbc76fcd4bd3362312dc91b087d9af66de423b1
@@ -33,7 +33,7 @@ git fetch
 git reset --hard
 git checkout ${BRANCH}
 git reset --hard ${SHA}
-conda env update --file environment.yaml -n base
+conda env update --file environment.yml -n base
 conda clean -a -y
 EOF
 
@@ -52,5 +52,8 @@ 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 backend/server.py --host 0.0.0.0 --port 9090
+  # python3 -u backend/server.py --host 0.0.0.0 --port 7860 --cors http://localhost:7860
+  # python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+  echo The lstein webUI is currently deactivated due to implementation limitations: \
+  https://github.com/invoke-ai/InvokeAI/blob/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977/backend/modules/create_cmd_parser.py#L26 \
+  Once the path the output is fixed, the UI will be activated again