From 3f450c6c50db984d2f388aff870569646fab2c98 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Sun, 20 Nov 2022 12:12:31 +0100
Subject: [PATCH 01/50] add test-invoke-pip.yml

---
 .github/workflows/test-invoke-pip.yml | 117 ++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 .github/workflows/test-invoke-pip.yml

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
new file mode 100644
index 00000000000..dff9f7e7bf8
--- /dev/null
+++ b/.github/workflows/test-invoke-pip.yml
@@ -0,0 +1,117 @@
+name: Test invoke.py pip
+on:
+  push:
+    branches:
+      - 'main'
+      - 'development'
+  pull_request:
+    branches:
+      - 'main'
+      - 'development'
+
+jobs:
+  matrix:
+    strategy:
+      fail-fast: false
+      matrix:
+        stable-diffusion-model:
+          - stable-diffusion-1.5
+        requirements-file:
+          - requirements-lin-cuda.txt
+          - requirements-lin-amd.txt
+          - requirements-mac-mps-cpu.txt
+        python-version:
+          - '3.9'
+          - '3.10'
+        include:
+          - requirements-file: requirements-lin-cuda.txt
+            os: ubuntu-latest
+            default-shell: bash -l {0}
+          - requirements-file: requirements-lin-amd.txt
+            os: ubuntu-latest
+            default-shell: bash -l {0}
+          - requirements-file: requirements-mac-mps-cpu.txt
+            os: macOS-12
+            default-shell: bash -l {0}
+          - stable-diffusion-model: stable-diffusion-1.5
+            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
+            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
+    name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: ${{ matrix.default-shell }}
+    steps:
+      - name: Checkout sources
+        id: checkout-sources
+        uses: actions/checkout@v3
+
+      - name: create models.yaml from example
+        run: cp configs/models.yaml.example configs/models.yaml
+
+      - name: set test prompt to main branch validation
+        if: ${{ github.ref == 'refs/heads/main' }}
+        run: echo "TEST_PROMPTS=tests/preflight_prompts.txt" >> $GITHUB_ENV
+
+      - name: set test prompt to development branch validation
+        if: ${{ github.ref == 'refs/heads/development' }}
+        run: echo "TEST_PROMPTS=tests/dev_prompts.txt" >> $GITHUB_ENV
+
+      - name: set test prompt to Pull Request validation
+        if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/development' }}
+        run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> $GITHUB_ENV
+
+      - name: create requirements.txt
+        run: cp environments-and-requirements/${{ matrix.requirements-file }} requirements.txt
+
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+
+      - name: install dependencies
+        run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
+
+      - name: install requirements
+        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
+
+      - name: Use Cached Stable Diffusion Model
+        id: cache-sd-model
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-${{ matrix.stable-diffusion-model }}
+        with:
+          path: ${{ matrix.stable-diffusion-model-dl-path }}
+          key: ${{ env.cache-name }}
+
+      - name: Download ${{ matrix.stable-diffusion-model }}
+        id: download-stable-diffusion-model
+        if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
+        run: |
+          [[ -d models/ldm/stable-diffusion-v1 ]] \
+            || mkdir -p models/ldm/stable-diffusion-v1
+          curl \
+            -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
+            -o ${{ matrix.stable-diffusion-model-dl-path }} \
+            -L ${{ matrix.stable-diffusion-model-url }}
+
+      - name: run preload_models.py
+        id: run-preload-models
+        run: |
+          ${{ env.pythonLocation }}/bin/python scripts/preload_models.py \
+            --no-interactive
+
+      - name: Run the tests
+        id: run-tests
+        run: |
+          time ${{ env.pythonLocation }}/bin/python scripts/invoke.py \
+            --model ${{ matrix.stable-diffusion-model }} \
+            --from_file ${{ env.TEST_PROMPTS }}
+
+      - name: Archive results
+        id: archive-results
+        uses: actions/upload-artifact@v3
+        with:
+          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
+          path: outputs/img-samples

From 96a3982c650763e5249d413dc166301e0a48763a Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Sun, 20 Nov 2022 12:27:15 +0100
Subject: [PATCH 02/50] update requirements-base.txt to fix tests

---
 environments-and-requirements/requirements-base.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index d76531a1337..e88cc5e9d78 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -21,7 +21,6 @@ pip>=22
 pudb
 pyreadline3
 pytorch-lightning==1.7.7
-realesrgan
 scikit-image>=0.19
 send2trash
 streamlit
@@ -32,6 +31,7 @@ torchmetrics
 transformers==4.21.*
 picklescan
 git+https://github.com/openai/CLIP.git@main#egg=clip
-git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
+git+https://github.com/invoke-ai/k-diffusion.git@mps#egg=k_diffusion
+git+https://github.com/invoke-ai/Real-ESRGAN.git#egg=realesrgan
 git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan
+git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan

From cf6185885b8c1173abff74e2cf33657e965e8265 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Sun, 20 Nov 2022 13:23:46 +0100
Subject: [PATCH 03/50] install requirements-base.txt separate since it
 requires to have torch already installed also restore origin
 requirements-base.txt after suc. test in my fork

---
 .github/workflows/test-invoke-pip.yml                      | 3 +++
 environments-and-requirements/requirements-base.txt        | 6 +++---
 environments-and-requirements/requirements-lin-amd.txt     | 4 +---
 environments-and-requirements/requirements-lin-cuda.txt    | 1 -
 environments-and-requirements/requirements-mac-mps-cpu.txt | 2 --
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index dff9f7e7bf8..10a09c75959 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -76,6 +76,9 @@ jobs:
       - name: install requirements
         run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
 
+      - name: install base requirements
+        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r environments-and-requirements/requirements-base.txt
+
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model
         uses: actions/cache@v3
diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index e88cc5e9d78..d76531a1337 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -21,6 +21,7 @@ pip>=22
 pudb
 pyreadline3
 pytorch-lightning==1.7.7
+realesrgan
 scikit-image>=0.19
 send2trash
 streamlit
@@ -31,7 +32,6 @@ torchmetrics
 transformers==4.21.*
 picklescan
 git+https://github.com/openai/CLIP.git@main#egg=clip
