Merge branch 'main' into lstein/enhance-merge-models-gui

.gitignore

@@ -196,7 +196,7 @@ checkpoints
 .DS_Store
 
 # Let the frontend manage its own gitignore
-!frontend/*
+!invokeai/frontend/*
 
 # Scratch folder
 .scratch/

environments-and-requirements/environment-lin-aarch64.yml

@@ -1,50 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - albumentations=0.4.3
-  - cudatoolkit
-  - einops=0.3.0
-  - eventlet
-  - flask-socketio=5.3.0
-  - flask=2.1.*
-  - flask_cors=3.0.10
-  - imageio-ffmpeg=0.4.2
-  - imageio=2.9.0
-  - kornia=0.6
-  - numpy=1.19
-  - opencv=4.6.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.25
-  - pip:
-      - accelerate
-      - diffusers[torch]~=0.11
-      - getpass_asterisk
-      - huggingface-hub>=0.11.1
-      - omegaconf==2.1.1
-      - picklescan
-      - pyreadline3
-      - realesrgan
-      - requests==2.25.1
-      - safetensors
-      - taming-transformers-rom1504
-      - test-tube>=0.7.5
-      - 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@basicsr-1.4.2#egg=gfpgan
-      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-      - -e .

environments-and-requirements/environment-lin-amd.yml

@@ -1,51 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.9.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - pip:
-    - --extra-index-url  https://download.pytorch.org/whl/rocm5.2/
-    - accelerate
-    - albumentations==0.4.3
-    - diffusers[torch]~=0.11
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - huggingface-hub>=0.11.1
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - requests==2.25.1
-    - safetensors
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - tqdm
-    - torch
-    - torch-fidelity==0.3.0
-    - torchaudio
-    - torchmetrics==0.7.0
-    - torchvision
-    - transformers~=4.25
-    - 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@basicsr-1.4.2#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/environment-lin-cuda.yml

@@ -1,50 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.9.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - torchvision=0.13.1
-  - torchaudio=0.12.1
-  - pytorch=1.12.1
-  - cudatoolkit=11.6
-  - pip:
-    - accelerate~=0.13
-    - albumentations==0.4.3
-    - diffusers[torch]~=0.11
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - huggingface-hub>=0.11.1
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - requests==2.25.1
-    - safetensors~=0.2
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - torch-fidelity==0.3.0
-    - torchmetrics==0.7.0
-    - transformers~=4.25
-    - 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@basicsr-1.4.2#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/environment-mac.yml

@@ -1,69 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - huggingface
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.10
-  - pip>=22.2
-  - pytorch=1.12
-  - pytorch-lightning=1.7
-  - torchvision=0.13
-  - torchmetrics=0.10
-  - torch-fidelity=0.3
-
-  # 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;} '
-  # ```
-  - accelerate
-  - albumentations=1.2
-  - coloredlogs=15.0
-  - einops=0.3
-  - eventlet
-  - grpcio=1.46
-  - flask=2.1
-  - flask-socketio=5.3
-  - flask-cors=3.0
-  - humanfriendly=10.0
-  - imageio=2.21
-  - imageio-ffmpeg=0.4
-  - imgaug=0.4
-  - kornia=0.6
-  - mpmath=1.2
-  - nomkl=3
-  - numpy=1.23
-  - omegaconf=2.1
-  - openh264=2.3
-  - onnx=1.12
-  - onnxruntime=1.12
-  - pudb=2019.2
-  - protobuf=3.20
-  - py-opencv=4.6
-  - scipy=1.9
-  - streamlit=1.12
-  - sympy=1.10
-  - send2trash=1.8
-  - tensorboard=2.10
-  - transformers~=4.25
-  - pip:
-      - diffusers[torch]~=0.11
-      - safetensors~=0.2
-      - getpass_asterisk
-      - huggingface-hub
-      - picklescan
-      - requests==2.25.1
-      - taming-transformers-rom1504
-      - test-tube==0.7.5
-      - 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@basicsr-1.4.2#egg=gfpgan
-      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-      - -e .
-variables:
-  PYTORCH_ENABLE_MPS_FALLBACK: 1

environments-and-requirements/environment-win-cuda.yml

@@ -1,51 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.10.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - torchvision=0.13.1
-  - torchaudio=0.12.1
-  - pytorch=1.12.1
-  - cudatoolkit=11.6
-  - pip:
-    - accelerate
-    - albumentations==0.4.3
-    - diffusers[torch]~=0.11
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - huggingface-hub>=0.11.1
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - requests==2.25.1
-    - safetensors
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - torch-fidelity==0.3.0
-    - torchmetrics==0.7.0
-    - transformers~=4.25
-    - windows-curses
-    - 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@basicsr-1.4.1#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/requirements-base.txt

@@ -1,46 +0,0 @@
-# pip will resolve the version which matches torch
-accelerate
-albumentations
-datasets
-diffusers[torch]~=0.12
-dnspython==2.2.1
-einops
-eventlet
-facexlib
-flask==2.1.3
-flask_cors==3.0.10
-flask_socketio==5.3.0
-flaskwebgui==1.0.3
-getpass_asterisk
-gfpgan==1.3.8
-huggingface-hub>=0.11.1
-imageio
-imageio-ffmpeg
-kornia
-npyscreen
-numpy==1.23.*
-omegaconf
-opencv-python
-picklescan
-pillow
-pip>=22
-prompt-toolkit
-pudb
-pyreadline3
-pytorch-lightning==1.7.7
-realesrgan
-requests==2.25.1
-safetensors
-scikit-image>=0.19
-send2trash
-streamlit
-taming-transformers-rom1504
-test-tube>=0.7.5
-torch-fidelity
-torchmetrics
-transformers~=4.26
-windows-curses; sys_platform == 'win32'
-https://github.com/Birch-san/k-diffusion/archive/refs/heads/mps.zip#egg=k-diffusion
-https://github.com/invoke-ai/PyPatchMatch/archive/refs/tags/0.1.5.zip#egg=pypatchmatch
-https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip#egg=clip
-https://github.com/invoke-ai/clipseg/archive/relaxed-python-requirement.zip#egg=clipseg

environments-and-requirements/requirements-lin-amd.txt

@@ -1,6 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-# Get hardware-appropriate torch/torchvision
---extra-index-url https://download.pytorch.org/whl/rocm5.2 --trusted-host https://download.pytorch.org
-torch>=1.13.1
-torchvision>=0.14.1
--e .

environments-and-requirements/requirements-lin-cuda.txt

@@ -1,6 +0,0 @@
---trusted-host https://download.pytorch.org
--r environments-and-requirements/requirements-base.txt
-torch>=1.13.1
-torchvision>=0.14.1
-xformers~=0.0.16
--e .

environments-and-requirements/requirements-mac-mps-cpu.txt

@@ -1,6 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-grpcio<1.51.0
-protobuf==3.20.3
-torch>=1.13.1
-torchvision>=0.14.1
--e .

environments-and-requirements/requirements-win-colab-cuda.txt

@@ -1,7 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-# Get hardware-appropriate torch/torchvision
---extra-index-url https://download.pytorch.org/whl/cu117 --trusted-host https://download.pytorch.org
-torch==1.13.1
-torchvision==0.14.1
-xformers~=0.0.16
--e .

installer/readme.txt

@@ -8,13 +8,16 @@ Preparations:
   to work. Instructions are given here:
   https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/
 
+  NOTE: At this time we do not recommend Python 3.11. We recommend 
+  Version 3.10.9, which has been extensively tested with InvokeAI.
+  
   Before you start the installer, please open up your system's command
   line window (Terminal or Command) and type the commands:
 
      python --version
 
   If all is well, it will print "Python 3.X.X", where the version number
-  is at least 3.9.1
+  is at least 3.9.1, and less than 3.11.
 
   If this works, check the version of the Python package manager, pip:
 

ldm/invoke/_version.py

@@ -1 +1 @@
-__version__='2.3.0+a0'
+__version__='2.3.0-rc2'

ldm/invoke/config/configure_invokeai.py

@@ -608,7 +608,7 @@ def new_config_file_contents(successfully_downloaded: dict, config_file: Path) -
     # if no default model was chosen, then we select the first
     # one in the list
     if not default_selected:
-        conf[successfully_downloaded.keys()[0]]["default"] = True
+        conf[list(successfully_downloaded.keys())[0]]["default"] = True
 
     return OmegaConf.to_yaml(conf)