From 1c5097b81b36cc3f3b5949b63e2b39722bb2e1cd Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Fri, 16 Sep 2022 00:36:31 +0530
Subject: [PATCH 1/3] Hotfix for pywavelet version, attempt 1

---
 scripts/on_sd_start.bat       |  2 ++
 scripts/on_sd_start.sh        |  2 ++
 ui/sd_internal/env_yaml.patch | 12 ++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 ui/sd_internal/env_yaml.patch

diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 526793fe..3e0299d6 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -18,6 +18,7 @@
     @call git checkout d154155d4c0b43e13ec1f00eb72b7ff9d522fcf9
 
     @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
 
     @cd ..
 ) else (
@@ -35,6 +36,7 @@
     @call git checkout d154155d4c0b43e13ec1f00eb72b7ff9d522fcf9
 
     @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
 
     @cd ..
 )
diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh
index 8de85925..e581232b 100755
--- a/scripts/on_sd_start.sh
+++ b/scripts/on_sd_start.sh
@@ -19,6 +19,7 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
     git checkout d154155d4c0b43e13ec1f00eb72b7ff9d522fcf9
 
     git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
 
     cd ..
 else
@@ -36,6 +37,7 @@ else
     git checkout d154155d4c0b43e13ec1f00eb72b7ff9d522fcf9
 
     git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
 
     cd ..
 fi
diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch
new file mode 100644
index 00000000..0f86d02c
--- /dev/null
+++ b/ui/sd_internal/env_yaml.patch
@@ -0,0 +1,12 @@
+diff --git a/environment.yaml b/environment.yaml
+index 7f25da8..c9eef41 100644
+--- a/environment.yaml
++++ b/environment.yaml
+@@ -23,6 +23,7 @@ dependencies:
+     - torch-fidelity==0.3.0
+     - transformers==4.19.2
+     - torchmetrics==0.6.0
++    - pywavelets==1.3.0
+     - kornia==0.6
+     - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+     - -e git+https://github.com/openai/CLIP.git@main#egg=clip

From bfdb74979f6e83694a2a729a43070666b4412dda Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 22 Sep 2022 12:25:57 +0530
Subject: [PATCH 2/3] Restrict to pandas 1.4.4, the new 1.5 version breaks the
 numpy dependency

---
 ui/sd_internal/env_yaml.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch
index 0f86d02c..a375524e 100644
--- a/ui/sd_internal/env_yaml.patch
+++ b/ui/sd_internal/env_yaml.patch
@@ -7,6 +7,7 @@ index 7f25da8..c9eef41 100644
      - transformers==4.19.2
      - torchmetrics==0.6.0
 +    - pywavelets==1.3.0
++    - pandas==1.4.4
      - kornia==0.6
      - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
      - -e git+https://github.com/openai/CLIP.git@main#egg=clip

From f42eaaea8616e2c4aa5209cffe4e6e3697db9846 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 22 Sep 2022 12:48:11 +0530
Subject: [PATCH 3/3] Fix incorrect patch for env

---
 ui/sd_internal/env_yaml.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch
index a375524e..cc140ef1 100644
--- a/ui/sd_internal/env_yaml.patch
+++ b/ui/sd_internal/env_yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/environment.yaml b/environment.yaml
-index 7f25da8..c9eef41 100644
+index 7f25da8..306750f 100644
 --- a/environment.yaml
 +++ b/environment.yaml
-@@ -23,6 +23,7 @@ dependencies:
+@@ -23,6 +23,8 @@ dependencies:
      - torch-fidelity==0.3.0
      - transformers==4.19.2
      - torchmetrics==0.6.0