-git+https://github.com/invoke-ai/k-diffusion.git@mps#egg=k_diffusion
-git+https://github.com/invoke-ai/Real-ESRGAN.git#egg=realesrgan
+git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
 git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan
+git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan
diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt
index 8ca0ead88cb..8aa526e1f2f 100644
--- a/environments-and-requirements/requirements-lin-amd.txt
+++ b/environments-and-requirements/requirements-lin-amd.txt
@@ -1,6 +1,4 @@
--r environments-and-requirements/requirements-base.txt
-
-# Get hardware-appropriate torch/torchvision 
+# Get hardware-appropriate torch/torchvision
 --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org
 torch
 torchvision
diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt
index 1578c60334b..d6e1198b1ab 100644
--- a/environments-and-requirements/requirements-lin-cuda.txt
+++ b/environments-and-requirements/requirements-lin-cuda.txt
@@ -1,2 +1 @@
--r environments-and-requirements/requirements-base.txt
 -e .
diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt
index 05c7d9a77c2..920fb52529d 100644
--- a/environments-and-requirements/requirements-mac-mps-cpu.txt
+++ b/environments-and-requirements/requirements-mac-mps-cpu.txt
@@ -1,5 +1,3 @@
--r environments-and-requirements/requirements-base.txt
-
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0

From 1da9f66108f5c4a96477dd1a46ef8716ed45739e Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 02:22:46 +0100
Subject: [PATCH 04/50] restore origin requirements add `basicsr>=1.4.2` to
 requirements-base.txt remove second installation step

---
 .github/workflows/test-invoke-pip.yml                      | 4 ++--
 environments-and-requirements/requirements-base.txt        | 1 +
 environments-and-requirements/requirements-lin-amd.txt     | 2 ++
 environments-and-requirements/requirements-mac-mps-cpu.txt | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 10a09c75959..4d61b2963a6 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -76,8 +76,8 @@ jobs:
       - name: install requirements
         run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
 
-      - name: install base requirements
-        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r environments-and-requirements/requirements-base.txt
+      # - name: install base requirements
+      #   run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r environments-and-requirements/requirements-base.txt
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model
diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index d76531a1337..76a9d1a02cb 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -1,5 +1,6 @@
 # pip will resolve the version which matches torch
 albumentations
+basicsr>=1.4.2
 dependency_injector==4.40.0
 diffusers
 einops
diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt
index 8aa526e1f2f..d627f99861d 100644
--- a/environments-and-requirements/requirements-lin-amd.txt
+++ b/environments-and-requirements/requirements-lin-amd.txt
@@ -1,3 +1,5 @@
+-r environments-and-requirements/requirements-base.txt
+
 # Get hardware-appropriate torch/torchvision
 --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org
 torch
diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt
index 920fb52529d..05c7d9a77c2 100644
--- a/environments-and-requirements/requirements-mac-mps-cpu.txt
+++ b/environments-and-requirements/requirements-mac-mps-cpu.txt
@@ -1,3 +1,5 @@
+-r environments-and-requirements/requirements-base.txt
+
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0

From 7e7c63b99feba8a40fec4273451c9212566520b8 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 02:33:26 +0100
Subject: [PATCH 05/50] re-add previously overseen req in lin-cuda

---
 environments-and-requirements/requirements-lin-cuda.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt
index d6e1198b1ab..1578c60334b 100644
--- a/environments-and-requirements/requirements-lin-cuda.txt
+++ b/environments-and-requirements/requirements-lin-cuda.txt
@@ -1 +1,2 @@
+-r environments-and-requirements/requirements-base.txt
 -e .

From a0393e5100932fbc634ba76656f02a95db506beb Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 02:36:57 +0100
Subject: [PATCH 06/50] fix typo in setup.py - `scripts/preload_models.py`

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0a2a808d320..1f95227d5dc 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def frontend_files(directory):
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Scientific/Engineering :: Image Processing',
     ],
-    scripts = ['scripts/invoke.py','scripts/load_models.py','scripts/sd-metadata.py'],
+    scripts = ['scripts/invoke.py','scripts/preload_models.py','scripts/sd-metadata.py'],
     data_files=[('frontend',frontend_files)],
 )
 

From e215b44f24f139fa6830eab8d6b191b5a28b5048 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 03:22:05 +0100
Subject: [PATCH 07/50] use GFBGAN from branch `basicsr-1.4.2`

---
 environments-and-requirements/requirements-base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index 76a9d1a02cb..a6771a44443 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -35,4 +35,4 @@ picklescan
 git+https://github.com/openai/CLIP.git@main#egg=clip
 git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
 git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan
+git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan

From 4bdee4d80a38050374fa730e7ab0fd458c0de77e Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 03:35:49 +0100
Subject: [PATCH 08/50] remove `basicsr>=1.4.2` from base reqs

---
 environments-and-requirements/requirements-base.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index a6771a44443..afb42864eb4 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -1,6 +1,5 @@
 # pip will resolve the version which matches torch
 albumentations
-basicsr>=1.4.2
 dependency_injector==4.40.0
 diffusers
 einops

From 66eb6aa1d4cde902078454cdc4c9f204bd9ad280 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Mon, 21 Nov 2022 03:59:40 +0100
Subject: [PATCH 09/50] add INVOKEAI_ROOT to env

---
 .github/workflows/test-invoke-pip.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 4d61b2963a6..237c8d033f0 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -41,6 +41,8 @@ jobs:
     defaults:
       run:
         shell: ${{ matrix.default-shell }}
+    env:
+      INVOKEAI_ROOT: /home/runner/invokeai
     steps:
       - name: Checkout sources
         id: checkout-sources

From 3afa21908837e76228071064dfa5b8c40b923077 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 02:43:56 +0100
Subject: [PATCH 10/50] disable upgrade of `pip`, `setuptools` and `wheel`

---
 .github/workflows/test-invoke-pip.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 237c8d033f0..a7d1f39543d 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -41,8 +41,8 @@ jobs:
     defaults:
       run:
         shell: ${{ matrix.default-shell }}
-    env:
-      INVOKEAI_ROOT: /home/runner/invokeai
+    # env:
+    #   INVOKEAI_ROOT: /home/runner/invokeai
     steps:
       - name: Checkout sources
         id: checkout-sources
@@ -72,8 +72,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
 
-      - name: install dependencies
-        run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
+      # - name: install dependencies
+      #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
       - name: install requirements
         run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt

From 77b4658716b41323842e1c1d68ebbd094decc7f7 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 03:18:17 +0100
Subject: [PATCH 11/50] try to use a venv which should not contain `wheel`

---
 .github/workflows/test-invoke-pip.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index a7d1f39543d..6f244ddba6c 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -75,11 +75,16 @@ jobs:
       # - name: install dependencies
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
+      - name: create venv
+        run: ${{ env.pythonLocation }}/bin/python -m venv .venv
+
       - name: install requirements
-        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
+        run: |
+          source .venv/bin/activate
+          pip install --prefer-binary -r requirements.txt
 
-      # - name: install base requirements
-      #   run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r environments-and-requirements/requirements-base.txt
+      # - name: install requirements
+      #   run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From 6260096f1d2f10598d5dafbbbf908cf8f2404a48 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 03:30:27 +0100
Subject: [PATCH 12/50] add relative path to pip command

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 6f244ddba6c..4965a8d3ba1 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -81,7 +81,7 @@ jobs:
       - name: install requirements
         run: |
           source .venv/bin/activate
-          pip install --prefer-binary -r requirements.txt
+          .venv/bin/pip install --prefer-binary -r requirements.txt
 
       # - name: install requirements
       #   run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt

From a746de5006cc587679b882d9700a8c9daef0d814 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 04:02:24 +0100
Subject: [PATCH 13/50] use `configure_invokeai.py --no-interactive --yes`

---
 .github/workflows/test-invoke-pip.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 4965a8d3ba1..0da9393868b 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -109,8 +109,7 @@ jobs:
       - name: run preload_models.py
         id: run-preload-models
         run: |
-          ${{ env.pythonLocation }}/bin/python scripts/preload_models.py \
-            --no-interactive
+          ${{ env.pythonLocation }}/bin/python scripts/configure_invokeai.py --no-interactive --yes
 
       - name: Run the tests
         id: run-tests

From 5e8326801026268dc25f0c76a0500727aecf348b Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 04:11:58 +0100
Subject: [PATCH 14/50] set grpcio to `<1.51.0`

---
 environments-and-requirements/requirements-mac-mps-cpu.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt
index 531d57a3072..c388722596e 100644
--- a/environments-and-requirements/requirements-mac-mps-cpu.txt
+++ b/environments-and-requirements/requirements-mac-mps-cpu.txt
@@ -1,6 +1,6 @@
 -r environments-and-requirements/requirements-base.txt
 
-grpcio==1.50.0
+grpcio<1.51.0
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0

From 26235245ddd2534057144b74a04990ed8d453459 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 04:22:10 +0100
Subject: [PATCH 15/50] revert changes to use venv

---
 .github/workflows/test-invoke-pip.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 0da9393868b..50c37efabfe 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -75,16 +75,8 @@ jobs:
       # - name: install dependencies
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
-      - name: create venv
-        run: ${{ env.pythonLocation }}/bin/python -m venv .venv
-
       - name: install requirements
-        run: |
-          source .venv/bin/activate
-          .venv/bin/pip install --prefer-binary -r requirements.txt
-
-      # - name: install requirements
-      #   run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
+        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From bdfba5cda40678187ff5196e9bd67f653347e7b6 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 04:23:08 +0100
Subject: [PATCH 16/50] remove `--prefer-binary`

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 50c37efabfe..01cb727d510 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -76,7 +76,7 @@ jobs:
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
       - name: install requirements
-        run: ${{ env.pythonLocation }}/bin/pip install --prefer-binary -r requirements.txt
+        run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From bb793a234da5d347080109aaa1aee63f6bddb381 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 04:29:37 +0100
Subject: [PATCH 17/50] disable step to create models.yaml since this will not
 be used anymore with new `configure_invokeai.py`

---
 .github/workflows/test-invoke-pip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 01cb727d510..7663dec1e70 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -48,8 +48,8 @@ jobs:
         id: checkout-sources
         uses: actions/checkout@v3
 
-      - name: create models.yaml from example
-        run: cp configs/models.yaml.example configs/models.yaml
+      # - name: create models.yaml from example
+      #   run: cp configs/models.yaml.example configs/models.yaml
 
       - name: set test prompt to main branch validation
         if: ${{ github.ref == 'refs/heads/main' }}

From df6be3fa1c966b1b1591ef7b44b936cd33957d43 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 05:12:22 +0100
Subject: [PATCH 18/50] use `pip install --no-binary=":all:"`

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 7663dec1e70..9081aa605f6 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -76,7 +76,7 @@ jobs:
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
       - name: install requirements
-        run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt
+        run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt --no-binary=":all:"
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From 473ad6a0115d8afb796d5b0ed818d5092d4c615f Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 05:57:58 +0100
Subject: [PATCH 19/50] another try to use venv

---
 .github/workflows/test-invoke-pip.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 9081aa605f6..8bf76610a42 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -76,7 +76,13 @@ jobs:
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
 
       - name: install requirements
-        run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt --no-binary=":all:"
+        run: |
+          ${{ env.pythonLocation }}/bin/python -m venv .venv
+          source .venv/bin/activate
+          .venv/bin/python -m pip install -r requirements.txt
+
+      # - name: install requirements
+      #   run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt --no-binary=":all:"
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From 96a548623129aa3be1ab3c2e1f93c344a80a2fd3 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 06:25:34 +0100
Subject: [PATCH 20/50] try uninstalling wheel before installing reqs

---
 .github/workflows/test-invoke-pip.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 8bf76610a42..14f3a9a44c8 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -77,12 +77,8 @@ jobs:
 
       - name: install requirements
         run: |
