From 19f940207622ed82d887289aa53b88713b6094f3 Mon Sep 17 00:00:00 2001
From: Abdullah Barhoum <ka70911@gmail.com>
Date: Tue, 30 Aug 2022 21:40:02 +0200
Subject: [PATCH] Update Core to fe76828926653f979263b4c9d0bf7acc75f4aad2

---
 README.md          |  2 +-
 build/Dockerfile   | 37 ++++++++++++++++++-------------------
 docker-compose.yml |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index dadff46..fba1aa9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ docker compose build
 
 you can let it build in the background while you download the different models
 
-- [Stable Diffusion v1.4 (4GB)](https://drive.yerf.org/wl/?id=EBfTrmcCCUAGaQBXVIj5lJmEhjoP1tgl), rename to `model.ckpt`
+- [Stable Diffusion v1.4 (4GB)](https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media), rename to `model.ckpt`
 - (Optional) [GFPGANv1.3.pth (333MB)](https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth) to improve generated faces.
 - (Optional) [RealESRGAN_x4plus.pth (64MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth) and [RealESRGAN_x4plus_anime_6B.pth (18MB)](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth) for super-sampling.
 
diff --git a/build/Dockerfile b/build/Dockerfile
index cb3c467..ab50506 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -13,27 +13,26 @@ RUN apt-get update && apt install fonts-dejavu-core && apt-get clean
 
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
-RUN cd stable-diffusion && git pull && git reset --hard c0c2a7c0d55561cfb6f42a3681346b9b70749ff1 && \
+RUN cd stable-diffusion && git pull && git reset --hard fe76828926653f979263b4c9d0bf7acc75f4aad2 && \
   conda env update --file environment.yaml --name base && conda clean -a -y
 
 # download dev UI version, update the sha below in case you want some other version
-RUN <<EOF
-git clone https://github.com/hlky/stable-diffusion-webui.git
-cd stable-diffusion-webui
-# map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
-git reset --hard 49e6178fd82ca736f9bbc621c6b12487c300e493
-cp -t /stable-diffusion/scripts/ webui.py relauncher.py txt2img.yaml
-cp -t /stable-diffusion/configs/webui webui.yaml
-cp -t /stable-diffusion/frontend/ frontend/*
-cd / && rm -rf stable-diffusion-webui
-EOF
-
-# For testing different versions:
-# RUN git clone https://github.com/AbdBarho/stable-diffusion-webui.git && cd stable-diffusion-webui && \
-#   git checkout respect-cli-params &&\
-#   cp -t /stable-diffusion/scripts/ txt2img.yaml webui.py webui.yaml webui_playground.py && \
-#   cd / && rm -rf stable-diffusion-webui
+# RUN <<EOF
+# git clone https://github.com/hlky/stable-diffusion-webui.git
+# cd stable-diffusion-webui
+# # map to this file: https://github.com/hlky/stable-diffusion-webui/blob/master/.github/sync.yml
+# git reset --hard 49e6178fd82ca736f9bbc621c6b12487c300e493
+# cp -t /stable-diffusion/scripts/ webui.py relauncher.py txt2img.yaml
+# cp -t /stable-diffusion/configs/webui webui.yaml
+# cp -t /stable-diffusion/frontend/ frontend/*
+# cd / && rm -rf stable-diffusion-webui
+# EOF
 
+# Textual-inversion:
+# RUN <<EOF
+# git clone https://github.com/hlky/sd-enable-textual-inversion.git
+# cp -rf sd-enable-textual-inversion /stable-diffusion
+# EOF
 
 # add info
 COPY info.py /info.py
@@ -52,7 +51,7 @@ CMD \
   test -f "/models/${name}" && mkdir -p "${base}" && ln -sf "/models/${name}" "${path}" && echo "Mounted ${name}";\
   done;\
   # force facexlib cache
-  mkdir -p /cache/weights/ && rm -rf /opt/conda/lib/python3.8/site-packages/facexlib/weights && \
-  ln -sf  /cache/weights/ /opt/conda/lib/python3.8/site-packages/facexlib/ && \
+  mkdir -p /cache/weights/ && rm -rf /stable-diffusion/src/facexlib/facexlib/weights && \
+  ln -sf  /cache/weights/ /stable-diffusion/src/facexlib/facexlib/ && \
   # run, -u to not buffer stdout / stderr
   python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --save-metadata ${CLI_ARGS}
diff --git a/docker-compose.yml b/docker-compose.yml
index f6ae90f..82304a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - ./output:/output
       - ./models:/models
     environment:
-      - CLI_ARGS=--gfpgan-gpu 0 --esrgan-cpu --optimized-turbo
+      - CLI_ARGS=--extra-models-cpu --optimized-turbo
     deploy:
       resources:
         reservations: