refactoring requirements

.gitignore

@@ -194,6 +194,10 @@ checkpoints
 
 # Let the frontend manage its own gitignore
 !frontend/*
+frontend/apt-get
+frontend/dist
+frontend/sudo
+frontend/update
 
 # Scratch folder
 .scratch/
@@ -201,6 +205,7 @@ checkpoints
 gfpgan/
 models/ldm/stable-diffusion-v1/*.sha256
 
+
 # GFPGAN model files
 gfpgan/
 
@@ -209,6 +214,8 @@ configs/models.yaml
 
 # weights (will be created by installer)
 models/ldm/stable-diffusion-v1/*.ckpt
+models/clipseg
+models/gfpgan
 
 # ignore initfile
 invokeai.init

environment-AMD.yml

@@ -10,6 +10,7 @@ dependencies:
   - pip:
     - --extra-index-url  https://download.pytorch.org/whl/rocm5.2/
     - albumentations==0.4.3
+    - clip
     - dependency_injector==4.40.0
     - diffusers==0.6.0
     - einops==0.3.0
@@ -18,6 +19,7 @@ dependencies:
     - flask_cors==3.0.10
     - flask_socketio==5.3.0
     - getpass_asterisk
+    - gfpgan
     - imageio-ffmpeg==0.4.2
     - imageio==2.9.0
     - kornia==0.6.0
@@ -27,6 +29,7 @@ dependencies:
     - pudb==2019.2
     - pyreadline3
     - pytorch-lightning==1.7.7
+    - realesrgan
     - send2trash==1.8.0
     - streamlit==1.12.0
     - taming-transformers-rom1504
@@ -37,9 +40,6 @@ dependencies:
     - torchmetrics==0.7.0
     - 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/invoke-ai/Real-ESRGAN.git#egg=realesrgan
-    - git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan
     - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
     - -e .

environment-linux-aarch64.yml

@@ -3,43 +3,43 @@ channels:
   - pytorch
   - conda-forge
 dependencies:
-  - python=3.9.*
+  - albumentations=0.4.3
-  - pip>=22.2.2
+  - clip
   - cudatoolkit
-  - pytorch
+  - einops=0.3.0
-  - torchvision
+  - eventlet
-  - numpy=1.19
+  - flask-socketio=5.3.0
-  - imageio=2.9.0
-  - opencv=4.6.0
-  - pillow=8.*
   - flask=2.1.*
   - flask_cors=3.0.10
-  - flask-socketio=5.3.0
-  - send2trash=1.8.0
-  - eventlet
-  - albumentations=0.4.3
-  - pudb=2019.2
   - imageio-ffmpeg=0.4.2
-  - pytorch-lightning=1.7.7
+  - imageio=2.9.0
-  - streamlit
-  - einops=0.3.0
   - kornia=0.6
-  - torchmetrics=0.7.0
+  - numpy=1.19
-  - transformers=4.21.3
+  - opencv=4.6.0
-  - torch-fidelity=0.3.0
+  - pillow=8.*
+  - pip>=22.2.2
+  - pudb=2019.2
+  - python=3.9.*
+  - pytorch
+  - pytorch-lightning=1.7.7
+  - send2trash=1.8.0
+  - streamlit
   - tokenizers>=0.11.1,!=0.11.3,<0.13
+  - torch-fidelity=0.3.0
+  - torchmetrics=0.7.0
+  - torchvision
+  - transformers=4.21.3
   - pip:
-      - getpass_asterisk
-      - omegaconf==2.1.1
-      - realesrgan==0.2.5.0
-      - test-tube>=0.7.5
-      - pyreadline3
       - dependency_injector==4.40.0
-      - -e git+https://github.com/openai/CLIP.git@main#egg=clip
+      - getpass_asterisk
-      - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+      - gfpgan
-      - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
+      - omegaconf==2.1.1
-      - -e git+https://github.com/TencentARC/GFPGAN.git#egg=gfpgan
+      - pyreadline3
-      - -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
+      - realesrgan
+      - taming-transformers-rom1504
+      - test-tube>=0.7.5
+      - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
+      - git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
       - -e .
 variables:
   PYTORCH_ENABLE_MPS_FALLBACK: 1

environment-linux-cuda.yml

@@ -13,6 +13,7 @@ dependencies:
   - cudatoolkit=11.6
   - pip:
     - albumentations==0.4.3
+    - clip
     - dependency_injector==4.40.0
     - diffusers==0.6.0
     - einops==0.3.0
@@ -21,6 +22,7 @@ dependencies:
     - flask_cors==3.0.10
     - flask_socketio==5.3.0
     - getpass_asterisk
+    - gfpgan
     - imageio-ffmpeg==0.4.2
     - imageio==2.9.0
     - kornia==0.6.0
@@ -30,6 +32,7 @@ dependencies:
     - pudb==2019.2
     - pyreadline3
     - pytorch-lightning==1.7.7
+    - realesrgan
     - send2trash==1.8.0
     - streamlit==1.12.0
     - taming-transformers-rom1504
@@ -37,9 +40,6 @@ dependencies:
     - torch-fidelity==0.3.0
     - 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/invoke-ai/Real-ESRGAN.git#egg=realesrgan
-    - git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan
     - git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
     - -e .

environment-mac.yml

@@ -5,20 +5,12 @@ channels:
 dependencies:
   - python=3.9.13
   - pip=22.2.2
-
   - pytorch=1.12.1
   - torchvision=0.13.1
 
-  # I suggest to keep the other deps sorted for convenience.
-  # To determine what the latest versions should be, run:
-  #
-  # ```shell
-  # sed -E 's/invokeai/invokeai-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yml > environment-mac-updated.yml
-  # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n invokeai-updated | awk ' {print "  - " $1 "==" $2;} '
-  # ```
-
   - albumentations=1.2.1
   - coloredlogs=15.0.1
+  - clip
   - diffusers=0.6.0
   - einops=0.4.1
   - grpcio=1.46.4
@@ -38,6 +30,7 @@ dependencies:
   - pytorch-lightning=1.7.7
   - scipy=1.9.3
   - streamlit=1.12.2
+  - taming-transformers-rom1504
   - sympy=1.10.1
   - tensorboard=2.10.0
   - torchmetrics=0.10.1
@@ -55,11 +48,9 @@ dependencies:
       - dependency_injector==4.40.0
       - realesrgan==0.2.5.0
       - test-tube==0.7.5
-      - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+      -  git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-      - -e git+https://github.com/openai/CLIP.git@main#egg=clip
+      -  git+https://github.com/TencentARC/GFPGAN.git#egg=gfpgan
-      - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
+      -  git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
-      - -e git+https://github.com/TencentARC/GFPGAN.git#egg=gfpgan
-      - -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
       - -e .
 variables:
   PYTORCH_ENABLE_MPS_FALLBACK: 1

environment-win-cuda.yml

@@ -13,6 +13,7 @@ dependencies:
   - cudatoolkit=11.6
   - pip:
     - albumentations==0.4.3
+    - clip
     - dependency_injector==4.40.0
     - diffusers==0.6.0
     - einops==0.3.0
@@ -37,9 +38,8 @@ dependencies:
     - torch-fidelity==0.3.0
     - 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/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@models-rename#egg=clipseg
     - -e .