-          ${{ env.pythonLocation }}/bin/python -m venv .venv
-          source .venv/bin/activate
-          .venv/bin/python -m pip install -r requirements.txt
-
-      # - name: install requirements
-      #   run: ${{ env.pythonLocation }}/bin/pip install -r requirements.txt --no-binary=":all:"
+          ${{ env.pythonLocation }}/bin/pip uninstall wheel -y
+          ${{ env.pythonLocation }}/bin/pip install -r requirements.txt
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From 58e04a4ea0d6be4a7d7ef260ee533d8b31357f3c Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 18:14:25 +0100
Subject: [PATCH 21/50] dont use requirements.txt as filename

---
 .github/workflows/test-invoke-pip.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 14f3a9a44c8..5103fb337d9 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -64,7 +64,7 @@ jobs:
         run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> $GITHUB_ENV
 
       - name: create requirements.txt
-        run: cp environments-and-requirements/${{ matrix.requirements-file }} requirements.txt
+        run: cp 'environments-and-requirements/${{ matrix.requirements-file }}' '${{ matrix.requirements-file }}'
 
       - name: setup python
         uses: actions/setup-python@v4
@@ -77,8 +77,7 @@ jobs:
 
       - name: install requirements
         run: |
-          ${{ env.pythonLocation }}/bin/pip uninstall wheel -y
-          ${{ env.pythonLocation }}/bin/pip install -r requirements.txt
+          ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From 68c320ccdd4c98ce0a91571b41b27c1396489ce8 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 18:22:40 +0100
Subject: [PATCH 22/50] update cache-dependency-path

---
 .github/workflows/test-invoke-pip.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 5103fb337d9..130be1841d4 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -71,6 +71,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
+          cache-dependency-path: ${{ matrix.requirements-file }}
 
       # - name: install dependencies
       #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel

From 25ae3e67e098c7f37e871b8cac09c027e0916cc9 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 18:42:39 +0100
Subject: [PATCH 23/50] add facexlib to requirements-base.txt

---
 environments-and-requirements/requirements-base.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt
index afb42864eb4..a59cdee138f 100644
--- a/environments-and-requirements/requirements-base.txt
+++ b/environments-and-requirements/requirements-base.txt
@@ -4,6 +4,7 @@ dependency_injector==4.40.0
 diffusers
 einops
 eventlet
+facexlib
 flask==2.1.3
 flask_cors==3.0.10
 flask_socketio==5.3.0

From 83ae4be94a748bfe133b0f9150d41573726be6d1 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 18:54:40 +0100
Subject: [PATCH 24/50] first install requirements-base.txt

---
 .github/workflows/test-invoke-pip.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 130be1841d4..0dc43b4274f 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -78,6 +78,7 @@ jobs:
 
       - name: install requirements
         run: |
+          ${{ env.pythonLocation }}/bin/pip install -r environments-and-requirements/requirements-base.txt
           ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
 
       - name: Use Cached Stable Diffusion Model

From 3db010a8de055c4f624a80fb02db101ec1aceec3 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 19:43:48 +0100
Subject: [PATCH 25/50] first install `-e .`, then install requirements I know
 that this is obviously the wrong order, but still have a feeling

---
 .github/workflows/test-invoke-pip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 0dc43b4274f..d21268e75da 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -78,8 +78,8 @@ jobs:
 
       - name: install requirements
         run: |
-          ${{ env.pythonLocation }}/bin/pip install -r environments-and-requirements/requirements-base.txt
-          ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
+          ${{ env.pythonLocation }}/bin/pip install -e .
+          ${{ env.pythonLocation }}/bin/pip install --upgrade -r '${{ matrix.requirements-file }}'
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model

From a2e40f2ff00d0b2c5722b96823c7914d684413a2 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 19:51:04 +0100
Subject: [PATCH 26/50] add facexlib to requirements.in

---
 installer/requirements.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/requirements.in b/installer/requirements.in
index 3eb796e0f0e..2af38f636ce 100644
--- a/installer/requirements.in
+++ b/installer/requirements.in
@@ -5,6 +5,7 @@ accelerate~=0.14
 albumentations
 diffusers
 eventlet
+facexlib
 flask_cors
 flask_socketio
 flaskwebgui

From d0553ca776dc217d32c3c29e587050696a0ae2b7 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 20:25:30 +0100
Subject: [PATCH 27/50] remove `-e .` from reqs and install after reqs

---
 .github/workflows/test-invoke-pip.yml                      | 2 +-
 environments-and-requirements/requirements-lin-amd.txt     | 2 +-
 environments-and-requirements/requirements-lin-cuda.txt    | 2 +-
 environments-and-requirements/requirements-mac-mps-cpu.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index d21268e75da..657aed8e82b 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -78,8 +78,8 @@ jobs:
 
       - name: install requirements
         run: |
-          ${{ env.pythonLocation }}/bin/pip install -e .
           ${{ env.pythonLocation }}/bin/pip install --upgrade -r '${{ matrix.requirements-file }}'
+          ${{ env.pythonLocation }}/bin/pip install -e .
 
       - name: Use Cached Stable Diffusion Model
         id: cache-sd-model
diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt
index d627f99861d..1687ef0996e 100644
--- a/environments-and-requirements/requirements-lin-amd.txt
+++ b/environments-and-requirements/requirements-lin-amd.txt
@@ -4,4 +4,4 @@
 --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org
 torch
 torchvision
--e .
+# -e .
diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt
index 1578c60334b..06e6e733669 100644
--- a/environments-and-requirements/requirements-lin-cuda.txt
+++ b/environments-and-requirements/requirements-lin-cuda.txt
@@ -1,2 +1,2 @@
 -r environments-and-requirements/requirements-base.txt
--e .
+# -e .
diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt
index c388722596e..54071e73c7f 100644
--- a/environments-and-requirements/requirements-mac-mps-cpu.txt
+++ b/environments-and-requirements/requirements-mac-mps-cpu.txt
@@ -4,4 +4,4 @@ grpcio<1.51.0
 protobuf==3.19.6
 torch<1.13.0
 torchvision<0.14.0
--e .
+# -e .

From 4aeb02b89f5c8e7c2d5326cb54e2d22d43c491eb Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 20:32:00 +0100
Subject: [PATCH 28/50] unpin torch and torchvision in requirements.in

---
 installer/requirements.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/installer/requirements.in b/installer/requirements.in
index 2af38f636ce..dab06aa72d1 100644
--- a/installer/requirements.in
+++ b/installer/requirements.in
@@ -4,6 +4,7 @@
 accelerate~=0.14
 albumentations
 diffusers
+einops
 eventlet
 facexlib
 flask_cors
@@ -11,6 +12,8 @@ flask_socketio
 flaskwebgui
 getpass_asterisk
 imageio-ffmpeg
+kornia
+numpy
 pyreadline3
 realesrgan
 send2trash
@@ -18,10 +21,8 @@ streamlit
 taming-transformers-rom1504
 test-tube
 torch-fidelity
-torch==1.12.1 ; platform_system == 'Darwin'
-torch==1.12.0+cu116 ; platform_system == 'Linux' or platform_system == 'Windows'
-torchvision==0.13.0 ; platform_system == 'Darwin'
-torchvision==0.13.0+cu116 ; platform_system == 'Linux' or platform_system == 'Windows'
+torch
+torchvision
 transformers
 picklescan
 https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip

From 8fe9abd1932dc15fb3571013413ccf6aaebd7366 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:00:10 +0100
Subject: [PATCH 29/50] fix model dl path

---
 .github/workflows/test-invoke-pip.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 657aed8e82b..735bd08b919 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -35,7 +35,8 @@ jobs:
             default-shell: bash -l {0}
           - stable-diffusion-model: stable-diffusion-1.5
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
+            stable-diffusion-model-dl-path: /home/runner/invokeai/models/ldm/stable-diffusion-v1
+            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     defaults:
@@ -101,7 +102,7 @@ jobs:
             -o ${{ matrix.stable-diffusion-model-dl-path }} \
             -L ${{ matrix.stable-diffusion-model-url }}
 
-      - name: run preload_models.py
+      - name: run configure_invokeai.py
         id: run-preload-models
         run: |
           ${{ env.pythonLocation }}/bin/python scripts/configure_invokeai.py --no-interactive --yes

From a84dc17faa518a4fd71b5a3e8183de1001b64a51 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:06:47 +0100
Subject: [PATCH 30/50] fix curl output path

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 735bd08b919..33d929c9339 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -99,7 +99,7 @@ jobs:
             || mkdir -p models/ldm/stable-diffusion-v1
           curl \
             -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
-            -o ${{ matrix.stable-diffusion-model-dl-path }} \
+            -o "${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \
             -L ${{ matrix.stable-diffusion-model-url }}
 
       - name: run configure_invokeai.py

From 8423b0cab87e65b7df3ab4c4164588760d13713e Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:12:21 +0100
Subject: [PATCH 31/50] create directory before downloading model

---
 .github/workflows/test-invoke-pip.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 33d929c9339..bcdb26717b0 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -95,8 +95,7 @@ jobs:
         id: download-stable-diffusion-model
         if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
         run: |
-          [[ -d models/ldm/stable-diffusion-v1 ]] \
-            || mkdir -p models/ldm/stable-diffusion-v1
+          mkdir -p ${{ matrix.stable-diffusion-model-dl-path }}
           curl \
             -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
             -o "${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \

From 4252d6b409314dcfe473eddff5881dbb8fb0bef4 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:20:31 +0100
Subject: [PATCH 32/50] set INVOKEAI_ROOT_PATH
 https://docs.github.com/en/actions/learn-github-actions/environment-variables#naming-conventions-for-environment-variables

---
 .github/workflows/test-invoke-pip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index bcdb26717b0..eab9014a782 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -42,8 +42,8 @@ jobs:
     defaults:
       run:
         shell: ${{ matrix.default-shell }}
-    # env:
-    #   INVOKEAI_ROOT: /home/runner/invokeai
+    env:
+      INVOKEAI_ROOT_PATH: /home/runner/invokeai
     steps:
       - name: Checkout sources
         id: checkout-sources

From 19162073726fc9f6478bd5dd893505916922307b Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:27:33 +0100
Subject: [PATCH 33/50] INVOKEAI_ROOT ${{ env.GITHUB_WORKSPACE }}/invokeai

---
 .github/workflows/test-invoke-pip.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index eab9014a782..503655f8bcb 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -35,7 +35,7 @@ jobs:
             default-shell: bash -l {0}
           - stable-diffusion-model: stable-diffusion-1.5
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: /home/runner/invokeai/models/ldm/stable-diffusion-v1
+            stable-diffusion-model-dl-path: ${{ env.GITHUB_WORKSPACE }}/invokeai/models/ldm/stable-diffusion-v1
             stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -43,7 +43,7 @@ jobs:
       run:
         shell: ${{ matrix.default-shell }}
     env:
-      INVOKEAI_ROOT_PATH: /home/runner/invokeai
+      INVOKEAI_ROOT: '${{ env.GITHUB_WORKSPACE }}/invokeai'
     steps:
       - name: Checkout sources
         id: checkout-sources

From 6b636e59774ba4920e13fbc3988f8d801f3051f7 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:34:34 +0100
Subject: [PATCH 34/50] fix matrix stable-diffusion-model-dl-path

---
 .github/workflows/test-invoke-pip.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 503655f8bcb..953d9c25e8b 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -35,7 +35,7 @@ jobs:
             default-shell: bash -l {0}
           - stable-diffusion-model: stable-diffusion-1.5
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: ${{ env.GITHUB_WORKSPACE }}/invokeai/models/ldm/stable-diffusion-v1
+            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
             stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -95,10 +95,10 @@ jobs:
         id: download-stable-diffusion-model
         if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
         run: |
-          mkdir -p ${{ matrix.stable-diffusion-model-dl-path }}
+          mkdir -p "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}"
           curl \
             -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
-            -o "${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \
+            -o "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \
             -L ${{ matrix.stable-diffusion-model-url }}
 
       - name: run configure_invokeai.py

From 832d5fac23fa44ea3adacf251133aa9b412a8d27 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:35:57 +0100
Subject: [PATCH 35/50] fix INVOKEAI_ROOT

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 953d9c25e8b..2ac9c2b2bfa 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -43,7 +43,7 @@ jobs:
       run:
         shell: ${{ matrix.default-shell }}
     env:
-      INVOKEAI_ROOT: '${{ env.GITHUB_WORKSPACE }}/invokeai'
+      INVOKEAI_ROOT: '${{ GITHUB_WORKSPACE }}/invokeai'
     steps:
       - name: Checkout sources
         id: checkout-sources

From 4711b324ec91a01ff922427a5c2c64cb92bbe3fb Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:38:05 +0100
Subject: [PATCH 36/50] fix INVOKEAI_ROOT

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index 2ac9c2b2bfa..a7e75ce197a 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -43,7 +43,7 @@ jobs:
       run:
         shell: ${{ matrix.default-shell }}
     env:
-      INVOKEAI_ROOT: '${{ GITHUB_WORKSPACE }}/invokeai'
+      INVOKEAI_ROOT: '${{ github.workspace }}/invokeai'
     steps:
       - name: Checkout sources
         id: checkout-sources

From 9161968cdf467322cb9cde5a50cc52d063d85d3e Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 21:53:27 +0100
Subject: [PATCH 37/50] add --root and --outdir to run-tests step

---
 .github/workflows/test-invoke-pip.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index a7e75ce197a..c03a1aafff5 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -111,7 +111,9 @@ jobs:
         run: |
           time ${{ env.pythonLocation }}/bin/python scripts/invoke.py \
             --model ${{ matrix.stable-diffusion-model }} \
-            --from_file ${{ env.TEST_PROMPTS }}
+            --from_file ${{ env.TEST_PROMPTS }} \
+            --root="${{ env.INVOKEAI_ROOT }}" \
+            --outdir="${{ env.INVOKEAI_ROOT }}/outputs"
 
       - name: Archive results
         id: archive-results

From 2509be924a2becf1d037b44477186db0bac72695 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:13:21 +0100
Subject: [PATCH 38/50] create models.yaml from example

---
 .github/workflows/test-invoke-pip.yml | 6 ++++--
 configs/models.yaml.example           | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index c03a1aafff5..b8d5f504541 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -49,8 +49,10 @@ jobs:
         id: checkout-sources
         uses: actions/checkout@v3
 
-      # - name: create models.yaml from example
-      #   run: cp configs/models.yaml.example configs/models.yaml
+      - name: create models.yaml from example
+        run: |
+          mkdir -p ${{ env.INVOKEAI_ROOT }}/configs
+          cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
 
       - name: set test prompt to main branch validation
         if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/configs/models.yaml.example b/configs/models.yaml.example
index 9c152c25c1e..31401cd02d8 100644
--- a/configs/models.yaml.example
+++ b/configs/models.yaml.example
@@ -7,8 +7,8 @@
 # was trained on.
 stable-diffusion-1.5:
   description: The newest Stable Diffusion version 1.5 weight file (4.27 GB)
-  weights: ./models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
-  config: ./configs/stable-diffusion/v1-inference.yaml
+  weights: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
+  config: configs/stable-diffusion/v1-inference.yaml
   width: 512
   height: 512
   vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt

From 0176c29c2d3b78bcce10527f8a7aeecaccc6e73a Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:31:06 +0100
Subject: [PATCH 39/50] fix scripts variable in setup.py by removing unused
 scripts

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 33085a457ad..cef2e6cc3eb 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def _get_requirements(path):
             packages = f.read().splitlines()
     except (IOError, OSError) as ex:
         raise RuntimeError("Can't open file with requirements: %s", repr(ex))
- 
+
     # Drop option lines
     packages = [package for package in packages if not re.match(r"^--", package)]
     packages = [package for package in packages if not re.match(r"^http", package)]
@@ -70,7 +70,7 @@ def _get_requirements(path):
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Scientific/Engineering :: Image Processing',
     ],
-    scripts = ['scripts/invoke.py','scripts/preload_models.py','scripts/load_models.py', 'scripts/configure_invokeai.py', 'scripts/sd-metadata.py'],
+    scripts = ['scripts/invoke.py','scripts/configure_invokeai.py', 'scripts/sd-metadata.py'],
     data_files=[('frontend',frontend_files)],
 )
 

From 30824e774973eaa823210bcc299ae19ccabfcd2d Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:33:49 +0100
Subject: [PATCH 40/50] fix archive-results path

---
 .github/workflows/test-invoke-pip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml
index b8d5f504541..69fc7c9ce97 100644
--- a/.github/workflows/test-invoke-pip.yml
+++ b/.github/workflows/test-invoke-pip.yml
@@ -122,4 +122,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
-          path: outputs/img-samples
+          path: ${{ env.INVOKEAI_ROOT }}/outputs/img-samples

From e332ca6577f2f40a2a3e5afb6630a539ea09c108 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:37:19 +0100
Subject: [PATCH 41/50] fix workflow to reflect latest code changes

---
 .github/workflows/test-invoke-conda.yml | 36 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index 41838ba565a..ddec884b5d5 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - 'main'
       - 'development'
+      - 'fix-gh-actions-fork'
   pull_request:
     branches:
       - 'main'
@@ -37,6 +38,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CONDA_ENV_NAME: invokeai
+      INVOKEAI_ROOT: '${{ github.workspace }}/invokeai'
     defaults:
       run:
         shell: ${{ matrix.default-shell }}
@@ -48,8 +50,10 @@ jobs:
       - name: create models.yaml from example
         run: cp configs/models.yaml.example configs/models.yaml
 
-      - name: create environment.yml
-        run: cp environments-and-requirements/${{ matrix.environment-file }} environment.yml
+      - name: create models.yaml from example
+        run: |
+          mkdir -p ${{ env.INVOKEAI_ROOT }}/configs
+          cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
 
       - name: Use cached conda packages
         id: use-cached-conda-packages
@@ -82,34 +86,34 @@ jobs:
         id: cache-sd-model
         uses: actions/cache@v3
         env:
-          cache-name: cache-${{ matrix.stable-diffusion-model-switch }}
+          cache-name: cache-${{ matrix.stable-diffusion-model }}
         with:
           path: ${{ matrix.stable-diffusion-model-dl-path }}
           key: ${{ env.cache-name }}
 
-      - name: Download ${{ matrix.stable-diffusion-model-switch }}
+      - name: Download ${{ matrix.stable-diffusion-model }}
         id: download-stable-diffusion-model
         if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
         run: |
-          [[ -d models/ldm/stable-diffusion-v1 ]] \
-            || mkdir -p models/ldm/stable-diffusion-v1
+          mkdir -p "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}"
           curl \
             -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
-            -o ${{ matrix.stable-diffusion-model-dl-path }} \
-            -L ${{ matrix.stable-diffusion-model }}
+            -o "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \
+            -L ${{ matrix.stable-diffusion-model-url }}
 
-      - name: run preload_models.py
+      - name: run configure_invokeai.py
         id: run-preload-models
         run: |
-          python scripts/preload_models.py \
-            --no-interactive
+          ${{ env.pythonLocation }}/bin/python scripts/configure_invokeai.py --no-interactive --yes
 
       - name: Run the tests
         id: run-tests
         run: |
-          time python scripts/invoke.py \
-            --model ${{ matrix.stable-diffusion-model-switch }} \
-            --from_file ${{ env.TEST_PROMPTS }}
+          time ${{ env.pythonLocation }}/bin/python scripts/invoke.py \
+            --model ${{ matrix.stable-diffusion-model }} \
+            --from_file ${{ env.TEST_PROMPTS }} \
+            --root="${{ env.INVOKEAI_ROOT }}" \
+            --outdir="${{ env.INVOKEAI_ROOT }}/outputs"
 
       - name: export conda env
         id: export-conda-env
@@ -121,5 +125,5 @@ jobs:
         id: archive-results
         uses: actions/upload-artifact@v3
         with:
-          name: results_${{ matrix.os }}_${{ matrix.stable-diffusion-model-switch }}
-          path: outputs/img-samples
+          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
+          path: ${{ env.INVOKEAI_ROOT }}/outputs/img-samples

From 12bb25e71d82d2934cd72492e329909ddde0a618 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:42:45 +0100
Subject: [PATCH 42/50] fix copy paste error

---
 .github/workflows/test-invoke-conda.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index ddec884b5d5..0e9d4502e3e 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -31,9 +31,10 @@ jobs:
           # - stable-diffusion-model: https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt
           #   stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
           #   stable-diffusion-model-switch: stable-diffusion-1.4
-          - stable-diffusion-model: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-switch: stable-diffusion-1.5
+          - stable-diffusion-model: stable-diffusion-1.5
+            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
+            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
+            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
     name: ${{ matrix.os }} with ${{ matrix.stable-diffusion-model-switch }}
     runs-on: ${{ matrix.os }}
     env:
@@ -47,14 +48,14 @@ jobs:
         id: checkout-sources
         uses: actions/checkout@v3
 
-      - name: create models.yaml from example
-        run: cp configs/models.yaml.example configs/models.yaml
-
       - name: create models.yaml from example
         run: |
           mkdir -p ${{ env.INVOKEAI_ROOT }}/configs
           cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
 
+      - name: create environment.yml
+        run: cp environments-and-requirements/${{ matrix.environment-file }} environment.yml
+
       - name: Use cached conda packages
         id: use-cached-conda-packages
         uses: actions/cache@v3

From 6ffd4d69018d28ff41d8dcc121ac9ed4667e3dfa Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:44:01 +0100
Subject: [PATCH 43/50] fix job name

---
 .github/workflows/test-invoke-conda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index 0e9d4502e3e..f98e71d91ac 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -35,7 +35,7 @@ jobs:
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
             stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
             stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
-    name: ${{ matrix.os }} with ${{ matrix.stable-diffusion-model-switch }}
+    name: ${{ matrix.os }} with ${{ matrix.stable-diffusion-model }}
     runs-on: ${{ matrix.os }}
     env:
       CONDA_ENV_NAME: invokeai

From d6fec554a2833931c33790a596a4d84f50bf5dc4 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 22:46:57 +0100
Subject: [PATCH 44/50] fix matrix.stable-diffusion-model

---
 .github/workflows/test-invoke-conda.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index f98e71d91ac..f0e7301501c 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -16,8 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         stable-diffusion-model:
-          # - 'https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt'
-          - 'https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt'
+          - 'stable-diffusion-1.5'
         os:
           - ubuntu-latest
           - macOS-12
@@ -28,9 +27,6 @@ jobs:
           - os: macOS-12
             environment-file: environment-mac.yml
             default-shell: bash -l {0}
-          # - stable-diffusion-model: https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt
-          #   stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
-          #   stable-diffusion-model-switch: stable-diffusion-1.4
           - stable-diffusion-model: stable-diffusion-1.5
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
             stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1

From be8027abc4fd3c908d3f8f85c44361650b5641da Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 23:08:11 +0100
Subject: [PATCH 45/50] restructure matrix

---
 .github/workflows/test-invoke-conda.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index f0e7301501c..806f6f17f8f 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -17,15 +17,19 @@ jobs:
       matrix:
         stable-diffusion-model:
           - 'stable-diffusion-1.5'
-        os:
-          - ubuntu-latest
-          - macOS-12
+        environment-yaml:
+          - environment-lin-amd.yml
+          - environment-lin-cuda.yml
+          - environment-mac.yml
         include:
-          - os: ubuntu-latest
-            environment-file: environment-lin-cuda.yml
+          - environment-yaml: environment-lin-amd.yml
+            os: ubuntu-latest
             default-shell: bash -l {0}
-          - os: macOS-12
-            environment-file: environment-mac.yml
+          - environment-yaml: environment-lin-cuda.yml
+            os: ubuntu-latest
+            default-shell: bash -l {0}
+          - environment-yaml: environment-mac.yml
+            os: macos-12
             default-shell: bash -l {0}
           - stable-diffusion-model: stable-diffusion-1.5
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
@@ -50,21 +54,21 @@ jobs:
           cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
 
       - name: create environment.yml
-        run: cp environments-and-requirements/${{ matrix.environment-file }} environment.yml
+        run: cp environments-and-requirements/${{ matrix.environment-yaml }} environment.yml
 
       - name: Use cached conda packages
         id: use-cached-conda-packages
         uses: actions/cache@v3
         with:
           path: ~/conda_pkgs_dir
-          key: conda-pkgs-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles(matrix.environment-file) }}
+          key: conda-pkgs-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles(matrix.environment-yaml) }}
 
       - name: Activate Conda Env
         id: activate-conda-env
         uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: ${{ env.CONDA_ENV_NAME }}
-          environment-file: environment.yml
+          environment-yaml: environment.yml
           miniconda-version: latest
 
       - name: set test prompt to main branch validation

From e9d6585e03df7ee2c91ce3dcdbe173cbb7628191 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 23:14:53 +0100
Subject: [PATCH 46/50] fix `activate conda env` step

---
 .github/workflows/test-invoke-conda.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index 806f6f17f8f..c04e7dcaedb 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -54,7 +54,7 @@ jobs:
           cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
 
       - name: create environment.yml
-        run: cp environments-and-requirements/${{ matrix.environment-yaml }} environment.yml
+        run: cp "environments-and-requirements/${{ matrix.environment-yaml }}" environment.yml
 
       - name: Use cached conda packages
         id: use-cached-conda-packages
@@ -68,7 +68,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: ${{ env.CONDA_ENV_NAME }}
-          environment-yaml: environment.yml
+          environment-file: environment.yml
           miniconda-version: latest
 
       - name: set test prompt to main branch validation

From 601526f1410391618cc059c9c58fb22472b89ffd Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Thu, 24 Nov 2022 23:32:42 +0100
Subject: [PATCH 47/50] update the environment yamls use same 4 git packages as
 for pip

---
 environments-and-requirements/environment-lin-amd.yml  | 4 ++--
 environments-and-requirements/environment-lin-cuda.yml | 4 ++--
 environments-and-requirements/environment-mac.yml      | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/environments-and-requirements/environment-lin-amd.yml b/environments-and-requirements/environment-lin-amd.yml
index 15a8b9b0db4..a06c8110c07 100644
--- a/environments-and-requirements/environment-lin-amd.yml
+++ b/environments-and-requirements/environment-lin-amd.yml
@@ -40,7 +40,7 @@ dependencies:
     - torchvision
     - transformers==4.21.3
     - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
+    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
     - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-    - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan
+    - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
     - -e .
diff --git a/environments-and-requirements/environment-lin-cuda.yml b/environments-and-requirements/environment-lin-cuda.yml
index b1926831f17..895515d43ae 100644
--- a/environments-and-requirements/environment-lin-cuda.yml
+++ b/environments-and-requirements/environment-lin-cuda.yml
@@ -40,7 +40,7 @@ dependencies:
     - torchmetrics==0.7.0
     - transformers==4.21.3
     - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
+    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
     - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-    - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan
+    - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
     - -e .
diff --git a/environments-and-requirements/environment-mac.yml b/environments-and-requirements/environment-mac.yml
index 4fe79d453a2..9bf8e279521 100644
--- a/environments-and-requirements/environment-mac.yml
+++ b/environments-and-requirements/environment-mac.yml
@@ -56,10 +56,9 @@ dependencies:
       - taming-transformers-rom1504
       - test-tube==0.7.5
       - git+https://github.com/openai/CLIP.git@main#egg=clip
-      - git+https://github.com/invoke-ai/k-diffusion.git@mps#egg=k_diffusion
-      - git+https://github.com/invoke-ai/Real-ESRGAN.git#egg=realesrgan
-      - git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan
+      - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
       - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
+      - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
       - -e .
 variables:
   PYTORCH_ENABLE_MPS_FALLBACK: 1

From a4213529b4a7c79c1a97d6d0a938e00b2d972869 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Fri, 25 Nov 2022 00:27:41 +0100
Subject: [PATCH 48/50] rename job in test-invoke-conda

---
 .github/workflows/test-invoke-conda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index c04e7dcaedb..0c43588ad14 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -35,7 +35,7 @@ jobs:
             stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
             stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
             stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
-    name: ${{ matrix.os }} with ${{ matrix.stable-diffusion-model }}
+    name: ${{ matrix.environment-yaml }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       CONDA_ENV_NAME: invokeai

From e0b98a6efa9035cdf9d19adecf344c91e984eca1 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Fri, 25 Nov 2022 00:29:32 +0100
Subject: [PATCH 49/50] add tqdm to environment-lin-amd.yml

---
 environments-and-requirements/environment-lin-amd.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environments-and-requirements/environment-lin-amd.yml b/environments-and-requirements/environment-lin-amd.yml
index a06c8110c07..8388a842064 100644
--- a/environments-and-requirements/environment-lin-amd.yml
+++ b/environments-and-requirements/environment-lin-amd.yml
@@ -33,6 +33,7 @@ dependencies:
     - streamlit==1.12.0
     - taming-transformers-rom1504
     - test-tube>=0.7.5
+    - tqdm
     - torch
     - torch-fidelity==0.3.0
     - torchaudio

From 317ccb87cac63d4b459ec9f5e8e922f1b699d4fd Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Fri, 25 Nov 2022 00:32:00 +0100
Subject: [PATCH 50/50] fix python commands in test-invoke-conda.yml

---
 .github/workflows/test-invoke-conda.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index 0c43588ad14..32126ef7f8b 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -105,12 +105,12 @@ jobs:
       - name: run configure_invokeai.py
         id: run-preload-models
         run: |
-          ${{ env.pythonLocation }}/bin/python scripts/configure_invokeai.py --no-interactive --yes
+          python scripts/configure_invokeai.py --no-interactive --yes
 
       - name: Run the tests
         id: run-tests
         run: |
-          time ${{ env.pythonLocation }}/bin/python scripts/invoke.py \
+          time python scripts/invoke.py \
             --model ${{ matrix.stable-diffusion-model }} \
             --from_file ${{ env.TEST_PROMPTS }} \
             --root="${{ env.INVOKEAI_ROOT }}" \