chore: bump version

Just a small thing now, as nodes are all still wip, but since
@psychedelicious was nice enough to add the progress image node for me,
what I noticed was missing now is the cancel button on nodes tab

.gitignore

@@ -34,7 +34,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+# dist/
 downloads/
 eggs/
 .eggs/
@@ -79,6 +79,7 @@ cov.xml
 .pytest.ini
 cover/
 junit/
+notes/
 
 # Translations
 *.mo
@@ -201,7 +202,8 @@ checkpoints
 # If it's a Mac
 .DS_Store
 
-invokeai/frontend/web/dist/*
+invokeai/frontend/yarn.lock
+invokeai/frontend/node_modules
 
 # Let the frontend manage its own gitignore
 !invokeai/frontend/web/*

README.md

@@ -1,8 +1,11 @@
 <div align="center">
 
-![project logo](https://github.com/invoke-ai/InvokeAI/raw/main/docs/assets/invoke_ai_banner.png)
+![project hero](https://github.com/invoke-ai/InvokeAI/assets/31807370/1a917d94-e099-4fa1-a70f-7dd8d0691018)
+
+# Invoke AI - Generative AI for Professional Creatives
+## Image Generation for Stable Diffusion, Custom-Trained Models, and more. 
+  Learn more about us and get started instantly at [invoke.ai](https://invoke.ai)
 
-# InvokeAI: A Stable Diffusion Toolkit
 
 [![discord badge]][discord link]
 
@@ -33,32 +36,32 @@
 
 </div>
 
-_**Note: The UI is not fully functional on `main`. If you need a stable UI based on `main`, use the `pre-nodes` tag while we [migrate to a new backend](https://github.com/invoke-ai/InvokeAI/discussions/3246).**_
+_**Note: This is an alpha release. Bugs are expected and not all
+features are fully implemented. Please use the GitHub [Issues
+pages](https://github.com/invoke-ai/InvokeAI/issues?q=is%3Aissue+is%3Aopen)
+to report unexpected problems. Also note that InvokeAI root directory
+which contains models, outputs and configuration files, has changed
+between the 2.x and 3.x release. If you wish to use your v2.3 root
+directory with v3.0, please follow the directions in [Migrating a 2.3
+root directory to 3.0](#migrating-to-3).**_
 
-InvokeAI is a leading creative engine built to empower professionals and enthusiasts alike. Generate and create stunning visual media using the latest AI-driven technologies. InvokeAI offers an industry leading Web Interface, interactive Command Line Interface, and also serves as the foundation for multiple commercial products.
+InvokeAI is a leading creative engine built to empower professionals
+and enthusiasts alike. Generate and create stunning visual media using
+the latest AI-driven technologies. InvokeAI offers an industry leading
+Web Interface, interactive Command Line Interface, and also serves as
+the foundation for multiple commercial products.
 
-**Quick links**: [[How to Install](https://invoke-ai.github.io/InvokeAI/#installation)] [<a href="https://discord.gg/ZmtBAhwWhy">Discord Server</a>] [<a href="https://invoke-ai.github.io/InvokeAI/">Documentation and Tutorials</a>] [<a href="https://github.com/invoke-ai/InvokeAI/">Code and Downloads</a>] [<a href="https://github.com/invoke-ai/InvokeAI/issues">Bug Reports</a>] [<a href="https://github.com/invoke-ai/InvokeAI/discussions">Discussion, Ideas & Q&A</a>]
-
-_Note: InvokeAI is rapidly evolving. Please use the
-[Issues](https://github.com/invoke-ai/InvokeAI/issues) tab to report bugs and make feature
-requests. Be sure to use the provided templates. They will help us diagnose issues faster._
-
-## FOR DEVELOPERS - MIGRATING TO THE 3.0.0 MODELS FORMAT
-
-The models directory and models.yaml have changed. To migrate to the
-new layout, please follow this recipe:
-
-1. Run `python scripts/migrate_models_to_3.0.py <path_to_root_directory>
-
-2. This will create a new models directory named `models-3.0` and a
-   new config directory named `models.yaml-3.0`, both in the current
-   working directory. If you prefer to name them something else, pass
-   the `--dest-directory` and/or `--dest-yaml` arguments.
-
-3. Check that the new models directory and yaml file look ok.
-
-4. Replace the existing directory and file, keeping backup copies just in
-case.
+**Quick links**: [[How to
+  Install](https://invoke-ai.github.io/InvokeAI/#installation)] [<a
+  href="https://discord.gg/ZmtBAhwWhy">Discord Server</a>] [<a
+  href="https://invoke-ai.github.io/InvokeAI/">Documentation and
+  Tutorials</a>] [<a
+  href="https://github.com/invoke-ai/InvokeAI/">Code and
+  Downloads</a>] [<a
+  href="https://github.com/invoke-ai/InvokeAI/issues">Bug Reports</a>]
+  [<a
+  href="https://github.com/invoke-ai/InvokeAI/discussions">Discussion,
+  Ideas & Q&A</a>]
 
 <div align="center">
 
@@ -68,22 +71,30 @@ case.
 
 ## Table of Contents
 
-1. [Quick Start](#getting-started-with-invokeai)
-2. [Installation](#detailed-installation-instructions)
-3. [Hardware Requirements](#hardware-requirements)
-4. [Features](#features)
-5. [Latest Changes](#latest-changes)
-6. [Troubleshooting](#troubleshooting)
-7. [Contributing](#contributing)
-8. [Contributors](#contributors)
-9. [Support](#support)
-10. [Further Reading](#further-reading)
+Table of Contents 📝
 
-## Getting Started with InvokeAI
+**Getting Started**
+1. 🏁 [Quick Start](#quick-start) 
+3. 🖥️ [Hardware Requirements](#hardware-requirements) 
+
+**More About Invoke**
+1. 🌟 [Features](#features) 
+2. 📣 [Latest Changes](#latest-changes) 
+3. 🛠️ [Troubleshooting](#troubleshooting) 
+
+**Supporting the Project**
+1. 🤝 [Contributing](#contributing) 
+2. 👥 [Contributors](#contributors) 
+3. 💕 [Support](#support) 
+
+## Quick Start
 
 For full installation and upgrade instructions, please see:
 [InvokeAI Installation Overview](https://invoke-ai.github.io/InvokeAI/installation/)
 
+If upgrading from version 2.3, please read [Migrating a 2.3 root
+directory to 3.0](#migrating-to-3) first.
+
 ### Automatic Installer (suggested for 1st time users)
 
 1. Go to the bottom of the [Latest Release Page](https://github.com/invoke-ai/InvokeAI/releases/latest)
@@ -92,9 +103,8 @@ For full installation and upgrade instructions, please see:
 
 3. Unzip the file.
 
-4. If you are on Windows, double-click on the `install.bat` script. On
-macOS, open a Terminal window, drag the file `install.sh` from Finder
-into the Terminal, and press return. On Linux, run `install.sh`.
+4. **Windows:** double-click on the `install.bat` script. **macOS:** Open a Terminal window, drag the file `install.sh` from Finder
+into the Terminal, and press return. **Linux:** run `install.sh`.
 
 5. You'll be asked to confirm the location of the folder in which
 to install InvokeAI and its image generation model files. Pick a
@@ -120,7 +130,7 @@ and go to http://localhost:9090.
 
 10. Type `banana sushi` in the box on the top left and click `Invoke`
 
-### Command-Line Installation (for users familiar with Terminals)
+### Command-Line Installation (for developers and users familiar with Terminals)
 
 You must have Python 3.9 or 3.10 installed on your machine. Earlier or later versions are
 not supported.
@@ -196,7 +206,7 @@ not supported.
 Be sure to activate the virtual environment each time before re-launching InvokeAI,
 using `source .venv/bin/activate` or `.venv\Scripts\activate`.
 
-### Detailed Installation Instructions
+## Detailed Installation Instructions
 
 This fork is supported across Linux, Windows and Macintosh. Linux
 users can use either an Nvidia-based card (with CUDA support) or an
@@ -204,6 +214,87 @@ AMD card (using the ROCm driver). For full installation and upgrade
 instructions, please see:
 [InvokeAI Installation Overview](https://invoke-ai.github.io/InvokeAI/installation/INSTALL_SOURCE/)
 
+<a name="migrating-to-3"></a>
+### Migrating a v2.3 InvokeAI root directory
+
+The InvokeAI root directory is where the InvokeAI startup file,
+installed models, and generated images are stored. It is ordinarily
+named `invokeai` and located in your home directory. The contents and
+layout of this directory has changed between versions 2.3 and 3.0 and
+cannot be used directly.
+
+We currently recommend that you use the installer to create a new root
+directory named differently from the 2.3 one, e.g. `invokeai-3` and
+then use a migration script to copy your 2.3 models into the new
+location. However, if you choose, you can upgrade this directory in
+place.  This section gives both recipes.
+
+#### Creating a new root directory and migrating old models
+
+This is the safer recipe because it leaves your old root directory in
+place to fall back on.
+
+1. Follow the instructions above to create and install InvokeAI in a
+directory that has a different name from the 2.3 invokeai directory.
+In this example, we will use "invokeai-3"
+
+2. When you are prompted to select models to install, select a minimal
+set of models, such as stable-diffusion-v1.5 only.
+
+3. After installation is complete launch `invokeai.sh` (Linux/Mac) or
+`invokeai.bat` and select option 8 "Open the developers console". This
+will take you to the command line.
+
+4. Issue the command `invokeai-migrate3 --from /path/to/v2.3-root --to
+/path/to/invokeai-3-root`. Provide the correct `--from` and `--to`
+paths for your v2.3 and v3.0 root directories respectively.
+
+This will copy and convert your old models from 2.3 format to 3.0
+format and create a new `models` directory in the 3.0 directory. The
+old models directory (which contains the models selected at install
+time) will be renamed `models.orig` and can be deleted once you have
+confirmed that the migration was successful.
+
+#### Migrating in place
+
+For the adventurous, you may do an in-place upgrade from 2.3 to 3.0
+without touching the command line. The recipe is as follows>
+
+1. Launch the InvokeAI launcher script in your current v2.3 root directory.
+
+2. Select option [9] "Update InvokeAI" to bring up the updater dialog.
+
+3a. During the alpha release phase, select option [3] and manually
+enter the tag name `v3.0.0+a2`.
+
+3b. Once 3.0 is released, select option [1] to upgrade to the latest release.
+
+4. Once the upgrade is finished you will be returned to the launcher
+menu. Select option [7] "Re-run the configure script to fix a broken
+install or to complete a major upgrade".
+
+This will run the configure script against the v2.3 directory and
+update it to the 3.0 format. The following files will be replaced:
+
+  - The invokeai.init file, replaced by invokeai.yaml
+  - The models directory
+  - The configs/models.yaml model index
+  
+The original versions of these files will be saved with the suffix
+".orig" appended to the end. Once you have confirmed that the upgrade
+worked, you can safely remove these files. Alternatively you can
+restore a working v2.3 directory by removing the new files and
+restoring the ".orig" files' original names.
+
+#### Migration Caveats
+
+The migration script will migrate your invokeai settings and models,
+including textual inversion models, LoRAs and merges that you may have
+installed previously. However it does **not** migrate the generated
+images stored in your 2.3-format outputs directory. The released
+version of 3.0 is expected to have an interface for importing an
+entire directory of image files as a batch.
+
 ## Hardware Requirements
 
 InvokeAI is supported across Linux, Windows and macOS. Linux
@@ -222,13 +313,9 @@ We do not recommend the GTX 1650 or 1660 series video cards. They are
 unable to run in half-precision mode and do not have sufficient VRAM
 to render 512x512 images.
 
-### Memory
+**Memory** - At least 12 GB Main Memory RAM.
 
-- At least 12 GB Main Memory RAM.
-
-### Disk
-
-- At least 12 GB of free disk space for the machine learning model, Python, and all its dependencies.
+**Disk** - At least 12 GB of free disk space for the machine learning model, Python, and all its dependencies.
 
 ## Features
 
@@ -244,7 +331,7 @@ The Unified Canvas is a fully integrated canvas implementation with support for
 
 ### *Advanced Prompt Syntax*
 
-InvokeAI's advanced prompt syntax allows for token weighting, cross-attention control, and prompt blending, allowing for fine-tuned tweaking of your invocations and exploration of the latent space.
+Invoke AI's advanced prompt syntax allows for token weighting, cross-attention control, and prompt blending, allowing for fine-tuned tweaking of your invocations and exploration of the latent space. 
 
 ### *Command Line Interface*
 
@@ -254,16 +341,12 @@ For users utilizing a terminal-based environment, or who want to take advantage
 
 - *Support for both ckpt and diffusers models*
 - *SD 2.0, 2.1 support*
-- *Noise Control & Tresholding*
-- *Popular Sampler Support*
 - *Upscaling & Face Restoration Tools*
 - *Embedding Manager & Support*
 - *Model Manager & Support*
-
-### Coming Soon
-
-- *Node-Based Architecture & UI*
-- And more...
+- *Node-Based Architecture*
+- *Node-Based Plug-&-Play UI (Beta)*
+- *Boards & Gallery Management
 
 ### Latest Changes
 
@@ -271,12 +354,12 @@ For our latest changes, view our [Release
 Notes](https://github.com/invoke-ai/InvokeAI/releases) and the
 [CHANGELOG](docs/CHANGELOG.md).
 
-## Troubleshooting
+### Troubleshooting
 
 Please check out our **[Q&A](https://invoke-ai.github.io/InvokeAI/help/TROUBLESHOOT/#faq)** to get solutions for common installation
 problems and other issues.
 
-## Contributing
+## 🤝 Contributing
 
 Anyone who wishes to contribute to this project, whether documentation, features, bug fixes, code
 cleanup, testing, or code reviews, is very much encouraged to do so.
@@ -295,14 +378,12 @@ to become part of our community.
 
 Welcome to InvokeAI!
 
-### Contributors
+### 👥 Contributors
 
 This fork is a combined effort of various people from across the world.
 [Check out the list of all these amazing people](https://invoke-ai.github.io/InvokeAI/other/CONTRIBUTORS/). We thank them for
 their time, hard work and effort.
 
-Thanks to [Weblate](https://weblate.org/) for generously providing translation services to this project.
-
 ### Support
 
 For support, please use this repository's GitHub Issues tracking service, or join the Discord.

docs/CHANGELOG.md

@@ -4,6 +4,236 @@ title: Changelog
 
 # :octicons-log-16: **Changelog**
 
+## v2.3.5 <small>(22 May 2023)</small>
+
+This release (along with the post1 and post2 follow-on releases) expands support for additional LoRA and LyCORIS models, upgrades diffusers versions, and fixes a few bugs.
+
+### LoRA and LyCORIS Support Improvement
+
+    A number of LoRA/LyCORIS fine-tune files (those which alter the text encoder as well as the unet model) were not having the desired effect in InvokeAI. This bug has now been fixed. Full documentation of LoRA support is available at InvokeAI LoRA Support.
+    Previously, InvokeAI did not distinguish between LoRA/LyCORIS models based on Stable Diffusion v1.5 vs those based on v2.0 and 2.1, leading to a crash when an incompatible model was loaded. This has now been fixed. In addition, the web pulldown menus for LoRA and Textual Inversion selection have been enhanced to show only those files that are compatible with the currently-selected Stable Diffusion model.
+    Support for the newer LoKR LyCORIS files has been added.
+
+### Library Updates and Speed/Reproducibility Advancements
+The major enhancement in this version is that NVIDIA users no longer need to decide between speed and reproducibility. Previously, if you activated the Xformers library, you would see improvements in speed and memory usage, but multiple images generated with the same seed and other parameters would be slightly different from each other. This is no longer the case. Relative to 2.3.5 you will see improved performance when running without Xformers, and even better performance when Xformers is activated. In both cases, images generated with the same settings will be identical.
+
+Here are the new library versions:
+Library 	Version
+Torch 	2.0.0
+Diffusers 	0.16.1
+Xformers 	0.0.19
+Compel 	1.1.5
+Other Improvements
+
+### Performance Improvements
+
+    When a model is loaded for the first time, InvokeAI calculates its checksum for incorporation into the PNG metadata. This process could take up to a minute on network-mounted disks and WSL mounts. This release noticeably speeds up the process.
+
+### Bug Fixes
+
+    The "import models from directory" and "import from URL" functionality in the console-based model installer has now been fixed.
+    When running the WebUI, we have reduced the number of times that InvokeAI reaches out to HuggingFace to fetch the list of embeddable Textual Inversion models. We have also caught and fixed a problem with the updater not correctly detecting when another instance of the updater is running 
+
+
+## v2.3.4 <small>(7 April 2023)</small>
+
+What's New in 2.3.4
+
+This features release adds support for LoRA (Low-Rank Adaptation) and LyCORIS (Lora beYond Conventional) models, as well as some minor bug fixes.
+### LoRA and LyCORIS Support
+
+LoRA files contain fine-tuning weights that enable particular styles, subjects or concepts to be applied to generated images. LyCORIS files are an extended variant of LoRA. InvokeAI supports the most common LoRA/LyCORIS format, which ends in the suffix .safetensors. You will find numerous LoRA and LyCORIS models for download at Civitai, and a small but growing number at Hugging Face. Full documentation of LoRA support is available at InvokeAI LoRA Support.( Pre-release note: this page will only be available after release)
+
+To use LoRA/LyCORIS models in InvokeAI:
+
+    Download the .safetensors files of your choice and place in /path/to/invokeai/loras. This directory was not present in earlier version of InvokeAI but will be created for you the first time you run the command-line or web client. You can also create the directory manually.
+
+    Add withLora(lora-file,weight) to your prompts. The weight is optional and will default to 1.0. A few examples, assuming that a LoRA file named loras/sushi.safetensors is present:
+
+family sitting at dinner table eating sushi withLora(sushi,0.9)
+family sitting at dinner table eating sushi withLora(sushi, 0.75)
+family sitting at dinner table eating sushi withLora(sushi)
+
+Multiple withLora() prompt fragments are allowed. The weight can be arbitrarily large, but the useful range is roughly 0.5 to 1.0. Higher weights make the LoRA's influence stronger. Negative weights are also allowed, which can lead to some interesting effects.
+
+    Generate as you usually would! If you find that the image is too "crisp" try reducing the overall CFG value or reducing individual LoRA weights. As is the case with all fine-tunes, you'll get the best results when running the LoRA on top of the model similar to, or identical with, the one that was used during the LoRA's training. Don't try to load a SD 1.x-trained LoRA into a SD 2.x model, and vice versa. This will trigger a non-fatal error message and generation will not proceed.
+
+    You can change the location of the loras directory by passing the --lora_directory option to `invokeai.
+
+### New WebUI LoRA and Textual Inversion Buttons
+
+This version adds two new web interface buttons for inserting LoRA and Textual Inversion triggers into the prompt as shown in the screenshot below.
+
+Clicking on one or the other of the buttons will bring up a menu of available LoRA/LyCORIS or Textual Inversion trigger terms. Select a menu item to insert the properly-formatted withLora() or <textual-inversion> prompt fragment into the positive prompt. The number in parentheses indicates the number of trigger terms currently in the prompt. You may click the button again and deselect the LoRA or trigger to remove it from the prompt, or simply edit the prompt directly.
+
+Currently terms are inserted into the positive prompt textbox only. However, some textual inversion embeddings are designed to be used with negative prompts. To move a textual inversion trigger into the negative prompt, simply cut and paste it.
+
+By default the Textual Inversion menu only shows locally installed models found at startup time in /path/to/invokeai/embeddings. However, InvokeAI has the ability to dynamically download and install additional Textual Inversion embeddings from the HuggingFace Concepts Library. You may choose to display the most popular of these (with five or more likes) in the Textual Inversion menu by going to Settings and turning on "Show Textual Inversions from HF Concepts Library." When this option is activated, the locally-installed TI embeddings will be shown first, followed by uninstalled terms from Hugging Face. See The Hugging Face Concepts Library and Importing Textual Inversion files for more information.
+### Minor features and fixes
+
+This release changes model switching behavior so that the command-line and Web UIs save the last model used and restore it the next time they are launched. It also improves the behavior of the installer so that the pip utility is kept up to date.
+  
+### Known Bugs in 2.3.4
+
+These are known bugs in the release.
+
+    The Ancestral DPMSolverMultistepScheduler (k_dpmpp_2a) sampler is not yet implemented for diffusers models and will disappear from the WebUI Sampler menu when a diffusers model is selected.
+    Windows Defender will sometimes raise Trojan or backdoor alerts for the codeformer.pth face restoration model, as well as the CIDAS/clipseg and runwayml/stable-diffusion-v1.5 models. These are false positives and can be safely ignored. InvokeAI performs a malware scan on all models as they are loaded. For additional security, you should use safetensors models whenever they are available.
+
+
+## v2.3.3 <small>(28 March 2023)</small>
+
+This is a bugfix and minor feature release.
+### Bugfixes
+
+Since version 2.3.2 the following bugs have been fixed:
+Bugs
+
+    When using legacy checkpoints with an external VAE, the VAE file is now scanned for malware prior to loading. Previously only the main model weights file was scanned.
+    Textual inversion will select an appropriate batchsize based on whether xformers is active, and will default to xformers enabled if the library is detected.
+    The batch script log file names have been fixed to be compatible with Windows.
+    Occasional corruption of the .next_prefix file (which stores the next output file name in sequence) on Windows systems is now detected and corrected.
+    Support loading of legacy config files that have no personalization (textual inversion) section.
+    An infinite loop when opening the developer's console from within the invoke.sh script has been corrected.
+    Documentation fixes, including a recipe for detecting and fixing problems with the AMD GPU ROCm driver.
+
+Enhancements
+
+    It is now possible to load and run several community-contributed SD-2.0 based models, including the often-requested "Illuminati" model.
+    The "NegativePrompts" embedding file, and others like it, can now be loaded by placing it in the InvokeAI embeddings directory.
+    If no --model is specified at launch time, InvokeAI will remember the last model used and restore it the next time it is launched.
+    On Linux systems, the invoke.sh launcher now uses a prettier console-based interface. To take advantage of it, install the dialog package using your package manager (e.g. sudo apt install dialog).
+    When loading legacy models (safetensors/ckpt) you can specify a custom config file and/or a VAE by placing like-named files in the same directory as the model following this example:
+
+my-favorite-model.ckpt
+my-favorite-model.yaml
+my-favorite-model.vae.pt      # or my-favorite-model.vae.safetensors
+
+### Known Bugs in 2.3.3
+
+These are known bugs in the release.
+
+    The Ancestral DPMSolverMultistepScheduler (k_dpmpp_2a) sampler is not yet implemented for diffusers models and will disappear from the WebUI Sampler menu when a diffusers model is selected.
+    Windows Defender will sometimes raise Trojan or backdoor alerts for the codeformer.pth face restoration model, as well as the CIDAS/clipseg and runwayml/stable-diffusion-v1.5 models. These are false positives and can be safely ignored. InvokeAI performs a malware scan on all models as they are loaded. For additional security, you should use safetensors models whenever they are available.
+
+
+## v2.3.2 <small>(11 March 2023)</small>
+This is a bugfix and minor feature release.
+
+### Bugfixes
+
+Since version 2.3.1 the following bugs have been fixed:
+
+    Black images appearing for potential NSFW images when generating with legacy checkpoint models and both --no-nsfw_checker and --ckpt_convert turned on.
+    Black images appearing when generating from models fine-tuned on Stable-Diffusion-2-1-base. When importing V2-derived models, you may be asked to select whether the model was derived from a "base" model (512 pixels) or the 768-pixel SD-2.1 model.
+    The "Use All" button was not restoring the Hi-Res Fix setting on the WebUI
+    When using the model installer console app, models failed to import correctly when importing from directories with spaces in their names. A similar issue with the output directory was also fixed.
+    Crashes that occurred during model merging.
+    Restore previous naming of Stable Diffusion base and 768 models.
+    Upgraded to latest versions of diffusers, transformers, safetensors and accelerate libraries upstream. We hope that this will fix the assertion NDArray > 2**32 issue that MacOS users have had when generating images larger than 768x768 pixels. Please report back.
+
+As part of the upgrade to diffusers, the location of the diffusers-based models has changed from models/diffusers to models/hub. When you launch InvokeAI for the first time, it will prompt you to OK a one-time move. This should be quick and harmless, but if you have modified your models/diffusers directory in some way, for example using symlinks, you may wish to cancel the migration and make appropriate adjustments.
+New "Invokeai-batch" script
+
+### Invoke AI Batch
+2.3.2 introduces a new command-line only script called invokeai-batch that can be used to generate hundreds of images from prompts and settings that vary systematically. This can be used to try the same prompt across multiple combinations of models, steps, CFG settings and so forth. It also allows you to template prompts and generate a combinatorial list like:
+
+a shack in the mountains, photograph
+a shack in the mountains, watercolor
+a shack in the mountains, oil painting
+a chalet in the mountains, photograph
+a chalet in the mountains, watercolor
+a chalet in the mountains, oil painting
+a shack in the desert, photograph
+...
+
+If you have a system with multiple GPUs, or a single GPU with lots of VRAM, you can parallelize generation across the combinatorial set, reducing wait times and using your system's resources efficiently (make sure you have good GPU cooling).
+
+To try invokeai-batch out. Launch the "developer's console" using the invoke launcher script, or activate the invokeai virtual environment manually. From the console, give the command invokeai-batch --help in order to learn how the script works and create your first template file for dynamic prompt generation.
+
+
+### Known Bugs in 2.3.2
+
+These are known bugs in the release.
+
+    The Ancestral DPMSolverMultistepScheduler (k_dpmpp_2a) sampler is not yet implemented for diffusers models and will disappear from the WebUI Sampler menu when a diffusers model is selected.
+    Windows Defender will sometimes raise a Trojan alert for the codeformer.pth face restoration model. As far as we have been able to determine, this is a false positive and can be safely whitelisted.
+
+
+## v2.3.1 <small>(22 February 2023)</small>
+This is primarily a bugfix release, but it does provide several new features that will improve the user experience.
+
+### Enhanced support for model management
+
+InvokeAI now makes it convenient to add, remove and modify models. You can individually import models that are stored on your local system, scan an entire folder and its subfolders for models and import them automatically, and even directly import models from the internet by providing their download URLs. You also have the option of designating a local folder to scan for new models each time InvokeAI is restarted.
+
+There are three ways of accessing the model management features:
+
+    From the WebUI, click on the cube to the right of the model selection menu. This will bring up a form that allows you to import models individually from your local disk or scan a directory for models to import.
+
+    Using the Model Installer App
+
+Choose option (5) download and install models from the invoke launcher script to start a new console-based application for model management. You can use this to select from a curated set of starter models, or import checkpoint, safetensors, and diffusers models from a local disk or the internet. The example below shows importing two checkpoint URLs from popular SD sites and a HuggingFace diffusers model using its Repository ID. It also shows how to designate a folder to be scanned at startup time for new models to import.
+
+Command-line users can start this app using the command invokeai-model-install.
+
+    Using the Command Line Client (CLI)
+
+The !install_model and !convert_model commands have been enhanced to allow entering of URLs and local directories to scan and import. The first command installs .ckpt and .safetensors files as-is. The second one converts them into the faster diffusers format before installation.
+
+Internally InvokeAI is able to probe the contents of a .ckpt or .safetensors file to distinguish among v1.x, v2.x and inpainting models. This means that you do not need to include "inpaint" in your model names to use an inpainting model. Note that Stable Diffusion v2.x models will be autoconverted into a diffusers model the first time you use it.
+
+Please see INSTALLING MODELS for more information on model management.
+
+### An Improved Installer Experience
+
+The installer now launches a console-based UI for setting and changing commonly-used startup options:
+
+After selecting the desired options, the installer installs several support models needed by InvokeAI's face reconstruction and upscaling features and then launches the interface for selecting and installing models shown earlier. At any time, you can edit the startup options by launching invoke.sh/invoke.bat and entering option (6) change InvokeAI startup options
+
+Command-line users can launch the new configure app using invokeai-configure.
+
+This release also comes with a renewed updater. To do an update without going through a whole reinstallation, launch invoke.sh or invoke.bat and choose option (9) update InvokeAI . This will bring you to a screen that prompts you to update to the latest released version, to the most current development version, or any released or unreleased version you choose by selecting the tag or branch of the desired version.
+
+Command-line users can run this interface by typing invokeai-configure
+
+### Image Symmetry Options
+
+There are now features to generate horizontal and vertical symmetry during generation. The way these work is to wait until a selected step in the generation process and then to turn on a mirror image effect. In addition to generating some cool images, you can also use this to make side-by-side comparisons of how an image will look with more or fewer steps. Access this option from the WebUI by selecting Symmetry from the image generation settings, or within the CLI by using the options --h_symmetry_time_pct and --v_symmetry_time_pct (these can be abbreviated to --h_sym and --v_sym like all other options).
+
+### A New Unified Canvas Look
+
+This release introduces a beta version of the WebUI Unified Canvas. To try it out, open up the settings dialogue in the WebUI (gear icon) and select Use Canvas Beta Layout:
+
+Refresh the screen and go to to Unified Canvas (left side of screen, third icon from the top). The new layout is designed to provide more space to work in and to keep the image controls close to the image itself:
+
+Model conversion and merging within the WebUI
+
+The WebUI now has an intuitive interface for model merging, as well as for permanent conversion of models from legacy .ckpt/.safetensors formats into diffusers format. These options are also available directly from the invoke.sh/invoke.bat scripts.
+An easier way to contribute translations to the WebUI
+
+We have migrated our translation efforts to Weblate, a FOSS translation product. Maintaining the growing project's translations is now far simpler for the maintainers and community. Please review our brief translation guide for more information on how to contribute.
+Numerous internal bugfixes and performance issues
+
+### Bug Fixes
+This releases quashes multiple bugs that were reported in 2.3.0. Major internal changes include upgrading to diffusers 0.13.0, and using the compel library for prompt parsing. See Detailed Change Log for a detailed list of bugs caught and squished.
+Summary of InvokeAI command line scripts (all accessible via the launcher menu)
+Command 	Description
+invokeai 	Command line interface
+invokeai --web 	Web interface
+invokeai-model-install 	Model installer with console forms-based front end
+invokeai-ti --gui 	Textual inversion, with a console forms-based front end
+invokeai-merge --gui 	Model merging, with a console forms-based front end
+invokeai-configure 	Startup configuration; can also be used to reinstall support models
+invokeai-update 	InvokeAI software updater
+
+### Known Bugs in 2.3.1
+
+These are known bugs in the release.
+    MacOS users generating 768x768 pixel images or greater using diffusers models may experience a hard crash with assertion NDArray > 2**32 This appears to be an issu...
+
+
+
 ## v2.3.0 <small>(15 January 2023)</small>
 
 **Transition to diffusers
@@ -264,7 +494,7 @@ sections describe what's new for InvokeAI.
   [Manual Installation](installation/020_INSTALL_MANUAL.md).
 - The ability to save frequently-used startup options (model to load, steps,
   sampler, etc) in a `.invokeai` file. See
-  [Client](features/CLI.md)
+  [Client](deprecated/CLI.md)
 - Support for AMD GPU cards (non-CUDA) on Linux machines.
 - Multiple bugs and edge cases squashed.
 
@@ -387,7 +617,7 @@ sections describe what's new for InvokeAI.
 - `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains for
   backward compatibility.
 - Completely new WebGUI - launch with `python3 scripts/invoke.py --web`
-- Support for [inpainting](features/INPAINTING.md) and
+- Support for [inpainting](deprecated/INPAINTING.md) and
   [outpainting](features/OUTPAINTING.md)
 - img2img runs on all k\* samplers
 - Support for
@@ -399,7 +629,7 @@ sections describe what's new for InvokeAI.
   using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E
   infinite canvas), and "embiggen" upscaling. See the `!fix` command.
 - New `--hires` option on `invoke>` line allows
-  [larger images to be created without duplicating elements](features/CLI.md#this-is-an-example-of-txt2img),
+  [larger images to be created without duplicating elements](deprecated/CLI.md#this-is-an-example-of-txt2img),
   at the cost of some performance.
 - New `--perlin` and `--threshold` options allow you to add and control
   variation during image generation (see
@@ -408,7 +638,7 @@ sections describe what's new for InvokeAI.
   of images and tweaking of previous settings.
 - Command-line completion in `invoke.py` now works on Windows, Linux and Mac
   platforms.
-- Improved [command-line completion behavior](features/CLI.md) New commands
+- Improved [command-line completion behavior](deprecated/CLI.md) New commands
   added:
   - List command-line history with `!history`
   - Search command-line history with `!search`

docs/contributing/CONTRIBUTING.md

@@ -0,0 +1,54 @@
+## Welcome to Invoke AI
+
+We're thrilled to have you here and we're excited for you to contribute. 
+
+Invoke AI originated as a project built by the community, and that vision carries forward today as we aim to build the best pro-grade tools available. We work together to incorporate the latest in AI/ML research, making these tools available in over 20 languages to artists and creatives around the world as part of our fully permissive OSS project designed for individual users to self-host and use.
+
+Here are some guidelines to help you get started:
+
+### Technical Prerequisites
+
+Front-end: You'll need a working knowledge of React and TypeScript.
+
+Back-end: Depending on the scope of your contribution, you may need to know SQLite, FastAPI, Python, and Socketio. Also, a good majority of the backend logic involved in processing images is built in a modular way using a concept called "Nodes", which are isolated functions that carry out individual, discrete operations. This design allows for easy contributions of novel pipelines and capabilities.
+
+### How to Submit Contributions
+
+To start contributing, please follow these steps:
+
+1. Familiarize yourself with our roadmap and open projects to see where your skills and interests align. These documents can serve as a source of inspiration.
+2. Open a Pull Request (PR) with a clear description of the feature you're adding or the problem you're solving. Make sure your contribution aligns with the project's vision.
+3. Adhere to general best practices. This includes assuming interoperability with other nodes, keeping the scope of your functions as small as possible, and organizing your code according to our architecture documents.
+
+### Types of Contributions We're Looking For
+
+We welcome all contributions that improve the project. Right now, we're especially looking for:
+
+1. Quality of life (QOL) enhancements on the front-end.
+2. New backend capabilities added through nodes.
+3. Incorporating additional optimizations from the broader open-source software community.
+
+### Communication and Decision-making Process
+
+Project maintainers and code owners review PRs to ensure they align with the project's goals. They may provide design or architectural guidance, suggestions on user experience, or provide more significant feedback on the contribution itself. Expect to receive feedback on your submissions, and don't hesitate to ask questions or propose changes.
+
+For more robust discussions, or if you're planning to add capabilities not currently listed on our roadmap, please reach out to us on our Discord server. That way, we can ensure your proposed contribution aligns with the project's direction before you start writing code.
+
+### Code of Conduct and Contribution Expectations
+
+We want everyone in our community to have a positive experience. To facilitate this, we've established a code of conduct and a statement of values that we expect all contributors to adhere to. Please take a moment to review these documents—they're essential to maintaining a respectful and inclusive environment.
+
+By making a contribution to this project, you certify that:
+
+1. The contribution was created in whole or in part by you and you have the right to submit it under the open-source license indicated in this project’s GitHub repository; or
+2. The contribution is based upon previous work that, to the best of your knowledge, is covered under an appropriate open-source license and you have the right under that license to submit that work with modifications, whether created in whole or in part by you, under the same open-source license (unless you are permitted to submit under a different license); or
+3. The contribution was provided directly to you by some other person who certified (1) or (2) and you have not modified it; or
+4. You understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information you submit with it, including your sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open-source license(s) involved.
+
+This disclaimer is not a license and does not grant any rights or permissions. You must obtain necessary permissions and licenses, including from third parties, before contributing to this project.
+
+This disclaimer is provided "as is" without warranty of any kind, whether expressed or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, or non-infringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the contribution or the use or other dealings in the contribution.
+
+---
+
+Remember, your contributions help make this project great. We're excited to see what you'll bring to our community!

docs/deprecated/CLI.md

@@ -205,14 +205,14 @@ Here are the invoke> command that apply to txt2img:
 | `--seamless`                              |                                           | `False`                                  | Activate seamless tiling for interesting effects                                                                                                                                                                                                 |
 | `--seamless_axes`                         |                                           | `x,y`                                    | Specify which axes to use circular convolution on.                                                                                                                                                                                               |
 | `--log_tokenization`                      | `-t`                                      | `False`                                  | Display a color-coded list of the parsed tokens derived from the prompt                                                                                                                                                                          |
-| `--skip_normalization`                    | `-x`                                      | `False`                                  | Weighted subprompts will not be normalized. See [Weighted Prompts](./OTHER.md#weighted-prompts)                                                                                                                                                  |
+| `--skip_normalization`                    | `-x`                                      | `False`                                  | Weighted subprompts will not be normalized. See [Weighted Prompts](../features/OTHER.md#weighted-prompts)                                                                                                                                                  |
 | `--upscale <int> <float>`                 | `-U <int> <float>`                        | `-U 1 0.75`                              | Upscale image by magnification factor (2, 4), and set strength of upscaling (0.0-1.0). If strength not set, will default to 0.75.                                                                                                                |
 | `--facetool_strength <float>`             | `-G <float> `                             | `-G0`                                    | Fix faces (defaults to using the GFPGAN algorithm); argument indicates how hard the algorithm should try (0.0-1.0)                                                                                                                               |
 | `--facetool <name>`                       | `-ft <name>`                              | `-ft gfpgan`                             | Select face restoration algorithm to use: gfpgan, codeformer                                                                                                                                                                                     |
 | `--codeformer_fidelity`                   | `-cf <float>`                             | `0.75`                                   | Used along with CodeFormer. Takes values between 0 and 1. 0 produces high quality but low accuracy. 1 produces high accuracy but low quality                                                                                                     |
 | `--save_original`                         | `-save_orig`                              | `False`                                  | When upscaling or fixing faces, this will cause the original image to be saved rather than replaced.                                                                                                                                             |
-| `--variation <float>`                     | `-v<float>`                               | `0.0`                                    | Add a bit of noise (0.0=none, 1.0=high) to the image in order to generate a series of variations. Usually used in combination with `-S<seed>` and `-n<int>` to generate a series a riffs on a starting image. See [Variations](./VARIATIONS.md). |
-| `--with_variations <pattern>`             |                                           | `None`                                   | Combine two or more variations. See [Variations](./VARIATIONS.md) for now to use this.                                                                                                                                                           |
+| `--variation <float>`                     | `-v<float>`                               | `0.0`                                    | Add a bit of noise (0.0=none, 1.0=high) to the image in order to generate a series of variations. Usually used in combination with `-S<seed>` and `-n<int>` to generate a series a riffs on a starting image. See [Variations](../features/VARIATIONS.md). |
+| `--with_variations <pattern>`             |                                           | `None`                                   | Combine two or more variations. See [Variations](../features/VARIATIONS.md) for now to use this.                                                                                                                                                           |
 | `--save_intermediates <n>`                |                                           | `None`                                   | Save the image from every nth step into an "intermediates" folder inside the output directory                                                                                                                                                    |
 | `--h_symmetry_time_pct <float>`           |                                           | `None`                                   | Create symmetry along the X axis at the desired percent complete of the generation process. (Must be between 0.0 and 1.0; set to a very small number like 0.0001 for just after the first step of generation.)                                   |
 | `--v_symmetry_time_pct <float>`           |                                           | `None`                                   | Create symmetry along the Y axis at the desired percent complete of the generation process. (Must be between 0.0 and 1.0; set to a very small number like 0.0001 for just after the first step of generation.)                                   |
@@ -257,7 +257,7 @@ additional options:
     by `-M`. You may also supply just a single initial image with the areas
     to overpaint made transparent, but you must be careful not to destroy
     the pixels underneath when you create the transparent areas. See
-    [Inpainting](./INPAINTING.md) for details.
+    [Inpainting](INPAINTING.md) for details.
 
 inpainting accepts all the arguments used for txt2img and img2img, as well as
 the --mask (-M) and --text_mask (-tm) arguments:
@@ -297,7 +297,7 @@ invoke> a piece of cake -I /path/to/breakfast.png -tm bagel 0.6
 
 You can load and use hundreds of community-contributed Textual
 Inversion models just by typing the appropriate trigger phrase. Please
-see [Concepts Library](CONCEPTS.md) for more details.
+see [Concepts Library](../features/CONCEPTS.md) for more details.
 
 ## Other Commands
 

docs/features/CONCEPTS.md

@@ -65,39 +65,21 @@ find out what each concept is for, you can browse the
 [Hugging Face concepts library](https://huggingface.co/sd-concepts-library) and
 look at examples of what each concept produces.
 
-When you have an idea of a concept you wish to try, go to the command-line
-client (CLI) and type a `<` character and the beginning of the Hugging Face
-concept name you wish to load. Press ++tab++, and the CLI will show you all
-matching concepts. You can also type `<` and hit ++tab++ to get a listing of all
-~800 concepts, but be prepared to scroll up to see them all! If there is more
-than one match you can continue to type and ++tab++ until the concept is
-completed.
+To load concepts, you will need to open the Web UI's configuration
+dialogue and activate "Show Textual Inversions from HF Concepts
+Library". This will then add a list of HF Concepts to the dropdown
+"Add Textual Inversion" menu. Select the concept(s) of your choice and
+they will be incorporated into the positive prompt. A few concepts are
+designed for the negative prompt, in which case you can add them to
+the negative prompt box by select the down arrow icon next to the
+textual inversion menu.
 
-!!! example
-
-    if you type in `<x` and hit ++tab++, you'll be prompted with the completions:
-
-    ```py
-    <xatu2>        <xatu>         <xbh>          <xi>           <xidiversity>  <xioboma>      <xuna>         <xyz>
-    ```
-
-    Now type `id` and press ++tab++. It will be autocompleted to `<xidiversity>`
-    because this is a unique match.
-
-    Finish your prompt and generate as usual. You may include multiple concept terms
-    in the prompt.
-
-If you have never used this concept before, you will see a message that the TI
-model is being downloaded and installed. After this, the concept will be saved
-locally (in the `models/sd-concepts-library` directory) for future use.
-
-Several steps happen during downloading and installation, including a scan of
-the file for malicious code. Should any errors occur, you will be warned and the
-concept will fail to load. Generation will then continue treating the trigger
-term as a normal string of characters (e.g. as literal `<ghibli-face>`).
-
-You can also use `<concept-names>` in the WebGUI's prompt textbox. There is no
-autocompletion at this time.
+There are nearly 1000 HF concepts, more than will fit into a menu. For
+this reason we only show the most popular concepts (those which have
+received 5 or more likes). If you wish to use a concept that is not on
+the list, you may simply type its name surrounded by brackets. For
+example, to load the concept named "xidiversity", add `<xidiversity>`
+to the positive or negative prompt text.
 
 ## Installing your Own TI Files
 
@@ -112,18 +94,11 @@ At startup time, InvokeAI will scan the `embeddings` directory and load any TI
 files it finds there. At startup you will see a message similar to this one:
 
 ```bash
->> Current embedding manager terms: *, <HOI4-Leader>, <princess-knight>
+>> Current embedding manager terms: <HOI4-Leader>, <princess-knight>
 ```
 
-Note the `*` trigger term. This is a placeholder term that many early TI
-tutorials taught people to use rather than a more descriptive term.
-Unfortunately, if you have multiple TI files that all use this term, only the
-first one loaded will be triggered by use of the term.
-
-To avoid this problem, you can use the `merge_embeddings.py` script to merge two
-or more TI files together. If it encounters a collision of terms, the script
-will prompt you to select new terms that do not collide. See
-[Textual Inversion](TEXTUAL_INVERSION.md) for details.
+The terms you can use will appear in the "Add Textual Inversion"
+dropdown menu above the HF Concepts.
 
 ## Further Reading
 

docs/features/CONTROLNET.md

@@ -0,0 +1,92 @@
+---
+title: ControlNet
+---
+
+# :material-loupe: ControlNet
+
+## ControlNet
+
+ControlNet
+
+ControlNet is a powerful set of features developed by the open-source community (notably, Stanford researcher [**@ilyasviel**](https://github.com/lllyasviel)) that allows you to apply a secondary neural network model to your image generation process in Invoke.
+
+With ControlNet, you can get more control over the output of your image generation, providing you with a way to direct the network towards generating images that better fit your desired style or outcome.
+
+
+### How it works
+
+ControlNet works by analyzing an input image, pre-processing that image to identify relevant information that can be interpreted by each specific ControlNet model, and then inserting that control information into the generation process. This can be used to adjust the style, composition, or other aspects of the image to better achieve a specific result.
+
+
+### Models
+
+As part of the model installation, ControlNet models can be selected including a variety of pre-trained models that have been added to achieve different effects or styles in your generated images. Further ControlNet models may require additional code functionality to also be incorporated into Invoke's Invocations folder. You should expect to follow any installation instructions for ControlNet models loaded  outside the default models provided by Invoke. The default models include:
+
+
+**Canny**:
+
+When the Canny model is used in ControlNet, Invoke will attempt to generate images that match the edges detected. 
+
+Canny edge detection works by detecting the edges in an image by looking for abrupt changes in intensity. It is known for its ability to detect edges accurately while reducing noise and false edges, and the preprocessor can identify more information by decreasing the thresholds.
+
+**M-LSD**: 
+
+M-LSD is another edge detection algorithm used in ControlNet. It stands for Multi-Scale Line Segment Detector. 
+
+It detects straight line segments in an image by analyzing the local structure of the image at multiple scales.  It can be useful for architectural imagery, or anything where straight-line structural information is needed for the resulting output. 
+
+**Lineart**: 
+
+The Lineart model in ControlNet generates line drawings from an input image. The resulting pre-processed image is a simplified version of the original, with only the outlines of objects visible.The Lineart model in ControlNet is known for its ability to accurately capture the contours of the objects in an input sketch. 
+
+**Lineart Anime**: 
+
+A variant of the Lineart model that generates line drawings with a distinct style inspired by anime and manga art styles.
+
+**Depth**: 
+A model that generates depth maps of images, allowing you to create more realistic 3D models or to simulate depth effects in post-processing.
+
+**Normal Map (BAE):** 
+A model that generates normal maps from input images, allowing for more realistic lighting effects in 3D rendering.
+		
+**Image Segmentation**: 
+A model that divides input images into segments or regions, each of which corresponds to a different object or part of the image. (More details coming soon)
+
+
+**Openpose**: 
+The OpenPose control model allows for the identification of the general pose of a character by pre-processing an existing image with a clear human structure. With advanced options, Openpose can also detect the face or hands in the image. 
+
+**Mediapipe Face**:
+
+The MediaPipe Face identification processor is able to clearly identify facial features in order to capture vivid expressions of human faces.
+
+**Tile (experimental)**:
+
+The Tile model fills out details in the image to match the image, rather than the prompt. The Tile Model is a versatile tool that offers a range of functionalities. Its primary capabilities can be boiled down to two main behaviors:
+
+- It can reinterpret specific details within an image and create fresh, new elements.
+- It has the ability to disregard global instructions if there's a discrepancy between them and the local context or specific parts of the image. In such cases, it uses the local context to guide the process.
+
+The Tile Model can be a powerful tool in your arsenal for enhancing image quality and details. If there are undesirable elements in your images, such as blurriness caused by resizing, this model can effectively eliminate these issues, resulting in cleaner, crisper images. Moreover, it can generate and add refined details to your images, improving their overall quality and appeal. 
+
+**Pix2Pix (experimental)**
+
+With Pix2Pix, you can input an image into the controlnet, and then "instruct" the model to change it using your prompt. For example, you can say "Make it winter" to add more wintry elements to a scene.
+
+**Inpaint**: Coming Soon - Currently this model is available but not functional on the Canvas. An upcoming release will provide additional capabilities for using this model when inpainting.
+
+Each of these models can be adjusted and combined with other ControlNet models to achieve different results, giving you even more control over your image generation process.
+
+
+## Using ControlNet
+
+To use ControlNet, you can simply select the desired model and adjust both the ControlNet and Pre-processor settings to achieve the desired result. You can also use multiple ControlNet models at the same time, allowing you to achieve even more complex effects or styles in your generated images.
+
+
+Each ControlNet has two settings that are applied to the ControlNet.
+
+Weight - Strength of the Controlnet model applied to the generation for the section, defined by start/end.
+
+Start/End  - 0 represents the start of the generation, 1 represents the end. The Start/end setting controls what steps during the generation process have the ControlNet applied.
+
+Additionally, each ControlNet section can be expanded in order to manipulate settings for the image pre-processor that adjusts your uploaded image before using it in when you Invoke.

docs/features/IMG2IMG.md

@@ -4,86 +4,13 @@ title: Image-to-Image
 
 # :material-image-multiple: Image-to-Image
 
-Both the Web and command-line interfaces provide an "img2img" feature
-that lets you seed your creations with an initial drawing or
-photo. This is a really cool feature that tells stable diffusion to
-build the prompt on top of the image you provide, preserving the
-original's basic shape and layout.
+InvokeAI provides an "img2img" feature that lets you seed your
+creations with an initial drawing or photo. This is a really cool
+feature that tells stable diffusion to build the prompt on top of the
+image you provide, preserving the original's basic shape and layout.
 
-See the [WebUI Guide](WEB.md) for a walkthrough of the img2img feature
-in the InvokeAI web server. This document describes how to use img2img
-in the command-line tool.
-
-## Basic Usage
-
-Launch the command-line client by launching `invoke.sh`/`invoke.bat`
-and choosing option (1). Alternative, activate the InvokeAI
-environment and issue the command `invokeai`.
-
-Once the `invoke> ` prompt appears, you can start an img2img render by
-pointing to a seed file with the `-I` option as shown here:
-
-!!! example ""
-
-    ```commandline
-    tree on a hill with a river, nature photograph, national geographic -I./test-pictures/tree-and-river-sketch.png -f 0.85
-    ```
-
-    <figure markdown>
-
-    | original image | generated image |
-    | :------------: | :-------------: |
-    | ![original-image](https://user-images.githubusercontent.com/50542132/193946000-c42a96d8-5a74-4f8a-b4c3-5213e6cadcce.png){ width=320 } | ![generated-image](https://user-images.githubusercontent.com/111189/194135515-53d4c060-e994-4016-8121-7c685e281ac9.png){ width=320 } |
-
-    </figure>
-
-The `--init_img` (`-I`) option gives the path to the seed picture. `--strength`
-(`-f`) controls how much the original will be modified, ranging from `0.0` (keep
-the original intact), to `1.0` (ignore the original completely). The default is
-`0.75`, and ranges from `0.25-0.90` give interesting results. Other relevant
-options include `-C` (classification free guidance scale), and `-s` (steps).
-Unlike `txt2img`, adding steps will continuously change the resulting image and
-it will not converge.
-
-You may also pass a `-v<variation_amount>` option to generate `-n<iterations>`
-count variants on the original image. This is done by passing the first
-generated image back into img2img the requested number of times. It generates
-interesting variants.
-
-Note that the prompt makes a big difference. For example, this slight variation
-on the prompt produces a very different image:
-
-<figure markdown>
-![](https://user-images.githubusercontent.com/111189/194135220-16b62181-b60c-4248-8989-4834a8fd7fbd.png){ width=320 }
-<caption markdown>photograph of a tree on a hill with a river</caption>
-</figure>
-
-!!! tip
-
-    When designing prompts, think about how the images scraped from the internet were
-    captioned. Very few photographs will be labeled "photograph" or "photorealistic."
-    They will, however, be captioned with the publication, photographer, camera model,
-    or film settings.
-
-If the initial image contains transparent regions, then Stable Diffusion will
-only draw within the transparent regions, a process called
-[`inpainting`](./INPAINTING.md#creating-transparent-regions-for-inpainting).
-However, for this to work correctly, the color information underneath the
-transparent needs to be preserved, not erased.
-
-!!! warning "**IMPORTANT ISSUE** "
-
-    `img2img` does not work properly on initial images smaller
-    than 512x512. Please scale your image to at least 512x512 before using it.
-    Larger images are not a problem, but may run out of VRAM on your GPU card. To
-    fix this, use the --fit option, which downscales the initial image to fit within
-    the box specified by width x height:
-
-    ```
-    tree on a hill with a river, national geographic -I./test-pictures/big-sketch.png -H512 -W512 --fit
-    ```
-
-## How does it actually work, though?
+For a walkthrough of using Image-to-Image in the Web UI, see [InvokeAI
+Web Server](./WEB.md#image-to-image).
 
 The main difference between `img2img` and `prompt2img` is the starting point.
 While `prompt2img` always starts with pure gaussian noise and progressively
@@ -99,10 +26,6 @@ seed `1592514025` develops something like this:
 
 !!! example ""
 
-    ```bash
-    invoke> "fire" -s10 -W384 -H384 -S1592514025
-    ```
-
     <figure markdown>
     ![latent steps](../assets/img2img/000019.steps.png){ width=720 }
     </figure>
@@ -157,17 +80,8 @@ Diffusion has less chance to refine itself, so the result ends up inheriting all
 the problems of my bad drawing.
 
 If you want to try this out yourself, all of these are using a seed of
-`1592514025` with a width/height of `384`, step count `10`, the default sampler
-(`k_lms`), and the single-word prompt `"fire"`:
-
-```bash
-invoke> "fire" -s10 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png --strength 0.7
-```
-
-The code for rendering intermediates is on my (damian0815's) branch
-[document-img2img](https://github.com/damian0815/InvokeAI/tree/document-img2img) -
-run `invoke.py` and check your `outputs/img-samples/intermediates` folder while
-generating an image.
+`1592514025` with a width/height of `384`, step count `10`, the
+`k_lms` sampler, and the single-word prompt `"fire"`.
 
 ### Compensating for the reduced step count
 
@@ -180,10 +94,6 @@ give each generation 20 steps.
 Here's strength `0.4` (note step count `50`, which is `20 ÷ 0.4` to make sure SD
 does `20` steps from my image):
 
-```bash
-invoke> "fire" -s50 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png -f 0.4
-```
-
 <figure markdown>
 ![000035.1592514025](../assets/img2img/000035.1592514025.png)
 </figure>
@@ -191,10 +101,6 @@ invoke> "fire" -s50 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png -f 0.4
 and here is strength `0.7` (note step count `30`, which is roughly `20 ÷ 0.7` to
 make sure SD does `20` steps from my image):
 
-```commandline
-invoke> "fire" -s30 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png -f 0.7
-```
-
 <figure markdown>
 ![000046.1592514025](../assets/img2img/000046.1592514025.png)
 </figure>

docs/features/MODEL_MERGING.md

@@ -71,6 +71,3 @@ under the selected name and register it with InvokeAI.
   use InvokeAI conventions - only alphanumeric letters and the
   characters ".+-".
 
-## Caveats
-
-This is a new script and may contain bugs.

docs/features/NSFW.md

@@ -31,10 +31,22 @@ turned on and off on the command line using `--nsfw_checker` and
 
 At installation time, InvokeAI will ask whether the checker should be
 activated by default (neither argument given on the command line). The
-response is stored in the InvokeAI initialization file (usually
-`invokeai.init` in your home directory). You can change the default at any
-time by opening this file in a text editor and commenting or
-uncommenting the line `--nsfw_checker`.
+response is stored in the InvokeAI initialization file
+(`invokeai.yaml` in the InvokeAI root directory).  You can change the
+default at any time by opening this file in a text editor and
+changing the line `nsfw_checker:` from true to false or vice-versa:
+
+
+```
+...
+  Features:
+    esrgan: true
+    internet_available: true
+    log_tokenization: false
+    nsfw_checker: true
+    patchmatch: true
+    restore: true
+```
 
 ## Caveats
 
@@ -79,11 +91,3 @@ generates. However, it does write metadata into the PNG data area,
 including the prompt used to generate the image and relevant parameter
 settings. These fields can be examined using the `sd-metadata.py`
 script that comes with the InvokeAI package.
-
-Note that several other Stable Diffusion distributions offer
-wavelet-based "invisible" watermarking. We have experimented with the
-library used to generate these watermarks and have reached the
-conclusion that while the watermarking library may be adding
-watermarks to PNG images, the currently available version is unable to
-retrieve them successfully. If and when a functioning version of the
-library becomes available, we will offer this feature as well.

docs/features/OTHER.md

@@ -18,43 +18,16 @@ Output Example:
 
 ## **Seamless Tiling**
 
-The seamless tiling mode causes generated images to seamlessly tile with itself. To use it, add the
-`--seamless` option when starting the script which will result in all generated images to tile, or
-for each `invoke>` prompt as shown here:
+The seamless tiling mode causes generated images to seamlessly tile
+with itself creating repetitive wallpaper-like patterns. To use it,
+activate the Seamless Tiling option in the Web GUI and then select
+whether to tile on the X (horizontal) and/or Y (vertical) axes. Tiling
+will then be active for the next set of generations.
+
+A nice prompt to test seamless tiling with is:
 
-```python
-invoke> "pond garden with lotus by claude monet" --seamless -s100 -n4
 ```
-
-By default this will tile on both the X and Y axes. However, you can also specify specific axes to tile on with `--seamless_axes`.
-Possible values are `x`, `y`, and `x,y`:
-```python
-invoke> "pond garden with lotus by claude monet" --seamless --seamless_axes=x -s100 -n4
-```
-
----
-
-## **Shortcuts: Reusing Seeds**
-
-Since it is so common to reuse seeds while refining a prompt, there is now a shortcut as of version
-1.11. Provide a `-S` (or `--seed`) switch of `-1` to use the seed of the most recent image
-generated. If you produced multiple images with the `-n` switch, then you can go back further
-using `-2`, `-3`, etc. up to the first image generated by the previous command. Sorry, but you can't go
-back further than one command.
-
-Here's an example of using this to do a quick refinement. It also illustrates using the new `-G`
-switch to turn on upscaling and face enhancement (see previous section):
-
-```bash
-invoke> a cute child playing hopscotch -G0.5
-[...]
-outputs/img-samples/000039.3498014304.png: "a cute child playing hopscotch" -s50 -W512 -H512 -C7.5 -mk_lms -S3498014304
-
-# I wonder what it will look like if I bump up the steps and set facial enhancement to full strength?
-invoke> a cute child playing hopscotch -G1.0 -s100 -S -1
-reusing previous seed 3498014304
-[...]
-outputs/img-samples/000040.3498014304.png: "a cute child playing hopscotch" -G1.0 -s100 -W512 -H512 -C7.5 -mk_lms -S3498014304
+pond garden with lotus by claude monet"
 ```
 
 ---
@@ -73,66 +46,27 @@ This will tell the sampler to invest 25% of its effort on the tabby cat aspect o
 on the white duck aspect (surprisingly, this example actually works). The prompt weights can use any
 combination of integers and floating point numbers, and they do not need to add up to 1.
 
----
-
-## **Filename Format**
-
-The argument `--fnformat` allows to specify the filename of the
- image. Supported wildcards are all arguments what can be set such as
- `perlin`, `seed`, `threshold`, `height`, `width`, `gfpgan_strength`,
- `sampler_name`, `steps`, `model`, `upscale`, `prompt`, `cfg_scale`,
- `prefix`.
-
-The following prompt
-```bash
-dream> a red car --steps 25 -C 9.8 --perlin 0.1 --fnformat {prompt}_steps.{steps}_cfg.{cfg_scale}_perlin.{perlin}.png
-```
-
-generates a file with the name: `outputs/img-samples/a red car_steps.25_cfg.9.8_perlin.0.1.png`
-
----
-
 ## **Thresholding and Perlin Noise Initialization Options**
 
-Two new options are the thresholding (`--threshold`) and the perlin noise initialization (`--perlin`) options. Thresholding limits the range of the latent values during optimization, which helps combat oversaturation with higher CFG scale values. Perlin noise initialization starts with a percentage (a value ranging from 0 to 1) of perlin noise mixed into the initial noise. Both features allow for more variations and options in the course of generating images.
+Under the Noise section of the Web UI, you will find two options named
+Perlin Noise and Noise Threshold. [Perlin
+noise](https://en.wikipedia.org/wiki/Perlin_noise) is a type of
+structured noise used to simulate terrain and other natural
+textures. The slider controls the percentage of perlin noise that will
+be mixed into the image at the beginning of generation. Adding a little
+perlin noise to a generation will alter the image substantially.
+
+The noise threshold limits the range of the latent values during
+sampling and helps combat the oversharpening seem with higher CFG
+scale values.
 
 For better intuition into what these options do in practice:
 
 ![here is a graphic demonstrating them both](../assets/truncation_comparison.jpg)
 
-In generating this graphic, perlin noise at initialization was programmatically varied going across on the diagram by values 0.0, 0.1, 0.2, 0.4, 0.5, 0.6, 0.8, 0.9, 1.0; and the threshold was varied going down from
-0, 1, 2, 3, 4, 5, 10, 20, 100. The other options are fixed, so the initial prompt is as follows (no thresholding or perlin noise):
-
-```bash
-invoke> "a portrait of a beautiful young lady" -S 1950357039 -s 100 -C 20 -A k_euler_a --threshold 0 --perlin 0
-```
-
-Here's an example of another prompt used when setting the threshold to 5 and perlin noise to 0.2:
-
-```bash
-invoke> "a portrait of a beautiful young lady" -S 1950357039 -s 100 -C 20 -A k_euler_a --threshold 5 --perlin 0.2
-```
-
-!!! note
-
-    currently the thresholding feature is only implemented for the k-diffusion style samplers, and empirically appears to work best with `k_euler_a` and `k_dpm_2_a`. Using 0 disables thresholding. Using 0 for perlin noise disables using perlin noise for initialization. Finally, using 1 for perlin noise uses only perlin noise for initialization.
-
----
-
-## **Simplified API**
-
-For programmers who wish to incorporate stable-diffusion into other products, this repository
-includes a simplified API for text to image generation, which lets you create images from a prompt
-in just three lines of code:
-
-```bash
-from ldm.generate import Generate
-g       = Generate()
-outputs = g.txt2img("a unicorn in manhattan")
-```
-
-Outputs is a list of lists in the format [filename1,seed1],[filename2,seed2]...].
-
-Please see the documentation in ldm/generate.py for more information.
-
----
+In generating this graphic, perlin noise at initialization was
+programmatically varied going across on the diagram by values 0.0,
+0.1, 0.2, 0.4, 0.5, 0.6, 0.8, 0.9, 1.0; and the threshold was varied
+going down from 0, 1, 2, 3, 4, 5, 10, 20, 100. The other options are
+fixed using the prompt "a portrait of a beautiful young lady" a CFG of
+20, 100 steps, and a seed of 1950357039.

docs/features/POSTPROCESS.md

@@ -8,12 +8,6 @@ title: Postprocessing
 
 This extension provides the ability to restore faces and upscale images.
 
-Face restoration and upscaling can be applied at the time you generate the
-images, or at any later time against a previously-generated PNG file, using the
-[!fix](#fixing-previously-generated-images) command.
-[Outpainting and outcropping](OUTPAINTING.md) can only be applied after the
-fact.
-
 ## Face Fixing
 
 The default face restoration module is GFPGAN. The default upscale is
@@ -23,8 +17,7 @@ Real-ESRGAN. For an alternative face restoration module, see
 As of version 1.14, environment.yaml will install the Real-ESRGAN package into
 the standard install location for python packages, and will put GFPGAN into a
 subdirectory of "src" in the InvokeAI directory. Upscaling with Real-ESRGAN
-should "just work" without further intervention. Simply pass the `--upscale`
-(`-U`) option on the `invoke>` command line, or indicate the desired scale on
+should "just work" without further intervention. Simply indicate the desired scale on
 the popup in the Web GUI.
 
 **GFPGAN** requires a series of downloadable model files to work. These are
@@ -41,48 +34,75 @@ reconstruction.
 
 ### Upscaling
 
-`-U : <upscaling_factor> <upscaling_strength>`
+Open the upscaling dialog by clicking on the "expand" icon located
+above the image display area in the Web UI:
 
-The upscaling prompt argument takes two values. The first value is a scaling
-factor and should be set to either `2` or `4` only. This will either scale the
-image 2x or 4x respectively using different models.
+<figure markdown>
+![upscale1](../assets/features/upscale-dialog.png)
+</figure>
 
-You can set the scaling stength between `0` and `1.0` to control intensity of
-the of the scaling. This is handy because AI upscalers generally tend to smooth
-out texture details. If you wish to retain some of those for natural looking
-results, we recommend using values between `0.5 to 0.8`.
+There are three different upscaling parameters that you can
+adjust. The first is the scale itself, either 2x or 4x.
 
-If you do not explicitly specify an upscaling_strength, it will default to 0.75.
+The second is the "Denoising Strength." Higher values will smooth out
+the image and remove digital chatter, but may lose fine detail at
+higher values.
+
+Third, "Upscale Strength" allows you to adjust how the You can set the
+scaling stength between `0` and `1.0` to control the intensity of the
+scaling. AI upscalers generally tend to smooth out texture details. If
+you wish to retain some of those for natural looking results, we
+recommend using values between `0.5 to 0.8`.
+
+[This figure](../assets/features/upscaling-montage.png) illustrates
+the effects of denoising and strength. The original image was 512x512,
+4x scaled to 2048x2048. The "original" version on the upper left was
+scaled using simple pixel averaging. The remainder use the ESRGAN
+upscaling algorithm at different levels of denoising and strength.
+
+<figure markdown>
+![upscaling](../assets/features/upscaling-montage.png){ width=720 }
+</figure>
+
+Both denoising and strength default to 0.75.
 
 ### Face Restoration
 
-`-G : <facetool_strength>`
+InvokeAI offers alternative two face restoration algorithms,
+[GFPGAN](https://github.com/TencentARC/GFPGAN) and
+[CodeFormer](https://huggingface.co/spaces/sczhou/CodeFormer). These
+algorithms improve the appearance of faces, particularly eyes and
+mouths. Issues with faces are less common with the latest set of
+Stable Diffusion models than with the original 1.4 release, but the
+restoration algorithms can still make a noticeable improvement in
+certain cases. You can also apply restoration to old photographs you
+upload.
 
-This prompt argument controls the strength of the face restoration that is being
-applied. Similar to upscaling, values between `0.5 to 0.8` are recommended.
+To access face restoration, click the "smiley face" icon in the
+toolbar above the InvokeAI image panel. You will be presented with a
+dialog that offers a choice between the two algorithm and sliders that
+allow you to adjust their parameters. Alternatively, you may open the
+left-hand accordion panel labeled "Face Restoration" and have the
+restoration algorithm of your choice applied to generated images
+automatically.
 
-You can use either one or both without any conflicts. In cases where you use
-both, the image will be first upscaled and then the face restoration process
-will be executed to ensure you get the highest quality facial features.
 
-`--save_orig`
+Like upscaling, there are a number of parameters that adjust the face
+restoration output. GFPGAN has a single parameter, `strength`, which
+controls how much the algorithm is allowed to adjust the
+image. CodeFormer has two parameters, `strength`, and `fidelity`,
+which together control the quality of the output image as described in
+the [CodeFormer project
+page](https://shangchenzhou.com/projects/CodeFormer/). Default values
+are 0.75 for both parameters, which achieves a reasonable balance
+between changing the image too much and not enough.
 
-When you use either `-U` or `-G`, the final result you get is upscaled or face
-modified. If you want to save the original Stable Diffusion generation, you can
-use the `-save_orig` prompt argument to save the original unaffected version
-too.
+[This figure](../assets/features/restoration-montage.png) illustrates
+the effects of adjusting GFPGAN and CodeFormer parameters.
 
-### Example Usage
-
-```bash
-invoke> "superman dancing with a panda bear" -U 2 0.6 -G 0.4
-```
-
-This also works with img2img:
-
-```bash
-invoke> "a man wearing a pineapple hat" -I path/to/your/file.png -U 2 0.5 -G 0.6
-```
+<figure markdown>
+![upscaling](../assets/features/restoration-montage.png){ width=720 }
+</figure>
 
 !!! note
 
@@ -95,69 +115,8 @@ invoke> "a man wearing a pineapple hat" -I path/to/your/file.png -U 2 0.5 -G 0.6
     process is complete. While the image generation is taking place, you will still be able to preview
     the base images.
 
-If you wish to stop during the image generation but want to upscale or face
-restore a particular generated image, pass it again with the same prompt and
-generated seed along with the `-U` and `-G` prompt arguments to perform those
-actions.
-
-## CodeFormer Support
-
-This repo also allows you to perform face restoration using
-[CodeFormer](https://github.com/sczhou/CodeFormer).
-
-In order to setup CodeFormer to work, you need to download the models like with
-GFPGAN. You can do this either by running `invokeai-configure` or by manually
-downloading the
-[model file](https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth)
-and saving it to `ldm/invoke/restoration/codeformer/weights` folder.
-
-You can use `-ft` prompt argument to swap between CodeFormer and the default
-GFPGAN. The above mentioned `-G` prompt argument will allow you to control the
-strength of the restoration effect.
-
-### CodeFormer Usage
-
-The following command will perform face restoration with CodeFormer instead of
-the default gfpgan.
-
-`<prompt> -G 0.8 -ft codeformer`
-
-### Other Options
-
-- `-cf` - cf or CodeFormer Fidelity takes values between `0` and `1`. 0 produces
-  high quality results but low accuracy and 1 produces lower quality results but
-  higher accuacy to your original face.
-
-The following command will perform face restoration with CodeFormer. CodeFormer
-will output a result that is closely matching to the input face.
-
-`<prompt> -G 1.0 -ft codeformer -cf 0.9`
-
-The following command will perform face restoration with CodeFormer. CodeFormer
-will output a result that is the best restoration possible. This may deviate
-slightly from the original face. This is an excellent option to use in
-situations when there is very little facial data to work with.
-
-`<prompt> -G 1.0 -ft codeformer -cf 0.1`
-
-## Fixing Previously-Generated Images
-
-It is easy to apply face restoration and/or upscaling to any
-previously-generated file. Just use the syntax
-`!fix path/to/file.png <options>`. For example, to apply GFPGAN at strength 0.8
-and upscale 2X for a file named `./outputs/img-samples/000044.2945021133.png`,
-just run:
-
-```bash
-invoke> !fix ./outputs/img-samples/000044.2945021133.png -G 0.8 -U 2
-```
-
-A new file named `000044.2945021133.fixed.png` will be created in the output
-directory. Note that the `!fix` command does not replace the original file,
-unlike the behavior at generate time.
-
 ## How to disable
 
 If, for some reason, you do not wish to load the GFPGAN and/or ESRGAN libraries,
 you can disable them on the invoke.py command line with the `--no_restore` and
-`--no_upscale` options, respectively.
+`--no_esrgan` options, respectively.

docs/features/PROMPTS.md

@@ -4,77 +4,12 @@ title: Prompting-Features
 
 # :octicons-command-palette-24: Prompting-Features
 
-## **Reading Prompts from a File**
-
-You can automate `invoke.py` by providing a text file with the prompts you want
-to run, one line per prompt. The text file must be composed with a text editor
-(e.g. Notepad) and not a word processor. Each line should look like what you
-would type at the invoke> prompt:
-
-```bash
-"a beautiful sunny day in the park, children playing" -n4 -C10
-"stormy weather on a mountain top, goats grazing" -s100
-"innovative packaging for a squid's dinner" -S137038382
-```
-
-Then pass this file's name to `invoke.py` when you invoke it:
-
-```bash
-python scripts/invoke.py --from_file "/path/to/prompts.txt"
-```
-
-You may also read a series of prompts from standard input by providing
-a filename of `-`. For example, here is a python script that creates a
-matrix of prompts, each one varying slightly:
-
-```bash
-#!/usr/bin/env python
-
-adjectives = ['sunny','rainy','overcast']
-samplers = ['k_lms','k_euler_a','k_heun']
-cfg = [7.5, 9, 11]
-
-for adj in adjectives:
-    for samp in samplers:
-        for cg in cfg:
-            print(f'a {adj} day -A{samp} -C{cg}')
-```
-
-Its output looks like this (abbreviated):
-
-```bash
-a sunny day -Aklms -C7.5
-a sunny day -Aklms -C9
-a sunny day -Aklms -C11
-a sunny day -Ak_euler_a -C7.5
-a sunny day -Ak_euler_a -C9
-...
-a overcast day -Ak_heun -C9
-a overcast day -Ak_heun -C11
-```
-
-To feed it to invoke.py, pass the filename of "-"
-
-```bash
-python matrix.py | python scripts/invoke.py --from_file -
-```
-
-When the script is finished, each of the 27 combinations
-of adjective, sampler and CFG will be executed.
-
-The command-line interface provides `!fetch` and `!replay` commands
-which allow you to read the prompts from a single previously-generated
-image or a whole directory of them, write the prompts to a file, and
-then replay them. Or you can create your own file of prompts and feed
-them to the command-line client from within an interactive session.
-See [Command-Line Interface](CLI.md) for details.
-
----
-
 ## **Negative and Unconditioned Prompts**
 
-Any words between a pair of square brackets will instruct Stable Diffusion to
-attempt to ban the concept from the generated image.
+Any words between a pair of square brackets will instruct Stable
+Diffusion to attempt to ban the concept from the generated image. The
+same effect is achieved by placing words in the "Negative Prompts"
+textbox in the Web UI.
 
 ```text
 this is a test prompt [not really] to make you understand [cool] how this works.
@@ -87,7 +22,9 @@ Here's a prompt that depicts what it does.
 
 original prompt:
 
-`#!bash "A fantastical translucent pony made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
+`#!bash "A fantastical translucent pony made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve"`
+
+`#!bash parameters: steps=20, dimensions=512x768, CFG=7.5, Scheduler=k_euler_a, seed=1654590180`
 
 <figure markdown>
 
@@ -99,7 +36,8 @@ That image has a woman, so if we want the horse without a rider, we can
 influence the image not to have a woman by putting [woman] in the prompt, like
 this:
 
-`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
+`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman]"`
+(same parameters as above)
 
 <figure markdown>
 
@@ -110,7 +48,8 @@ this:
 That's nice - but say we also don't want the image to be quite so blue. We can
 add "blue" to the list of negative prompts, so it's now [woman blue]:
 
-`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
+`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue]"`
+(same parameters as above)
 
 <figure markdown>
 
@@ -121,7 +60,8 @@ add "blue" to the list of negative prompts, so it's now [woman blue]:
 Getting close - but there's no sense in having a saddle when our horse doesn't
 have a rider, so we'll add one more negative prompt: [woman blue saddle].
 
-`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue saddle]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
+`#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue saddle]"`
+(same parameters as above)
 
 <figure markdown>
 
@@ -261,19 +201,6 @@ Prompt2prompt `.swap()` is not compatible with xformers, which will be temporari
 The `prompt2prompt` code is based off
 [bloc97's colab](https://github.com/bloc97/CrossAttentionControl).
 
-Note that `prompt2prompt` is not currently working with the runwayML inpainting
-model, and may never work due to the way this model is set up. If you attempt to
-use `prompt2prompt` you will get the original image back. However, since this
-model is so good at inpainting, a good substitute is to use the `clipseg` text
-masking option:
-
-```bash
-invoke> a fluffy cat eating a hotdog
-Outputs:
-[1010] outputs/000025.2182095108.png: a fluffy cat eating a hotdog
-invoke> a smiling dog eating a hotdog -I 000025.2182095108.png -tm cat
-```
-
 ### Escaping parantheses () and speech marks ""
 
 If the model you are using has parentheses () or speech marks "" as part of its
@@ -374,6 +301,5 @@ summoning up the concept of some sort of scifi creature? Let's find out.
 Indeed, removing the word "hybrid" produces an image that is more like what we'd
 expect.
 
-In conclusion, prompt blending is great for exploring creative space, but can be
-difficult to direct. A forthcoming release of InvokeAI will feature more
-deterministic prompt weighting.
+In conclusion, prompt blending is great for exploring creative space,
+but takes some trial and error to achieve the desired effect.

docs/features/TEXTUAL_INVERSION.md

@@ -46,11 +46,19 @@ start the front end by selecting choice (3):
 
 ```sh
 Do you want to generate images using the
-1. command-line
-2. browser-based UI
-3. textual inversion training
-4. open the developer console
-Please enter 1, 2, 3, or 4: [1] 3
+1: Browser-based UI
+2: Command-line interface
+3: Run textual inversion training
+4: Merge models (diffusers type only)
+5: Download and install models
+6: Change InvokeAI startup options
+7: Re-run the configure script to fix a broken install
+8: Open the developer console
+9: Update InvokeAI
+10: Command-line help
+Q: Quit
+
+Please enter 1-10, Q: [1] 
 ```
 
 From the command line, with the InvokeAI virtual environment active,

docs/features/VARIATIONS.md

@@ -6,9 +6,7 @@ title: Variations
 
 ## Intro
 
-Release 1.13 of SD-Dream adds support for image variations.
-
-You are able to do the following:
+InvokeAI's support for variations enables you to do the following:
 
 1. Generate a series of systematic variations of an image, given a prompt. The
    amount of variation from one image to the next can be controlled.
@@ -30,19 +28,7 @@ The prompt we will use throughout is:
 This will be indicated as `#!bash "prompt"` in the examples below.
 
 First we let SD create a series of images in the usual way, in this case
-requesting six iterations:
-
-```bash
-invoke> lucy lawless as xena, warrior princess, character portrait, high resolution -n6
-...
-Outputs:
-./outputs/Xena/000001.1579445059.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S1579445059
-./outputs/Xena/000001.1880768722.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S1880768722
-./outputs/Xena/000001.332057179.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S332057179
-./outputs/Xena/000001.2224800325.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S2224800325
-./outputs/Xena/000001.465250761.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S465250761
-./outputs/Xena/000001.3357757885.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -S3357757885
-```
+requesting six iterations.
 
 <figure markdown>
 ![var1](../assets/variation_walkthru/000001.3357757885.png)
@@ -53,22 +39,16 @@ Outputs:
 
 ## Step 2 - Generating Variations
 
-Let's try to generate some variations. Using the same seed, we pass the argument
-`-v0.1` (or --variant_amount), which generates a series of variations each
-differing by a variation amount of 0.2. This number ranges from `0` to `1.0`,
-with higher numbers being larger amounts of variation.
+Let's try to generate some variations on this image. We select the "*"
+symbol in the line of icons above the image in order to fix the prompt
+and seed. Then we open up the "Variations" section of the generation
+panel and use the slider to set the variation amount to 0.2. The
+higher this value, the more each generated image will differ from the
+previous one.
 
-```bash
-invoke> "prompt" -n6 -S3357757885 -v0.2
-...
-Outputs:
-./outputs/Xena/000002.784039624.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 784039624:0.2 -S3357757885
-./outputs/Xena/000002.3647897225.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 3647897225:0.2 -S3357757885
-./outputs/Xena/000002.917731034.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 917731034:0.2 -S3357757885
-./outputs/Xena/000002.4116285959.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 4116285959:0.2 -S3357757885
-./outputs/Xena/000002.1614299449.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 1614299449:0.2 -S3357757885
-./outputs/Xena/000002.1335553075.png: "prompt" -s50 -W512 -H512 -C7.5 -Ak_lms -V 1335553075:0.2 -S3357757885
-```
+Now we run the prompt a second time, requesting six iterations. You
+will see six images that are thematically related to each other. Try
+increasing and decreasing the variation amount and see what happens.
 
 ### **Variation Sub Seeding**
 

docs/features/WEB.md

@@ -299,14 +299,6 @@ initial image" icons are located.
 
 See the [Unified Canvas Guide](UNIFIED_CANVAS.md)
 
-## Parting remarks
-
-This concludes the walkthrough, but there are several more features that you can
-explore. Please check out the [Command Line Interface](CLI.md) documentation for
-further explanation of the advanced features that were not covered here.
-
-The WebUI is only rapid development. Check back regularly for updates!
-
 ## Reference
 
 ### Additional Options
@@ -349,11 +341,9 @@ the settings configured in the toolbar.
 
 See below for additional documentation related to each feature:
 
-- [Core Prompt Settings](./CLI.md)
 - [Variations](./VARIATIONS.md)
 - [Upscaling](./POSTPROCESS.md#upscaling)
 - [Image to Image](./IMG2IMG.md)
-- [Inpainting](./INPAINTING.md)
 - [Other](./OTHER.md)
 
 #### Invocation Gallery

docs/features/index.md

@@ -13,28 +13,16 @@ Build complex scenes by combine and modifying multiple images in a stepwise
 fashion. This feature combines img2img, inpainting and outpainting in
 a single convenient digital artist-optimized user interface.
 
-### * The [Command Line Interface (CLI)](CLI.md)
-Scriptable access to InvokeAI's features.
-
 ## Image Generation
 ### * [Prompt Engineering](PROMPTS.md)
 Get the images you want with the InvokeAI  prompt engineering language.
 
-## * [Post-Processing](POSTPROCESS.md)
-Restore mangled faces and make images larger with upscaling. Also see the [Embiggen Upscaling Guide](EMBIGGEN.md).
-
 ## * The [Concepts Library](CONCEPTS.md)
 Add custom subjects and styles using HuggingFace's repository of embeddings.
 
-### * [Image-to-Image Guide for the CLI](IMG2IMG.md)
+### * [Image-to-Image Guide](IMG2IMG.md)
 Use a seed image to build new creations in the CLI.
 
-### * [Inpainting Guide for the CLI](INPAINTING.md)
-Selectively erase and replace portions of an existing image in the CLI.
-
-### * [Outpainting Guide for the CLI](OUTPAINTING.md)
-Extend the borders of the image with an "outcrop" function within the CLI.
-
 ### * [Generating Variations](VARIATIONS.md)
 Have an image you like and want to generate many more like it? Variations
 are the ticket.

docs/index.md

@@ -13,6 +13,7 @@ title: Home
 
 <div align="center" markdown>
 
+
 [![project logo](assets/invoke_ai_banner.png)](https://github.com/invoke-ai/InvokeAI)
 
 [![discord badge]][discord link]
@@ -131,17 +132,13 @@ This method is recommended for those familiar with running Docker containers
 - [WebUI overview](features/WEB.md)
 - [WebUI hotkey reference guide](features/WEBUIHOTKEYS.md)
 - [WebUI Unified Canvas for Img2Img, inpainting and outpainting](features/UNIFIED_CANVAS.md)
+
 <!-- separator -->
-### The InvokeAI Command Line Interface
-- [Command Line Interace Reference Guide](features/CLI.md)
-<!-- separator -->
+
 ### Image Management
 - [Image2Image](features/IMG2IMG.md)
-- [Inpainting](features/INPAINTING.md)
-- [Outpainting](features/OUTPAINTING.md)
 - [Adding custom styles and subjects](features/CONCEPTS.md)
 - [Upscaling and Face Reconstruction](features/POSTPROCESS.md)
-- [Embiggen upscaling](features/EMBIGGEN.md)
 - [Other Features](features/OTHER.md)
 
 <!-- separator -->
@@ -156,83 +153,60 @@ This method is recommended for those familiar with running Docker containers
 - [Prompt Syntax](features/PROMPTS.md)
 - [Generating Variations](features/VARIATIONS.md)
 
-## :octicons-log-16: Latest Changes
+## :octicons-log-16: Important Changes Since Version 2.3
 
-### v2.3.0 <small>(9 February 2023)</small>
+### Nodes
 
-#### Migration to Stable Diffusion `diffusers` models
+Behind the scenes, InvokeAI has been completely rewritten to support
+"nodes," small unitary operations that can be combined into graphs to
+form arbitrary workflows. For example, there is a prompt node that
+processes the prompt string and feeds it to a text2latent node that
+generates a latent image. The latents are then fed to a latent2image
+node that translates the latent image into a PNG.
 
-Previous versions of InvokeAI supported the original model file format introduced with Stable Diffusion 1.4. In the original format, known variously as "checkpoint", or "legacy" format, there is a single large weights file ending with `.ckpt` or `.safetensors`. Though this format has served the community well, it has a number of disadvantages, including file size, slow loading times, and a variety of non-standard variants that require special-case code to handle. In addition, because checkpoint files are actually a bundle of multiple machine learning sub-models, it is hard to swap different sub-models in and out, or to share common sub-models. A new format, introduced by the StabilityAI company in collaboration with HuggingFace, is called `diffusers` and consists of a directory of individual models. The most immediate benefit of `diffusers` is that they load from disk very quickly. A longer term benefit is that in the near future `diffusers` models will be able to share common sub-models, dramatically reducing disk space when you have multiple fine-tune models derived from the same base.
+The WebGUI has a node editor that allows you to graphically design and
+execute custom node graphs. The ability to save and load graphs is
+still a work in progress, but coming soon.
 
-When you perform a new install of version 2.3.0, you will be offered the option to install the `diffusers` versions of a number of popular SD models, including Stable Diffusion versions 1.5 and 2.1 (including the 768x768 pixel version of 2.1). These will act and work just like the checkpoint versions. Do not be concerned if you already have a lot of ".ckpt" or ".safetensors" models on disk! InvokeAI 2.3.0 can still load these and generate images from them without any extra intervention on your part.
+### Command-Line Interface Retired
 
-To take advantage of the optimized loading times of `diffusers` models, InvokeAI offers options to convert legacy checkpoint models into optimized `diffusers` models. If you use the `invokeai` command line interface, the relevant commands are:
+The original "invokeai" command-line interface has been retired. The
+`invokeai` command will now launch a new command-line client that can
+be used by developers to create and test nodes. It is not intended to
+be used for routine image generation or manipulation.
 
-* `!convert_model` -- Take the path to a local checkpoint file or a URL that is pointing to one, convert it into a `diffusers` model, and import it into InvokeAI's models registry file.
-* `!optimize_model` -- If you already have a checkpoint model in your InvokeAI models file, this command will accept its short name and convert it into a like-named `diffusers` model, optionally deleting the original checkpoint file.
-* `!import_model` -- Take the local path of either a checkpoint file or a `diffusers` model directory and import it into InvokeAI's registry file. You may also provide the ID of any diffusers model that has been published on the [HuggingFace models repository](https://huggingface.co/models?pipeline_tag=text-to-image&sort=downloads) and it will be downloaded and installed automatically.
+To launch the Web GUI from the command-line, use the command
+`invokeai-web` rather than the traditional `invokeai --web`.
 
-The WebGUI offers similar functionality for model management.
+### ControlNet
 
-For advanced users, new command-line options provide additional functionality. Launching `invokeai` with the argument `--autoconvert <path to directory>` takes the path to a directory of checkpoint files, automatically converts them into `diffusers` models and imports them. Each time the script is launched, the directory will be scanned for new checkpoint files to be loaded. Alternatively, the `--ckpt_convert` argument will cause any checkpoint or safetensors model that is already registered with InvokeAI to be converted into a `diffusers` model on the fly, allowing you to take advantage of future diffusers-only features without explicitly converting the model and saving it to disk.
+This version of InvokeAI features ControlNet, a system that allows you
+to achieve exact poses for human and animal figures by providing a
+model to follow. Full details are found in [ControlNet](features/CONTROLNET.md)
 
-Please see [INSTALLING MODELS](https://invoke-ai.github.io/InvokeAI/installation/050_INSTALLING_MODELS/) for more information on model management in both the command-line and Web interfaces.
+### New Schedulers
 
-#### Support for the `XFormers` Memory-Efficient Crossattention Package
+The list of schedulers has been completely revamped and brought up to date:
 
-On CUDA (Nvidia) systems, version 2.3.0 supports the `XFormers` library. Once installed,  the`xformers` package dramatically reduces the memory footprint of loaded Stable Diffusion models files and modestly increases image generation speed. `xformers` will be installed and activated automatically if you specify a CUDA system at install time.
+| **Short Name** | **Scheduler**                   | **Notes**                   |
+|----------------|---------------------------------|-----------------------------|
+| **ddim**       | DDIMScheduler                   |                             |
+| **ddpm**       | DDPMScheduler                   |                             |
+| **deis**       | DEISMultistepScheduler          |                             |
+| **lms**        | LMSDiscreteScheduler            |                             |
+| **pndm**       | PNDMScheduler                   |                             |
+| **heun**       | HeunDiscreteScheduler           | original noise schedule     |
+| **heun_k**     | HeunDiscreteScheduler           | using karras noise schedule |
+| **euler**      | EulerDiscreteScheduler          | original noise schedule     |
+| **euler_k**    | EulerDiscreteScheduler          | using karras noise schedule |
+| **kdpm_2**     | KDPM2DiscreteScheduler          |                             |
+| **kdpm_2_a**   | KDPM2AncestralDiscreteScheduler |                             |
+| **dpmpp_2s**   | DPMSolverSinglestepScheduler    |                             |
+| **dpmpp_2m**   | DPMSolverMultistepScheduler     | original noise scnedule     |
+| **dpmpp_2m_k** | DPMSolverMultistepScheduler     | using karras noise schedule |
+| **unipc**      | UniPCMultistepScheduler         | CPU only                    |
 
-The caveat with using `xformers` is that it introduces slightly non-deterministic behavior, and images generated using the same seed and other settings will be subtly different between invocations. Generally the changes are unnoticeable unless you rapidly shift back and forth between images, but to disable `xformers` and restore fully deterministic behavior, you may launch InvokeAI using the `--no-xformers` option. This is most conveniently done by opening the file `invokeai/invokeai.init` with a text editor, and adding the line `--no-xformers` at the bottom.
-
-#### A Negative Prompt Box in the WebUI
-
-There is now a separate text input box for negative prompts in the WebUI. This is convenient for stashing frequently-used negative prompts ("mangled limbs, bad anatomy"). The `[negative prompt]` syntax continues to work in the main prompt box as well.
-
-To see exactly how your prompts are being parsed, launch `invokeai` with the `--log_tokenization` option. The console window will then display the tokenization process for both positive and negative prompts.
-
-#### Model Merging
-
-Version 2.3.0 offers an intuitive user interface for merging up to three Stable Diffusion models using an intuitive user interface. Model merging allows you to mix the behavior of models to achieve very interesting effects. To use this, each of the models must already be imported into InvokeAI and saved in `diffusers` format, then launch the merger using a new menu item in the InvokeAI launcher script (`invoke.sh`, `invoke.bat`) or directly from the command line with `invokeai-merge --gui`. You will be prompted to select the models to merge, the proportions in which to mix them, and the mixing algorithm. The script will create a new merged `diffusers` model and import it into InvokeAI for your use.
-
-See [MODEL MERGING](https://invoke-ai.github.io/InvokeAI/features/MODEL_MERGING/) for more details.
-
-#### Textual Inversion Training
-
-Textual Inversion (TI) is a technique for training a Stable Diffusion model to emit a particular subject or style when triggered by a keyword phrase. You can perform TI training by placing a small number of images of the subject or style in a directory, and choosing a distinctive trigger phrase, such as "pointillist-style". After successful training, The subject or style will be activated by including `<pointillist-style>` in your prompt.
-
-Previous versions of InvokeAI were able to perform TI, but it required using a command-line script with dozens of obscure command-line arguments. Version 2.3.0 features an intuitive TI frontend that will build a TI model on top of any `diffusers` model. To access training you can launch from a new item in the launcher script or from the command line using `invokeai-ti --gui`.
-
-See [TEXTUAL INVERSION](https://invoke-ai.github.io/InvokeAI/features/TEXTUAL_INVERSION/) for further details.
-
-#### A New Installer Experience
-
-The InvokeAI installer has been upgraded in order to provide a smoother and hopefully more glitch-free experience. In addition, InvokeAI is now packaged as a PyPi project, allowing developers and power-users to install InvokeAI with the command `pip install InvokeAI  --use-pep517`. Please see [Installation](#installation) for details.
-
-Developers should be aware that the `pip` installation procedure has been simplified and that the `conda` method is no longer supported at all. Accordingly, the `environments_and_requirements` directory has been deleted from the repository.
-
-#### Command-line name changes
-
-All of InvokeAI's functionality, including the WebUI, command-line interface, textual inversion training and model merging, can all be accessed from the `invoke.sh` and `invoke.bat` launcher scripts. The menu of options has been expanded to add the new functionality. For the convenience of developers and power users, we have normalized the names of the InvokeAI command-line scripts:
-
-* `invokeai` -- Command-line client
-* `invokeai --web` -- Web GUI
-* `invokeai-merge --gui` -- Model merging script with graphical front end
-* `invokeai-ti --gui` -- Textual inversion script with graphical front end
-* `invokeai-configure` -- Configuration tool for initializing the `invokeai` directory and selecting popular starter models.
-
-For backward compatibility, the old command names are also recognized, including `invoke.py` and `configure-invokeai.py`. However, these are deprecated and will eventually be removed.
-
-Developers should be aware that the locations of the script's source code has been moved. The new locations are:
-* `invokeai` =>  `ldm/invoke/CLI.py`
-* `invokeai-configure` => `ldm/invoke/config/configure_invokeai.py`
-* `invokeai-ti`=> `ldm/invoke/training/textual_inversion.py`
-* `invokeai-merge` => `ldm/invoke/merge_diffusers`
-
-Developers are strongly encouraged to perform an "editable" install of InvokeAI using `pip install -e .  --use-pep517` in the Git repository, and then to call the scripts using their 2.3.0 names, rather than executing the scripts directly. Developers should also be aware that the several important data files have been relocated into a new directory named `invokeai`. This includes the WebGUI's `frontend` and `backend` directories, and the `INITIAL_MODELS.yaml` files used by the installer to select starter models. Eventually all InvokeAI modules will be in subdirectories of `invokeai`.
-
-Please see [2.3.0 Release Notes](https://github.com/invoke-ai/InvokeAI/releases/tag/v2.3.0) for further details.
-For older changelogs, please visit the
-**[CHANGELOG](CHANGELOG/#v223-2-december-2022)**.
+Please see [3.0.0 Release Notes](https://github.com/invoke-ai/InvokeAI/releases/tag/v3.0.0) for further details.
 
 ## :material-target: Troubleshooting
 
@@ -268,8 +242,3 @@ free to send me an email if you use and like the script.
 Original portions of the software are Copyright (c) 2022-23
 by [The InvokeAI Team](https://github.com/invoke-ai).
 
-## :octicons-book-24: Further Reading
-
-Please see the original README for more information on this software and
-underlying algorithm, located in the file
-[README-CompViz.md](other/README-CompViz.md).

docs/installation/060_INSTALL_PATCHMATCH.md

@@ -87,18 +87,18 @@ Prior to installing PyPatchMatch, you need to take the following steps:
     sudo pacman -S --needed base-devel
     ```
 
-2. Install `opencv`:
+2. Install `opencv` and `blas`:
 
     ```sh
-    sudo pacman -S opencv
+    sudo pacman -S opencv blas
     ```
 
     or for CUDA support
 
     ```sh
-    sudo pacman -S opencv-cuda
+    sudo pacman -S opencv-cuda blas
     ```
-
+    
 3. Fix the naming of the `opencv` package configuration file:
 
     ```sh

installer/lib/installer.py

@@ -149,7 +149,7 @@ class Installer:
 
         return venv_dir
 
-    def install(self, root: str = "~/invokeai", version: str = "latest", yes_to_all=False, find_links: Path = None) -> None:
+    def install(self, root: str = "~/invokeai-3", version: str = "latest", yes_to_all=False, find_links: Path = None) -> None:
         """
         Install the InvokeAI application into the given runtime path
 

installer/templates/invoke.bat.in

@@ -14,7 +14,7 @@ echo 3. Run textual inversion training
 echo 4. Merge models (diffusers type only)
 echo 5. Download and install models
 echo 6. Change InvokeAI startup options
-echo 7. Re-run the configure script to fix a broken install
+echo 7. Re-run the configure script to fix a broken install or to complete a major upgrade
 echo 8. Open the developer console
 echo 9. Update InvokeAI
 echo 10. Command-line help

installer/templates/invoke.sh.in

@@ -81,7 +81,7 @@ do_choice() {
         ;;
     7)
         clear
-        printf "Re-run the configure script to fix a broken install\n"
+        printf "Re-run the configure script to fix a broken install or to complete a major upgrade\n"
         invokeai-configure --root ${INVOKEAI_ROOT} --yes --default_only
         ;;
     8)
@@ -118,12 +118,12 @@ do_choice() {
 do_dialog() {
     options=(
         1 "Generate images with a browser-based interface"
-        2 "Generate images using a command-line interface"
+        2 "Explore InvokeAI nodes using a command-line interface"
         3 "Textual inversion training"
         4 "Merge models (diffusers type only)"
         5 "Download and install models"
         6 "Change InvokeAI startup options"
-        7 "Re-run the configure script to fix a broken install"
+        7 "Re-run the configure script to fix a broken install or to complete a major upgrade"
         8 "Open the developer console"
         9 "Update InvokeAI")
 

invokeai/app/api/routers/app_info.py

@@ -0,0 +1,18 @@
+from fastapi.routing import APIRouter
+from pydantic import BaseModel
+
+from invokeai.version import __version__
+
+app_router = APIRouter(prefix="/v1/app", tags=['app'])
+
+
+class AppVersion(BaseModel):
+    """App Version Response"""
+    version: str
+
+
+@app_router.get('/version', operation_id="app_version",
+                status_code=200,
+                response_model=AppVersion)
+async def get_version() -> AppVersion:
+    return AppVersion(version=__version__)

invokeai/app/api/routers/boards.py

@@ -5,6 +5,7 @@ from invokeai.app.services.board_record_storage import BoardChanges
 from invokeai.app.services.image_record_storage import OffsetPaginatedResults
 from invokeai.app.services.models.board_record import BoardDTO
 
+
 from ..dependencies import ApiDependencies
 
 boards_router = APIRouter(prefix="/v1/boards", tags=["boards"])
@@ -71,11 +72,19 @@ async def update_board(
 @boards_router.delete("/{board_id}", operation_id="delete_board")
 async def delete_board(
     board_id: str = Path(description="The id of board to delete"),
+    include_images: Optional[bool] = Query(
+        description="Permanently delete all images on the board", default=False
+    ),
 ) -> None:
     """Deletes a board"""
-
     try:
-        ApiDependencies.invoker.services.boards.delete(board_id=board_id)
+        if include_images is True:
+            ApiDependencies.invoker.services.images.delete_images_on_board(
+                board_id=board_id
+            )
+            ApiDependencies.invoker.services.boards.delete(board_id=board_id)
+        else:
+            ApiDependencies.invoker.services.boards.delete(board_id=board_id)
     except Exception as e:
         # TODO: Does this need any exception handling at all?
         pass

invokeai/app/api/routers/models.py

@@ -1,69 +1,30 @@
-# Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654) and 2023 Kent Keirsey (https://github.com/hipsterusername)
+# Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654), 2023 Kent Keirsey (https://github.com/hipsterusername), 2024 Lincoln Stein
 
-from typing import Annotated, Literal, Optional, Union, Dict
 
-from fastapi import Query
-from fastapi.routing import APIRouter, HTTPException
-from pydantic import BaseModel, Field, parse_obj_as
-from ..dependencies import ApiDependencies
+from typing import Literal, List, Optional, Union
+
+from fastapi import Body, Path, Query, Response
+from fastapi.routing import APIRouter
+from pydantic import BaseModel, parse_obj_as
+from starlette.exceptions import HTTPException
+
 from invokeai.backend import BaseModelType, ModelType
-from invokeai.backend.model_management.models import OPENAPI_MODEL_CONFIGS
-MODEL_CONFIGS = Union[tuple(OPENAPI_MODEL_CONFIGS)]
+from invokeai.backend.model_management.models import (
+    OPENAPI_MODEL_CONFIGS,
+    SchedulerPredictionType,
+)
+from invokeai.backend.model_management import MergeInterpolationMethod
+from ..dependencies import ApiDependencies
 
 models_router = APIRouter(prefix="/v1/models", tags=["models"])
 
-
-class VaeRepo(BaseModel):
-    repo_id: str = Field(description="The repo ID to use for this VAE")
-    path: Optional[str] = Field(description="The path to the VAE")
-    subfolder: Optional[str] = Field(description="The subfolder to use for this VAE")
-
-class ModelInfo(BaseModel):
-    description: Optional[str] = Field(description="A description of the model")
-    model_name: str = Field(description="The name of the model")
-    model_type: str = Field(description="The type of the model")
-    
-class DiffusersModelInfo(ModelInfo):
-    format: Literal['folder'] = 'folder'
-
-    vae: Optional[VaeRepo] = Field(description="The VAE repo to use for this model")
-    repo_id: Optional[str] = Field(description="The repo ID to use for this model")
-    path: Optional[str] = Field(description="The path to the model")
-    
-class CkptModelInfo(ModelInfo):
-    format: Literal['ckpt'] = 'ckpt'
-
-    config: str = Field(description="The path to the model config")
-    weights: str = Field(description="The path to the model weights")
-    vae: str = Field(description="The path to the model VAE")
-    width: Optional[int] = Field(description="The width of the model")
-    height: Optional[int] = Field(description="The height of the model")
-
-class SafetensorsModelInfo(CkptModelInfo):
-    format: Literal['safetensors'] = 'safetensors'
-
-class CreateModelRequest(BaseModel):
-    name: str = Field(description="The name of the model")
-    info: Union[CkptModelInfo, DiffusersModelInfo] = Field(discriminator="format", description="The model info")
-
-class CreateModelResponse(BaseModel):
-    name: str = Field(description="The name of the new model")
-    info: Union[CkptModelInfo, DiffusersModelInfo] = Field(discriminator="format", description="The model info")
-    status: str = Field(description="The status of the API response")
-
-class ConversionRequest(BaseModel):
-    name: str = Field(description="The name of the new model")
-    info: CkptModelInfo = Field(description="The converted model info")
-    save_location: str = Field(description="The path to save the converted model weights")
-    
-
-class ConvertedModelResponse(BaseModel):
-    name: str = Field(description="The name of the new model")
-    info: DiffusersModelInfo = Field(description="The converted model info")
+UpdateModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
+ImportModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
+ConvertModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
+MergeModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
 
 class ModelsList(BaseModel):
-    models: list[MODEL_CONFIGS]
-
+    models: list[Union[tuple(OPENAPI_MODEL_CONFIGS)]]
 
 @models_router.get(
     "/",
@@ -71,43 +32,103 @@ class ModelsList(BaseModel):
     responses={200: {"model": ModelsList }},
 )
 async def list_models(
-    base_model: Optional[BaseModelType] = Query(
-        default=None, description="Base model"
-    ),
-    model_type: Optional[ModelType] = Query(
-        default=None, description="The type of model to get"
-    ),
+    base_model: Optional[BaseModelType] = Query(default=None, description="Base model"),
+    model_type: Optional[ModelType] = Query(default=None, description="The type of model to get"),
 ) -> ModelsList:
     """Gets a list of models"""
     models_raw = ApiDependencies.invoker.services.model_manager.list_models(base_model, model_type)
     models = parse_obj_as(ModelsList, { "models": models_raw })
     return models
 
-
-@models_router.post(
-    "/",
+@models_router.patch(
+    "/{base_model}/{model_type}/{model_name}",
     operation_id="update_model",
-    responses={200: {"status": "success"}},
+    responses={200: {"description" : "The model was updated successfully"},
+               404: {"description" : "The model could not be found"},
+               400: {"description" : "Bad request"}
+               },
+    status_code = 200,
+    response_model = UpdateModelResponse,
 )
 async def update_model(
-    model_request: CreateModelRequest
-) -> CreateModelResponse:
+        base_model: BaseModelType = Path(description="Base model"),
+        model_type: ModelType = Path(description="The type of model"),
+        model_name: str = Path(description="model name"),
+        info: Union[tuple(OPENAPI_MODEL_CONFIGS)] = Body(description="Model configuration"),
+) -> UpdateModelResponse:
     """ Add Model """
-    model_request_info = model_request.info
-    info_dict = model_request_info.dict()
-    model_response = CreateModelResponse(name=model_request.name, info=model_request.info, status="success")
-
-    ApiDependencies.invoker.services.model_manager.add_model(
-        model_name=model_request.name,
-        model_attributes=info_dict,
-        clobber=True,
-    )
+    try:
+        ApiDependencies.invoker.services.model_manager.update_model(
+            model_name=model_name,
+            base_model=base_model,
+            model_type=model_type,
+            model_attributes=info.dict()
+        )
+        model_raw = ApiDependencies.invoker.services.model_manager.list_model(
+            model_name=model_name,
+            base_model=base_model,
+            model_type=model_type,
+        )
+        model_response = parse_obj_as(UpdateModelResponse, model_raw)
+    except KeyError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
 
     return model_response
 
+@models_router.post(
+    "/",
+    operation_id="import_model",
+    responses= {
+        201: {"description" : "The model imported successfully"},
+        404: {"description" : "The model could not be found"},
+        424: {"description" : "The model appeared to import successfully, but could not be found in the model manager"},
+        409: {"description" : "There is already a model corresponding to this path or repo_id"},
+    },
+    status_code=201,
+    response_model=ImportModelResponse
+)
+async def import_model(
+        location: str = Body(description="A model path, repo_id or URL to import"),
+        prediction_type: Optional[Literal['v_prediction','epsilon','sample']] = \
+                Body(description='Prediction type for SDv2 checkpoint files', default="v_prediction"),
+) -> ImportModelResponse:
+    """ Add a model using its local path, repo_id, or remote URL """
+    
+    items_to_import = {location}
+    prediction_types = { x.value: x for x in SchedulerPredictionType }
+    logger = ApiDependencies.invoker.services.logger
+
+    try:
+        installed_models = ApiDependencies.invoker.services.model_manager.heuristic_import(
+            items_to_import = items_to_import,
+            prediction_type_helper = lambda x: prediction_types.get(prediction_type)
+        )
+        info = installed_models.get(location)
+
+        if not info:
+            logger.error("Import failed")
+            raise HTTPException(status_code=424)
+        
+        logger.info(f'Successfully imported {location}, got {info}')
+        model_raw = ApiDependencies.invoker.services.model_manager.list_model(
+            model_name=info.name,
+            base_model=info.base_model,
+            model_type=info.model_type
+        )
+        return parse_obj_as(ImportModelResponse, model_raw)
+    
+    except KeyError as e:
+        logger.error(str(e))
+        raise HTTPException(status_code=404, detail=str(e))
+    except ValueError as e:
+        logger.error(str(e))
+        raise HTTPException(status_code=409, detail=str(e))
+        
 
 @models_router.delete(
-    "/{model_name}",
+    "/{base_model}/{model_type}/{model_name}",
     operation_id="del_model",
     responses={
         204: {
@@ -118,144 +139,95 @@ async def update_model(
         }
     },
 )
-async def delete_model(model_name: str) -> None:
+async def delete_model(
+        base_model: BaseModelType = Path(description="Base model"),
+        model_type: ModelType = Path(description="The type of model"),
+        model_name: str = Path(description="model name"),
+) -> Response:
     """Delete Model"""
-    model_names = ApiDependencies.invoker.services.model_manager.model_names()
     logger = ApiDependencies.invoker.services.logger
-    model_exists = model_name in model_names
-
-    # check if model exists
-    logger.info(f"Checking for model {model_name}...")
-           
-    if model_exists:
-        logger.info(f"Deleting Model: {model_name}")
-        ApiDependencies.invoker.services.model_manager.del_model(model_name, delete_files=True)
-        logger.info(f"Model Deleted: {model_name}")
-        raise HTTPException(status_code=204, detail=f"Model '{model_name}' deleted successfully")
     
-    else:
-        logger.error("Model not found")
+    try:
+        ApiDependencies.invoker.services.model_manager.del_model(model_name,
+                                                                 base_model = base_model,
+                                                                 model_type = model_type
+                                                                 )
+        logger.info(f"Deleted model: {model_name}")
+        return Response(status_code=204)
+    except KeyError:
+        logger.error(f"Model not found: {model_name}")
         raise HTTPException(status_code=404, detail=f"Model '{model_name}' not found")
-    
 
-            # @socketio.on("convertToDiffusers")
-        # def convert_to_diffusers(model_to_convert: dict):
-        #     try:
-        #         if model_info := self.generate.model_manager.model_info(
-        #             model_name=model_to_convert["model_name"]
-        #         ):
-        #             if "weights" in model_info:
-        #                 ckpt_path = Path(model_info["weights"])
-        #                 original_config_file = Path(model_info["config"])
-        #                 model_name = model_to_convert["model_name"]
-        #                 model_description = model_info["description"]
-        #             else:
-        #                 self.socketio.emit(
-        #                     "error", {"message": "Model is not a valid checkpoint file"}
-        #                 )
-        #         else:
-        #             self.socketio.emit(
-        #                 "error", {"message": "Could not retrieve model info."}
-        #             )
-
-        #         if not ckpt_path.is_absolute():
-        #             ckpt_path = Path(Globals.root, ckpt_path)
-
-        #         if original_config_file and not original_config_file.is_absolute():
-        #             original_config_file = Path(Globals.root, original_config_file)
-
-        #         diffusers_path = Path(
-        #             ckpt_path.parent.absolute(), f"{model_name}_diffusers"
-        #         )
-
-        #         if model_to_convert["save_location"] == "root":
-        #             diffusers_path = Path(
-        #                 global_converted_ckpts_dir(), f"{model_name}_diffusers"
-        #             )
-
-        #         if (
-        #             model_to_convert["save_location"] == "custom"
-        #             and model_to_convert["custom_location"] is not None
-        #         ):
-        #             diffusers_path = Path(
-        #                 model_to_convert["custom_location"], f"{model_name}_diffusers"
-        #             )
-
-        #         if diffusers_path.exists():
-        #             shutil.rmtree(diffusers_path)
-
-        #         self.generate.model_manager.convert_and_import(
-        #             ckpt_path,
-        #             diffusers_path,
-        #             model_name=model_name,
-        #             model_description=model_description,
-        #             vae=None,
-        #             original_config_file=original_config_file,
-        #             commit_to_conf=opt.conf,
-        #         )
-
-        #         new_model_list = self.generate.model_manager.list_models()
-        #         socketio.emit(
-        #             "modelConverted",
-        #             {
-        #                 "new_model_name": model_name,
-        #                 "model_list": new_model_list,
-        #                 "update": True,
-        #             },
-        #         )
-        #         print(f">> Model Converted: {model_name}")
-        #     except Exception as e:
-        #         self.handle_exceptions(e)
-
-        # @socketio.on("mergeDiffusersModels")
-        # def merge_diffusers_models(model_merge_info: dict):
-        #     try:
-        #         models_to_merge = model_merge_info["models_to_merge"]
-        #         model_ids_or_paths = [
-        #             self.generate.model_manager.model_name_or_path(x)
-        #             for x in models_to_merge
-        #         ]
-        #         merged_pipe = merge_diffusion_models(
-        #             model_ids_or_paths,
-        #             model_merge_info["alpha"],
-        #             model_merge_info["interp"],
-        #             model_merge_info["force"],
-        #         )
-
-        #         dump_path = global_models_dir() / "merged_models"
-        #         if model_merge_info["model_merge_save_path"] is not None:
-        #             dump_path = Path(model_merge_info["model_merge_save_path"])
-
-        #         os.makedirs(dump_path, exist_ok=True)
-        #         dump_path = dump_path / model_merge_info["merged_model_name"]
-        #         merged_pipe.save_pretrained(dump_path, safe_serialization=1)
-
-        #         merged_model_config = dict(
-        #             model_name=model_merge_info["merged_model_name"],
-        #             description=f'Merge of models {", ".join(models_to_merge)}',
-        #             commit_to_conf=opt.conf,
-        #         )
-
-        #         if vae := self.generate.model_manager.config[models_to_merge[0]].get(
-        #             "vae", None
-        #         ):
-        #             print(f">> Using configured VAE assigned to {models_to_merge[0]}")
-        #             merged_model_config.update(vae=vae)
-
-        #         self.generate.model_manager.import_diffuser_model(
-        #             dump_path, **merged_model_config
-        #         )
-        #         new_model_list = self.generate.model_manager.list_models()
-
-        #         socketio.emit(
-        #             "modelsMerged",
-        #             {
-        #                 "merged_models": models_to_merge,
-        #                 "merged_model_name": model_merge_info["merged_model_name"],
-        #                 "model_list": new_model_list,
-        #                 "update": True,
-        #             },
-        #         )
-        #         print(f">> Models Merged: {models_to_merge}")
-        #         print(f">> New Model Added: {model_merge_info['merged_model_name']}")
-        #     except Exception as e:
+@models_router.put(
+    "/convert/{base_model}/{model_type}/{model_name}",
+    operation_id="convert_model",
+    responses={
+        200: { "description": "Model converted successfully" },
+        400: {"description" : "Bad request"  },
+        404: { "description": "Model not found"  },
+    },
+    status_code = 200,
+    response_model = ConvertModelResponse,
+)
+async def convert_model(
+        base_model: BaseModelType = Path(description="Base model"),
+        model_type: ModelType = Path(description="The type of model"),
+        model_name: str = Path(description="model name"),
+) -> ConvertModelResponse:
+    """Convert a checkpoint model into a diffusers model"""
+    logger = ApiDependencies.invoker.services.logger
+    try:
+        logger.info(f"Converting model: {model_name}")
+        ApiDependencies.invoker.services.model_manager.convert_model(model_name,
+                                                                     base_model = base_model,
+                                                                     model_type = model_type
+                                                                     )
+        model_raw = ApiDependencies.invoker.services.model_manager.list_model(model_name,
+                                                                              base_model = base_model,
+                                                                              model_type = model_type)
+        response = parse_obj_as(ConvertModelResponse, model_raw)
+    except KeyError:
+        raise HTTPException(status_code=404, detail=f"Model '{model_name}' not found")
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    return response
+        
+@models_router.put(
+    "/merge/{base_model}",
+    operation_id="merge_models",
+    responses={
+        200: { "description": "Model converted successfully" },
+        400: { "description": "Incompatible models"  },
+        404: { "description": "One or more models not found"  },
+    },
+    status_code = 200,
+    response_model = MergeModelResponse,
+)
+async def merge_models(
+        base_model: BaseModelType                  = Path(description="Base model"),
+        model_names: List[str]                     = Body(description="model name", min_items=2, max_items=3),
+        merged_model_name: Optional[str]           = Body(description="Name of destination model"),
+        alpha: Optional[float]                     = Body(description="Alpha weighting strength to apply to 2d and 3d models", default=0.5),
+        interp: Optional[MergeInterpolationMethod] = Body(description="Interpolation method"),
+        force: Optional[bool]                      = Body(description="Force merging of models created with different versions of diffusers", default=False),
+) -> MergeModelResponse:
+    """Convert a checkpoint model into a diffusers model"""
+    logger = ApiDependencies.invoker.services.logger
+    try:
+        logger.info(f"Merging models: {model_names}")
+        result = ApiDependencies.invoker.services.model_manager.merge_models(model_names,
+                                                                             base_model,
+                                                                             merged_model_name or "+".join(model_names),
+                                                                             alpha,
+                                                                             interp,
+                                                                             force)
+        model_raw = ApiDependencies.invoker.services.model_manager.list_model(result.name,
+                                                                              base_model = base_model,
+                                                                              model_type = ModelType.Main,
+                                                                              )
+        response = parse_obj_as(ConvertModelResponse, model_raw)
+    except KeyError:
+        raise HTTPException(status_code=404, detail=f"One or more of the models '{model_names}' not found")
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    return response

invokeai/app/api_app.py

@@ -22,12 +22,22 @@ app_config.parse_args()
 logger = InvokeAILogger.getLogger(config=app_config)
 
 import invokeai.frontend.web as web_dir
+import mimetypes
 
 from .api.dependencies import ApiDependencies
-from .api.routers import sessions, models, images, boards, board_images
+from .api.routers import sessions, models, images, boards, board_images, app_info
 from .api.sockets import SocketIO
 from .invocations.baseinvocation import BaseInvocation
 
+import torch
+if torch.backends.mps.is_available():
+    import invokeai.backend.util.mps_fixes
+
+# fix for windows mimetypes registry entries being borked
+# see https://github.com/invoke-ai/InvokeAI/discussions/3684#discussioncomment-6391352
+mimetypes.add_type('application/javascript', '.js')
+mimetypes.add_type('text/css', '.css')
+
 # Create the app
 # TODO: create this all in a method so configuration/etc. can be passed in?
 app = FastAPI(title="Invoke AI", docs_url=None, redoc_url=None)
@@ -82,6 +92,8 @@ app.include_router(boards.boards_router, prefix="/api")
 
 app.include_router(board_images.board_images_router, prefix="/api")
 
+app.include_router(app_info.app_router, prefix='/api')
+
 # Build a custom OpenAPI to include all outputs
 # TODO: can outputs be included on metadata of invocation schemas somehow?
 def custom_openapi():

invokeai/app/cli/commands.py

@@ -47,7 +47,7 @@ def add_parsers(
     commands: list[type],
     command_field: str = "type",
     exclude_fields: list[str] = ["id", "type"],
-    add_arguments: Callable[[argparse.ArgumentParser], None]|None = None
+    add_arguments: Union[Callable[[argparse.ArgumentParser], None],None] = None
     ):
     """Adds parsers for each command to the subparsers"""
 
@@ -72,7 +72,7 @@ def add_parsers(
 def add_graph_parsers(
     subparsers,
     graphs: list[LibraryGraph],
-    add_arguments: Callable[[argparse.ArgumentParser], None]|None = None
+    add_arguments: Union[Callable[[argparse.ArgumentParser], None], None] = None
 ):
     for graph in graphs:
         command_parser = subparsers.add_parser(graph.name, help=graph.description)

invokeai/app/cli_app.py

@@ -1,12 +1,11 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
 import argparse
-import os
 import re
 import shlex
 import sys
 import time
-from typing import Union, get_type_hints
+from typing import Union, get_type_hints, Optional
 
 from pydantic import BaseModel, ValidationError
 from pydantic.fields import Field
@@ -18,8 +17,17 @@ config = InvokeAIAppConfig.get_config()
 config.parse_args()
 logger = InvokeAILogger().getLogger(config=config)
 
+from invokeai.app.services.board_image_record_storage import (
+    SqliteBoardImageRecordStorage,
+)
+from invokeai.app.services.board_images import (
+    BoardImagesService,
+    BoardImagesServiceDependencies,
+)
+from invokeai.app.services.board_record_storage import SqliteBoardRecordStorage
+from invokeai.app.services.boards import BoardService, BoardServiceDependencies
 from invokeai.app.services.image_record_storage import SqliteImageRecordStorage
-from invokeai.app.services.images import ImageService
+from invokeai.app.services.images import ImageService, ImageServiceDependencies
 from invokeai.app.services.metadata import CoreMetadataService
 from invokeai.app.services.resource_name import SimpleNameService
 from invokeai.app.services.urls import LocalUrlService
@@ -44,6 +52,10 @@ from .services.processor import DefaultInvocationProcessor
 from .services.restoration_services import RestorationServices
 from .services.sqlite import SqliteItemStorage
 
+import torch
+if torch.backends.mps.is_available():
+    import invokeai.backend.util.mps_fixes
+
 
 class CliCommand(BaseModel):
     command: Union[BaseCommand.get_commands() + BaseInvocation.get_invocations()] = Field(discriminator="type")  # type: ignore
@@ -230,21 +242,49 @@ def invoke_cli():
     image_file_storage = DiskImageFileStorage(f"{output_folder}/images")
     names = SimpleNameService()
 
-    images = ImageService(
-        image_record_storage=image_record_storage,
-        image_file_storage=image_file_storage,
-        metadata=metadata,
-        url=urls,
-        logger=logger,
-        names=names,
-        graph_execution_manager=graph_execution_manager,
+    board_record_storage = SqliteBoardRecordStorage(db_location)
+    board_image_record_storage = SqliteBoardImageRecordStorage(db_location)
+
+    boards = BoardService(
+        services=BoardServiceDependencies(
+            board_image_record_storage=board_image_record_storage,
+            board_record_storage=board_record_storage,
+            image_record_storage=image_record_storage,
+            url=urls,
+            logger=logger,
+        )
     )
 
+    board_images = BoardImagesService(
+        services=BoardImagesServiceDependencies(
+            board_image_record_storage=board_image_record_storage,
+            board_record_storage=board_record_storage,
+            image_record_storage=image_record_storage,
+            url=urls,
+            logger=logger,
+        )
+    )
+
+    images = ImageService(
+        services=ImageServiceDependencies(
+            board_image_record_storage=board_image_record_storage,
+            image_record_storage=image_record_storage,
+            image_file_storage=image_file_storage,
+            metadata=metadata,
+            url=urls,
+            logger=logger,
+            names=names,
+            graph_execution_manager=graph_execution_manager,
+        )
+    )
+        
     services = InvocationServices(
         model_manager=model_manager,
         events=events,
         latents = ForwardCacheLatentsStorage(DiskLatentsStorage(f'{output_folder}/latents')),
         images=images,
+        boards=boards,
+        board_images=board_images,
         queue=MemoryInvocationQueue(),
         graph_library=SqliteItemStorage[LibraryGraph](
             filename=db_location, table_name="graphs"
@@ -311,7 +351,7 @@ def invoke_cli():
 
                 # Parse invocation
                 command: CliCommand = None # type:ignore
-                system_graph: LibraryGraph|None = None
+                system_graph: Optional[LibraryGraph] = None
                 if args['type'] in system_graph_names:
                     system_graph = next(filter(lambda g: g.name == args['type'], system_graphs))
                     invocation = GraphInvocation(graph=system_graph.graph, id=str(current_id))

invokeai/app/invocations/baseinvocation.py

@@ -4,9 +4,10 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from inspect import signature
-from typing import get_args, get_type_hints, Dict, List, Literal, TypedDict, TYPE_CHECKING
+from typing import (TYPE_CHECKING, Dict, List, Literal, TypedDict, get_args,
+                    get_type_hints)
 
-from pydantic import BaseModel, Field
+from pydantic import BaseConfig, BaseModel, Field
 
 if TYPE_CHECKING:
     from ..services.invocation_services import InvocationServices
@@ -65,8 +66,13 @@ class BaseInvocation(ABC, BaseModel):
     @classmethod
     def get_invocations_map(cls):
         # Get the type strings out of the literals and into a dictionary
-        return dict(map(lambda t: (get_args(get_type_hints(t)['type'])[0], t),BaseInvocation.get_all_subclasses()))
-    
+        return dict(
+            map(
+                lambda t: (get_args(get_type_hints(t)["type"])[0], t),
+                BaseInvocation.get_all_subclasses(),
+            )
+        )
+
     @classmethod
     def get_output_type(cls):
         return signature(cls.invoke).return_annotation
@@ -75,11 +81,11 @@ class BaseInvocation(ABC, BaseModel):
     def invoke(self, context: InvocationContext) -> BaseInvocationOutput:
         """Invoke with provided context and return outputs."""
         pass
-    
-    #fmt: off
+
+    # fmt: off
     id: str = Field(description="The id of this node. Must be unique among all nodes.")
     is_intermediate: bool = Field(default=False, description="Whether or not this node is an intermediate node.")
-    #fmt: on
+    # fmt: on
 
 
 # TODO: figure out a better way to provide these hints
@@ -97,16 +103,20 @@ class UIConfig(TypedDict, total=False):
             "latents",
             "model",
             "control",
+            "image_collection",
+            "vae_model",
+            "lora_model",
         ],
     ]
     tags: List[str]
     title: str
 
+
 class CustomisedSchemaExtra(TypedDict):
     ui: UIConfig
 
 
-class InvocationConfig(BaseModel.Config):
+class InvocationConfig(BaseConfig):
     """Customizes pydantic's BaseModel.Config class for use by Invocations.
 
     Provide `schema_extra` a `ui` dict to add hints for generated UIs.

invokeai/app/invocations/collections.py

@@ -4,13 +4,16 @@ from typing import Literal
 
 import numpy as np
 from pydantic import Field, validator
+from invokeai.app.models.image import ImageField
 
 from invokeai.app.util.misc import SEED_MAX, get_random_seed
 
 from .baseinvocation import (
     BaseInvocation,
+    InvocationConfig,
     InvocationContext,
     BaseInvocationOutput,
+    UIConfig,
 )
 
 
@@ -22,6 +25,7 @@ class IntCollectionOutput(BaseInvocationOutput):
     # Outputs
     collection: list[int] = Field(default=[], description="The int collection")
 
+
 class FloatCollectionOutput(BaseInvocationOutput):
     """A collection of floats"""
 
@@ -31,6 +35,18 @@ class FloatCollectionOutput(BaseInvocationOutput):
     collection: list[float] = Field(default=[], description="The float collection")
 
 
+class ImageCollectionOutput(BaseInvocationOutput):
+    """A collection of images"""
+
+    type: Literal["image_collection"] = "image_collection"
+
+    # Outputs
+    collection: list[ImageField] = Field(default=[], description="The output images")
+
+    class Config:
+        schema_extra = {"required": ["type", "collection"]}
+
+
 class RangeInvocation(BaseInvocation):
     """Creates a range of numbers from start to stop with step"""
 
@@ -92,3 +108,27 @@ class RandomRangeInvocation(BaseInvocation):
         return IntCollectionOutput(
             collection=list(rng.integers(low=self.low, high=self.high, size=self.size))
         )
+
+
+class ImageCollectionInvocation(BaseInvocation):
+    """Load a collection of images and provide it as output."""
+
+    # fmt: off
+    type: Literal["image_collection"] = "image_collection"
+
+    # Inputs
+    images: list[ImageField] = Field(
+        default=[], description="The image collection to load"
+    )
+    # fmt: on
+    def invoke(self, context: InvocationContext) -> ImageCollectionOutput:
+        return ImageCollectionOutput(collection=self.images)
+
+    class Config(InvocationConfig):
+        schema_extra = {
+            "ui": {
+                "type_hints": {
+                    "images": "image_collection",
+                }
+            },
+        }

invokeai/app/invocations/compel.py

@@ -1,27 +1,25 @@
-from typing import Literal, Optional, Union
+from typing import Literal, Optional, Union, List
 from pydantic import BaseModel, Field
-from contextlib import ExitStack
 import re
-
-from .baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext, InvocationConfig
-from .model import ClipField
-
-from ...backend.util.devices import torch_dtype
-from ...backend.stable_diffusion.diffusion import InvokeAIDiffuserComponent
-from ...backend.model_management import BaseModelType, ModelType, SubModelType
-from ...backend.model_management.lora import ModelPatcher
-
+import torch
 from compel import Compel
-from compel.prompt_parser import (
-    Blend,
-    CrossAttentionControlSubstitute,
-    FlattenedPrompt,
-    Fragment, Conjunction,
-)
+from compel.prompt_parser import (Blend, Conjunction,
+                                  CrossAttentionControlSubstitute,
+                                  FlattenedPrompt, Fragment)
+from ...backend.util.devices import torch_dtype
+from ...backend.model_management import ModelType
+from ...backend.model_management.models import ModelNotFoundException
+from ...backend.model_management.lora import ModelPatcher
+from ...backend.stable_diffusion.diffusion import InvokeAIDiffuserComponent
+from .baseinvocation import (BaseInvocation, BaseInvocationOutput,
+                             InvocationConfig, InvocationContext)
+from .model import ClipField
 
 
 class ConditioningField(BaseModel):
-    conditioning_name: Optional[str] = Field(default=None, description="The name of conditioning data")
+    conditioning_name: Optional[str] = Field(
+        default=None, description="The name of conditioning data")
+
     class Config:
         schema_extra = {"required": ["conditioning_name"]}
 
@@ -51,86 +49,111 @@ class CompelInvocation(BaseInvocation):
                 "title": "Prompt (Compel)",
                 "tags": ["prompt", "compel"],
                 "type_hints": {
-                  "model": "model"
+                    "model": "model"
                 }
             },
         }
 
+    @torch.no_grad()
     def invoke(self, context: InvocationContext) -> CompelOutput:
-
         tokenizer_info = context.services.model_manager.get_model(
             **self.clip.tokenizer.dict(),
         )
         text_encoder_info = context.services.model_manager.get_model(
             **self.clip.text_encoder.dict(),
         )
-        with tokenizer_info as orig_tokenizer,\
-             text_encoder_info as text_encoder,\
-             ExitStack() as stack:
 
-            loras = [(stack.enter_context(context.services.model_manager.get_model(**lora.dict(exclude={"weight"}))), lora.weight) for lora in self.clip.loras]
+        def _lora_loader():
+            for lora in self.clip.loras:
+                lora_info = context.services.model_manager.get_model(
+                    **lora.dict(exclude={"weight"}))
+                yield (lora_info.context.model, lora.weight)
+                del lora_info
+            return
 
-            ti_list = []
-            for trigger in re.findall(r"<[a-zA-Z0-9., _-]+>", self.prompt):
-                name = trigger[1:-1]
-                try:
-                    ti_list.append(
-                        stack.enter_context(
-                            context.services.model_manager.get_model(
-                                model_name=name,
-                                base_model=self.clip.text_encoder.base_model,
-                                model_type=ModelType.TextualInversion,
-                            )
-                        )
-                    )
-                except Exception:
-                    #print(e)
-                    #import traceback
-                    #print(traceback.format_exc())
-                    print(f"Warn: trigger: \"{trigger}\" not found")
+        #loras = [(context.services.model_manager.get_model(**lora.dict(exclude={"weight"})).context.model, lora.weight) for lora in self.clip.loras]
 
-            with ModelPatcher.apply_lora_text_encoder(text_encoder, loras),\
-                 ModelPatcher.apply_ti(orig_tokenizer, text_encoder, ti_list) as (tokenizer, ti_manager):
-
-                compel = Compel(
-                    tokenizer=tokenizer,
-                    text_encoder=text_encoder,
-                    textual_inversion_manager=ti_manager,
-                    dtype_for_device_getter=torch_dtype,
-                    truncate_long_prompts=True, # TODO:
+        ti_list = []
+        for trigger in re.findall(r"<[a-zA-Z0-9., _-]+>", self.prompt):
+            name = trigger[1:-1]
+            try:
+                ti_list.append(
+                    context.services.model_manager.get_model(
+                        model_name=name,
+                        base_model=self.clip.text_encoder.base_model,
+                        model_type=ModelType.TextualInversion,
+                    ).context.model
                 )
-                
-                conjunction = Compel.parse_prompt_string(self.prompt)
-                prompt: Union[FlattenedPrompt, Blend] = conjunction.prompts[0]
+            except ModelNotFoundException:
+                # print(e)
+                #import traceback
+                #print(traceback.format_exc())
+                print(f"Warn: trigger: \"{trigger}\" not found")
 
-                if context.services.configuration.log_tokenization:
-                    log_tokenization_for_prompt_object(prompt, tokenizer)
+        with ModelPatcher.apply_lora_text_encoder(text_encoder_info.context.model, _lora_loader()),\
+                ModelPatcher.apply_ti(tokenizer_info.context.model, text_encoder_info.context.model, ti_list) as (tokenizer, ti_manager),\
+                ModelPatcher.apply_clip_skip(text_encoder_info.context.model, self.clip.skipped_layers),\
+                text_encoder_info as text_encoder:
 
-                c, options = compel.build_conditioning_tensor_for_prompt_object(prompt)
-                
-                # TODO: long prompt support
-                #if not self.truncate_long_prompts:
-                #    [c, uc] = compel.pad_conditioning_tensors_to_same_length([c, uc])
-                ec = InvokeAIDiffuserComponent.ExtraConditioningInfo(
-                    tokens_count_including_eos_bos=get_max_token_count(tokenizer, conjunction),
-                    cross_attention_control_args=options.get("cross_attention_control", None),
-                )
-                
-            conditioning_name = f"{context.graph_execution_state_id}_{self.id}_conditioning"
-
-            # TODO: hacky but works ;D maybe rename latents somehow?
-            context.services.latents.save(conditioning_name, (c, ec))
-
-            return CompelOutput(
-                conditioning=ConditioningField(
-                    conditioning_name=conditioning_name,
-                ),
+            compel = Compel(
+                tokenizer=tokenizer,
+                text_encoder=text_encoder,
+                textual_inversion_manager=ti_manager,
+                dtype_for_device_getter=torch_dtype,
+                truncate_long_prompts=True,  # TODO:
             )
 
+            conjunction = Compel.parse_prompt_string(self.prompt)
+            prompt: Union[FlattenedPrompt, Blend] = conjunction.prompts[0]
+
+            if context.services.configuration.log_tokenization:
+                log_tokenization_for_prompt_object(prompt, tokenizer)
+
+            c, options = compel.build_conditioning_tensor_for_prompt_object(
+                prompt)
+
+            # TODO: long prompt support
+            # if not self.truncate_long_prompts:
+            #    [c, uc] = compel.pad_conditioning_tensors_to_same_length([c, uc])
+            ec = InvokeAIDiffuserComponent.ExtraConditioningInfo(
+                tokens_count_including_eos_bos=get_max_token_count(
+                    tokenizer, conjunction),
+                cross_attention_control_args=options.get(
+                    "cross_attention_control", None),)
+
+        conditioning_name = f"{context.graph_execution_state_id}_{self.id}_conditioning"
+
+        # TODO: hacky but works ;D maybe rename latents somehow?
+        context.services.latents.save(conditioning_name, (c, ec))
+
+        return CompelOutput(
+            conditioning=ConditioningField(
+                conditioning_name=conditioning_name,
+            ),
+        )
+
+class ClipSkipInvocationOutput(BaseInvocationOutput):
+    """Clip skip node output"""
+    type: Literal["clip_skip_output"] = "clip_skip_output"
+    clip: ClipField = Field(None, description="Clip with skipped layers")
+
+class ClipSkipInvocation(BaseInvocation):
+    """Skip layers in clip text_encoder model."""
+    type: Literal["clip_skip"] = "clip_skip"
+
+    clip: ClipField = Field(None, description="Clip to use")
+    skipped_layers: int = Field(0, description="Number of layers to skip in text_encoder")
+
+    def invoke(self, context: InvocationContext) -> ClipSkipInvocationOutput:
+        self.clip.skipped_layers += self.skipped_layers
+        return ClipSkipInvocationOutput(
+            clip=self.clip,
+        )
+
 
 def get_max_token_count(
-    tokenizer, prompt: Union[FlattenedPrompt, Blend, Conjunction], truncate_if_too_long=False
-) -> int:
+        tokenizer, prompt: Union[FlattenedPrompt, Blend, Conjunction],
+        truncate_if_too_long=False) -> int:
     if type(prompt) is Blend:
         blend: Blend = prompt
         return max(
@@ -149,13 +172,13 @@ def get_max_token_count(
         )
     else:
         return len(
-            get_tokens_for_prompt_object(tokenizer, prompt, truncate_if_too_long)
-        )
+            get_tokens_for_prompt_object(
+                tokenizer, prompt, truncate_if_too_long))
 
 
 def get_tokens_for_prompt_object(
     tokenizer, parsed_prompt: FlattenedPrompt, truncate_if_too_long=True
-) -> [str]:
+) -> List[str]:
     if type(parsed_prompt) is Blend:
         raise ValueError(
             "Blend is not supported here - you need to get tokens for each of its .children"
@@ -184,7 +207,7 @@ def log_tokenization_for_conjunction(
 ):
     display_label_prefix = display_label_prefix or ""
     for i, p in enumerate(c.prompts):
-        if len(c.prompts)>1:
+        if len(c.prompts) > 1:
             this_display_label_prefix = f"{display_label_prefix}(conjunction part {i + 1}, weight={c.weights[i]})"
         else:
             this_display_label_prefix = display_label_prefix
@@ -239,7 +262,8 @@ def log_tokenization_for_prompt_object(
             )
 
 
-def log_tokenization_for_text(text, tokenizer, display_label=None, truncate_if_too_long=False):
+def log_tokenization_for_text(
+        text, tokenizer, display_label=None, truncate_if_too_long=False):
     """shows how the prompt is tokenized
     # usually tokens have '</w>' to indicate end-of-word,
     # but for readability it has been replaced with ' '

invokeai/app/invocations/controlnet_image_processors.py

@@ -1,11 +1,12 @@
-# InvokeAI nodes for ControlNet image preprocessors
+# Invocations for ControlNet image preprocessors
 # initial implementation by Gregg Helt, 2023
 # heavily leverages controlnet_aux package: https://github.com/patrickvonplaten/controlnet_aux
 from builtins import float, bool
 
+import cv2
 import numpy as np
-from typing import Literal, Optional, Union, List
-from PIL import Image, ImageFilter, ImageOps
+from typing import Literal, Optional, Union, List, Dict
+from PIL import Image
 from pydantic import BaseModel, Field, validator
 
 from ..models.image import ImageField, ImageCategory, ResourceOrigin
@@ -29,8 +30,13 @@ from controlnet_aux import (
     ContentShuffleDetector,
     ZoeDetector,
     MediapipeFaceDetector,
+    SamDetector,
+    LeresDetector,
 )
 
+from controlnet_aux.util import HWC3, ade_palette
+
+
 from .image import ImageOutput, PILInvocationConfig
 
 CONTROLNET_DEFAULT_MODELS = [
@@ -95,6 +101,9 @@ CONTROLNET_DEFAULT_MODELS = [
 
 CONTROLNET_NAME_VALUES = Literal[tuple(CONTROLNET_DEFAULT_MODELS)]
 CONTROLNET_MODE_VALUES = Literal[tuple(["balanced", "more_prompt", "more_control", "unbalanced"])]
+# crop and fill options not ready yet
+# CONTROLNET_RESIZE_VALUES = Literal[tuple(["just_resize", "crop_resize", "fill_resize"])]
+
 
 class ControlField(BaseModel):
     image: ImageField = Field(default=None, description="The control image")
@@ -105,7 +114,8 @@ class ControlField(BaseModel):
                                       description="When the ControlNet is first applied (% of total steps)")
     end_step_percent: float = Field(default=1, ge=0, le=1,
                                     description="When the ControlNet is last applied (% of total steps)")
-    control_mode: CONTROLNET_MODE_VALUES = Field(default="balanced", description="The contorl mode to use")
+    control_mode: CONTROLNET_MODE_VALUES = Field(default="balanced", description="The control mode to use")
+    # resize_mode: CONTROLNET_RESIZE_VALUES = Field(default="just_resize", description="The resize mode to use")
 
     @validator("control_weight")
     def abs_le_one(cls, v):
@@ -180,7 +190,7 @@ class ControlNetInvocation(BaseInvocation):
             ),
         )
 
-# TODO: move image processors to separate file (image_analysis.py
+
 class ImageProcessorInvocation(BaseInvocation, PILInvocationConfig):
     """Base class for invocations that preprocess images for ControlNet"""
 
@@ -412,9 +422,9 @@ class ContentShuffleImageProcessorInvocation(ImageProcessorInvocation, PILInvoca
     # Inputs
     detect_resolution: int = Field(default=512, ge=0, description="The pixel resolution for detection")
     image_resolution: int = Field(default=512, ge=0, description="The pixel resolution for the output image")
-    h: Union[int, None] = Field(default=512, ge=0, description="Content shuffle `h` parameter")
-    w: Union[int, None] = Field(default=512, ge=0, description="Content shuffle `w` parameter")
-    f: Union[int, None] = Field(default=256, ge=0, description="Content shuffle `f` parameter")
+    h: Optional[int] = Field(default=512, ge=0, description="Content shuffle `h` parameter")
+    w: Optional[int] = Field(default=512, ge=0, description="Content shuffle `w` parameter")
+    f: Optional[int] = Field(default=256, ge=0, description="Content shuffle `f` parameter")
     # fmt: on
 
     def run_processor(self, image):
@@ -452,6 +462,104 @@ class MediapipeFaceProcessorInvocation(ImageProcessorInvocation, PILInvocationCo
     # fmt: on
 
     def run_processor(self, image):
+        # MediaPipeFaceDetector throws an error if image has alpha channel
+        #     so convert to RGB if needed
+        if image.mode == 'RGBA':
+            image = image.convert('RGB')
         mediapipe_face_processor = MediapipeFaceDetector()
         processed_image = mediapipe_face_processor(image, max_faces=self.max_faces, min_confidence=self.min_confidence)
         return processed_image
+
+class LeresImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
+    """Applies leres processing to image"""
+    # fmt: off
+    type: Literal["leres_image_processor"] = "leres_image_processor"
+    # Inputs
+    thr_a: float = Field(default=0, description="Leres parameter `thr_a`")
+    thr_b: float = Field(default=0, description="Leres parameter `thr_b`")
+    boost: bool = Field(default=False, description="Whether to use boost mode")
+    detect_resolution: int = Field(default=512, ge=0, description="The pixel resolution for detection")
+    image_resolution: int = Field(default=512, ge=0, description="The pixel resolution for the output image")
+    # fmt: on
+
+    def run_processor(self, image):
+        leres_processor = LeresDetector.from_pretrained("lllyasviel/Annotators")
+        processed_image = leres_processor(image,
+                                          thr_a=self.thr_a,
+                                          thr_b=self.thr_b,
+                                          boost=self.boost,
+                                          detect_resolution=self.detect_resolution,
+                                          image_resolution=self.image_resolution)
+        return processed_image
+
+
+class TileResamplerProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
+
+    # fmt: off
+    type: Literal["tile_image_processor"] = "tile_image_processor"
+    # Inputs
+    #res: int = Field(default=512, ge=0, le=1024, description="The pixel resolution for each tile")
+    down_sampling_rate: float = Field(default=1.0, ge=1.0, le=8.0, description="Down sampling rate")
+    # fmt: on
+
+    # tile_resample copied from sd-webui-controlnet/scripts/processor.py
+    def tile_resample(self,
+                      np_img: np.ndarray,
+                      res=512,   # never used?
+                      down_sampling_rate=1.0,
+                      ):
+        np_img = HWC3(np_img)
+        if down_sampling_rate < 1.1:
+            return np_img
+        H, W, C = np_img.shape
+        H = int(float(H) / float(down_sampling_rate))
+        W = int(float(W) / float(down_sampling_rate))
+        np_img = cv2.resize(np_img, (W, H), interpolation=cv2.INTER_AREA)
+        return np_img
+
+    def run_processor(self, img):
+        np_img = np.array(img, dtype=np.uint8)
+        processed_np_image = self.tile_resample(np_img,
+                                                #res=self.tile_size,
+                                                down_sampling_rate=self.down_sampling_rate
+                                                )
+        processed_image = Image.fromarray(processed_np_image)
+        return processed_image
+
+
+
+
+class SegmentAnythingProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
+    """Applies segment anything processing to image"""
+    # fmt: off
+    type: Literal["segment_anything_processor"] = "segment_anything_processor"
+    # fmt: on
+
+    def run_processor(self, image):
+        # segment_anything_processor = SamDetector.from_pretrained("ybelkada/segment-anything", subfolder="checkpoints")
+        segment_anything_processor = SamDetectorReproducibleColors.from_pretrained("ybelkada/segment-anything", subfolder="checkpoints")
+        np_img = np.array(image, dtype=np.uint8)
+        processed_image = segment_anything_processor(np_img)
+        return processed_image
+
+class SamDetectorReproducibleColors(SamDetector):
+
+    # overriding SamDetector.show_anns() method to use reproducible colors for segmentation image
+    #     base class show_anns() method randomizes colors,
+    #     which seems to also lead to non-reproducible image generation
+    # so using ADE20k color palette instead
+    def show_anns(self, anns: List[Dict]):
+        if len(anns) == 0:
+            return
+        sorted_anns = sorted(anns, key=(lambda x: x['area']), reverse=True)
+        h, w = anns[0]['segmentation'].shape
+        final_img = Image.fromarray(np.zeros((h, w, 3), dtype=np.uint8), mode="RGB")
+        palette = ade_palette()
+        for i, ann in enumerate(sorted_anns):
+            m = ann['segmentation']
+            img = np.empty((m.shape[0], m.shape[1], 3), dtype=np.uint8)
+            # doing modulo just in case number of annotated regions exceeds number of colors in palette
+            ann_color = palette[i % len(palette)]
+            img[:, :] = ann_color
+            final_img.paste(Image.fromarray(img, mode="RGB"), (0, 0), Image.fromarray(np.uint8(m * 255)))
+        return np.array(final_img, dtype=np.uint8)

invokeai/app/invocations/generate.py

@@ -1,11 +1,10 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
 from functools import partial
-from typing import Literal, Optional, Union, get_args
+from typing import Literal, Optional, get_args
 
 import torch
-from diffusers import ControlNetModel
-from pydantic import BaseModel, Field
+from pydantic import Field
 
 from invokeai.app.models.image import (ColorField, ImageCategory, ImageField,
                                        ResourceOrigin)
@@ -18,7 +17,6 @@ from ..util.step_callback import stable_diffusion_step_callback
 from .baseinvocation import BaseInvocation, InvocationConfig, InvocationContext
 from .image import ImageOutput
 
-import re
 from ...backend.model_management.lora import ModelPatcher
 from ...backend.stable_diffusion.diffusers_pipeline import StableDiffusionGeneratorPipeline
 from .model import UNetField, VaeField
@@ -76,7 +74,7 @@ class InpaintInvocation(BaseInvocation):
     vae: VaeField = Field(default=None, description="Vae model")
 
     # Inputs
-    image: Union[ImageField, None] = Field(description="The input image")
+    image: Optional[ImageField] = Field(description="The input image")
     strength: float = Field(
         default=0.75, gt=0, le=1, description="The strength of the original image"
     )
@@ -86,7 +84,7 @@ class InpaintInvocation(BaseInvocation):
     )
 
     # Inputs
-    mask: Union[ImageField, None] = Field(description="The mask")
+    mask: Optional[ImageField] = Field(description="The mask")
     seam_size: int = Field(default=96, ge=1, description="The seam inpaint size (px)")
     seam_blur: int = Field(
         default=16, ge=0, description="The seam inpaint blur radius (px)"

invokeai/app/invocations/image.py

@@ -1,7 +1,6 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
-import io
-from typing import Literal, Optional, Union
+from typing import Literal, Optional
 
 import numpy
 from PIL import Image, ImageFilter, ImageOps, ImageChops
@@ -67,7 +66,7 @@ class LoadImageInvocation(BaseInvocation):
     type: Literal["load_image"] = "load_image"
 
     # Inputs
-    image: Union[ImageField, None] = Field(
+    image: Optional[ImageField] = Field(
         default=None, description="The image to load"
     )
     # fmt: on
@@ -87,7 +86,7 @@ class ShowImageInvocation(BaseInvocation):
     type: Literal["show_image"] = "show_image"
 
     # Inputs
-    image: Union[ImageField, None] = Field(
+    image: Optional[ImageField] = Field(
         default=None, description="The image to show"
     )
 
@@ -112,7 +111,7 @@ class ImageCropInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_crop"] = "img_crop"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to crop")
+    image: Optional[ImageField]  = Field(default=None, description="The image to crop")
     x:      int = Field(default=0, description="The left x coordinate of the crop rectangle")
     y:      int = Field(default=0, description="The top y coordinate of the crop rectangle")
     width:  int = Field(default=512, gt=0, description="The width of the crop rectangle")
@@ -150,8 +149,8 @@ class ImagePasteInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_paste"] = "img_paste"
 
     # Inputs
-    base_image:     Union[ImageField, None]  = Field(default=None, description="The base image")
-    image:          Union[ImageField, None]  = Field(default=None, description="The image to paste")
+    base_image:     Optional[ImageField]  = Field(default=None, description="The base image")
+    image:          Optional[ImageField]  = Field(default=None, description="The image to paste")
     mask: Optional[ImageField] = Field(default=None, description="The mask to use when pasting")
     x:                     int = Field(default=0, description="The left x coordinate at which to paste the image")
     y:                     int = Field(default=0, description="The top y coordinate at which to paste the image")
@@ -203,7 +202,7 @@ class MaskFromAlphaInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["tomask"] = "tomask"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to create the mask from")
+    image: Optional[ImageField]  = Field(default=None, description="The image to create the mask from")
     invert:      bool = Field(default=False, description="Whether or not to invert the mask")
     # fmt: on
 
@@ -237,8 +236,8 @@ class ImageMultiplyInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_mul"] = "img_mul"
 
     # Inputs
-    image1: Union[ImageField, None]  = Field(default=None, description="The first image to multiply")
-    image2: Union[ImageField, None]  = Field(default=None, description="The second image to multiply")
+    image1: Optional[ImageField]  = Field(default=None, description="The first image to multiply")
+    image2: Optional[ImageField]  = Field(default=None, description="The second image to multiply")
     # fmt: on
 
     def invoke(self, context: InvocationContext) -> ImageOutput:
@@ -273,7 +272,7 @@ class ImageChannelInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_chan"] = "img_chan"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to get the channel from")
+    image: Optional[ImageField]  = Field(default=None, description="The image to get the channel from")
     channel: IMAGE_CHANNELS  = Field(default="A", description="The channel to get")
     # fmt: on
 
@@ -308,7 +307,7 @@ class ImageConvertInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_conv"] = "img_conv"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to convert")
+    image: Optional[ImageField]  = Field(default=None, description="The image to convert")
     mode: IMAGE_MODES  = Field(default="L", description="The mode to convert to")
     # fmt: on
 
@@ -340,7 +339,7 @@ class ImageBlurInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_blur"] = "img_blur"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to blur")
+    image: Optional[ImageField]  = Field(default=None, description="The image to blur")
     radius:     float = Field(default=8.0, ge=0, description="The blur radius")
     blur_type: Literal["gaussian", "box"] = Field(default="gaussian", description="The type of blur")
     # fmt: on
@@ -398,7 +397,7 @@ class ImageResizeInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_resize"] = "img_resize"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to resize")
+    image: Optional[ImageField]  = Field(default=None, description="The image to resize")
     width:                         int = Field(ge=64, multiple_of=8, description="The width to resize to (px)")
     height:                        int = Field(ge=64, multiple_of=8, description="The height to resize to (px)")
     resample_mode:  PIL_RESAMPLING_MODES = Field(default="bicubic", description="The resampling mode")
@@ -437,7 +436,7 @@ class ImageScaleInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_scale"] = "img_scale"
 
     # Inputs
-    image:       Union[ImageField, None] = Field(default=None, description="The image to scale")
+    image:       Optional[ImageField] = Field(default=None, description="The image to scale")
     scale_factor:                  float = Field(gt=0, description="The factor by which to scale the image")
     resample_mode:  PIL_RESAMPLING_MODES = Field(default="bicubic", description="The resampling mode")
     # fmt: on
@@ -477,7 +476,7 @@ class ImageLerpInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_lerp"] = "img_lerp"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to lerp")
+    image: Optional[ImageField]  = Field(default=None, description="The image to lerp")
     min: int = Field(default=0, ge=0, le=255, description="The minimum output value")
     max: int = Field(default=255, ge=0, le=255, description="The maximum output value")
     # fmt: on
@@ -513,7 +512,7 @@ class ImageInverseLerpInvocation(BaseInvocation, PILInvocationConfig):
     type: Literal["img_ilerp"] = "img_ilerp"
 
     # Inputs
-    image: Union[ImageField, None]  = Field(default=None, description="The image to lerp")
+    image: Optional[ImageField]  = Field(default=None, description="The image to lerp")
     min: int = Field(default=0, ge=0, le=255, description="The minimum input value")
     max: int = Field(default=255, ge=0, le=255, description="The maximum input value")
     # fmt: on

invokeai/app/invocations/infill.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654) and the InvokeAI Team
 
-from typing import Literal, Union, get_args
+from typing import Literal, Optional, get_args
 
 import numpy as np
 import math
@@ -68,7 +68,7 @@ def get_tile_images(image: np.ndarray, width=8, height=8):
 
 
 def tile_fill_missing(
-    im: Image.Image, tile_size: int = 16, seed: Union[int, None] = None
+    im: Image.Image, tile_size: int = 16, seed: Optional[int] = None
 ) -> Image.Image:
     # Only fill if there's an alpha layer
     if im.mode != "RGBA":
@@ -125,7 +125,7 @@ class InfillColorInvocation(BaseInvocation):
     """Infills transparent areas of an image with a solid color"""
 
     type: Literal["infill_rgba"] = "infill_rgba"
-    image: Union[ImageField, None] = Field(
+    image: Optional[ImageField] = Field(
         default=None, description="The image to infill"
     )
     color: ColorField = Field(
@@ -162,7 +162,7 @@ class InfillTileInvocation(BaseInvocation):
 
     type: Literal["infill_tile"] = "infill_tile"
 
-    image: Union[ImageField, None] = Field(
+    image: Optional[ImageField] = Field(
         default=None, description="The image to infill"
     )
     tile_size: int = Field(default=32, ge=1, description="The tile size (px)")
@@ -202,7 +202,7 @@ class InfillPatchMatchInvocation(BaseInvocation):
 
     type: Literal["infill_patchmatch"] = "infill_patchmatch"
 
-    image: Union[ImageField, None] = Field(
+    image: Optional[ImageField] = Field(
         default=None, description="The image to infill"
     )
 

invokeai/app/invocations/latent.py

@@ -1,21 +1,18 @@
 # Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654)
 
-from contextlib import ExitStack
 from typing import List, Literal, Optional, Union
 
 import einops
-
-from pydantic import BaseModel, Field, validator
 import torch
-from diffusers import ControlNetModel, DPMSolverMultistepScheduler
+from diffusers import ControlNetModel
 from diffusers.image_processor import VaeImageProcessor
 from diffusers.schedulers import SchedulerMixin as Scheduler
+from pydantic import BaseModel, Field, validator
 
-from invokeai.app.util.misc import SEED_MAX, get_random_seed
 from invokeai.app.util.step_callback import stable_diffusion_step_callback
 
 from ..models.image import ImageCategory, ImageField, ResourceOrigin
-from ...backend.image_util.seamless import configure_model_padding
+from ...backend.model_management.lora import ModelPatcher
 from ...backend.stable_diffusion import PipelineIntermediateState
 from ...backend.stable_diffusion.diffusers_pipeline import (
     ConditioningData, ControlNetData, StableDiffusionGeneratorPipeline,
@@ -23,8 +20,7 @@ from ...backend.stable_diffusion.diffusers_pipeline import (
 from ...backend.stable_diffusion.diffusion.shared_invokeai_diffusion import \
     PostprocessingSettings
 from ...backend.stable_diffusion.schedulers import SCHEDULER_MAP
-from ...backend.util.devices import choose_torch_device, torch_dtype
-from ...backend.model_management.lora import ModelPatcher
+from ...backend.util.devices import torch_dtype
 from .baseinvocation import (BaseInvocation, BaseInvocationOutput,
                              InvocationConfig, InvocationContext)
 from .compel import ConditioningField
@@ -32,14 +28,17 @@ from .controlnet_image_processors import ControlField
 from .image import ImageOutput
 from .model import ModelInfo, UNetField, VaeField
 
+
 class LatentsField(BaseModel):
     """A latents field used for passing latents between invocations"""
 
-    latents_name: Optional[str] = Field(default=None, description="The name of the latents")
+    latents_name: Optional[str] = Field(
+        default=None, description="The name of the latents")
 
     class Config:
         schema_extra = {"required": ["latents_name"]}
 
+
 class LatentsOutput(BaseInvocationOutput):
     """Base class for invocations that output latents"""
     #fmt: off
@@ -53,29 +52,11 @@ class LatentsOutput(BaseInvocationOutput):
 
 
 def build_latents_output(latents_name: str, latents: torch.Tensor):
-      return LatentsOutput(
-          latents=LatentsField(latents_name=latents_name),
-          width=latents.size()[3] * 8,
-          height=latents.size()[2] * 8,
-      )
-
-class NoiseOutput(BaseInvocationOutput):
-    """Invocation noise output"""
-    #fmt: off
-    type:  Literal["noise_output"] = "noise_output"
-
-    # Inputs
-    noise: LatentsField            = Field(default=None, description="The output noise")
-    width:                     int = Field(description="The width of the noise in pixels")
-    height:                    int = Field(description="The height of the noise in pixels")
-    #fmt: on
-
-def build_noise_output(latents_name: str, latents: torch.Tensor):
-      return NoiseOutput(
-          noise=LatentsField(latents_name=latents_name),
-          width=latents.size()[3] * 8,
-          height=latents.size()[2] * 8,
-      )
+    return LatentsOutput(
+        latents=LatentsField(latents_name=latents_name),
+        width=latents.size()[3] * 8,
+        height=latents.size()[2] * 8,
+    )
 
 
 SAMPLER_NAME_VALUES = Literal[
@@ -83,84 +64,30 @@ SAMPLER_NAME_VALUES = Literal[
 ]
 
 
-
 def get_scheduler(
     context: InvocationContext,
     scheduler_info: ModelInfo,
     scheduler_name: str,
 ) -> Scheduler:
-    scheduler_class, scheduler_extra_config = SCHEDULER_MAP.get(scheduler_name, SCHEDULER_MAP['ddim'])
-    orig_scheduler_info = context.services.model_manager.get_model(**scheduler_info.dict())
+    scheduler_class, scheduler_extra_config = SCHEDULER_MAP.get(
+        scheduler_name, SCHEDULER_MAP['ddim'])
+    orig_scheduler_info = context.services.model_manager.get_model(
+        **scheduler_info.dict())
     with orig_scheduler_info as orig_scheduler:
         scheduler_config = orig_scheduler.config
-        
+
     if "_backup" in scheduler_config:
         scheduler_config = scheduler_config["_backup"]
-    scheduler_config = {**scheduler_config, **scheduler_extra_config, "_backup": scheduler_config}
+    scheduler_config = {**scheduler_config, **
+                        scheduler_extra_config, "_backup": scheduler_config}
     scheduler = scheduler_class.from_config(scheduler_config)
-    
+
     # hack copied over from generate.py
     if not hasattr(scheduler, 'uses_inpainting_model'):
         scheduler.uses_inpainting_model = lambda: False
     return scheduler
 
 
-def get_noise(width:int, height:int, device:torch.device, seed:int = 0, latent_channels:int=4, use_mps_noise:bool=False, downsampling_factor:int = 8):
-    # limit noise to only the diffusion image channels, not the mask channels
-    input_channels = min(latent_channels, 4)
-    use_device = "cpu" if (use_mps_noise or device.type == "mps") else device
-    generator = torch.Generator(device=use_device).manual_seed(seed)
-    x = torch.randn(
-        [
-            1,
-            input_channels,
-            height // downsampling_factor,
-            width //  downsampling_factor,
-        ],
-        dtype=torch_dtype(device),
-        device=use_device,
-        generator=generator,
-    ).to(device)
-    # if self.perlin > 0.0:
-    #     perlin_noise = self.get_perlin_noise(
-    #         width // self.downsampling_factor, height // self.downsampling_factor
-    #     )
-    #     x = (1 - self.perlin) * x + self.perlin * perlin_noise
-    return x
-
-class NoiseInvocation(BaseInvocation):
-    """Generates latent noise."""
-
-    type: Literal["noise"] = "noise"
-
-    # Inputs
-    seed:       int = Field(ge=0, le=SEED_MAX, description="The seed to use", default_factory=get_random_seed)
-    width:       int = Field(default=512, multiple_of=8, gt=0, description="The width of the resulting noise", )
-    height:      int = Field(default=512, multiple_of=8, gt=0, description="The height of the resulting noise", )
-
-
-    # Schema customisation
-    class Config(InvocationConfig):
-        schema_extra = {
-            "ui": {
-                "tags": ["latents", "noise"],
-            },
-        }
-
-    @validator("seed", pre=True)
-    def modulo_seed(cls, v):
-        """Returns the seed modulo SEED_MAX to ensure it is within the valid range."""
-        return v % SEED_MAX
-
-    def invoke(self, context: InvocationContext) -> NoiseOutput:
-        device = torch.device(choose_torch_device())
-        noise = get_noise(self.width, self.height, device, self.seed)
-
-        name = f'{context.graph_execution_state_id}__{self.id}'
-        context.services.latents.save(name, noise)
-        return build_noise_output(latents_name=name, latents=noise)
-
-
 # Text to image
 class TextToLatentsInvocation(BaseInvocation):
     """Generates latents from conditionings."""
@@ -199,18 +126,18 @@ class TextToLatentsInvocation(BaseInvocation):
             "ui": {
                 "tags": ["latents"],
                 "type_hints": {
-                  "model": "model",
-                  "control": "control",
-                  # "cfg_scale": "float",
-                  "cfg_scale": "number"
+                    "model": "model",
+                    "control": "control",
+                    # "cfg_scale": "float",
+                    "cfg_scale": "number"
                 }
             },
         }
 
     # TODO: pass this an emitter method or something? or a session for dispatching?
     def dispatch_progress(
-        self, context: InvocationContext, source_node_id: str, intermediate_state: PipelineIntermediateState
-    ) -> None:
+            self, context: InvocationContext, source_node_id: str,
+            intermediate_state: PipelineIntermediateState) -> None:
         stable_diffusion_step_callback(
             context=context,
             intermediate_state=intermediate_state,
@@ -218,9 +145,12 @@ class TextToLatentsInvocation(BaseInvocation):
             source_node_id=source_node_id,
         )
 
-    def get_conditioning_data(self, context: InvocationContext, scheduler) -> ConditioningData:
-        c, extra_conditioning_info = context.services.latents.get(self.positive_conditioning.conditioning_name)
-        uc, _ = context.services.latents.get(self.negative_conditioning.conditioning_name)
+    def get_conditioning_data(
+            self, context: InvocationContext, scheduler) -> ConditioningData:
+        c, extra_conditioning_info = context.services.latents.get(
+            self.positive_conditioning.conditioning_name)
+        uc, _ = context.services.latents.get(
+            self.negative_conditioning.conditioning_name)
 
         conditioning_data = ConditioningData(
             unconditioned_embeddings=uc,
@@ -228,10 +158,10 @@ class TextToLatentsInvocation(BaseInvocation):
             guidance_scale=self.cfg_scale,
             extra=extra_conditioning_info,
             postprocessing_settings=PostprocessingSettings(
-                threshold=0.0,#threshold,
-                warmup=0.2,#warmup,
-                h_symmetry_time_pct=None,#h_symmetry_time_pct,
-                v_symmetry_time_pct=None#v_symmetry_time_pct,
+                threshold=0.0,  # threshold,
+                warmup=0.2,  # warmup,
+                h_symmetry_time_pct=None,  # h_symmetry_time_pct,
+                v_symmetry_time_pct=None  # v_symmetry_time_pct,
             ),
         )
 
@@ -239,31 +169,32 @@ class TextToLatentsInvocation(BaseInvocation):
             scheduler,
 
             # for ddim scheduler
-            eta=0.0, #ddim_eta
+            eta=0.0,  # ddim_eta
 
             # for ancestral and sde schedulers
             generator=torch.Generator(device=uc.device).manual_seed(0),
         )
         return conditioning_data
 
-    def create_pipeline(self, unet, scheduler) -> StableDiffusionGeneratorPipeline:
+    def create_pipeline(
+            self, unet, scheduler) -> StableDiffusionGeneratorPipeline:
         # TODO:
-        #configure_model_padding(
+        # configure_model_padding(
         #    unet,
         #    self.seamless,
         #    self.seamless_axes,
-        #)
+        # )
 
         class FakeVae:
             class FakeVaeConfig:
                 def __init__(self):
                     self.block_out_channels = [0]
-            
+
             def __init__(self):
                 self.config = FakeVae.FakeVaeConfig()
 
         return StableDiffusionGeneratorPipeline(
-            vae=FakeVae(), # TODO: oh...
+            vae=FakeVae(),  # TODO: oh...
             text_encoder=None,
             tokenizer=None,
             unet=unet,
@@ -273,11 +204,12 @@ class TextToLatentsInvocation(BaseInvocation):
             requires_safety_checker=False,
             precision="float16" if unet.dtype == torch.float16 else "float32",
         )
-    
+
     def prep_control_data(
         self,
         context: InvocationContext,
-        model: StableDiffusionGeneratorPipeline, # really only need model for dtype and device
+        # really only need model for dtype and device
+        model: StableDiffusionGeneratorPipeline,
         control_input: List[ControlField],
         latents_shape: List[int],
         do_classifier_free_guidance: bool = True,
@@ -313,15 +245,17 @@ class TextToLatentsInvocation(BaseInvocation):
                     print("Using HF model subfolders")
                     print("    control_name: ", control_name)
                     print("    control_subfolder: ", control_subfolder)
-                    control_model = ControlNetModel.from_pretrained(control_name,
-                                                                    subfolder=control_subfolder,
-                                                                    torch_dtype=model.unet.dtype).to(model.device)
+                    control_model = ControlNetModel.from_pretrained(
+                        control_name, subfolder=control_subfolder,
+                        torch_dtype=model.unet.dtype).to(
+                        model.device)
                 else:
-                    control_model = ControlNetModel.from_pretrained(control_info.control_model,
-                                                                    torch_dtype=model.unet.dtype).to(model.device)
+                    control_model = ControlNetModel.from_pretrained(
+                        control_info.control_model, torch_dtype=model.unet.dtype).to(model.device)
                 control_models.append(control_model)
                 control_image_field = control_info.image
-                input_image = context.services.images.get_pil_image(control_image_field.image_name)
+                input_image = context.services.images.get_pil_image(
+                    control_image_field.image_name)
                 # self.image.image_type, self.image.image_name
                 # FIXME: still need to test with different widths, heights, devices, dtypes
                 #        and add in batch_size, num_images_per_prompt?
@@ -338,42 +272,50 @@ class TextToLatentsInvocation(BaseInvocation):
                     dtype=control_model.dtype,
                     control_mode=control_info.control_mode,
                 )
-                control_item = ControlNetData(model=control_model,
-                                              image_tensor=control_image,
-                                              weight=control_info.control_weight,
-                                              begin_step_percent=control_info.begin_step_percent,
-                                              end_step_percent=control_info.end_step_percent,
-                                              control_mode=control_info.control_mode,
-                                              )
+                control_item = ControlNetData(
+                    model=control_model, image_tensor=control_image,
+                    weight=control_info.control_weight,
+                    begin_step_percent=control_info.begin_step_percent,
+                    end_step_percent=control_info.end_step_percent,
+                    control_mode=control_info.control_mode,)
                 control_data.append(control_item)
                 # MultiControlNetModel has been refactored out, just need list[ControlNetData]
         return control_data
 
+    @torch.no_grad()
     def invoke(self, context: InvocationContext) -> LatentsOutput:
         noise = context.services.latents.get(self.noise.latents_name)
 
         # Get the source node id (we are invoking the prepared node)
-        graph_execution_state = context.services.graph_execution_manager.get(context.graph_execution_state_id)
+        graph_execution_state = context.services.graph_execution_manager.get(
+            context.graph_execution_state_id)
         source_node_id = graph_execution_state.prepared_source_mapping[self.id]
 
         def step_callback(state: PipelineIntermediateState):
             self.dispatch_progress(context, source_node_id, state)
 
-        unet_info = context.services.model_manager.get_model(**self.unet.unet.dict())
-        with unet_info as unet,\
-             ExitStack() as stack:
+        def _lora_loader():
+            for lora in self.unet.loras:
+                lora_info = context.services.model_manager.get_model(
+                    **lora.dict(exclude={"weight"}))
+                yield (lora_info.context.model, lora.weight)
+                del lora_info
+            return
+
+        unet_info = context.services.model_manager.get_model(
+            **self.unet.unet.dict())
+        with ModelPatcher.apply_lora_unet(unet_info.context.model, _lora_loader()),\
+                unet_info as unet:
 
             scheduler = get_scheduler(
                 context=context,
                 scheduler_info=self.unet.scheduler,
                 scheduler_name=self.scheduler,
             )
-            
+
             pipeline = self.create_pipeline(unet, scheduler)
             conditioning_data = self.get_conditioning_data(context, scheduler)
 
-            loras = [(stack.enter_context(context.services.model_manager.get_model(**lora.dict(exclude={"weight"}))), lora.weight) for lora in self.unet.loras]
-
             control_data = self.prep_control_data(
                 model=pipeline, context=context, control_input=self.control,
                 latents_shape=noise.shape,
@@ -381,16 +323,15 @@ class TextToLatentsInvocation(BaseInvocation):
                 do_classifier_free_guidance=True,
             )
 
-            with ModelPatcher.apply_lora_unet(pipeline.unet, loras):
-                # TODO: Verify the noise is the right size
-                result_latents, result_attention_map_saver = pipeline.latents_from_embeddings(
-                    latents=torch.zeros_like(noise, dtype=torch_dtype(unet.device)),
-                    noise=noise,
-                    num_inference_steps=self.steps,
-                    conditioning_data=conditioning_data,
-                    control_data=control_data, # list[ControlNetData]
-                    callback=step_callback,
-                )
+            # TODO: Verify the noise is the right size
+            result_latents, result_attention_map_saver = pipeline.latents_from_embeddings(
+                latents=torch.zeros_like(noise, dtype=torch_dtype(unet.device)),
+                noise=noise,
+                num_inference_steps=self.steps,
+                conditioning_data=conditioning_data,
+                control_data=control_data,  # list[ControlNetData]
+                callback=step_callback,
+            )
 
         # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
         torch.cuda.empty_cache()
@@ -399,14 +340,18 @@ class TextToLatentsInvocation(BaseInvocation):
         context.services.latents.save(name, result_latents)
         return build_latents_output(latents_name=name, latents=result_latents)
 
+
 class LatentsToLatentsInvocation(TextToLatentsInvocation):
     """Generates latents using latents as base image."""
 
     type: Literal["l2l"] = "l2l"
 
     # Inputs
-    latents: Optional[LatentsField] = Field(description="The latents to use as a base image")
-    strength: float = Field(default=0.7, ge=0, le=1, description="The strength of the latents to use")
+    latents: Optional[LatentsField] = Field(
+        description="The latents to use as a base image")
+    strength: float = Field(
+        default=0.7, ge=0, le=1,
+        description="The strength of the latents to use")
 
     # Schema customisation
     class Config(InvocationConfig):
@@ -421,23 +366,31 @@ class LatentsToLatentsInvocation(TextToLatentsInvocation):
             },
         }
 
+    @torch.no_grad()
     def invoke(self, context: InvocationContext) -> LatentsOutput:
         noise = context.services.latents.get(self.noise.latents_name)
         latent = context.services.latents.get(self.latents.latents_name)
 
         # Get the source node id (we are invoking the prepared node)
-        graph_execution_state = context.services.graph_execution_manager.get(context.graph_execution_state_id)
+        graph_execution_state = context.services.graph_execution_manager.get(
+            context.graph_execution_state_id)
         source_node_id = graph_execution_state.prepared_source_mapping[self.id]
 
         def step_callback(state: PipelineIntermediateState):
             self.dispatch_progress(context, source_node_id, state)
 
-        unet_info = context.services.model_manager.get_model(
-            **self.unet.unet.dict(),
-        )
+        def _lora_loader():
+            for lora in self.unet.loras:
+                lora_info = context.services.model_manager.get_model(
+                    **lora.dict(exclude={"weight"}))
+                yield (lora_info.context.model, lora.weight)
+                del lora_info
+            return
 
-        with unet_info as unet,\
-             ExitStack() as stack:
+        unet_info = context.services.model_manager.get_model(
+            **self.unet.unet.dict())
+        with ModelPatcher.apply_lora_unet(unet_info.context.model, _lora_loader()),\
+                unet_info as unet:
 
             scheduler = get_scheduler(
                 context=context,
@@ -447,7 +400,7 @@ class LatentsToLatentsInvocation(TextToLatentsInvocation):
 
             pipeline = self.create_pipeline(unet, scheduler)
             conditioning_data = self.get_conditioning_data(context, scheduler)
-            
+
             control_data = self.prep_control_data(
                 model=pipeline, context=context, control_input=self.control,
                 latents_shape=noise.shape,
@@ -457,8 +410,7 @@ class LatentsToLatentsInvocation(TextToLatentsInvocation):
 
             # TODO: Verify the noise is the right size
             initial_latents = latent if self.strength < 1.0 else torch.zeros_like(
-                latent, device=unet.device, dtype=latent.dtype
-            )
+                latent, device=unet.device, dtype=latent.dtype)
 
             timesteps, _ = pipeline.get_img2img_timesteps(
                 self.steps,
@@ -466,18 +418,15 @@ class LatentsToLatentsInvocation(TextToLatentsInvocation):
                 device=unet.device,
             )
 
-            loras = [(stack.enter_context(context.services.model_manager.get_model(**lora.dict(exclude={"weight"}))), lora.weight) for lora in self.unet.loras]
-
-            with ModelPatcher.apply_lora_unet(pipeline.unet, loras):
-                result_latents, result_attention_map_saver = pipeline.latents_from_embeddings(
-                    latents=initial_latents,
-                    timesteps=timesteps,
-                    noise=noise,
-                    num_inference_steps=self.steps,
-                    conditioning_data=conditioning_data,
-                    control_data=control_data,  # list[ControlNetData]
-                    callback=step_callback
-                )
+            result_latents, result_attention_map_saver = pipeline.latents_from_embeddings(
+                latents=initial_latents,
+                timesteps=timesteps,
+                noise=noise,
+                num_inference_steps=self.steps,
+                conditioning_data=conditioning_data,
+                control_data=control_data,  # list[ControlNetData]
+                callback=step_callback
+            )
 
         # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
         torch.cuda.empty_cache()
@@ -494,9 +443,12 @@ class LatentsToImageInvocation(BaseInvocation):
     type: Literal["l2i"] = "l2i"
 
     # Inputs
-    latents: Optional[LatentsField] = Field(description="The latents to generate an image from")
+    latents: Optional[LatentsField] = Field(
+        description="The latents to generate an image from")
     vae: VaeField = Field(default=None, description="Vae submodel")
-    tiled: bool = Field(default=False, description="Decode latents by overlaping tiles(less memory consumption)")
+    tiled: bool = Field(
+        default=False,
+        description="Decode latents by overlaping tiles(less memory consumption)")
 
     # Schema customisation
     class Config(InvocationConfig):
@@ -527,7 +479,7 @@ class LatentsToImageInvocation(BaseInvocation):
                 # copied from diffusers pipeline
                 latents = latents / vae.config.scaling_factor
                 image = vae.decode(latents, return_dict=False)[0]
-                image = (image / 2 + 0.5).clamp(0, 1) # denormalize
+                image = (image / 2 + 0.5).clamp(0, 1)  # denormalize
                 # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16
                 np_image = image.cpu().permute(0, 2, 3, 1).float().numpy()
 
@@ -550,9 +502,9 @@ class LatentsToImageInvocation(BaseInvocation):
             height=image_dto.height,
         )
 
-LATENTS_INTERPOLATION_MODE = Literal[
-    "nearest", "linear", "bilinear", "bicubic", "trilinear", "area", "nearest-exact"
-]
+
+LATENTS_INTERPOLATION_MODE = Literal["nearest", "linear",
+                                     "bilinear", "bicubic", "trilinear", "area", "nearest-exact"]
 
 
 class ResizeLatentsInvocation(BaseInvocation):
@@ -561,21 +513,25 @@ class ResizeLatentsInvocation(BaseInvocation):
     type: Literal["lresize"] = "lresize"
 
     # Inputs
-    latents:    Optional[LatentsField] = Field(description="The latents to resize")
-    width:                         int = Field(ge=64, multiple_of=8, description="The width to resize to (px)")
-    height:                        int = Field(ge=64, multiple_of=8, description="The height to resize to (px)")
-    mode:   LATENTS_INTERPOLATION_MODE = Field(default="bilinear", description="The interpolation mode")
-    antialias:                    bool = Field(default=False, description="Whether or not to antialias (applied in bilinear and bicubic modes only)")
+    latents: Optional[LatentsField] = Field(
+        description="The latents to resize")
+    width:                         int = Field(
+        ge=64, multiple_of=8, description="The width to resize to (px)")
+    height:                        int = Field(
+        ge=64, multiple_of=8, description="The height to resize to (px)")
+    mode:   LATENTS_INTERPOLATION_MODE = Field(
+        default="bilinear", description="The interpolation mode")
+    antialias: bool = Field(
+        default=False,
+        description="Whether or not to antialias (applied in bilinear and bicubic modes only)")
 
     def invoke(self, context: InvocationContext) -> LatentsOutput:
         latents = context.services.latents.get(self.latents.latents_name)
 
         resized_latents = torch.nn.functional.interpolate(
-            latents,
-            size=(self.height // 8, self.width // 8),
-            mode=self.mode,
-            antialias=self.antialias if self.mode in ["bilinear", "bicubic"] else False,
-        )
+            latents, size=(self.height // 8, self.width // 8),
+            mode=self.mode, antialias=self.antialias
+            if self.mode in ["bilinear", "bicubic"] else False,)
 
         # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
         torch.cuda.empty_cache()
@@ -592,21 +548,24 @@ class ScaleLatentsInvocation(BaseInvocation):
     type: Literal["lscale"] = "lscale"
 
     # Inputs
-    latents:   Optional[LatentsField] = Field(description="The latents to scale")
-    scale_factor:               float = Field(gt=0, description="The factor by which to scale the latents")
-    mode:  LATENTS_INTERPOLATION_MODE = Field(default="bilinear", description="The interpolation mode")
-    antialias:                   bool = Field(default=False, description="Whether or not to antialias (applied in bilinear and bicubic modes only)")
+    latents: Optional[LatentsField] = Field(
+        description="The latents to scale")
+    scale_factor:               float = Field(
+        gt=0, description="The factor by which to scale the latents")
+    mode:  LATENTS_INTERPOLATION_MODE = Field(
+        default="bilinear", description="The interpolation mode")
+    antialias: bool = Field(
+        default=False,
+        description="Whether or not to antialias (applied in bilinear and bicubic modes only)")
 
     def invoke(self, context: InvocationContext) -> LatentsOutput:
         latents = context.services.latents.get(self.latents.latents_name)
 
         # resizing
         resized_latents = torch.nn.functional.interpolate(
-            latents,
-            scale_factor=self.scale_factor,
-            mode=self.mode,
-            antialias=self.antialias if self.mode in ["bilinear", "bicubic"] else False,
-        )
+            latents, scale_factor=self.scale_factor, mode=self.mode,
+            antialias=self.antialias
+            if self.mode in ["bilinear", "bicubic"] else False,)
 
         # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
         torch.cuda.empty_cache()
@@ -623,9 +582,11 @@ class ImageToLatentsInvocation(BaseInvocation):
     type: Literal["i2l"] = "i2l"
 
     # Inputs
-    image: Union[ImageField, None] = Field(description="The image to encode")
+    image: Optional[ImageField] = Field(description="The image to encode")
     vae: VaeField = Field(default=None, description="Vae submodel")
-    tiled: bool = Field(default=False, description="Encode latents by overlaping tiles(less memory consumption)")
+    tiled: bool = Field(
+        default=False,
+        description="Encode latents by overlaping tiles(less memory consumption)")
 
     # Schema customisation
     class Config(InvocationConfig):

invokeai/app/invocations/model.py

@@ -1,31 +1,39 @@
-from typing import Literal, Optional, Union, List
-from pydantic import BaseModel, Field
 import copy
+from typing import List, Literal, Optional, Union
 
-from .baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationContext, InvocationConfig
+from pydantic import BaseModel, Field
 
-from ...backend.util.devices import choose_torch_device, torch_dtype
 from ...backend.model_management import BaseModelType, ModelType, SubModelType
+from .baseinvocation import (BaseInvocation, BaseInvocationOutput,
+                             InvocationConfig, InvocationContext)
+
 
 class ModelInfo(BaseModel):
     model_name: str = Field(description="Info to load submodel")
     base_model: BaseModelType = Field(description="Base model")
     model_type: ModelType = Field(description="Info to load submodel")
-    submodel: Optional[SubModelType] = Field(description="Info to load submodel")
+    submodel: Optional[SubModelType] = Field(
+        default=None, description="Info to load submodel"
+    )
+
 
 class LoraInfo(ModelInfo):
     weight: float = Field(description="Lora's weight which to use when apply to model")
 
+
 class UNetField(BaseModel):
     unet: ModelInfo = Field(description="Info to load unet submodel")
     scheduler: ModelInfo = Field(description="Info to load scheduler submodel")
     loras: List[LoraInfo] = Field(description="Loras to apply on model loading")
 
+
 class ClipField(BaseModel):
     tokenizer: ModelInfo = Field(description="Info to load tokenizer submodel")
     text_encoder: ModelInfo = Field(description="Info to load text_encoder submodel")
+    skipped_layers: int = Field(description="Number of skipped layers in text_encoder")
     loras: List[LoraInfo] = Field(description="Loras to apply on model loading")
 
+
 class VaeField(BaseModel):
     # TODO: better naming?
     vae: ModelInfo = Field(description="Info to load vae submodel")
@@ -34,46 +42,51 @@ class VaeField(BaseModel):
 class ModelLoaderOutput(BaseInvocationOutput):
     """Model loader output"""
 
-    #fmt: off
+    # fmt: off
     type: Literal["model_loader_output"] = "model_loader_output"
 
     unet: UNetField = Field(default=None, description="UNet submodel")
     clip: ClipField = Field(default=None, description="Tokenizer and text_encoder submodels")
     vae: VaeField = Field(default=None, description="Vae submodel")
-    #fmt: on
+    # fmt: on
 
 
-class PipelineModelField(BaseModel):
-    """Pipeline model field"""
+class MainModelField(BaseModel):
+    """Main model field"""
 
     model_name: str = Field(description="Name of the model")
     base_model: BaseModelType = Field(description="Base model")
 
 
-class PipelineModelLoaderInvocation(BaseInvocation):
-    """Loads a pipeline model, outputting its submodels."""
+class LoRAModelField(BaseModel):
+    """LoRA model field"""
 
-    type: Literal["pipeline_model_loader"] = "pipeline_model_loader"
+    model_name: str = Field(description="Name of the LoRA model")
+    base_model: BaseModelType = Field(description="Base model")
 
-    model: PipelineModelField = Field(description="The model to load")
+
+class MainModelLoaderInvocation(BaseInvocation):
+    """Loads a main model, outputting its submodels."""
+
+    type: Literal["main_model_loader"] = "main_model_loader"
+
+    model: MainModelField = Field(description="The model to load")
     # TODO: precision?
 
     # Schema customisation
     class Config(InvocationConfig):
         schema_extra = {
             "ui": {
+                "title": "Model Loader",
                 "tags": ["model", "loader"],
-                "type_hints": {
-                  "model": "model"
-                }
+                "type_hints": {"model": "model"},
             },
         }
 
     def invoke(self, context: InvocationContext) -> ModelLoaderOutput:
-
         base_model = self.model.base_model
         model_name = self.model.model_name
-        model_type = ModelType.Pipeline
+        model_type = ModelType.Main
 
         # TODO: not found exceptions
         if not context.services.model_manager.model_exists(
@@ -112,7 +125,6 @@ class PipelineModelLoaderInvocation(BaseInvocation):
             )
         """
 
-
         return ModelLoaderOutput(
             unet=UNetField(
                 unet=ModelInfo(
@@ -143,6 +155,7 @@ class PipelineModelLoaderInvocation(BaseInvocation):
                     submodel=SubModelType.TextEncoder,
                 ),
                 loras=[],
+                skipped_layers=0,
             ),
             vae=VaeField(
                 vae=ModelInfo(
@@ -151,43 +164,66 @@ class PipelineModelLoaderInvocation(BaseInvocation):
                     model_type=model_type,
                     submodel=SubModelType.Vae,
                 ),
-            )
+            ),
         )
 
+
 class LoraLoaderOutput(BaseInvocationOutput):
     """Model loader output"""
 
-    #fmt: off
+    # fmt: off
     type: Literal["lora_loader_output"] = "lora_loader_output"
 
     unet: Optional[UNetField] = Field(default=None, description="UNet submodel")
     clip: Optional[ClipField] = Field(default=None, description="Tokenizer and text_encoder submodels")
-    #fmt: on
+    # fmt: on
+
 
 class LoraLoaderInvocation(BaseInvocation):
     """Apply selected lora to unet and text_encoder."""
 
     type: Literal["lora_loader"] = "lora_loader"
 
-    lora_name: str = Field(description="Lora model name")
+    lora: Union[LoRAModelField, None] = Field(
+        default=None, description="Lora model name"
+    )
     weight: float = Field(default=0.75, description="With what weight to apply lora")
 
     unet: Optional[UNetField] = Field(description="UNet model for applying lora")
     clip: Optional[ClipField] = Field(description="Clip model for applying lora")
 
+    class Config(InvocationConfig):
+        schema_extra = {
+            "ui": {
+                "title": "Lora Loader",
+                "tags": ["lora", "loader"],
+                "type_hints": {"lora": "lora_model"},
+            },
+        }
+
     def invoke(self, context: InvocationContext) -> LoraLoaderOutput:
+        if self.lora is None:
+            raise Exception("No LoRA provided")
+
+        base_model = self.lora.base_model
+        lora_name = self.lora.model_name
 
         if not context.services.model_manager.model_exists(
-            model_name=self.lora_name,
-            model_type=SDModelType.Lora,
+            base_model=base_model,
+            model_name=lora_name,
+            model_type=ModelType.Lora,
         ):
-            raise Exception(f"Unkown lora name: {self.lora_name}!")
+            raise Exception(f"Unkown lora name: {lora_name}!")
 
-        if self.unet is not None and any(lora.model_name == self.lora_name for lora in self.unet.loras):
-            raise Exception(f"Lora \"{self.lora_name}\" already applied to unet")
+        if self.unet is not None and any(
+            lora.model_name == lora_name for lora in self.unet.loras
+        ):
+            raise Exception(f'Lora "{lora_name}" already applied to unet')
 
-        if self.clip is not None and any(lora.model_name == self.lora_name for lora in self.clip.loras):
-            raise Exception(f"Lora \"{self.lora_name}\" already applied to clip")
+        if self.clip is not None and any(
+            lora.model_name == lora_name for lora in self.clip.loras
+        ):
+            raise Exception(f'Lora "{lora_name}" already applied to clip')
 
         output = LoraLoaderOutput()
 
@@ -195,8 +231,9 @@ class LoraLoaderInvocation(BaseInvocation):
             output.unet = copy.deepcopy(self.unet)
             output.unet.loras.append(
                 LoraInfo(
-                    model_name=self.lora_name,
-                    model_type=SDModelType.Lora,
+                    base_model=base_model,
+                    model_name=lora_name,
+                    model_type=ModelType.Lora,
                     submodel=None,
                     weight=self.weight,
                 )
@@ -206,8 +243,9 @@ class LoraLoaderInvocation(BaseInvocation):
             output.clip = copy.deepcopy(self.clip)
             output.clip.loras.append(
                 LoraInfo(
-                    model_name=self.lora_name,
-                    model_type=SDModelType.Lora,
+                    base_model=base_model,
+                    model_name=lora_name,
+                    model_type=ModelType.Lora,
                     submodel=None,
                     weight=self.weight,
                 )
@@ -215,3 +253,58 @@ class LoraLoaderInvocation(BaseInvocation):
 
         return output
 
+
+class VAEModelField(BaseModel):
+    """Vae model field"""
+
+    model_name: str = Field(description="Name of the model")
+    base_model: BaseModelType = Field(description="Base model")
+
+
+class VaeLoaderOutput(BaseInvocationOutput):
+    """Model loader output"""
+
+    # fmt: off
+    type: Literal["vae_loader_output"] = "vae_loader_output"
+
+    vae: VaeField = Field(default=None, description="Vae model")
+    # fmt: on
+
+
+class VaeLoaderInvocation(BaseInvocation):
+    """Loads a VAE model, outputting a VaeLoaderOutput"""
+
+    type: Literal["vae_loader"] = "vae_loader"
+
+    vae_model: VAEModelField = Field(description="The VAE to load")
+
+    # Schema customisation
+    class Config(InvocationConfig):
+        schema_extra = {
+            "ui": {
+                "title": "VAE Loader",
+                "tags": ["vae", "loader"],
+                "type_hints": {"vae_model": "vae_model"},
+            },
+        }
+
+    def invoke(self, context: InvocationContext) -> VaeLoaderOutput:
+        base_model = self.vae_model.base_model
+        model_name = self.vae_model.model_name
+        model_type = ModelType.Vae
+
+        if not context.services.model_manager.model_exists(
+            base_model=base_model,
+            model_name=model_name,
+            model_type=model_type,
+        ):
+            raise Exception(f"Unkown vae name: {model_name}!")
+        return VaeLoaderOutput(
+            vae=VaeField(
+                vae=ModelInfo(
+                    model_name=model_name,
+                    base_model=base_model,
+                    model_type=model_type,
+                )
+            )
+        )

invokeai/app/invocations/noise.py

@@ -0,0 +1,134 @@
+# Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654) & the InvokeAI Team
+
+import math
+from typing import Literal
+
+from pydantic import Field, validator
+import torch
+from invokeai.app.invocations.latent import LatentsField
+
+from invokeai.app.util.misc import SEED_MAX, get_random_seed
+from ...backend.util.devices import choose_torch_device, torch_dtype
+from .baseinvocation import (
+    BaseInvocation,
+    BaseInvocationOutput,
+    InvocationConfig,
+    InvocationContext,
+)
+
+"""
+Utilities
+"""
+
+
+def get_noise(
+    width: int,
+    height: int,
+    device: torch.device,
+    seed: int = 0,
+    latent_channels: int = 4,
+    downsampling_factor: int = 8,
+    use_cpu: bool = True,
+    perlin: float = 0.0,
+):
+    """Generate noise for a given image size."""
+    noise_device_type = "cpu" if use_cpu else device.type
+
+    # limit noise to only the diffusion image channels, not the mask channels
+    input_channels = min(latent_channels, 4)
+    generator = torch.Generator(device=noise_device_type).manual_seed(seed)
+
+    noise_tensor = torch.randn(
+        [
+            1,
+            input_channels,
+            height // downsampling_factor,
+            width // downsampling_factor,
+        ],
+        dtype=torch_dtype(device),
+        device=noise_device_type,
+        generator=generator,
+    ).to(device)
+
+    return noise_tensor
+
+
+"""
+Nodes
+"""
+
+
+class NoiseOutput(BaseInvocationOutput):
+    """Invocation noise output"""
+
+    # fmt: off
+    type:  Literal["noise_output"] = "noise_output"
+
+    # Inputs
+    noise: LatentsField            = Field(default=None, description="The output noise")
+    width:                     int = Field(description="The width of the noise in pixels")
+    height:                    int = Field(description="The height of the noise in pixels")
+    # fmt: on
+
+
+def build_noise_output(latents_name: str, latents: torch.Tensor):
+    return NoiseOutput(
+        noise=LatentsField(latents_name=latents_name),
+        width=latents.size()[3] * 8,
+        height=latents.size()[2] * 8,
+    )
+
+
+class NoiseInvocation(BaseInvocation):
+    """Generates latent noise."""
+
+    type: Literal["noise"] = "noise"
+
+    # Inputs
+    seed: int = Field(
+        ge=0,
+        le=SEED_MAX,
+        description="The seed to use",
+        default_factory=get_random_seed,
+    )
+    width: int = Field(
+        default=512,
+        multiple_of=8,
+        gt=0,
+        description="The width of the resulting noise",
+    )
+    height: int = Field(
+        default=512,
+        multiple_of=8,
+        gt=0,
+        description="The height of the resulting noise",
+    )
+    use_cpu: bool = Field(
+        default=True,
+        description="Use CPU for noise generation (for reproducible results across platforms)",
+    )
+
+    # Schema customisation
+    class Config(InvocationConfig):
+        schema_extra = {
+            "ui": {
+                "tags": ["latents", "noise"],
+            },
+        }
+
+    @validator("seed", pre=True)
+    def modulo_seed(cls, v):
+        """Returns the seed modulo SEED_MAX to ensure it is within the valid range."""
+        return v % SEED_MAX
+
+    def invoke(self, context: InvocationContext) -> NoiseOutput:
+        noise = get_noise(
+            width=self.width,
+            height=self.height,
+            device=choose_torch_device(),
+            seed=self.seed,
+            use_cpu=self.use_cpu,
+        )
+        name = f"{context.graph_execution_state_id}__{self.id}"
+        context.services.latents.save(name, noise)
+        return build_noise_output(latents_name=name, latents=noise)

invokeai/app/invocations/param_easing.py

@@ -133,20 +133,19 @@ class StepParamEasingInvocation(BaseInvocation):
         postlist = list(num_poststeps * [self.post_end_value])
 
         if log_diagnostics:
-            logger = InvokeAILogger.getLogger(name="StepParamEasing")
-            logger.debug("start_step: " + str(start_step))
-            logger.debug("end_step: " + str(end_step))
-            logger.debug("num_easing_steps: " + str(num_easing_steps))
-            logger.debug("num_presteps: " + str(num_presteps))
-            logger.debug("num_poststeps: " + str(num_poststeps))
-            logger.debug("prelist size: " + str(len(prelist)))
-            logger.debug("postlist size: " + str(len(postlist)))
-            logger.debug("prelist: " + str(prelist))
-            logger.debug("postlist: " + str(postlist))
+            context.services.logger.debug("start_step: " + str(start_step))
+            context.services.logger.debug("end_step: " + str(end_step))
+            context.services.logger.debug("num_easing_steps: " + str(num_easing_steps))
+            context.services.logger.debug("num_presteps: " + str(num_presteps))
+            context.services.logger.debug("num_poststeps: " + str(num_poststeps))
+            context.services.logger.debug("prelist size: " + str(len(prelist)))
+            context.services.logger.debug("postlist size: " + str(len(postlist)))
+            context.services.logger.debug("prelist: " + str(prelist))
+            context.services.logger.debug("postlist: " + str(postlist))
 
         easing_class = EASING_FUNCTIONS_MAP[self.easing]
         if log_diagnostics:
-            logger.debug("easing class: " + str(easing_class))
+            context.services.logger.debug("easing class: " + str(easing_class))
         easing_list = list()
         if self.mirror:  # "expected" mirroring
             # if number of steps is even, squeeze duration down to (number_of_steps)/2
@@ -156,7 +155,7 @@ class StepParamEasingInvocation(BaseInvocation):
             # but if even then number_of_steps/2 === ceil(number_of_steps/2), so can just use ceil always
 
             base_easing_duration = int(np.ceil(num_easing_steps/2.0))
-            if log_diagnostics: logger.debug("base easing duration: " + str(base_easing_duration))
+            if log_diagnostics: context.services.logger.debug("base easing duration: " + str(base_easing_duration))
             even_num_steps = (num_easing_steps % 2 == 0)  # even number of steps
             easing_function = easing_class(start=self.start_value,
                                            end=self.end_value,
@@ -166,14 +165,14 @@ class StepParamEasingInvocation(BaseInvocation):
                 easing_val = easing_function.ease(step_index)
                 base_easing_vals.append(easing_val)
                 if log_diagnostics:
-                    logger.debug("step_index: " + str(step_index) + ", easing_val: " + str(easing_val))
+                    context.services.logger.debug("step_index: " + str(step_index) + ", easing_val: " + str(easing_val))
             if even_num_steps:
                 mirror_easing_vals = list(reversed(base_easing_vals))
             else:
                 mirror_easing_vals = list(reversed(base_easing_vals[0:-1]))
             if log_diagnostics:
-                logger.debug("base easing vals: " + str(base_easing_vals))
-                logger.debug("mirror easing vals: " + str(mirror_easing_vals))
+                context.services.logger.debug("base easing vals: " + str(base_easing_vals))
+                context.services.logger.debug("mirror easing vals: " + str(mirror_easing_vals))
             easing_list = base_easing_vals + mirror_easing_vals
 
         # FIXME: add alt_mirror option (alternative to default or mirror), or remove entirely
@@ -206,12 +205,12 @@ class StepParamEasingInvocation(BaseInvocation):
                 step_val = easing_function.ease(step_index)
                 easing_list.append(step_val)
                 if log_diagnostics:
-                    logger.debug("step_index: " + str(step_index) + ", easing_val: " + str(step_val))
+                    context.services.logger.debug("step_index: " + str(step_index) + ", easing_val: " + str(step_val))
 
         if log_diagnostics:
-            logger.debug("prelist size: " + str(len(prelist)))
-            logger.debug("easing_list size: " + str(len(easing_list)))
-            logger.debug("postlist size: " + str(len(postlist)))
+            context.services.logger.debug("prelist size: " + str(len(prelist)))
+            context.services.logger.debug("easing_list size: " + str(len(easing_list)))
+            context.services.logger.debug("postlist size: " + str(len(postlist)))
 
         param_list = prelist + easing_list + postlist
 

invokeai/app/invocations/reconstruct.py

@@ -1,4 +1,4 @@
-from typing import Literal, Union
+from typing import Literal, Optional
 
 from pydantic import Field
 
@@ -15,7 +15,7 @@ class RestoreFaceInvocation(BaseInvocation):
     type:  Literal["restore_face"] = "restore_face"
 
     # Inputs
-    image: Union[ImageField, None] = Field(description="The input image")
+    image: Optional[ImageField] = Field(description="The input image")
     strength:                float = Field(default=0.75, gt=0, le=1, description="The strength of the restoration"  )
     # fmt: on
 

invokeai/app/invocations/upscale.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
-from typing import Literal, Union
+from typing import Literal, Optional
 
 from pydantic import Field
 
@@ -16,7 +16,7 @@ class UpscaleInvocation(BaseInvocation):
     type: Literal["upscale"] = "upscale"
 
     # Inputs
-    image: Union[ImageField, None] = Field(description="The input image", default=None)
+    image: Optional[ImageField] = Field(description="The input image", default=None)
     strength: float = Field(default=0.75, gt=0, le=1, description="The strength")
     level: Literal[2, 4] = Field(default=2, description="The upscale level")
     # fmt: on

invokeai/app/services/board_image_record_storage.py

@@ -1,8 +1,7 @@
 from abc import ABC, abstractmethod
 import sqlite3
 import threading
-from typing import Union, cast
-from invokeai.app.services.board_record_storage import BoardRecord
+from typing import Optional, cast
 
 from invokeai.app.services.image_record_storage import OffsetPaginatedResults
 from invokeai.app.services.models.image_record import (
@@ -44,7 +43,7 @@ class BoardImageRecordStorageBase(ABC):
     def get_board_for_image(
         self,
         image_name: str,
-    ) -> Union[str, None]:
+    ) -> Optional[str]:
         """Gets an image's board id, if it has one."""
         pass
 
@@ -215,7 +214,7 @@ class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
     def get_board_for_image(
         self,
         image_name: str,
-    ) -> Union[str, None]:
+    ) -> Optional[str]:
         try:
             self._lock.acquire()
             self._cursor.execute(

invokeai/app/services/board_images.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from logging import Logger
-from typing import List, Union
+from typing import List, Union, Optional
 from invokeai.app.services.board_image_record_storage import BoardImageRecordStorageBase
 from invokeai.app.services.board_record_storage import (
     BoardRecord,
@@ -49,7 +49,7 @@ class BoardImagesServiceABC(ABC):
     def get_board_for_image(
         self,
         image_name: str,
-    ) -> Union[str, None]:
+    ) -> Optional[str]:
         """Gets an image's board id, if it has one."""
         pass
 
@@ -126,13 +126,13 @@ class BoardImagesService(BoardImagesServiceABC):
     def get_board_for_image(
         self,
         image_name: str,
-    ) -> Union[str, None]:
+    ) -> Optional[str]:
         board_id = self._services.board_image_records.get_board_for_image(image_name)
         return board_id
 
 
 def board_record_to_dto(
-    board_record: BoardRecord, cover_image_name: str | None, image_count: int
+    board_record: BoardRecord, cover_image_name: Optional[str], image_count: int
 ) -> BoardDTO:
     """Converts a board record to a board DTO."""
     return BoardDTO(

invokeai/app/services/config.py

@@ -15,7 +15,7 @@ InvokeAI:
     conf_path: configs/models.yaml
     legacy_conf_dir: configs/stable-diffusion
     outdir: outputs
-    autoconvert_dir: null
+    autoimport_dir: null
   Models:
     model: stable-diffusion-1.5
     embeddings: true
@@ -171,6 +171,7 @@ from pydantic import BaseSettings, Field, parse_obj_as
 from typing import ClassVar, Dict, List, Literal, Union, get_origin, get_type_hints, get_args
 
 INIT_FILE = Path('invokeai.yaml')
+MODEL_CORE = Path('models/core')
 DB_FILE   = Path('invokeai.db')
 LEGACY_INIT_FILE = Path('invokeai.init')
 
@@ -228,10 +229,10 @@ class InvokeAISettings(BaseSettings):
         upcase_environ = dict()
         for key,value in os.environ.items():
             upcase_environ[key.upper()] = value
-        
+
         fields = cls.__fields__
         cls.argparse_groups = {}
-        
+
         for name, field in fields.items():
             if name not in cls._excluded():
                 current_default = field.default
@@ -324,16 +325,11 @@ class InvokeAISettings(BaseSettings):
                 help=field.field_info.description,
             )
 def _find_root()->Path:
+    venv = Path(os.environ.get("VIRTUAL_ENV") or ".")
     if os.environ.get("INVOKEAI_ROOT"):
         root = Path(os.environ.get("INVOKEAI_ROOT")).resolve()
-    elif (
-            os.environ.get("VIRTUAL_ENV")
-            and (Path(os.environ.get("VIRTUAL_ENV"), "..", INIT_FILE).exists()
-                 or
-                 Path(os.environ.get("VIRTUAL_ENV"), "..", LEGACY_INIT_FILE).exists()
-                 )
-    ):
-        root = Path(os.environ.get("VIRTUAL_ENV"), "..").resolve()
+    elif any([(venv.parent/x).exists() for x in [INIT_FILE, LEGACY_INIT_FILE, MODEL_CORE]]):
+        root = (venv.parent).resolve()
     else:
         root = Path("~/invokeai").expanduser().resolve()
     return root
@@ -348,7 +344,7 @@ setting environment variables INVOKEAI_<setting>.
      '''
     singleton_config: ClassVar[InvokeAIAppConfig] = None
     singleton_init: ClassVar[Dict] = None
-    
+
     #fmt: off
     type: Literal["InvokeAI"] = "InvokeAI"
     host                : str = Field(default="127.0.0.1", description="IP address to bind to", category='Web Server')
@@ -367,24 +363,28 @@ setting environment variables INVOKEAI_<setting>.
 
     always_use_cpu      : bool = Field(default=False, description="If true, use the CPU for rendering even if a GPU is available.", category='Memory/Performance')
     free_gpu_mem        : bool = Field(default=False, description="If true, purge model from GPU after each generation.", category='Memory/Performance')
-    max_loaded_models   : int = Field(default=2, gt=0, description="Maximum number of models to keep in memory for rapid switching", category='Memory/Performance')
+    max_loaded_models   : int = Field(default=3, gt=0, description="(DEPRECATED: use max_cache_size) Maximum number of models to keep in memory for rapid switching", category='Memory/Performance')
+    max_cache_size      : float = Field(default=6.0, gt=0, description="Maximum memory amount used by model cache for rapid switching", category='Memory/Performance')
     precision           : Literal[tuple(['auto','float16','float32','autocast'])] = Field(default='float16',description='Floating point precision', category='Memory/Performance')
     sequential_guidance : bool = Field(default=False, description="Whether to calculate guidance in serial instead of in parallel, lowering memory requirements", category='Memory/Performance')
     xformers_enabled    : bool = Field(default=True, description="Enable/disable memory-efficient attention", category='Memory/Performance')
     tiled_decode        : bool = Field(default=False, description="Whether to enable tiled VAE decode (reduces memory consumption with some performance penalty)", category='Memory/Performance')
 
     root                : Path = Field(default=_find_root(), description='InvokeAI runtime root directory', category='Paths')
-    autoconvert_dir     : Path = Field(default=None, description='Path to a directory of ckpt files to be converted into diffusers and imported on startup.', category='Paths')
+    autoimport_dir      : Path = Field(default='autoimport/main', description='Path to a directory of models files to be imported on startup.', category='Paths')
+    lora_dir            : Path = Field(default='autoimport/lora', description='Path to a directory of LoRA/LyCORIS models to be imported on startup.', category='Paths')
+    embedding_dir       : Path = Field(default='autoimport/embedding', description='Path to a directory of Textual Inversion embeddings to be imported on startup.', category='Paths')
+    controlnet_dir      : Path = Field(default='autoimport/controlnet', description='Path to a directory of ControlNet embeddings to be imported on startup.', category='Paths')
     conf_path           : Path = Field(default='configs/models.yaml', description='Path to models definition file', category='Paths')
-    models_dir          : Path = Field(default='./models', description='Path to the models directory', category='Paths')
+    models_dir          : Path = Field(default='models', description='Path to the models directory', category='Paths')
     legacy_conf_dir     : Path = Field(default='configs/stable-diffusion', description='Path to directory of legacy checkpoint config files', category='Paths')
     db_dir              : Path = Field(default='databases', description='Path to InvokeAI databases directory', category='Paths')
     outdir              : Path = Field(default='outputs', description='Default folder for output images', category='Paths')
     from_file           : Path = Field(default=None, description='Take command input from the indicated file (command-line client only)', category='Paths')
     use_memory_db       : bool = Field(default=False, description='Use in-memory database for storing image metadata', category='Paths')
-    
+
     model               : str = Field(default='stable-diffusion-1.5', description='Initial model name', category='Models')
-    
+
     log_handlers        : List[str] = Field(default=["console"], description='Log handler. Valid options are "console", "file=<path>", "syslog=path|address:host:port", "http=<url>"', category="Logging")
     # note - would be better to read the log_format values from logging.py, but this creates circular dependencies issues
     log_format          : Literal[tuple(['plain','color','syslog','legacy'])] = Field(default="color", description='Log format. Use "plain" for text-only, "color" for colorized output, "legacy" for 2.3-style logging and "syslog" for syslog-style', category="Logging")
@@ -393,7 +393,7 @@ setting environment variables INVOKEAI_<setting>.
 
     def parse_args(self, argv: List[str]=None, conf: DictConfig = None, clobber=False):
         '''
-        Update settings with contents of init file, environment, and 
+        Update settings with contents of init file, environment, and
         command-line settings.
         :param conf: alternate Omegaconf dictionary object
         :param argv: aternate sys.argv list
@@ -408,7 +408,7 @@ setting environment variables INVOKEAI_<setting>.
             except:
                 pass
         InvokeAISettings.initconf = conf
-        
+
         # parse args again in order to pick up settings in configuration file
         super().parse_args(argv)
 
@@ -428,7 +428,7 @@ setting environment variables INVOKEAI_<setting>.
             cls.singleton_config = cls(**kwargs)
             cls.singleton_init = kwargs
         return cls.singleton_config
-        
+
     @property
     def root_path(self)->Path:
         '''

invokeai/app/services/default_graphs.py

@@ -1,4 +1,5 @@
-from ..invocations.latent import LatentsToImageInvocation, NoiseInvocation, TextToLatentsInvocation
+from ..invocations.latent import LatentsToImageInvocation, TextToLatentsInvocation
+from ..invocations.noise import NoiseInvocation
 from ..invocations.compel import CompelInvocation
 from ..invocations.params import ParamIntInvocation
 from .graph import Edge, EdgeConnection, ExposedNodeInput, ExposedNodeOutput, Graph, LibraryGraph

invokeai/app/services/events.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
-from typing import Any
+from typing import Any, Optional
 from invokeai.app.models.image import ProgressImage
 from invokeai.app.util.misc import get_timestamp
 from invokeai.app.services.model_manager_service import BaseModelType, ModelType, SubModelType, ModelInfo
-from invokeai.app.models.exceptions import CanceledException
 
 class EventServiceBase:
     session_event: str = "session_event"
@@ -28,7 +27,7 @@ class EventServiceBase:
         graph_execution_state_id: str,
         node: dict,
         source_node_id: str,
-        progress_image: ProgressImage | None,
+        progress_image: Optional[ProgressImage],
         step: int,
         total_steps: int,
     ) -> None:

invokeai/app/services/graph.py

@@ -3,7 +3,6 @@
 import copy
 import itertools
 import uuid
-from types import NoneType
 from typing import (
     Annotated,
     Any,
@@ -26,6 +25,8 @@ from ..invocations.baseinvocation import (
     InvocationContext,
 )
 
+# in 3.10 this would be "from types import NoneType"
+NoneType = type(None)
 
 class EdgeConnection(BaseModel):
     node_id: str = Field(description="The id of the node for this edge connection")
@@ -60,8 +61,6 @@ def get_input_field(node: BaseInvocation, field: str) -> Any:
     node_input_field = node_inputs.get(field) or None
     return node_input_field
 
-from typing import Optional, Union, List, get_args
-
 def is_union_subtype(t1, t2):
     t1_args = get_args(t1)
     t2_args = get_args(t2)
@@ -846,7 +845,7 @@ class GraphExecutionState(BaseModel):
             ]
         }
 
-    def next(self) -> BaseInvocation | None:
+    def next(self) -> Optional[BaseInvocation]:
         """Gets the next node ready to execute."""
 
         # TODO: enable multiple nodes to execute simultaneously by tracking currently executing nodes

invokeai/app/services/image_file_storage.py

@@ -2,13 +2,12 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
 from queue import Queue
-from typing import Dict, Optional
+from typing import Dict, Optional, Union
 
 from PIL.Image import Image as PILImageType
 from PIL import Image, PngImagePlugin
 from send2trash import send2trash
 
-from invokeai.app.models.image import ResourceOrigin
 from invokeai.app.models.metadata import ImageMetadata
 from invokeai.app.util.thumbnails import get_thumbnail_name, make_thumbnail
 
@@ -80,13 +79,15 @@ class DiskImageFileStorage(ImageFileStorageBase):
     __cache: Dict[Path, PILImageType]
     __max_cache_size: int
 
-    def __init__(self, output_folder: str | Path):
+    def __init__(self, output_folder: Union[str, Path]):
         self.__cache = dict()
         self.__cache_ids = Queue()
         self.__max_cache_size = 10  # TODO: get this from config
 
-        self.__output_folder: Path = output_folder if isinstance(output_folder, Path) else Path(output_folder)
-        self.__thumbnails_folder = self.__output_folder / 'thumbnails'
+        self.__output_folder: Path = (
+            output_folder if isinstance(output_folder, Path) else Path(output_folder)
+        )
+        self.__thumbnails_folder = self.__output_folder / "thumbnails"
 
         # Validate required output folders at launch
         self.__validate_storage_folders()
@@ -94,7 +95,7 @@ class DiskImageFileStorage(ImageFileStorageBase):
     def get(self, image_name: str) -> PILImageType:
         try:
             image_path = self.get_path(image_name)
-            
+
             cache_item = self.__get_cache(image_path)
             if cache_item:
                 return cache_item
@@ -155,31 +156,33 @@ class DiskImageFileStorage(ImageFileStorageBase):
     # TODO: make this a bit more flexible for e.g. cloud storage
     def get_path(self, image_name: str, thumbnail: bool = False) -> Path:
         path = self.__output_folder / image_name
-        
+
         if thumbnail:
             thumbnail_name = get_thumbnail_name(image_name)
             path = self.__thumbnails_folder / thumbnail_name
 
         return path
 
-    def validate_path(self, path: str | Path) -> bool:
+    def validate_path(self, path: Union[str, Path]) -> bool:
         """Validates the path given for an image or thumbnail."""
         path = path if isinstance(path, Path) else Path(path)
         return path.exists()
-    
+
     def __validate_storage_folders(self) -> None:
         """Checks if the required output folders exist and create them if they don't"""
         folders: list[Path] = [self.__output_folder, self.__thumbnails_folder]
         for folder in folders:
             folder.mkdir(parents=True, exist_ok=True)
 
-    def __get_cache(self, image_name: Path) -> PILImageType | None:
+    def __get_cache(self, image_name: Path) -> Optional[PILImageType]:
         return None if image_name not in self.__cache else self.__cache[image_name]
 
     def __set_cache(self, image_name: Path, image: PILImageType):
         if not image_name in self.__cache:
             self.__cache[image_name] = image
-            self.__cache_ids.put(image_name)  # TODO: this should refresh position for LRU cache
+            self.__cache_ids.put(
+                image_name
+            )  # TODO: this should refresh position for LRU cache
             if len(self.__cache) > self.__max_cache_size:
                 cache_id = self.__cache_ids.get()
                 if cache_id in self.__cache:

invokeai/app/services/image_record_storage.py

@@ -3,7 +3,6 @@ from datetime import datetime
 from typing import Generic, Optional, TypeVar, cast
 import sqlite3
 import threading
-from typing import Optional, Union
 
 from pydantic import BaseModel, Field
 from pydantic.generics import GenericModel
@@ -94,6 +93,11 @@ class ImageRecordStorageBase(ABC):
         """Deletes an image record."""
         pass
 
+    @abstractmethod
+    def delete_many(self, image_names: list[str]) -> None:
+        """Deletes many image records."""
+        pass
+
     @abstractmethod
     def save(
         self,
@@ -111,7 +115,7 @@ class ImageRecordStorageBase(ABC):
         pass
 
     @abstractmethod
-    def get_most_recent_image_for_board(self, board_id: str) -> ImageRecord | None:
+    def get_most_recent_image_for_board(self, board_id: str) -> Optional[ImageRecord]:
         """Gets the most recent image for a board."""
         pass
 
@@ -203,7 +207,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
             """
         )
 
-    def get(self, image_name: str) -> Union[ImageRecord, None]:
+    def get(self, image_name: str) -> Optional[ImageRecord]:
         try:
             self._lock.acquire()
 
@@ -215,7 +219,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
                 (image_name,),
             )
 
-            result = cast(Union[sqlite3.Row, None], self._cursor.fetchone())
+            result = cast(Optional[sqlite3.Row], self._cursor.fetchone())
         except sqlite3.Error as e:
             self._conn.rollback()
             raise ImageRecordNotFoundException from e
@@ -385,6 +389,25 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
         finally:
             self._lock.release()
 
+    def delete_many(self, image_names: list[str]) -> None:
+        try:
+            placeholders = ",".join("?" for _ in image_names)
+
+            self._lock.acquire()
+
+            # Construct the SQLite query with the placeholders
+            query = f"DELETE FROM images WHERE image_name IN ({placeholders})"
+
+            # Execute the query with the list of IDs as parameters
+            self._cursor.execute(query, image_names)
+
+            self._conn.commit()
+        except sqlite3.Error as e:
+            self._conn.rollback()
+            raise ImageRecordDeleteException from e
+        finally:
+            self._lock.release()
+
     def save(
         self,
         image_name: str,
@@ -451,7 +474,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
 
     def get_most_recent_image_for_board(
         self, board_id: str
-    ) -> Union[ImageRecord, None]:
+    ) -> Optional[ImageRecord]:
         try:
             self._lock.acquire()
             self._cursor.execute(
@@ -466,7 +489,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
                 (board_id,),
             )
 
-            result = cast(Union[sqlite3.Row, None], self._cursor.fetchone())
+            result = cast(Optional[sqlite3.Row], self._cursor.fetchone())
         finally:
             self._lock.release()
         if result is None:

invokeai/app/services/images.py

@@ -112,6 +112,11 @@ class ImageServiceABC(ABC):
         """Deletes an image."""
         pass
 
+    @abstractmethod
+    def delete_images_on_board(self, board_id: str):
+        """Deletes all images on a board."""
+        pass
+
 
 class ImageServiceDependencies:
     """Service dependencies for the ImageService."""
@@ -341,9 +346,31 @@ class ImageService(ImageServiceABC):
             self._services.logger.error("Problem deleting image record and file")
             raise e
 
+    def delete_images_on_board(self, board_id: str):
+        try:
+            images = self._services.board_image_records.get_images_for_board(board_id)
+            image_name_list = list(
+                map(
+                    lambda r: r.image_name,
+                    images.items,
+                )
+            )
+            for image_name in image_name_list:
+                self._services.image_files.delete(image_name)
+            self._services.image_records.delete_many(image_name_list)
+        except ImageRecordDeleteException:
+            self._services.logger.error(f"Failed to delete image records")
+            raise
+        except ImageFileDeleteException:
+            self._services.logger.error(f"Failed to delete image files")
+            raise
+        except Exception as e:
+            self._services.logger.error("Problem deleting image records and files")
+            raise e
+
     def _get_metadata(
         self, session_id: Optional[str] = None, node_id: Optional[str] = None
-    ) -> Union[ImageMetadata, None]:
+    ) -> Optional[ImageMetadata]:
         """Get the metadata for a node."""
         metadata = None
 

invokeai/app/services/invocation_queue.py

@@ -5,7 +5,7 @@ from abc import ABC, abstractmethod
 from queue import Queue
 
 from pydantic import BaseModel, Field
-
+from typing import Optional
 
 class InvocationQueueItem(BaseModel):
     graph_execution_state_id: str = Field(description="The ID of the graph execution state")
@@ -22,7 +22,7 @@ class InvocationQueueABC(ABC):
         pass
 
     @abstractmethod
-    def put(self, item: InvocationQueueItem | None) -> None:
+    def put(self, item: Optional[InvocationQueueItem]) -> None:
         pass
 
     @abstractmethod
@@ -57,7 +57,7 @@ class MemoryInvocationQueue(InvocationQueueABC):
 
         return item
 
-    def put(self, item: InvocationQueueItem | None) -> None:
+    def put(self, item: Optional[InvocationQueueItem]) -> None:
         self.__queue.put(item)
 
     def cancel(self, graph_execution_state_id: str) -> None:

invokeai/app/services/invocation_services.py

@@ -7,7 +7,7 @@ if TYPE_CHECKING:
     from invokeai.app.services.board_images import BoardImagesServiceABC
     from invokeai.app.services.boards import BoardServiceABC
     from invokeai.app.services.images import ImageServiceABC
-    from invokeai.backend import ModelManager
+    from invokeai.app.services.model_manager_service import ModelManagerServiceBase
     from invokeai.app.services.events import EventServiceBase
     from invokeai.app.services.latent_storage import LatentsStorageBase
     from invokeai.app.services.restoration_services import RestorationServices
@@ -22,46 +22,47 @@ class InvocationServices:
     """Services that can be used by invocations"""
 
     # TODO: Just forward-declared everything due to circular dependencies. Fix structure.
-    events: "EventServiceBase"
-    latents: "LatentsStorageBase"
-    queue: "InvocationQueueABC"
-    model_manager: "ModelManager"
-    restoration: "RestorationServices"
-    configuration: "InvokeAISettings"
-    images: "ImageServiceABC"
-    boards: "BoardServiceABC"
     board_images: "BoardImagesServiceABC"
-    graph_library: "ItemStorageABC"["LibraryGraph"]
+    boards: "BoardServiceABC"
+    configuration: "InvokeAISettings"
+    events: "EventServiceBase"
     graph_execution_manager: "ItemStorageABC"["GraphExecutionState"]
+    graph_library: "ItemStorageABC"["LibraryGraph"]
+    images: "ImageServiceABC"
+    latents: "LatentsStorageBase"
+    logger: "Logger"
+    model_manager: "ModelManagerServiceBase"
     processor: "InvocationProcessorABC"
+    queue: "InvocationQueueABC"
+    restoration: "RestorationServices"
 
     def __init__(
         self,
-        model_manager: "ModelManager",
-        events: "EventServiceBase",
-        logger: "Logger",
-        latents: "LatentsStorageBase",
-        images: "ImageServiceABC",
-        boards: "BoardServiceABC",
         board_images: "BoardImagesServiceABC",
-        queue: "InvocationQueueABC",
-        graph_library: "ItemStorageABC"["LibraryGraph"],
-        graph_execution_manager: "ItemStorageABC"["GraphExecutionState"],
-        processor: "InvocationProcessorABC",
-        restoration: "RestorationServices",
+        boards: "BoardServiceABC",
         configuration: "InvokeAISettings",
+        events: "EventServiceBase",
+        graph_execution_manager: "ItemStorageABC"["GraphExecutionState"],
+        graph_library: "ItemStorageABC"["LibraryGraph"],
+        images: "ImageServiceABC",
+        latents: "LatentsStorageBase",
+        logger: "Logger",
+        model_manager: "ModelManagerServiceBase",
+        processor: "InvocationProcessorABC",
+        queue: "InvocationQueueABC",
+        restoration: "RestorationServices",
     ):
-        self.model_manager = model_manager
-        self.events = events
-        self.logger = logger
-        self.latents = latents
-        self.images = images
-        self.boards = boards
         self.board_images = board_images
-        self.queue = queue
-        self.graph_library = graph_library
-        self.graph_execution_manager = graph_execution_manager
-        self.processor = processor
-        self.restoration = restoration
-        self.configuration = configuration
         self.boards = boards
+        self.boards = boards
+        self.configuration = configuration
+        self.events = events
+        self.graph_execution_manager = graph_execution_manager
+        self.graph_library = graph_library
+        self.images = images
+        self.latents = latents
+        self.logger = logger
+        self.model_manager = model_manager
+        self.processor = processor
+        self.queue = queue
+        self.restoration = restoration

invokeai/app/services/invoker.py

@@ -1,14 +1,11 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
 from abc import ABC
-from threading import Event, Thread
+from typing import Optional
 
-from ..invocations.baseinvocation import InvocationContext
 from .graph import Graph, GraphExecutionState
-from .invocation_queue import InvocationQueueABC, InvocationQueueItem
+from .invocation_queue import InvocationQueueItem
 from .invocation_services import InvocationServices
-from .item_storage import ItemStorageABC
-
 
 class Invoker:
     """The invoker, used to execute invocations"""
@@ -21,7 +18,7 @@ class Invoker:
 
     def invoke(
         self, graph_execution_state: GraphExecutionState, invoke_all: bool = False
-    ) -> str | None:
+    ) -> Optional[str]:
         """Determines the next node to invoke and enqueues it, preparing if needed.
         Returns the id of the queued node, or `None` if there are no nodes left to enqueue."""
 
@@ -45,7 +42,7 @@ class Invoker:
 
         return invocation.id
 
-    def create_execution_state(self, graph: Graph | None = None) -> GraphExecutionState:
+    def create_execution_state(self, graph: Optional[Graph] = None) -> GraphExecutionState:
         """Creates a new execution state for the given graph"""
         new_state = GraphExecutionState(graph=Graph() if graph is None else graph)
         self.services.graph_execution_manager.set(new_state)

invokeai/app/services/latent_storage.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
 from queue import Queue
-from typing import Dict
+from typing import Dict, Union, Optional
 
 import torch
 
@@ -55,7 +55,7 @@ class ForwardCacheLatentsStorage(LatentsStorageBase):
         if name in self.__cache:
             del self.__cache[name]
 
-    def __get_cache(self, name: str) -> torch.Tensor|None:
+    def __get_cache(self, name: str) -> Optional[torch.Tensor]:
         return None if name not in self.__cache else self.__cache[name]
 
     def __set_cache(self, name: str, data: torch.Tensor):
@@ -69,9 +69,9 @@ class ForwardCacheLatentsStorage(LatentsStorageBase):
 class DiskLatentsStorage(LatentsStorageBase):
     """Stores latents in a folder on disk without caching"""
 
-    __output_folder: str | Path
+    __output_folder: Union[str, Path]
 
-    def __init__(self, output_folder: str | Path):
+    def __init__(self, output_folder: Union[str, Path]):
         self.__output_folder = output_folder if isinstance(output_folder, Path) else Path(output_folder)
         self.__output_folder.mkdir(parents=True, exist_ok=True)
 
@@ -91,4 +91,4 @@ class DiskLatentsStorage(LatentsStorageBase):
 
     def get_path(self, name: str) -> Path:
         return self.__output_folder / name
-    
+    

invokeai/app/services/metadata.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Any, Union
+from typing import Any, Optional
 import networkx as nx
 
 from invokeai.app.models.metadata import ImageMetadata
@@ -34,7 +34,7 @@ class CoreMetadataService(MetadataServiceBase):
 
         return metadata
 
-    def _find_nearest_ancestor(self, G: nx.DiGraph, node_id: str) -> Union[str, None]:
+    def _find_nearest_ancestor(self, G: nx.DiGraph, node_id: str) -> Optional[str]:
         """
         Finds the id of the nearest ancestor (of a valid type) of a given node.
 
@@ -65,7 +65,7 @@ class CoreMetadataService(MetadataServiceBase):
 
     def _get_additional_metadata(
         self, graph: Graph, node_id: str
-    ) -> Union[dict[str, Any], None]:
+    ) -> Optional[dict[str, Any]]:
         """
         Returns additional metadata for a given node.
 

invokeai/app/services/model_manager_service.py

@@ -2,22 +2,29 @@
 
 from __future__ import annotations
 
-import torch
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Optional, Union, Callable, List, Tuple, types, TYPE_CHECKING
-from dataclasses import dataclass
+from pydantic import Field
+from typing import Optional, Union, Callable, List, Tuple, TYPE_CHECKING
+from types import ModuleType
 
-from invokeai.backend.model_management.model_manager import (
+from invokeai.backend.model_management import (
     ModelManager,
     BaseModelType,
     ModelType,
     SubModelType,
     ModelInfo,
+    AddModelResult,
+    SchedulerPredictionType,
+    ModelMerger,
+    MergeInterpolationMethod,
 )
+
+
+import torch
 from invokeai.app.models.exceptions import CanceledException
-from .config import InvokeAIAppConfig
 from ...backend.util import choose_precision, choose_torch_device
+from .config import InvokeAIAppConfig
 
 if TYPE_CHECKING:
     from ..invocations.baseinvocation import BaseInvocation, InvocationContext
@@ -30,16 +37,16 @@ class ModelManagerServiceBase(ABC):
     def __init__(
         self,
         config: InvokeAIAppConfig,
-        logger: types.ModuleType,
+        logger: ModuleType,
     ):
         """
-        Initialize with the path to the models.yaml config file. 
+        Initialize with the path to the models.yaml config file.
         Optional parameters are the torch device type, precision, max_models,
         and sequential_offload boolean. Note that the default device
         type and precision are set up for a CUDA system running at half precision.
         """
         pass
-    
+
     @abstractmethod
     def get_model(
         self,
@@ -50,8 +57,8 @@ class ModelManagerServiceBase(ABC):
         node: Optional[BaseInvocation] = None,
         context: Optional[InvocationContext] = None,
     ) -> ModelInfo:
-        """Retrieve the indicated model with name and type. 
-        submodel can be used to get a part (such as the vae) 
+        """Retrieve the indicated model with name and type.
+        submodel can be used to get a part (such as the vae)
         of a diffusers pipeline."""
         pass
 
@@ -73,13 +80,7 @@ class ModelManagerServiceBase(ABC):
     def model_info(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict:
         """
         Given a model name returns a dict-like (OmegaConf) object describing it.
-        """
-        pass
-
-    @abstractmethod
-    def model_names(self) -> List[Tuple[str, BaseModelType, ModelType]]:
-        """
-        Returns a list of all the model names known.
+        Uses the exact format as the omegaconf stanza.
         """
         pass
 
@@ -101,7 +102,20 @@ class ModelManagerServiceBase(ABC):
         }
         """
         pass
+    
+    @abstractmethod
+    def list_model(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict:
+        """
+        Return information about the model using the same format as list_models()
+        """
+        pass
 
+    @abstractmethod
+    def model_names(self) -> List[Tuple[str, BaseModelType, ModelType]]:
+        """
+        Returns a list of all the model names known.
+        """
+        pass
 
     @abstractmethod
     def add_model(
@@ -111,16 +125,34 @@ class ModelManagerServiceBase(ABC):
         model_type: ModelType,
         model_attributes: dict,
         clobber: bool = False
-    ) -> None:
+    ) -> AddModelResult:
         """
         Update the named model with a dictionary of attributes. Will fail with an
         assertion error if the name already exists. Pass clobber=True to overwrite.
+        On a successful update, the config will be changed in memory. Will fail
+        with an assertion error if provided attributes are incorrect or
+        the model name is missing. Call commit() to write changes to disk.
+        """
+        pass
+
+    @abstractmethod
+    def update_model(
+        self,
+        model_name: str,
+        base_model: BaseModelType,
+        model_type: ModelType,
+        model_attributes: dict,
+    ) -> AddModelResult:
+        """
+        Update the named model with a dictionary of attributes. Will fail with a
+        KeyErrorException if the name does not already exist.
+
         On a successful update, the config will be changed in memory. Will fail 
         with an assertion error if provided attributes are incorrect or 
         the model name is missing. Call commit() to write changes to disk.
         """
         pass
-
+    
     @abstractmethod
     def del_model(
         self,
@@ -129,14 +161,78 @@ class ModelManagerServiceBase(ABC):
         model_type: ModelType,
     ):
         """
-        Delete the named model from configuration. If delete_files is true, 
-        then the underlying weight file or diffusers directory will be deleted 
+        Delete the named model from configuration. If delete_files is true,
+        then the underlying weight file or diffusers directory will be deleted
         as well. Call commit() to write to disk.
         """
         pass
 
     @abstractmethod
-    def commit(self, conf_file: Path = None) -> None:
+    def convert_model(
+        self,
+        model_name: str,
+        base_model: BaseModelType,
+        model_type: Union[ModelType.Main,ModelType.Vae],
+    ) -> AddModelResult:
+        """
+        Convert a checkpoint file into a diffusers folder, deleting the cached
+        version and deleting the original checkpoint file if it is in the models
+        directory.
+        :param model_name: Name of the model to convert
+        :param base_model: Base model type
+        :param model_type: Type of model ['vae' or 'main']
+
+        This will raise a ValueError unless the model is not a checkpoint. It will
+        also raise a ValueError in the event that there is a similarly-named diffusers
+        directory already in place.
+        """
+        pass
+
+    @abstractmethod
+    def heuristic_import(self,
+                         items_to_import: set[str],
+                         prediction_type_helper: Optional[Callable[[Path],SchedulerPredictionType]]=None,
+                         )->dict[str, AddModelResult]:
+        '''Import a list of paths, repo_ids or URLs. Returns the set of
+        successfully imported items.
+        :param items_to_import: Set of strings corresponding to models to be imported.
+        :param prediction_type_helper: A callback that receives the Path of a Stable Diffusion 2 checkpoint model and returns a SchedulerPredictionType.
+
+        The prediction type helper is necessary to distinguish between
+        models based on Stable Diffusion 2 Base (requiring
+        SchedulerPredictionType.Epsilson) and Stable Diffusion 768
+        (requiring SchedulerPredictionType.VPrediction). It is
+        generally impossible to do this programmatically, so the
+        prediction_type_helper usually asks the user to choose.
+
+        The result is a set of successfully installed models. Each element
+        of the set is a dict corresponding to the newly-created OmegaConf stanza for
+        that model.
+        '''
+        pass
+
+    @abstractmethod
+    def merge_models(
+            self,
+            model_names: List[str] = Field(default=None, min_items=2, max_items=3, description="List of model names to merge"),
+            base_model: Union[BaseModelType,str] = Field(default=None, description="Base model shared by all models to be merged"),
+            merged_model_name: str = Field(default=None, description="Name of destination model after merging"),
+            alpha: Optional[float] = 0.5,
+            interp: Optional[MergeInterpolationMethod] = None,
+            force: Optional[bool] = False,
+    ) -> AddModelResult:
+        """
+        Merge two to three diffusrs pipeline models and save as a new model.
+        :param model_names: List of 2-3 models to merge
+        :param base_model: Base model to use for all models
+        :param merged_model_name: Name of destination merged model
+        :param alpha: Alpha strength to apply to 2d and 3d model
+        :param interp: Interpolation method. None (default) 
+        """
+        pass
+    
+    @abstractmethod
+    def commit(self, conf_file: Optional[Path] = None) -> None:
         """
         Write current configuration out to the indicated file.
         If no conf_file is provided, then replaces the
@@ -150,10 +246,10 @@ class ModelManagerService(ModelManagerServiceBase):
     def __init__(
         self,
         config: InvokeAIAppConfig,
-        logger: types.ModuleType,
+        logger: ModuleType,
     ):
         """
-        Initialize with the path to the models.yaml config file. 
+        Initialize with the path to the models.yaml config file.
         Optional parameters are the torch device type, precision, max_models,
         and sequential_offload boolean. Note that the default device
         type and precision are set up for a CUDA system running at half precision.
@@ -168,6 +264,8 @@ class ModelManagerService(ModelManagerServiceBase):
         logger.debug(f'config file={config_file}')
 
         device = torch.device(choose_torch_device())
+        logger.debug(f'GPU device = {device}')
+
         precision = config.precision
         if precision == "auto":
             precision = choose_precision(device)
@@ -183,6 +281,8 @@ class ModelManagerService(ModelManagerServiceBase):
             if hasattr(config,'max_cache_size') \
                else config.max_loaded_models * 2.5
 
+        logger.debug(f"Maximum RAM cache size: {max_cache_size} GiB")
+
         sequential_offload = config.sequential_guidance
 
         self.mgr = ModelManager(
@@ -238,7 +338,7 @@ class ModelManagerService(ModelManagerServiceBase):
                 submodel=submodel,
                 model_info=model_info
             )
-            
+
         return model_info
 
     def model_exists(
@@ -274,12 +374,19 @@ class ModelManagerService(ModelManagerServiceBase):
         base_model: Optional[BaseModelType] = None,
         model_type: Optional[ModelType] = None
     ) -> list[dict]:
-    # ) -> dict:
         """
         Return a list of models.
         """
         return self.mgr.list_models(base_model, model_type)
 
+    def list_model(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict:
+        """
+        Return information about the model using the same format as list_models()
+        """
+        return self.mgr.list_model(model_name=model_name,
+                                   base_model=base_model,
+                                   model_type=model_type)
+
     def add_model(
         self,
         model_name: str,
@@ -291,13 +398,32 @@ class ModelManagerService(ModelManagerServiceBase):
         """
         Update the named model with a dictionary of attributes. Will fail with an
         assertion error if the name already exists. Pass clobber=True to overwrite.
+        On a successful update, the config will be changed in memory. Will fail
+        with an assertion error if provided attributes are incorrect or
+        the model name is missing. Call commit() to write changes to disk.
+        """
+        self.logger.debug(f'add/update model {model_name}')        
+        return self.mgr.add_model(model_name, base_model, model_type, model_attributes, clobber)
+
+    def update_model(
+        self,
+        model_name: str,
+        base_model: BaseModelType,
+        model_type: ModelType,
+        model_attributes: dict,
+    ) -> AddModelResult:
+        """
+        Update the named model with a dictionary of attributes. Will fail with a
+        KeyError exception if the name does not already exist.
         On a successful update, the config will be changed in memory. Will fail 
         with an assertion error if provided attributes are incorrect or 
         the model name is missing. Call commit() to write changes to disk.
         """
-        return self.mgr.add_model(model_name, base_model, model_type, model_attributes, clobber)
-
-
+        self.logger.debug(f'update model {model_name}')
+        if not self.model_exists(model_name, base_model, model_type):
+            raise KeyError(f"Unknown model {model_name}")
+        return self.add_model(model_name, base_model, model_type, model_attributes, clobber=True)
+    
     def del_model(
         self,
         model_name: str,
@@ -305,12 +431,33 @@ class ModelManagerService(ModelManagerServiceBase):
         model_type: ModelType,
     ):
         """
-        Delete the named model from configuration. If delete_files is true, 
-        then the underlying weight file or diffusers directory will be deleted 
+        Delete the named model from configuration. If delete_files is true,
+        then the underlying weight file or diffusers directory will be deleted
         as well. Call commit() to write to disk.
         """
+        self.logger.debug(f'delete model {model_name}')
         self.mgr.del_model(model_name, base_model, model_type)
 
+    def convert_model(
+        self,
+        model_name: str,
+        base_model: BaseModelType,
+        model_type: Union[ModelType.Main,ModelType.Vae],
+    ) -> AddModelResult:
+        """
+        Convert a checkpoint file into a diffusers folder, deleting the cached
+        version and deleting the original checkpoint file if it is in the models
+        directory.
+        :param model_name: Name of the model to convert
+        :param base_model: Base model type
+        :param model_type: Type of model ['vae' or 'main']
+
+        This will raise a ValueError unless the model is not a checkpoint. It will
+        also raise a ValueError in the event that there is a similarly-named diffusers
+        directory already in place.
+        """
+        self.logger.debug(f'convert model {model_name}')        
+        return self.mgr.convert_model(model_name, base_model, model_type)
 
     def commit(self, conf_file: Optional[Path]=None):
         """
@@ -360,4 +507,56 @@ class ModelManagerService(ModelManagerServiceBase):
     @property
     def logger(self):
         return self.mgr.logger
-        
+
+    def heuristic_import(self,
+                         items_to_import: set[str],
+                         prediction_type_helper: Optional[Callable[[Path],SchedulerPredictionType]]=None,
+                         )->dict[str, AddModelResult]:
+        '''Import a list of paths, repo_ids or URLs. Returns the set of
+        successfully imported items.
+        :param items_to_import: Set of strings corresponding to models to be imported.
+        :param prediction_type_helper: A callback that receives the Path of a Stable Diffusion 2 checkpoint model and returns a SchedulerPredictionType.
+
+        The prediction type helper is necessary to distinguish between
+        models based on Stable Diffusion 2 Base (requiring
+        SchedulerPredictionType.Epsilson) and Stable Diffusion 768
+        (requiring SchedulerPredictionType.VPrediction). It is
+        generally impossible to do this programmatically, so the
+        prediction_type_helper usually asks the user to choose.
+
+        The result is a set of successfully installed models. Each element
+        of the set is a dict corresponding to the newly-created OmegaConf stanza for
+        that model.
+        '''
+        return self.mgr.heuristic_import(items_to_import, prediction_type_helper)        
+
+    def merge_models(
+            self,
+            model_names: List[str] = Field(default=None, min_items=2, max_items=3, description="List of model names to merge"),
+            base_model: Union[BaseModelType,str] = Field(default=None, description="Base model shared by all models to be merged"),
+            merged_model_name: str = Field(default=None, description="Name of destination model after merging"),
+            alpha: Optional[float] = 0.5,
+            interp: Optional[MergeInterpolationMethod] = None,
+            force: Optional[bool] = False,
+    ) -> AddModelResult:
+        """
+        Merge two to three diffusrs pipeline models and save as a new model.
+        :param model_names: List of 2-3 models to merge
+        :param base_model: Base model to use for all models
+        :param merged_model_name: Name of destination merged model
+        :param alpha: Alpha strength to apply to 2d and 3d model
+        :param interp: Interpolation method. None (default) 
+        """
+        merger = ModelMerger(self.mgr)
+        try:
+            result = merger.merge_diffusion_models_and_save(
+                model_names = model_names,
+                base_model = base_model,
+                merged_model_name = merged_model_name,
+                alpha = alpha,
+                interp = interp,
+                force = force,
+            )
+        except AssertionError as e:
+            raise ValueError(e)
+        return result

invokeai/app/services/models/image_record.py

@@ -88,7 +88,7 @@ class ImageUrlsDTO(BaseModel):
 class ImageDTO(ImageRecord, ImageUrlsDTO):
     """Deserialized image record, enriched for the frontend."""
 
-    board_id: Union[str, None] = Field(
+    board_id: Optional[str] = Field(
         description="The id of the board the image belongs to, if one exists."
     )
     """The id of the board the image belongs to, if one exists."""
@@ -96,7 +96,7 @@ class ImageDTO(ImageRecord, ImageUrlsDTO):
 
 
 def image_record_to_dto(
-    image_record: ImageRecord, image_url: str, thumbnail_url: str, board_id: Union[str, None]
+    image_record: ImageRecord, image_url: str, thumbnail_url: str, board_id: Optional[str]
 ) -> ImageDTO:
     """Converts an image record to an image DTO."""
     return ImageDTO(

invokeai/app/services/sqlite.py

@@ -1,6 +1,6 @@
 import sqlite3
 from threading import Lock
-from typing import Generic, TypeVar, Union, get_args
+from typing import Generic, TypeVar, Optional, Union, get_args
 
 from pydantic import BaseModel, parse_raw_as
 
@@ -63,7 +63,7 @@ class SqliteItemStorage(ItemStorageABC, Generic[T]):
             self._lock.release()
         self._on_changed(item)
 
-    def get(self, id: str) -> Union[T, None]:
+    def get(self, id: str) -> Optional[T]:
         try:
             self._lock.acquire()
             self._cursor.execute(

invokeai/backend/generator/base.py

@@ -21,7 +21,7 @@ from PIL import Image, ImageChops, ImageFilter
 from accelerate.utils import set_seed
 from diffusers import DiffusionPipeline
 from tqdm import trange
-from typing import Callable, List, Iterator, Optional, Type
+from typing import Callable, List, Iterator, Optional, Type, Union
 from dataclasses import dataclass, field
 from diffusers.schedulers import SchedulerMixin as Scheduler
 
@@ -178,7 +178,7 @@ class InvokeAIGenerator(metaclass=ABCMeta):
 # ------------------------------------
 class Img2Img(InvokeAIGenerator):
     def generate(self,
-               init_image: Image.Image | torch.FloatTensor,
+               init_image: Union[Image.Image, torch.FloatTensor],
                strength: float=0.75,
                **keyword_args
                )->Iterator[InvokeAIGeneratorOutput]:
@@ -195,7 +195,7 @@ class Img2Img(InvokeAIGenerator):
 # Takes all the arguments of Img2Img and adds the mask image and the seam/infill stuff
 class Inpaint(Img2Img):
     def generate(self,
-                 mask_image: Image.Image | torch.FloatTensor,
+                 mask_image: Union[Image.Image, torch.FloatTensor],
                  # Seam settings - when 0, doesn't fill seam
                  seam_size: int = 96,
                  seam_blur: int = 16,
@@ -570,28 +570,16 @@ class Generator:
         device = self.model.device
         # limit noise to only the diffusion image channels, not the mask channels
         input_channels = min(self.latent_channels, 4)
-        if self.use_mps_noise or device.type == "mps":
-            x = torch.randn(
-                [
-                    1,
-                    input_channels,
-                    height // self.downsampling_factor,
-                    width // self.downsampling_factor,
-                ],
-                dtype=self.torch_dtype(),
-                device="cpu",
-            ).to(device)
-        else:
-            x = torch.randn(
-                [
-                    1,
-                    input_channels,
-                    height // self.downsampling_factor,
-                    width // self.downsampling_factor,
-                ],
-                dtype=self.torch_dtype(),
-                device=device,
-            )
+        x = torch.randn(
+            [
+                1,
+                input_channels,
+                height // self.downsampling_factor,
+                width // self.downsampling_factor,
+            ],
+            dtype=self.torch_dtype(),
+            device=device,
+        )
         if self.perlin > 0.0:
             perlin_noise = self.get_perlin_noise(
                 width // self.downsampling_factor, height // self.downsampling_factor

invokeai/backend/generator/img2img.py

@@ -88,10 +88,7 @@ class Img2Img(Generator):
 
     def get_noise_like(self, like: torch.Tensor):
         device = like.device
-        if device.type == "mps":
-            x = torch.randn_like(like, device="cpu").to(device)
-        else:
-            x = torch.randn_like(like, device=device)
+        x = torch.randn_like(like, device=device)
         if self.perlin > 0.0:
             shape = like.shape
             x = (1 - self.perlin) * x + self.perlin * self.get_perlin_noise(

invokeai/backend/generator/inpaint.py

@@ -4,11 +4,10 @@ invokeai.backend.generator.inpaint descends from .generator
 from __future__ import annotations
 
 import math
-from typing import Tuple, Union
+from typing import Tuple, Union, Optional
 
 import cv2
 import numpy as np
-import PIL
 import torch
 from PIL import Image, ImageChops, ImageFilter, ImageOps
 
@@ -76,7 +75,7 @@ class Inpaint(Img2Img):
         return im_patched
 
     def tile_fill_missing(
-        self, im: Image.Image, tile_size: int = 16, seed: Union[int, None] = None
+        self, im: Image.Image, tile_size: int = 16, seed: Optional[int] = None
     ) -> Image.Image:
         # Only fill if there's an alpha layer
         if im.mode != "RGBA":
@@ -203,8 +202,8 @@ class Inpaint(Img2Img):
         cfg_scale,
         ddim_eta,
         conditioning,
-        init_image: Image.Image | torch.FloatTensor,
-        mask_image: Image.Image | torch.FloatTensor,
+        init_image: Union[Image.Image, torch.FloatTensor],
+        mask_image: Union[Image.Image, torch.FloatTensor],
         strength: float,
         mask_blur_radius: int = 8,
         # Seam settings - when 0, doesn't fill seam

invokeai/backend/install/invokeai_configure.py

@@ -7,8 +7,6 @@
 # Coauthor: Kevin Turner http://github.com/keturn
 #
 import sys
-print("Loading Python libraries...\n",file=sys.stderr)
-
 import argparse
 import io
 import os
@@ -16,6 +14,7 @@ import shutil
 import textwrap
 import traceback
 import warnings
+import yaml
 from argparse import Namespace
 from pathlib import Path
 from shutil import get_terminal_size
@@ -25,6 +24,7 @@ from urllib import request
 import npyscreen
 import transformers
 from diffusers import AutoencoderKL
+from diffusers.pipelines.stable_diffusion.safety_checker import StableDiffusionSafetyChecker
 from huggingface_hub import HfFolder
 from huggingface_hub import login as hf_hub_login
 from omegaconf import OmegaConf
@@ -34,6 +34,8 @@ from transformers import (
     CLIPSegForImageSegmentation,
     CLIPTextModel,
     CLIPTokenizer,
+    AutoFeatureExtractor,
+    BertTokenizerFast,
 )
 import invokeai.configs as configs
 
@@ -43,6 +45,7 @@ from invokeai.app.services.config import (
 from invokeai.backend.util.logging import InvokeAILogger
 from invokeai.frontend.install.model_install import addModelsForm, process_and_execute
 from invokeai.frontend.install.widgets import (
+    SingleSelectColumns,
     CenteredButtonPress,
     IntTitleSlider,
     set_min_terminal_size,
@@ -52,12 +55,13 @@ from invokeai.frontend.install.widgets import (
 )
 from invokeai.backend.install.legacy_arg_parsing import legacy_parser
 from invokeai.backend.install.model_install_backend import (
-    default_dataset,
-    download_from_hf,
-    hf_download_with_resume,
-    recommended_datasets,
-    UserSelections,
+    hf_download_from_pretrained,
+    InstallSelections,
+    ModelInstall,
 )
+from invokeai.backend.model_management.model_probe import (
+    ModelType, BaseModelType
+    )
 
 warnings.filterwarnings("ignore")
 transformers.logging.set_verbosity_error()
@@ -73,7 +77,7 @@ Weights_dir = "ldm/stable-diffusion-v1/"
 Default_config_file = config.model_conf_path
 SD_Configs = config.legacy_conf_path
 
-PRECISION_CHOICES = ['auto','float16','float32','autocast']
+PRECISION_CHOICES = ['auto','float16','float32']
 
 INIT_FILE_PREAMBLE = """# InvokeAI initialization file
 # This is the InvokeAI initialization file, which contains command-line default values.
@@ -81,7 +85,7 @@ INIT_FILE_PREAMBLE = """# InvokeAI initialization file
 # or renaming it and then running invokeai-configure again.
 """
 
-logger=None
+logger=InvokeAILogger.getLogger()
 
 # --------------------------------------------
 def postscript(errors: None):
@@ -162,75 +166,91 @@ class ProgressBar:
 # ---------------------------------------------
 def download_with_progress_bar(model_url: str, model_dest: str, label: str = "the"):
     try:
-        print(f"Installing {label} model file {model_url}...", end="", file=sys.stderr)
+        logger.info(f"Installing {label} model file {model_url}...")
         if not os.path.exists(model_dest):
             os.makedirs(os.path.dirname(model_dest), exist_ok=True)
             request.urlretrieve(
                 model_url, model_dest, ProgressBar(os.path.basename(model_dest))
             )
-            print("...downloaded successfully", file=sys.stderr)
+            logger.info("...downloaded successfully")
         else:
-            print("...exists", file=sys.stderr)
+            logger.info("...exists")
     except Exception:
-        print("...download failed", file=sys.stderr)
-        print(f"Error downloading {label} model", file=sys.stderr)
+        logger.info("...download failed")
+        logger.info(f"Error downloading {label} model")
         print(traceback.format_exc(), file=sys.stderr)
 
 
-# ---------------------------------------------
-# this will preload the Bert tokenizer fles
-def download_bert():
-    print("Installing bert tokenizer...", file=sys.stderr)
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", category=DeprecationWarning)
-        from transformers import BertTokenizerFast
+def download_conversion_models():
+    target_dir = config.root_path / 'models/core/convert'
+    kwargs = dict()  # for future use
+    try:
+        logger.info('Downloading core tokenizers and text encoders')
 
-        download_from_hf(BertTokenizerFast, "bert-base-uncased")
+        # bert
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            bert = BertTokenizerFast.from_pretrained("bert-base-uncased", **kwargs)
+            bert.save_pretrained(target_dir / 'bert-base-uncased', safe_serialization=True)
+        
+        # sd-1
+        repo_id = 'openai/clip-vit-large-patch14'
+        hf_download_from_pretrained(CLIPTokenizer, repo_id, target_dir / 'clip-vit-large-patch14')
+        hf_download_from_pretrained(CLIPTextModel, repo_id, target_dir / 'clip-vit-large-patch14')
 
+        # sd-2
+        repo_id = "stabilityai/stable-diffusion-2"
+        pipeline = CLIPTokenizer.from_pretrained(repo_id, subfolder="tokenizer", **kwargs)
+        pipeline.save_pretrained(target_dir / 'stable-diffusion-2-clip' / 'tokenizer', safe_serialization=True)
 
-# ---------------------------------------------
-def download_sd1_clip():
-    print("Installing SD1 clip model...", file=sys.stderr)
-    version = "openai/clip-vit-large-patch14"
-    download_from_hf(CLIPTokenizer, version)
-    download_from_hf(CLIPTextModel, version)
+        pipeline = CLIPTextModel.from_pretrained(repo_id, subfolder="text_encoder", **kwargs)
+        pipeline.save_pretrained(target_dir / 'stable-diffusion-2-clip' / 'text_encoder', safe_serialization=True)
 
+        # VAE
+        logger.info('Downloading stable diffusion VAE')
+        vae = AutoencoderKL.from_pretrained('stabilityai/sd-vae-ft-mse', **kwargs)
+        vae.save_pretrained(target_dir / 'sd-vae-ft-mse', safe_serialization=True)
 
-# ---------------------------------------------
-def download_sd2_clip():
-    version = "stabilityai/stable-diffusion-2"
-    print("Installing SD2 clip model...", file=sys.stderr)
-    download_from_hf(CLIPTokenizer, version, subfolder="tokenizer")
-    download_from_hf(CLIPTextModel, version, subfolder="text_encoder")
+        # safety checking
+        logger.info('Downloading safety checker')
+        repo_id = "CompVis/stable-diffusion-safety-checker"
+        pipeline = AutoFeatureExtractor.from_pretrained(repo_id,**kwargs)
+        pipeline.save_pretrained(target_dir / 'stable-diffusion-safety-checker', safe_serialization=True)
 
+        pipeline = StableDiffusionSafetyChecker.from_pretrained(repo_id,**kwargs)
+        pipeline.save_pretrained(target_dir / 'stable-diffusion-safety-checker', safe_serialization=True)
+    except KeyboardInterrupt:
+        raise
+    except Exception as e:
+        logger.error(str(e))
 
 # ---------------------------------------------
 def download_realesrgan():
-    print("Installing models from RealESRGAN...", file=sys.stderr)
+    logger.info("Installing models from RealESRGAN...")
     model_url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth"
     wdn_model_url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-wdn-x4v3.pth"
 
-    model_dest = config.root_path / "models/realesrgan/realesr-general-x4v3.pth"
-    wdn_model_dest = config.root_path / "models/realesrgan/realesr-general-wdn-x4v3.pth"
+    model_dest = config.root_path / "models/core/upscaling/realesrgan/realesr-general-x4v3.pth"
+    wdn_model_dest = config.root_path / "models/core/upscaling/realesrgan/realesr-general-wdn-x4v3.pth"
 
     download_with_progress_bar(model_url, str(model_dest), "RealESRGAN")
     download_with_progress_bar(wdn_model_url, str(wdn_model_dest), "RealESRGANwdn")
 
 
 def download_gfpgan():
-    print("Installing GFPGAN models...", file=sys.stderr)
+    logger.info("Installing GFPGAN models...")
     for model in (
         [
             "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth",
-            "./models/gfpgan/GFPGANv1.4.pth",
+            "./models/core/face_restoration/gfpgan/GFPGANv1.4.pth",
         ],
         [
             "https://github.com/xinntao/facexlib/releases/download/v0.1.0/detection_Resnet50_Final.pth",
-            "./models/gfpgan/weights/detection_Resnet50_Final.pth",
+            "./models/core/face_restoration/gfpgan/weights/detection_Resnet50_Final.pth",
         ],
         [
             "https://github.com/xinntao/facexlib/releases/download/v0.2.2/parsing_parsenet.pth",
-            "./models/gfpgan/weights/parsing_parsenet.pth",
+            "./models/core/face_restoration/gfpgan/weights/parsing_parsenet.pth",
         ],
     ):
         model_url, model_dest = model[0], config.root_path / model[1]
@@ -239,70 +259,32 @@ def download_gfpgan():
 
 # ---------------------------------------------
 def download_codeformer():
-    print("Installing CodeFormer model file...", file=sys.stderr)
+    logger.info("Installing CodeFormer model file...")
     model_url = (
         "https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth"
     )
-    model_dest = config.root_path / "models/codeformer/codeformer.pth"
+    model_dest = config.root_path / "models/core/face_restoration/codeformer/codeformer.pth"
     download_with_progress_bar(model_url, str(model_dest), "CodeFormer")
 
 
 # ---------------------------------------------
 def download_clipseg():
-    print("Installing clipseg model for text-based masking...", file=sys.stderr)
+    logger.info("Installing clipseg model for text-based masking...")
     CLIPSEG_MODEL = "CIDAS/clipseg-rd64-refined"
     try:
-        download_from_hf(AutoProcessor, CLIPSEG_MODEL)
-        download_from_hf(CLIPSegForImageSegmentation, CLIPSEG_MODEL)
+        hf_download_from_pretrained(AutoProcessor, CLIPSEG_MODEL, config.root_path / 'models/core/misc/clipseg')
+        hf_download_from_pretrained(CLIPSegForImageSegmentation, CLIPSEG_MODEL, config.root_path / 'models/core/misc/clipseg')
     except Exception:
-        print("Error installing clipseg model:")
-        print(traceback.format_exc())
+        logger.info("Error installing clipseg model:")
+        logger.info(traceback.format_exc())
 
 
-# -------------------------------------
-def download_safety_checker():
-    print("Installing model for NSFW content detection...", file=sys.stderr)
-    try:
-        from diffusers.pipelines.stable_diffusion.safety_checker import (
-            StableDiffusionSafetyChecker,
-        )
-        from transformers import AutoFeatureExtractor
-    except ModuleNotFoundError:
-        print("Error installing NSFW checker model:")
-        print(traceback.format_exc())
-        return
-    safety_model_id = "CompVis/stable-diffusion-safety-checker"
-    print("AutoFeatureExtractor...", file=sys.stderr)
-    download_from_hf(AutoFeatureExtractor, safety_model_id)
-    print("StableDiffusionSafetyChecker...", file=sys.stderr)
-    download_from_hf(StableDiffusionSafetyChecker, safety_model_id)
-
-
-# -------------------------------------
-def download_vaes():
-    print("Installing stabilityai VAE...", file=sys.stderr)
-    try:
-        # first the diffusers version
-        repo_id = "stabilityai/sd-vae-ft-mse"
-        args = dict(
-            cache_dir=config.cache_dir,
-        )
-        if not AutoencoderKL.from_pretrained(repo_id, **args):
-            raise Exception(f"download of {repo_id} failed")
-
-        repo_id = "stabilityai/sd-vae-ft-mse-original"
-        model_name = "vae-ft-mse-840000-ema-pruned.ckpt"
-        # next the legacy checkpoint version
-        if not hf_download_with_resume(
-            repo_id=repo_id,
-            model_name=model_name,
-            model_dir=str(config.root_path / Model_dir / Weights_dir),
-        ):
-            raise Exception(f"download of {model_name} failed")
-    except Exception as e:
-        print(f"Error downloading StabilityAI standard VAE: {str(e)}", file=sys.stderr)
-        print(traceback.format_exc(), file=sys.stderr)
-
+def download_support_models():
+    download_realesrgan()
+    download_gfpgan()
+    download_codeformer()
+    download_clipseg()
+    download_conversion_models()
 
 # -------------------------------------
 def get_root(root: str = None) -> str:
@@ -378,9 +360,7 @@ Use cursor arrows to make a checkbox selection, and space to toggle.
             scroll_exit=True,
         )
         self.nextrely += 1
-        label = """If you have an account at HuggingFace you may optionally paste your access token here
-to allow InvokeAI to download restricted styles & subjects from the "Concept Library". See https://huggingface.co/settings/tokens.
-"""
+        label = """HuggingFace access token (OPTIONAL) for automatic model downloads. See https://huggingface.co/settings/tokens."""
         for line in textwrap.wrap(label,width=window_width-6):
             self.add_widget_intelligent(
                 npyscreen.FixedText,
@@ -442,6 +422,7 @@ to allow InvokeAI to download restricted styles & subjects from the "Concept Lib
         )
         self.precision = self.add_widget_intelligent(
             npyscreen.TitleSelectOne,
+            columns = 2,
             name="Precision",
             values=PRECISION_CHOICES,
             value=PRECISION_CHOICES.index(precision),
@@ -449,13 +430,13 @@ to allow InvokeAI to download restricted styles & subjects from the "Concept Lib
             max_height=len(PRECISION_CHOICES) + 1,
             scroll_exit=True,
         )
-        self.max_loaded_models = self.add_widget_intelligent(
+        self.max_cache_size = self.add_widget_intelligent(
             IntTitleSlider,
-            name="Number of models to cache in CPU memory (each will use 2-4 GB!)",
-            value=old_opts.max_loaded_models,
-            out_of=10,
-            lowest=1,
-            begin_entry_at=4,
+            name="Size of the RAM cache used for fast model switching (GB)",
+            value=old_opts.max_cache_size,
+            out_of=20,
+            lowest=3,
+            begin_entry_at=6,
             scroll_exit=True,
         )
         self.nextrely += 1
@@ -465,39 +446,19 @@ to allow InvokeAI to download restricted styles & subjects from the "Concept Lib
             editable=False,
             color="CONTROL",
         )
-        self.embedding_dir = self.add_widget_intelligent(
-            npyscreen.TitleFilename,
-            name=" Textual Inversion Embeddings:",
-            value=str(default_embedding_dir()),
-            select_dir=True,
-            must_exist=False,
-            use_two_lines=False,
-            labelColor="GOOD",
-            begin_entry_at=32,
-            scroll_exit=True,
-        )
-        self.lora_dir = self.add_widget_intelligent(
-            npyscreen.TitleFilename,
-            name="             LoRA and LyCORIS:",
-            value=str(default_lora_dir()),
-            select_dir=True,
-            must_exist=False,
-            use_two_lines=False,
-            labelColor="GOOD",
-            begin_entry_at=32,
-            scroll_exit=True,
-        )
-        self.controlnet_dir = self.add_widget_intelligent(
-            npyscreen.TitleFilename,
-            name="             ControlNets:",
-            value=str(default_controlnet_dir()),
-            select_dir=True,
-            must_exist=False,
-            use_two_lines=False,
-            labelColor="GOOD",
-            begin_entry_at=32,
-            scroll_exit=True,
-        )
+        self.autoimport_dirs = {}
+        for description, config_name, path in autoimport_paths(old_opts):
+            self.autoimport_dirs[config_name] = self.add_widget_intelligent(
+                npyscreen.TitleFilename,
+                name=description+':',
+                value=str(path),
+                select_dir=True,
+                must_exist=False,
+                use_two_lines=False,
+                labelColor="GOOD",
+                begin_entry_at=32,
+                scroll_exit=True
+            )
         self.nextrely += 1
         self.add_widget_intelligent(
             npyscreen.TitleFixedText,
@@ -562,10 +523,6 @@ https://huggingface.co/spaces/CompVis/stable-diffusion-license
             bad_fields.append(
                 f"The output directory does not seem to be valid. Please check that {str(Path(opt.outdir).parent)} is an existing directory."
             )
-        if not Path(opt.embedding_dir).parent.exists():
-            bad_fields.append(
-                f"The embedding directory does not seem to be valid. Please check that {str(Path(opt.embedding_dir).parent)} is an existing directory."
-            )
         if len(bad_fields) > 0:
             message = "The following problems were detected and must be corrected:\n"
             for problem in bad_fields:
@@ -582,22 +539,22 @@ https://huggingface.co/spaces/CompVis/stable-diffusion-license
                 "outdir",
                 "nsfw_checker",
                 "free_gpu_mem",
-                "max_loaded_models",
+                "max_cache_size",
                 "xformers_enabled",
                 "always_use_cpu",
-                "embedding_dir",
-                "lora_dir",
-                "controlnet_dir",
         ]:
             setattr(new_opts, attr, getattr(self, attr).value)
 
+        for attr in self.autoimport_dirs:
+            directory = Path(self.autoimport_dirs[attr].value)
+            if directory.is_relative_to(config.root_path):
+                directory = directory.relative_to(config.root_path)
+            setattr(new_opts, attr, directory)
+
         new_opts.hf_token = self.hf_token.value
         new_opts.license_acceptance = self.license_acceptance.value
         new_opts.precision = PRECISION_CHOICES[self.precision.value[0]]
         
-        # widget library workaround to make max_loaded_models an int rather than a float
-        new_opts.max_loaded_models = int(new_opts.max_loaded_models)
-
         return new_opts
 
 
@@ -607,7 +564,8 @@ class EditOptApplication(npyscreen.NPSAppManaged):
         self.program_opts = program_opts
         self.invokeai_opts = invokeai_opts
         self.user_cancelled = False
-        self.user_selections = default_user_selections(program_opts)
+        self.autoload_pending = True
+        self.install_selections = default_user_selections(program_opts)
 
     def onStart(self):
         npyscreen.setTheme(npyscreen.Themes.DefaultTheme)
@@ -642,41 +600,62 @@ def default_startup_options(init_file: Path) -> Namespace:
         opts.nsfw_checker = True
     return opts
 
-def default_user_selections(program_opts: Namespace) -> UserSelections:
-    return UserSelections(
-        install_models=default_dataset()
+def default_user_selections(program_opts: Namespace) -> InstallSelections:
+    installer = ModelInstall(config)
+    models = installer.all_models()
+    return InstallSelections(
+        install_models=[models[installer.default_model()].path or models[installer.default_model()].repo_id]
         if program_opts.default_only
-        else recommended_datasets()
+        else [models[x].path or models[x].repo_id for x in installer.recommended_models()]
         if program_opts.yes_to_all
-        else dict(),
-        purge_deleted_models=False,
-        scan_directory=None,
-        autoscan_on_startup=None,
+        else list(),
+#        scan_directory=None,
+#        autoscan_on_startup=None,
     )
 
-
+# -------------------------------------
+def autoimport_paths(config: InvokeAIAppConfig):
+    return [
+        ('Checkpoints & diffusers models', 'autoimport_dir', config.root_path / config.autoimport_dir),
+        ('LoRA/LyCORIS models',            'lora_dir',       config.root_path / config.lora_dir),
+        ('Controlnet models',              'controlnet_dir', config.root_path / config.controlnet_dir),
+        ('Textual Inversion Embeddings',   'embedding_dir',  config.root_path / config.embedding_dir),
+    ]
+    
 # -------------------------------------
 def initialize_rootdir(root: Path, yes_to_all: bool = False):
-    print("** INITIALIZING INVOKEAI RUNTIME DIRECTORY **")
-
+    logger.info("** INITIALIZING INVOKEAI RUNTIME DIRECTORY **")
     for name in (
             "models",
-            "configs",
-            "embeddings",
             "databases",
-            "loras",
-            "controlnets",
             "text-inversion-output",
             "text-inversion-training-data",
+            "configs"
     ):
         os.makedirs(os.path.join(root, name), exist_ok=True)
+    for model_type in ModelType:
+        Path(root, 'autoimport', model_type.value).mkdir(parents=True, exist_ok=True)
 
     configs_src = Path(configs.__path__[0])
     configs_dest = root / "configs"
     if not os.path.samefile(configs_src, configs_dest):
         shutil.copytree(configs_src, configs_dest, dirs_exist_ok=True)
 
+    dest = root / 'models'
+    for model_base in BaseModelType:
+        for model_type in ModelType:
+            path = dest / model_base.value / model_type.value
+            path.mkdir(parents=True, exist_ok=True)
+    path = dest / 'core'
+    path.mkdir(parents=True, exist_ok=True)
 
+    with open(root / 'configs' / 'models.yaml','w') as yaml_file:
+        yaml_file.write(yaml.dump({'__metadata__':
+                                   {'version':'3.0.0'}
+                                   }
+                                  )
+                        )
+        
 # -------------------------------------
 def run_console_ui(
     program_opts: Namespace, initfile: Path = None
@@ -699,7 +678,7 @@ def run_console_ui(
     if editApp.user_cancelled:
         return (None, None)
     else:
-        return (editApp.new_opts, editApp.user_selections)
+        return (editApp.new_opts, editApp.install_selections)
 
 
 # -------------------------------------
@@ -722,18 +701,6 @@ def write_opts(opts: Namespace, init_file: Path):
 def default_output_dir() -> Path:
     return config.root_path / "outputs"
 
-# -------------------------------------
-def default_embedding_dir() -> Path:
-    return config.root_path / "embeddings"
-
-# -------------------------------------
-def default_lora_dir() -> Path:
-    return config.root_path / "loras"
-
-# -------------------------------------
-def default_controlnet_dir() -> Path:
-    return config.root_path / "controlnets"
-
 # -------------------------------------
 def write_default_options(program_opts: Namespace, initfile: Path):
     opt = default_startup_options(initfile)
@@ -758,14 +725,42 @@ def migrate_init_file(legacy_format:Path):
     new.nsfw_checker = old.safety_checker
     new.xformers_enabled = old.xformers
     new.conf_path = old.conf
-    new.embedding_dir = old.embedding_path
+    new.root = legacy_format.parent.resolve()
 
     invokeai_yaml = legacy_format.parent / 'invokeai.yaml'
     with open(invokeai_yaml,"w", encoding="utf-8") as outfile:
         outfile.write(new.to_yaml())
 
-    legacy_format.replace(legacy_format.parent / 'invokeai.init.old')
+    legacy_format.replace(legacy_format.parent / 'invokeai.init.orig')
 
+# -------------------------------------
+def migrate_models(root: Path):
+    from invokeai.backend.install.migrate_to_3 import do_migrate
+    do_migrate(root, root)
+
+def migrate_if_needed(opt: Namespace, root: Path)->bool:
+    # We check for to see if the runtime directory is correctly initialized.
+    old_init_file = root / 'invokeai.init'
+    new_init_file = root / 'invokeai.yaml'
+    old_hub = root / 'models/hub'
+    migration_needed =  old_init_file.exists() and not new_init_file.exists() or old_hub.exists()
+    
+    if migration_needed:
+        if opt.yes_to_all or \
+            yes_or_no(f'{str(config.root_path)} appears to be a 2.3 format root directory. Convert to version 3.0?'):
+
+            logger.info('** Migrating invokeai.init to invokeai.yaml')
+            migrate_init_file(old_init_file)
+            config.parse_args(argv=[],conf=OmegaConf.load(new_init_file))
+
+            if old_hub.exists():
+                migrate_models(config.root_path)
+        else:
+            print('Cannot continue without conversion. Aborting.')
+    
+    return migration_needed
+
+    
 # -------------------------------------
 def main():
     parser = argparse.ArgumentParser(description="InvokeAI model downloader")
@@ -831,20 +826,16 @@ def main():
     errors = set()
 
     try:
-        models_to_download = default_user_selections(opt)
-
-        # We check for to see if the runtime directory is correctly initialized.
-        old_init_file = config.root_path / 'invokeai.init'
-        new_init_file = config.root_path / 'invokeai.yaml'
-        if old_init_file.exists() and not new_init_file.exists():
-            print('** Migrating invokeai.init to invokeai.yaml')
-            migrate_init_file(old_init_file)
-            # Load new init file into config
-            config.parse_args(argv=[],conf=OmegaConf.load(new_init_file))
+        # if we do a root migration/upgrade, then we are keeping previous
+        # configuration and we are done.
+        if migrate_if_needed(opt, config.root_path):
+            sys.exit(0)
 
         if not config.model_conf_path.exists():
             initialize_rootdir(config.root_path, opt.yes_to_all)
 
+        models_to_download = default_user_selections(opt)
+        new_init_file = config.root_path / 'invokeai.yaml'
         if opt.yes_to_all:
             write_default_options(opt, new_init_file)
             init_options = Namespace(
@@ -855,29 +846,21 @@ def main():
             if init_options:
                 write_opts(init_options, new_init_file)
             else:
-                print(
+                logger.info(
                     '\n** CANCELLED AT USER\'S REQUEST. USE THE "invoke.sh" LAUNCHER TO RUN LATER **\n'
                 )
                 sys.exit(0)
-
+                
         if opt.skip_support_models:
-            print("\n** SKIPPING SUPPORT MODEL DOWNLOADS PER USER REQUEST **")
+            logger.info("SKIPPING SUPPORT MODEL DOWNLOADS PER USER REQUEST")
         else:
-            print("\n** CHECKING/UPDATING SUPPORT MODELS **")
-            download_bert()
-            download_sd1_clip()
-            download_sd2_clip()
-            download_realesrgan()
-            download_gfpgan()
-            download_codeformer()
-            download_clipseg()
-            download_safety_checker()
-            download_vaes()
+            logger.info("CHECKING/UPDATING SUPPORT MODELS")
+            download_support_models()
 
         if opt.skip_sd_weights:
-            print("\n** SKIPPING DIFFUSION WEIGHTS DOWNLOAD PER USER REQUEST **")
+            logger.info("\n** SKIPPING DIFFUSION WEIGHTS DOWNLOAD PER USER REQUEST **")
         elif models_to_download:
-            print("\n** DOWNLOADING DIFFUSION WEIGHTS **")
+            logger.info("\n** DOWNLOADING DIFFUSION WEIGHTS **")
             process_and_execute(opt, models_to_download)
 
         postscript(errors=errors)

invokeai/backend/install/legacy_arg_parsing.py

@@ -4,6 +4,8 @@ import argparse
 import shlex
 from argparse import ArgumentParser
 
+# note that this includes both old sampler names and new scheduler names
+# in order to be able to parse both 2.0 and 3.0-pre-nodes versions of invokeai.init
 SAMPLER_CHOICES = [
     "ddim",
     "ddpm",
@@ -27,6 +29,15 @@ SAMPLER_CHOICES = [
     "dpmpp_sde",
     "dpmpp_sde_k",
     "unipc",
+    "k_dpm_2_a",
+    "k_dpm_2",
+    "k_dpmpp_2_a",
+    "k_dpmpp_2",
+    "k_euler_a",
+    "k_euler",
+    "k_heun",
+    "k_lms",
+    "plms",
 ]
 
 PRECISION_CHOICES = [

invokeai/backend/install/migrate_to_3.py

@@ -0,0 +1,606 @@
+'''
+Migrate the models directory and models.yaml file from an existing
+InvokeAI 2.3 installation to 3.0.0.
+'''
+
+import os
+import argparse
+import shutil
+import yaml
+
+import transformers
+import diffusers
+import warnings
+
+from dataclasses import dataclass
+from pathlib import Path
+from omegaconf import OmegaConf, DictConfig
+from typing import Union
+
+from diffusers import StableDiffusionPipeline, AutoencoderKL
+from diffusers.pipelines.stable_diffusion.safety_checker import StableDiffusionSafetyChecker
+from transformers import (
+    CLIPTextModel,
+    CLIPTokenizer,
+    AutoFeatureExtractor,
+    BertTokenizerFast,
+)
+
+import invokeai.backend.util.logging as logger
+from invokeai.app.services.config import InvokeAIAppConfig
+from invokeai.backend.model_management import ModelManager
+from invokeai.backend.model_management.model_probe import (
+    ModelProbe, ModelType, BaseModelType, ModelProbeInfo
+    )
+
+warnings.filterwarnings("ignore")
+transformers.logging.set_verbosity_error()
+diffusers.logging.set_verbosity_error()
+
+# holder for paths that we will migrate
+@dataclass
+class ModelPaths:
+    models: Path
+    embeddings: Path
+    loras: Path
+    controlnets: Path
+
+class MigrateTo3(object):
+    def __init__(self,
+                 from_root: Path,
+                 to_models: Path,
+                 model_manager: ModelManager,
+                 src_paths: ModelPaths,
+                 ):
+        self.root_directory = from_root
+        self.dest_models = to_models
+        self.mgr = model_manager
+        self.src_paths = src_paths
+        
+    @classmethod
+    def initialize_yaml(cls, yaml_file: Path):
+        with open(yaml_file, 'w') as file:
+            file.write(
+                yaml.dump(
+                    {
+                        '__metadata__': {'version':'3.0.0'}
+                    }
+                )
+            )
+    
+    def create_directory_structure(self):
+        '''
+        Create the basic directory structure for the models folder.
+        '''
+        for model_base in [BaseModelType.StableDiffusion1,BaseModelType.StableDiffusion2]:
+            for model_type in [ModelType.Main, ModelType.Vae, ModelType.Lora,
+                               ModelType.ControlNet,ModelType.TextualInversion]:
+                path = self.dest_models / model_base.value / model_type.value
+                path.mkdir(parents=True, exist_ok=True)
+        path = self.dest_models / 'core'
+        path.mkdir(parents=True, exist_ok=True)
+
+    @staticmethod
+    def copy_file(src:Path,dest:Path):
+        '''
+        copy a single file with logging
+        '''
+        if dest.exists():
+            logger.info(f'Skipping existing {str(dest)}')
+            return
+        logger.info(f'Copying {str(src)} to {str(dest)}')
+        try:
+            shutil.copy(src, dest)
+        except Exception as e:
+            logger.error(f'COPY FAILED: {str(e)}')
+
+    @staticmethod
+    def copy_dir(src:Path,dest:Path):
+        '''
+        Recursively copy a directory with logging
+        '''
+        if dest.exists():
+            logger.info(f'Skipping existing {str(dest)}')
+            return
+        
+        logger.info(f'Copying {str(src)} to {str(dest)}')
+        try:
+            shutil.copytree(src, dest)
+        except Exception as e:
+            logger.error(f'COPY FAILED: {str(e)}')
+
+    def migrate_models(self, src_dir: Path):
+        '''
+        Recursively walk through src directory, probe anything
+        that looks like a model, and copy the model into the
+        appropriate location within the destination models directory.
+        '''
+        directories_scanned = set()
+        for root, dirs, files in os.walk(src_dir):
+            for d in dirs:
+                try:
+                    model = Path(root,d)
+                    info = ModelProbe().heuristic_probe(model)
+                    if not info:
+                        continue
+                    dest = self._model_probe_to_path(info) / model.name
+                    self.copy_dir(model, dest)
+                    directories_scanned.add(model)
+                except Exception as e:
+                    logger.error(str(e))
+                except KeyboardInterrupt:
+                    raise
+                except Exception as e:
+                    logger.error(str(e))
+            for f in files:
+                # don't copy raw learned_embeds.bin or pytorch_lora_weights.bin
+                # let them be copied as part of a tree copy operation
+                try:
+                    if f in {'learned_embeds.bin','pytorch_lora_weights.bin'}:
+                        continue
+                    model = Path(root,f)
+                    if model.parent in directories_scanned:
+                        continue
+                    info = ModelProbe().heuristic_probe(model)
+                    if not info:
+                        continue
+                    dest = self._model_probe_to_path(info) / f
+                    self.copy_file(model, dest)
+                except Exception as e:
+                    logger.error(str(e))
+                except KeyboardInterrupt:
+                    raise
+                except Exception as e:
+                    logger.error(str(e))
+
+    def migrate_support_models(self):
+        '''
+        Copy the clipseg, upscaler, and restoration models to their new
+        locations.
+        '''
+        dest_directory = self.dest_models
+        if (self.root_directory / 'models/clipseg').exists():
+            self.copy_dir(self.root_directory / 'models/clipseg', dest_directory / 'core/misc/clipseg')
+        if (self.root_directory / 'models/realesrgan').exists():
+            self.copy_dir(self.root_directory / 'models/realesrgan', dest_directory / 'core/upscaling/realesrgan')
+        for d in ['codeformer','gfpgan']:
+            path = self.root_directory / 'models' / d
+            if path.exists():
+                self.copy_dir(path,dest_directory / f'core/face_restoration/{d}')
+
+    def migrate_tuning_models(self):
+        '''
+        Migrate the embeddings, loras and controlnets directories to their new homes.
+        '''
+        for src in [self.src_paths.embeddings, self.src_paths.loras, self.src_paths.controlnets]:
+            if not src:
+                continue
+            if src.is_dir():
+                logger.info(f'Scanning {src}')
+                self.migrate_models(src)
+            else:
+                logger.info(f'{src} directory not found; skipping')
+                continue
+
+    def migrate_conversion_models(self):
+        '''
+        Migrate all the models that are needed by the ckpt_to_diffusers conversion
+        script.
+        '''
+
+        dest_directory = self.dest_models
+        kwargs = dict(
+            cache_dir = self.root_directory / 'models/hub',
+            #local_files_only = True
+        )
+        try:
+            logger.info('Migrating core tokenizers and text encoders')
+            target_dir = dest_directory / 'core' / 'convert'
+
+            self._migrate_pretrained(BertTokenizerFast,
+                                     repo_id='bert-base-uncased',
+                                     dest = target_dir / 'bert-base-uncased',
+                                     **kwargs)
+
+            # sd-1
+            repo_id = 'openai/clip-vit-large-patch14'
+            self._migrate_pretrained(CLIPTokenizer,
+                                     repo_id= repo_id,
+                                     dest= target_dir / 'clip-vit-large-patch14',
+                                     **kwargs)
+            self._migrate_pretrained(CLIPTextModel,
+                                     repo_id = repo_id,
+                                     dest = target_dir / 'clip-vit-large-patch14',
+                                     force = True,
+                                     **kwargs)
+
+            # sd-2
+            repo_id = "stabilityai/stable-diffusion-2"
+            self._migrate_pretrained(CLIPTokenizer,
+                                     repo_id = repo_id,
+                                     dest = target_dir / 'stable-diffusion-2-clip' / 'tokenizer',
+                                     **{'subfolder':'tokenizer',**kwargs}
+                                     )
+            self._migrate_pretrained(CLIPTextModel,
+                                     repo_id = repo_id,
+                                     dest = target_dir / 'stable-diffusion-2-clip' / 'text_encoder',
+                                     **{'subfolder':'text_encoder',**kwargs}
+                                     )
+
+            # VAE
+            logger.info('Migrating stable diffusion VAE')
+            self._migrate_pretrained(AutoencoderKL,
+                                     repo_id = 'stabilityai/sd-vae-ft-mse',
+                                     dest = target_dir / 'sd-vae-ft-mse',
+                                     **kwargs)
+            
+            # safety checking
+            logger.info('Migrating safety checker')
+            repo_id = "CompVis/stable-diffusion-safety-checker"
+            self._migrate_pretrained(AutoFeatureExtractor,
+                                     repo_id = repo_id,
+                                     dest = target_dir / 'stable-diffusion-safety-checker',
+                                     **kwargs)
+            self._migrate_pretrained(StableDiffusionSafetyChecker,
+                                     repo_id = repo_id,
+                                     dest = target_dir / 'stable-diffusion-safety-checker',
+                                     **kwargs)
+        except KeyboardInterrupt:
+            raise
+        except Exception as e:
+            logger.error(str(e))
+
+    def _model_probe_to_path(self, info: ModelProbeInfo)->Path:
+        return Path(self.dest_models, info.base_type.value, info.model_type.value)
+
+    def _migrate_pretrained(self, model_class, repo_id: str, dest: Path, force:bool=False, **kwargs):
+        if dest.exists() and not force:
+            logger.info(f'Skipping existing {dest}')
+            return
+        model = model_class.from_pretrained(repo_id, **kwargs)
+        self._save_pretrained(model, dest, overwrite=force)
+
+    def _save_pretrained(self, model, dest: Path, overwrite: bool=False):
+        model_name = dest.name
+        if overwrite:
+            model.save_pretrained(dest, safe_serialization=True)
+        else:
+            download_path = dest.with_name(f'{model_name}.downloading')
+            model.save_pretrained(download_path, safe_serialization=True)
+            download_path.replace(dest)
+
+    def _download_vae(self, repo_id: str, subfolder:str=None)->Path:
+        vae = AutoencoderKL.from_pretrained(repo_id, cache_dir=self.root_directory / 'models/hub', subfolder=subfolder)
+        info = ModelProbe().heuristic_probe(vae)
+        _, model_name = repo_id.split('/')
+        dest = self._model_probe_to_path(info) / self.unique_name(model_name, info)
+        vae.save_pretrained(dest, safe_serialization=True)
+        return dest
+
+    def _vae_path(self, vae: Union[str,dict])->Path:
+        '''
+        Convert 2.3 VAE stanza to a straight path.
+        '''
+        vae_path = None
+        
+        # First get a path
+        if isinstance(vae,str):
+            vae_path = vae
+
+        elif isinstance(vae,DictConfig):
+            if p := vae.get('path'):
+                vae_path = p
+            elif repo_id := vae.get('repo_id'):
+                if repo_id=='stabilityai/sd-vae-ft-mse':  # this guy is already downloaded
+                    vae_path = 'models/core/convert/sd-vae-ft-mse'
+                    return vae_path
+                else:
+                    vae_path = self._download_vae(repo_id, vae.get('subfolder'))
+
+        assert vae_path is not None, "Couldn't find VAE for this model"
+
+        # if the VAE is in the old models directory, then we must move it into the new
+        # one. VAEs outside of this directory can stay where they are.
+        vae_path = Path(vae_path)
+        if vae_path.is_relative_to(self.src_paths.models):
+            info = ModelProbe().heuristic_probe(vae_path)
+            dest = self._model_probe_to_path(info) / vae_path.name
+            if not dest.exists():
+                if vae_path.is_dir():
+                    self.copy_dir(vae_path,dest)
+                else:
+                    self.copy_file(vae_path,dest)
+            vae_path = dest
+
+        if vae_path.is_relative_to(self.dest_models):
+            rel_path = vae_path.relative_to(self.dest_models)
+            return Path('models',rel_path)
+        else:
+            return vae_path
+
+    def migrate_repo_id(self, repo_id: str, model_name: str=None, **extra_config):
+        '''
+        Migrate a locally-cached diffusers pipeline identified with a repo_id
+        '''
+        dest_dir = self.dest_models
+        
+        cache = self.root_directory / 'models/hub'
+        kwargs = dict(
+            cache_dir = cache,
+            safety_checker = None,
+            # local_files_only = True,
+        )
+
+        owner,repo_name = repo_id.split('/')
+        model_name = model_name or repo_name
+        model = cache / '--'.join(['models',owner,repo_name])
+        
+        if len(list(model.glob('snapshots/**/model_index.json')))==0:
+            return
+        revisions = [x.name for x in model.glob('refs/*')]
+
+        # if an fp16 is available we use that
+        revision = 'fp16' if len(revisions) > 1 and 'fp16' in revisions else revisions[0]
+        pipeline = StableDiffusionPipeline.from_pretrained(
+            repo_id,
+            revision=revision,
+            **kwargs)
+
+        info = ModelProbe().heuristic_probe(pipeline)
+        if not info:
+            return
+
+        if self.mgr.model_exists(model_name, info.base_type, info.model_type):
+            logger.warning(f'A model named {model_name} already exists at the destination. Skipping migration.')
+            return
+
+        dest = self._model_probe_to_path(info) / model_name
+        self._save_pretrained(pipeline, dest)
+            
+        rel_path = Path('models',dest.relative_to(dest_dir))
+        self._add_model(model_name, info, rel_path, **extra_config)
+
+    def migrate_path(self, location: Path, model_name: str=None, **extra_config):
+        '''
+        Migrate a model referred to using 'weights' or 'path'
+        '''
+
+        # handle relative paths
+        dest_dir = self.dest_models
+        location = self.root_directory / location
+        model_name = model_name or location.stem
+        
+        info = ModelProbe().heuristic_probe(location)
+        if not info:
+            return
+        
+        if self.mgr.model_exists(model_name, info.base_type, info.model_type):
+            logger.warning(f'A model named {model_name} already exists at the destination. Skipping migration.')
+            return
+
+        # uh oh, weights is in the old models directory - move it into the new one
+        if Path(location).is_relative_to(self.src_paths.models):
+            dest = Path(dest_dir, info.base_type.value, info.model_type.value, location.name)
+            if location.is_dir():
+                self.copy_dir(location,dest)
+            else:
+                self.copy_file(location,dest)
+            location = Path('models', info.base_type.value, info.model_type.value, location.name)
+
+        self._add_model(model_name, info, location, **extra_config)
+
+    def _add_model(self,
+                   model_name: str,
+                   info: ModelProbeInfo,
+                   location: Path,
+                   **extra_config):
+        if info.model_type != ModelType.Main:
+            return
+        
+        self.mgr.add_model(
+            model_name = model_name,
+            base_model = info.base_type,
+            model_type = info.model_type,
+            clobber = True,
+            model_attributes = {
+                'path': str(location),
+                'description': f'A {info.base_type.value} {info.model_type.value} model',
+                'model_format': info.format,
+                'variant': info.variant_type.value,
+                **extra_config,
+            }
+        )
+        
+    def migrate_defined_models(self):
+        '''
+        Migrate models defined in models.yaml
+        '''
+        # find any models referred to in old models.yaml
+        conf = OmegaConf.load(self.root_directory / 'configs/models.yaml')
+        
+        for model_name, stanza in conf.items():
+
+            try:
+                passthru_args = {}
+                
+                if vae := stanza.get('vae'):
+                    try:
+                        passthru_args['vae'] = str(self._vae_path(vae))
+                    except Exception as e:
+                        logger.warning(f'Could not find a VAE matching "{vae}" for model "{model_name}"')
+                        logger.warning(str(e))
+
+                if config := stanza.get('config'):
+                    passthru_args['config'] = config
+
+                if description:= stanza.get('description'):
+                    passthru_args['description'] = description
+                
+                if repo_id := stanza.get('repo_id'):
+                    logger.info(f'Migrating diffusers model {model_name}')
+                    self.migrate_repo_id(repo_id, model_name, **passthru_args)
+
+                elif location := stanza.get('weights'):
+                    logger.info(f'Migrating checkpoint model {model_name}')
+                    self.migrate_path(Path(location), model_name, **passthru_args)
+                    
+                elif location := stanza.get('path'):
+                    logger.info(f'Migrating diffusers model {model_name}')
+                    self.migrate_path(Path(location), model_name, **passthru_args)
+                    
+            except KeyboardInterrupt:
+                raise
+            except Exception as e:
+                logger.error(str(e))
+                    
+    def migrate(self):
+        self.create_directory_structure()
+        # the configure script is doing this
+        self.migrate_support_models()
+        self.migrate_conversion_models()
+        self.migrate_tuning_models()
+        self.migrate_defined_models()
+
+def _parse_legacy_initfile(root: Path, initfile: Path)->ModelPaths:
+    '''
+    Returns tuple of (embedding_path, lora_path, controlnet_path)
+    '''
+    parser = argparse.ArgumentParser(fromfile_prefix_chars='@')
+    parser.add_argument(
+        '--embedding_directory',
+        '--embedding_path',
+        type=Path,
+        dest='embedding_path',
+        default=Path('embeddings'),
+    )
+    parser.add_argument(
+        '--lora_directory',
+        dest='lora_path',
+        type=Path,
+        default=Path('loras'),
+    )
+    opt,_ = parser.parse_known_args([f'@{str(initfile)}'])
+    return ModelPaths(
+        models = root / 'models',
+        embeddings = root / str(opt.embedding_path).strip('"'),
+        loras = root / str(opt.lora_path).strip('"'),
+        controlnets = root / 'controlnets',
+    )
+
+def _parse_legacy_yamlfile(root: Path, initfile: Path)->ModelPaths:
+    '''
+    Returns tuple of (embedding_path, lora_path, controlnet_path)
+    '''
+    # Don't use the config object because it is unforgiving of version updates
+    # Just use omegaconf directly
+    opt = OmegaConf.load(initfile)
+    paths = opt.InvokeAI.Paths
+    models = paths.get('models_dir','models')
+    embeddings = paths.get('embedding_dir','embeddings')
+    loras = paths.get('lora_dir','loras')
+    controlnets = paths.get('controlnet_dir','controlnets')
+    return ModelPaths(
+        models = root / models,
+        embeddings = root / embeddings,
+        loras = root /loras,
+        controlnets = root / controlnets,
+    )
+    
+def get_legacy_embeddings(root: Path) -> ModelPaths:
+    path = root / 'invokeai.init'
+    if path.exists():
+        return _parse_legacy_initfile(root, path)
+    path = root / 'invokeai.yaml'
+    if path.exists():
+        return _parse_legacy_yamlfile(root, path)
+
+def do_migrate(src_directory: Path, dest_directory: Path):
+    """
+    Migrate models from src to dest InvokeAI root directories
+    """
+    config_file = dest_directory / 'configs' / 'models.yaml.3'
+    dest_models = dest_directory / 'models.3'
+    
+    version_3 = (dest_directory / 'models' / 'core').exists()
+
+    # Here we create the destination models.yaml file.
+    # If we are writing into a version 3 directory and the
+    # file already exists, then we write into a copy of it to
+    # avoid deleting its previous customizations. Otherwise we
+    # create a new empty one.
+    if version_3:  # write into the dest directory
+        try:
+            shutil.copy(dest_directory / 'configs' / 'models.yaml', config_file)
+        except:
+            MigrateTo3.initialize_yaml(config_file)
+        mgr = ModelManager(config_file) # important to initialize BEFORE moving the models directory
+        (dest_directory / 'models').replace(dest_models)
+    else:
+        MigrateTo3.initialize_yaml(config_file)
+        mgr = ModelManager(config_file)
+    
+    paths = get_legacy_embeddings(src_directory)
+    migrator = MigrateTo3(
+        from_root = src_directory,
+        to_models = dest_models,
+        model_manager = mgr,
+        src_paths = paths
+    )
+    migrator.migrate()
+    print("Migration successful.")
+
+    if not version_3:
+        (dest_directory / 'models').replace(src_directory / 'models.orig')
+        print(f'Original models directory moved to {dest_directory}/models.orig')
+        
+    (dest_directory / 'configs' / 'models.yaml').replace(src_directory / 'configs' / 'models.yaml.orig')
+    print(f'Original models.yaml file moved to {dest_directory}/configs/models.yaml.orig')
+    
+    config_file.replace(config_file.with_suffix(''))
+    dest_models.replace(dest_models.with_suffix(''))
+    
+def main():
+    parser = argparse.ArgumentParser(prog="invokeai-migrate3",
+                                     description="""
+This will copy and convert the models directory and the configs/models.yaml from the InvokeAI 2.3 format 
+'--from-directory' root to the InvokeAI 3.0 '--to-directory' root. These may be abbreviated '--from' and '--to'.a
+
+The old models directory and config file will be renamed 'models.orig' and 'models.yaml.orig' respectively.
+It is safe to provide the same directory for both arguments, but it is better to use the invokeai_configure
+script, which will perform a full upgrade in place."""
+                                     )
+    parser.add_argument('--from-directory',
+                        dest='src_root',
+                        type=Path,
+                        required=True,
+                        help='Source InvokeAI 2.3 root directory (containing "invokeai.init" or "invokeai.yaml")'
+                        )
+    parser.add_argument('--to-directory',
+                        dest='dest_root',
+                        type=Path,
+                        required=True,
+                        help='Destination InvokeAI 3.0 directory (containing "invokeai.yaml")'
+                        )
+    args = parser.parse_args()
+    src_root = args.src_root
+    assert src_root.is_dir(), f"{src_root} is not a valid directory"
+    assert (src_root / 'models').is_dir(), f"{src_root} does not contain a 'models' subdirectory"
+    assert (src_root / 'models' / 'hub').exists(), f"{src_root} does not contain a version 2.3 models directory"
+    assert (src_root / 'invokeai.init').exists() or (src_root / 'invokeai.yaml').exists(), f"{src_root} does not contain an InvokeAI init file."
+
+    dest_root = args.dest_root
+    assert dest_root.is_dir(), f"{dest_root} is not a valid directory"
+    config = InvokeAIAppConfig.get_config()
+    config.parse_args(['--root',str(dest_root)])
+
+    # TODO: revisit
+    # assert (dest_root / 'models').is_dir(), f"{dest_root} does not contain a 'models' subdirectory"
+    # assert (dest_root / 'invokeai.yaml').exists(), f"{dest_root} does not contain an InvokeAI init file."
+
+    do_migrate(src_root,dest_root)
+
+if __name__ == '__main__':
+    main()
+
+
+

invokeai/backend/install/model_install_backend.py

@@ -2,46 +2,37 @@
 Utility (backend) functions used by model_install.py
 """
 import os
-import re
 import shutil
-import sys
 import warnings
 from dataclasses import dataclass,field
 from pathlib import Path
-from tempfile import TemporaryFile
-from typing import List, Dict, Callable
+from tempfile import TemporaryDirectory
+from typing import List, Dict, Callable, Union, Set
 
 import requests
-from diffusers import AutoencoderKL
-from huggingface_hub import hf_hub_url, HfFolder
+from diffusers import StableDiffusionPipeline
+from diffusers import logging as dlogging
+from huggingface_hub import hf_hub_url, HfFolder, HfApi
 from omegaconf import OmegaConf
-from omegaconf.dictconfig import DictConfig
 from tqdm import tqdm
 
 import invokeai.configs as configs
 
-
 from invokeai.app.services.config import InvokeAIAppConfig
-from ..stable_diffusion import StableDiffusionGeneratorPipeline
+from invokeai.backend.model_management import ModelManager, ModelType, BaseModelType, ModelVariantType, AddModelResult
+from invokeai.backend.model_management.model_probe import ModelProbe, SchedulerPredictionType, ModelProbeInfo
+from invokeai.backend.util import download_with_resume
 from ..util.logging import InvokeAILogger
 
 warnings.filterwarnings("ignore")
 
 # --------------------------globals-----------------------
 config = InvokeAIAppConfig.get_config()
-
-Model_dir = "models"
-Weights_dir = "ldm/stable-diffusion-v1/"
+logger = InvokeAILogger.getLogger(name='InvokeAI')
 
 # the initial "configs" dir is now bundled in the `invokeai.configs` package
 Dataset_path = Path(configs.__path__[0]) / "INITIAL_MODELS.yaml"
 
-# initial models omegaconf
-Datasets = None
-
-# logger
-logger = InvokeAILogger.getLogger(name='InvokeAI')
-
 Config_preamble = """
 # This file describes the alternative machine learning models
 # available to InvokeAI script.
@@ -52,6 +43,24 @@ Config_preamble = """
 # was trained on.
 """
 
+LEGACY_CONFIGS = {
+    BaseModelType.StableDiffusion1: {
+        ModelVariantType.Normal: 'v1-inference.yaml',
+        ModelVariantType.Inpaint: 'v1-inpainting-inference.yaml',
+    },
+
+    BaseModelType.StableDiffusion2: {
+        ModelVariantType.Normal: {
+            SchedulerPredictionType.Epsilon: 'v2-inference.yaml',
+            SchedulerPredictionType.VPrediction: 'v2-inference-v.yaml',
+        },
+        ModelVariantType.Inpaint: {
+            SchedulerPredictionType.Epsilon: 'v2-inpainting-inference.yaml',
+            SchedulerPredictionType.VPrediction: 'v2-inpainting-inference-v.yaml',
+        }
+    }
+}
+
 @dataclass
 class ModelInstallList:
     '''Class for listing models to be installed/removed'''
@@ -59,133 +68,332 @@ class ModelInstallList:
     remove_models: List[str] = field(default_factory=list)
 
 @dataclass
-class UserSelections():
+class InstallSelections():
     install_models: List[str]= field(default_factory=list)
     remove_models: List[str]=field(default_factory=list)
-    purge_deleted_models: bool=field(default_factory=list)
-    install_cn_models: List[str] = field(default_factory=list)
-    remove_cn_models: List[str] = field(default_factory=list)
-    install_lora_models: List[str] = field(default_factory=list)
-    remove_lora_models: List[str] = field(default_factory=list)
-    install_ti_models: List[str] = field(default_factory=list)
-    remove_ti_models: List[str] = field(default_factory=list)
-    scan_directory: Path = None
-    autoscan_on_startup: bool=False
-    import_model_paths: str=None
+#    scan_directory: Path = None
+#    autoscan_on_startup: bool=False
+
+@dataclass
+class ModelLoadInfo():
+    name: str
+    model_type: ModelType
+    base_type: BaseModelType
+    path: Path = None
+    repo_id: str = None
+    description: str = ''
+    installed: bool = False
+    recommended: bool = False
+    default: bool = False
+
+class ModelInstall(object):
+    def __init__(self,
+                 config:InvokeAIAppConfig,
+                 prediction_type_helper: Callable[[Path],SchedulerPredictionType]=None,
+                 model_manager: ModelManager = None,
+                 access_token:str = None):
+        self.config = config
+        self.mgr = model_manager or ModelManager(config.model_conf_path)
+        self.datasets = OmegaConf.load(Dataset_path)
+        self.prediction_helper = prediction_type_helper
+        self.access_token = access_token or HfFolder.get_token()
+        self.reverse_paths = self._reverse_paths(self.datasets)
+
+    def all_models(self)->Dict[str,ModelLoadInfo]:
+        '''
+        Return dict of model_key=>ModelLoadInfo objects.
+        This method consolidates and simplifies the entries in both
+        models.yaml and INITIAL_MODELS.yaml so that they can
+        be treated uniformly. It also sorts the models alphabetically
+        by their name, to improve the display somewhat.
+        '''
+        model_dict = dict()
         
-def default_config_file():
-    return config.model_conf_path
+        # first populate with the entries in INITIAL_MODELS.yaml
+        for key, value in self.datasets.items():
+            name,base,model_type = ModelManager.parse_key(key)
+            value['name'] = name
+            value['base_type'] = base
+            value['model_type'] = model_type
+            model_dict[key] = ModelLoadInfo(**value)
 
-def sd_configs():
-    return config.legacy_conf_path
-
-def initial_models():
-    global Datasets
-    if Datasets:
-        return Datasets
-    return (Datasets := OmegaConf.load(Dataset_path)['diffusers'])
-
-def install_requested_models(
-        diffusers: ModelInstallList = None,
-        controlnet: ModelInstallList = None,
-        lora: ModelInstallList = None,
-        ti: ModelInstallList = None,
-        cn_model_map: Dict[str,str] = None, # temporary - move to model manager
-        scan_directory: Path = None,
-        external_models: List[str] = None,
-        scan_at_startup: bool = False,
-        precision: str = "float16",
-        purge_deleted: bool = False,
-        config_file_path: Path = None,
-        model_config_file_callback:  Callable[[Path],Path] = None
-):
-    """
-    Entry point for installing/deleting starter models, or installing external models.
-    """
-    access_token = HfFolder.get_token()
-    config_file_path = config_file_path or default_config_file()
-    if not config_file_path.exists():
-        open(config_file_path, "w")
-
-    # prevent circular import here
-    from ..model_management import ModelManager
-    model_manager = ModelManager(OmegaConf.load(config_file_path), precision=precision)
-    if controlnet:
-        model_manager.install_controlnet_models(controlnet.install_models, access_token=access_token)
-        model_manager.delete_controlnet_models(controlnet.remove_models)
-
-    if lora:
-        model_manager.install_lora_models(lora.install_models, access_token=access_token)
-        model_manager.delete_lora_models(lora.remove_models)
-
-    if ti:
-        model_manager.install_ti_models(ti.install_models, access_token=access_token)
-        model_manager.delete_ti_models(ti.remove_models)
-
-    if diffusers:
-        # TODO: Replace next three paragraphs with calls into new model manager
-        if diffusers.remove_models and len(diffusers.remove_models) > 0:
-            logger.info("Processing requested deletions")
-            for model in diffusers.remove_models:
-                logger.info(f"{model}...")
-                model_manager.del_model(model, delete_files=purge_deleted)
-            model_manager.commit(config_file_path)
-
-        if diffusers.install_models and len(diffusers.install_models) > 0:
-            logger.info("Installing requested models")
-            downloaded_paths = download_weight_datasets(
-                models=diffusers.install_models,
-                access_token=None,
-                precision=precision,
-            )
-            successful = {x:v for x,v in downloaded_paths.items() if v is not None}
-            if len(successful) > 0:
-                update_config_file(successful, config_file_path)
-            if len(successful) < len(diffusers.install_models):
-                unsuccessful = [x for x in downloaded_paths if downloaded_paths[x] is None]
-                logger.warning(f"Some of the model downloads were not successful: {unsuccessful}")
-
-    # due to above, we have to reload the model manager because conf file
-    # was changed behind its back
-    model_manager = ModelManager(OmegaConf.load(config_file_path), precision=precision)
-
-    external_models = external_models or list()
-    if scan_directory:
-        external_models.append(str(scan_directory))
-
-    if len(external_models) > 0:
-        logger.info("INSTALLING EXTERNAL MODELS")
-        for path_url_or_repo in external_models:
-            try:
-                logger.debug(f'In install_requested_models; callback = {model_config_file_callback}')
-                model_manager.heuristic_import(
-                    path_url_or_repo,
-                    commit_to_conf=config_file_path,
-                    config_file_callback = model_config_file_callback,
+        # supplement with entries in models.yaml
+        installed_models = self.mgr.list_models()
+        for md in installed_models:
+            base = md['base_model']
+            model_type = md['type']
+            name = md['name']
+            key = ModelManager.create_key(name, base, model_type)
+            if key in model_dict:
+                model_dict[key].installed = True
+            else:
+                model_dict[key] = ModelLoadInfo(
+                    name = name,
+                    base_type = base,
+                    model_type = model_type,
+                    path = value.get('path'),
+                    installed = True,
                 )
-            except KeyboardInterrupt:
-                sys.exit(-1)
-            except Exception:
+        return {x : model_dict[x] for x in sorted(model_dict.keys(),key=lambda y: model_dict[y].name.lower())}
+
+    def starter_models(self)->Set[str]:
+        models = set()
+        for key, value in self.datasets.items():
+            name,base,model_type = ModelManager.parse_key(key)
+            if model_type==ModelType.Main:
+                models.add(key)
+        return models
+
+    def recommended_models(self)->Set[str]:
+        starters = self.starter_models()
+        return set([x for x in starters if self.datasets[x].get('recommended',False)])
+    
+    def default_model(self)->str:
+        starters = self.starter_models()
+        defaults = [x for x in starters if self.datasets[x].get('default',False)]
+        return defaults[0]
+
+    def install(self, selections: InstallSelections):
+        verbosity = dlogging.get_verbosity()  # quench NSFW nags
+        dlogging.set_verbosity_error()
+
+        job = 1
+        jobs = len(selections.remove_models) + len(selections.install_models)
+        
+        # remove requested models
+        for key in selections.remove_models:
+            name,base,mtype = self.mgr.parse_key(key)
+            logger.info(f'Deleting {mtype} model {name} [{job}/{jobs}]')
+            try:
+                self.mgr.del_model(name,base,mtype)
+            except FileNotFoundError as e:
+                logger.warning(e)
+            job += 1
+            
+        # add requested models
+        for path in selections.install_models:
+            logger.info(f'Installing {path} [{job}/{jobs}]')
+            try:
+                self.heuristic_import(path)
+            except (ValueError, KeyError) as e:
+                logger.error(str(e))
+            job += 1
+            
+        dlogging.set_verbosity(verbosity)
+        self.mgr.commit()
+
+    def heuristic_import(self,
+                         model_path_id_or_url: Union[str,Path],
+                         models_installed: Set[Path]=None,
+                         )->Dict[str, AddModelResult]:
+        '''
+        :param model_path_id_or_url: A Path to a local model to import, or a string representing its repo_id or URL
+        :param models_installed: Set of installed models, used for recursive invocation
+        Returns a set of dict objects corresponding to newly-created stanzas in models.yaml.
+        '''
+
+        if not models_installed:
+            models_installed = dict()
+            
+        # A little hack to allow nested routines to retrieve info on the requested ID
+        self.current_id = model_path_id_or_url
+        path = Path(model_path_id_or_url)
+        # checkpoint file, or similar
+        if path.is_file():
+            models_installed.update({str(path):self._install_path(path)})
+
+        # folders style or similar
+        elif path.is_dir() and any([(path/x).exists() for x in \
+                                    {'config.json','model_index.json','learned_embeds.bin','pytorch_lora_weights.bin'}
+                                    ]
+                                   ):
+            models_installed.update(self._install_path(path))
+
+        # recursive scan
+        elif path.is_dir():
+            for child in path.iterdir():
+                self.heuristic_import(child, models_installed=models_installed)
+
+        # huggingface repo
+        elif len(str(model_path_id_or_url).split('/')) == 2:
+            models_installed.update({str(model_path_id_or_url): self._install_repo(str(model_path_id_or_url))})
+
+        # a URL
+        elif str(model_path_id_or_url).startswith(("http:", "https:", "ftp:")):
+            models_installed.update({str(model_path_id_or_url): self._install_url(model_path_id_or_url)})
+
+        else:
+            raise KeyError(f'{str(model_path_id_or_url)} is not recognized as a local path, repo ID or URL. Skipping')
+
+        return models_installed
+
+    # install a model from a local path. The optional info parameter is there to prevent
+    # the model from being probed twice in the event that it has already been probed.
+    def _install_path(self, path: Path, info: ModelProbeInfo=None)->AddModelResult:
+        info = info or ModelProbe().heuristic_probe(path,self.prediction_helper)
+        if not info:
+            logger.warning(f'Unable to parse format of {path}')
+            return None
+        model_name = path.stem if path.is_file() else path.name
+        if self.mgr.model_exists(model_name, info.base_type, info.model_type):
+            raise ValueError(f'A model named "{model_name}" is already installed.')
+        attributes = self._make_attributes(path,info)
+        return self.mgr.add_model(model_name = model_name,
+                                  base_model = info.base_type,
+                                  model_type = info.model_type,
+                                  model_attributes = attributes,
+                                  )
+
+    def _install_url(self, url: str)->AddModelResult:
+        with TemporaryDirectory(dir=self.config.models_path) as staging:
+            location = download_with_resume(url,Path(staging))
+            if not location:
+                logger.error(f'Unable to download {url}. Skipping.')
+            info = ModelProbe().heuristic_probe(location)
+            dest = self.config.models_path / info.base_type.value / info.model_type.value / location.name
+            models_path = shutil.move(location,dest)
+
+        # staged version will be garbage-collected at this time
+        return self._install_path(Path(models_path), info)
+
+    def _install_repo(self, repo_id: str)->AddModelResult:
+        hinfo = HfApi().model_info(repo_id)
+        
+        # we try to figure out how to download this most economically
+        # list all the files in the repo
+        files = [x.rfilename for x in hinfo.siblings]
+        location = None
+
+        with TemporaryDirectory(dir=self.config.models_path) as staging:
+            staging = Path(staging)
+            if 'model_index.json' in files:
+                location = self._download_hf_pipeline(repo_id, staging)   # pipeline
+            else:
+                for suffix in ['safetensors','bin']:
+                    if f'pytorch_lora_weights.{suffix}' in files:
+                        location = self._download_hf_model(repo_id, ['pytorch_lora_weights.bin'], staging)  # LoRA
+                        break
+                    elif self.config.precision=='float16' and f'diffusion_pytorch_model.fp16.{suffix}' in files: # vae, controlnet or some other standalone
+                        files = ['config.json', f'diffusion_pytorch_model.fp16.{suffix}']
+                        location = self._download_hf_model(repo_id, files, staging)
+                        break
+                    elif f'diffusion_pytorch_model.{suffix}' in files:
+                        files = ['config.json', f'diffusion_pytorch_model.{suffix}']
+                        location = self._download_hf_model(repo_id, files, staging)
+                        break
+                    elif f'learned_embeds.{suffix}' in files:
+                        location = self._download_hf_model(repo_id, [f'learned_embeds.{suffix}'], staging)
+                        break
+            if not location:
+                logger.warning(f'Could not determine type of repo {repo_id}. Skipping install.')
+                return {}
+
+            info = ModelProbe().heuristic_probe(location, self.prediction_helper)
+            if not info:
+                logger.warning(f'Could not probe {location}. Skipping install.')
+                return {}
+            dest = self.config.models_path / info.base_type.value / info.model_type.value / self._get_model_name(repo_id,location)
+            if dest.exists():
+                shutil.rmtree(dest)
+            shutil.copytree(location,dest)
+            return self._install_path(dest, info)
+
+    def _get_model_name(self,path_name: str, location: Path)->str:
+        '''
+        Calculate a name for the model - primitive implementation.
+        '''
+        if key := self.reverse_paths.get(path_name):
+            (name, base, mtype) = ModelManager.parse_key(key)
+            return name
+        else:
+            return location.stem
+
+    def _make_attributes(self, path: Path, info: ModelProbeInfo)->dict:
+        model_name = path.name if path.is_dir() else path.stem
+        description = f'{info.base_type.value} {info.model_type.value} model {model_name}'
+        if key := self.reverse_paths.get(self.current_id):
+            if key in self.datasets:
+                description = self.datasets[key].get('description') or description
+
+        rel_path = self.relative_to_root(path)
+
+        attributes = dict(
+            path = str(rel_path),
+            description = str(description),
+            model_format = info.format,
+            )
+        if info.model_type == ModelType.Main:
+            attributes.update(dict(variant = info.variant_type,))
+            if info.format=="checkpoint":
+                try:
+                    possible_conf = path.with_suffix('.yaml')
+                    if possible_conf.exists():
+                        legacy_conf = str(self.relative_to_root(possible_conf))
+                    elif info.base_type == BaseModelType.StableDiffusion2:
+                        legacy_conf = Path(self.config.legacy_conf_dir, LEGACY_CONFIGS[info.base_type][info.variant_type][info.prediction_type])
+                    else:
+                        legacy_conf = Path(self.config.legacy_conf_dir, LEGACY_CONFIGS[info.base_type][info.variant_type])
+                except KeyError:
+                    legacy_conf = Path(self.config.legacy_conf_dir, 'v1-inference.yaml')  # best guess
+                    
+                attributes.update(
+                    dict(
+                        config = str(legacy_conf)
+                    )
+                )
+        return attributes
+
+    def relative_to_root(self, path: Path)->Path:
+        root = self.config.root_path
+        if path.is_relative_to(root):
+            return path.relative_to(root)
+        else:
+            return path
+
+    def _download_hf_pipeline(self, repo_id: str, staging: Path)->Path:
+        '''
+        This retrieves a StableDiffusion model from cache or remote and then
+        does a save_pretrained() to the indicated staging area.
+        '''
+        _,name = repo_id.split("/")
+        revisions = ['fp16','main'] if self.config.precision=='float16' else ['main']
+        model = None
+        for revision in revisions:
+            try:
+                model = StableDiffusionPipeline.from_pretrained(repo_id,revision=revision,safety_checker=None)
+            except:  # most errors are due to fp16 not being present. Fix this to catch other errors
                 pass
+            if model:
+                break
+        if not model:
+            logger.error(f'Diffusers model {repo_id} could not be downloaded. Skipping.')
+            return None
+        model.save_pretrained(staging / name, safe_serialization=True)
+        return staging / name
 
-    if scan_at_startup and scan_directory.is_dir():
-        update_autoconvert_dir(scan_directory)
-    else:
-        update_autoconvert_dir(None)
-
-def update_autoconvert_dir(autodir: Path):
-    '''
-    Update the "autoconvert_dir" option in invokeai.yaml
-    '''
-    invokeai_config_path = config.init_file_path
-    conf = OmegaConf.load(invokeai_config_path)
-    conf.InvokeAI.Paths.autoconvert_dir = str(autodir) if autodir else None
-    yaml = OmegaConf.to_yaml(conf)
-    tmpfile = invokeai_config_path.parent / "new_config.tmp"
-    with open(tmpfile, "w", encoding="utf-8") as outfile:
-        outfile.write(yaml)
-    tmpfile.replace(invokeai_config_path)
+    def _download_hf_model(self, repo_id: str, files: List[str], staging: Path)->Path:
+        _,name = repo_id.split("/")
+        location = staging / name
+        paths = list()
+        for filename in files:
+            p = hf_download_with_resume(repo_id,
+                                        model_dir=location,
+                                        model_name=filename,
+                                        access_token = self.access_token
+                                        )
+            if p:
+                paths.append(p)
+            else:
+                logger.warning(f'Could not download {filename} from {repo_id}.')
+            
+        return location if len(paths)>0 else None
 
+    @classmethod
+    def _reverse_paths(cls,datasets)->dict:
+        '''
+        Reverse mapping from repo_id/path to destination name.
+        '''
+        return {v.get('path') or v.get('repo_id') : k for k, v in datasets.items()}
 
 # -------------------------------------
 def yes_or_no(prompt: str, default_yes=True):
@@ -197,133 +405,19 @@ def yes_or_no(prompt: str, default_yes=True):
         return response[0] in ("y", "Y")
 
 # ---------------------------------------------
-def recommended_datasets() -> List['str']:
-    datasets = set()
-    for ds in initial_models().keys():
-        if initial_models()[ds].get("recommended", False):
-            datasets.add(ds)
-    return list(datasets)
-
-# ---------------------------------------------
-def default_dataset() -> dict:
-    datasets = set()
-    for ds in initial_models().keys():
-        if initial_models()[ds].get("default", False):
-            datasets.add(ds)
-    return list(datasets)
-
-
-# ---------------------------------------------
-def all_datasets() -> dict:
-    datasets = dict()
-    for ds in initial_models().keys():
-        datasets[ds] = True
-    return datasets
-
-
-# ---------------------------------------------
-# look for legacy model.ckpt in models directory and offer to
-# normalize its name
-def migrate_models_ckpt():
-    model_path = os.path.join(config.root_dir, Model_dir, Weights_dir)
-    if not os.path.exists(os.path.join(model_path, "model.ckpt")):
-        return
-    new_name = initial_models()["stable-diffusion-1.4"]["file"]
-    logger.warning(
-        'The Stable Diffusion v4.1 "model.ckpt" is already installed. The name will be changed to {new_name} to avoid confusion.'
-    )
-    logger.warning(f"model.ckpt => {new_name}")
-    os.replace(
-        os.path.join(model_path, "model.ckpt"), os.path.join(model_path, new_name)
-    )
-
-
-# ---------------------------------------------
-def download_weight_datasets(
-    models: List[str], access_token: str, precision: str = "float32"
-):
-    migrate_models_ckpt()
-    successful = dict()
-    for mod in models:
-        logger.info(f"Downloading {mod}:")
-        successful[mod] = _download_repo_or_file(
-            initial_models()[mod], access_token, precision=precision
-        )
-    return successful
-
-
-def _download_repo_or_file(
-    mconfig: DictConfig, access_token: str, precision: str = "float32"
-) -> Path:
-    path = None
-    if mconfig["format"] == "ckpt":
-        path = _download_ckpt_weights(mconfig, access_token)
-    else:
-        path = _download_diffusion_weights(mconfig, access_token, precision=precision)
-        if "vae" in mconfig and "repo_id" in mconfig["vae"]:
-            _download_diffusion_weights(
-                mconfig["vae"], access_token, precision=precision
-            )
-    return path
-
-def _download_ckpt_weights(mconfig: DictConfig, access_token: str) -> Path:
-    repo_id = mconfig["repo_id"]
-    filename = mconfig["file"]
-    cache_dir = os.path.join(config.root_dir, Model_dir, Weights_dir)
-    return hf_download_with_resume(
-        repo_id=repo_id,
-        model_dir=cache_dir,
-        model_name=filename,
-        access_token=access_token,
-    )
-
-
-# ---------------------------------------------
-def download_from_hf(
-    model_class: object, model_name: str, **kwargs
+def hf_download_from_pretrained(
+        model_class: object, model_name: str, destination: Path, **kwargs
 ):
     logger = InvokeAILogger.getLogger('InvokeAI')
     logger.addFilter(lambda x: 'fp16 is not a valid' not in x.getMessage())
     
-    path = config.cache_dir
     model = model_class.from_pretrained(
         model_name,
-        cache_dir=path,
         resume_download=True,
         **kwargs,
     )
-    model_name = "--".join(("models", *model_name.split("/")))
-    return path / model_name if model else None
-
-
-def _download_diffusion_weights(
-    mconfig: DictConfig, access_token: str, precision: str = "float32"
-):
-    repo_id = mconfig["repo_id"]
-    model_class = (
-        StableDiffusionGeneratorPipeline
-        if mconfig.get("format", None) == "diffusers"
-        else AutoencoderKL
-    )
-    extra_arg_list = [{"revision": "fp16"}, {}] if precision == "float16" else [{}]
-    path = None
-    for extra_args in extra_arg_list:
-        try:
-            path = download_from_hf(
-                model_class,
-                repo_id,
-                safety_checker=None,
-                **extra_args,
-            )
-        except OSError as e:
-            if 'Revision Not Found' in str(e):
-                pass
-            else:
-                logger.error(str(e))
-        if path:
-            break
-    return path
-
+    model.save_pretrained(destination, safe_serialization=True)
+    return destination
 
 # ---------------------------------------------
 def hf_download_with_resume(
@@ -383,128 +477,3 @@ def hf_download_with_resume(
     return model_dest
 
 
-# ---------------------------------------------
-def update_config_file(successfully_downloaded: dict, config_file: Path):
-    config_file = (
-        Path(config_file) if config_file is not None else default_config_file()
-    )
-
-    # In some cases (incomplete setup, etc), the default configs directory might be missing.
-    # Create it if it doesn't exist.
-    # this check is ignored if opt.config_file is specified - user is assumed to know what they
-    # are doing if they are passing a custom config file from elsewhere.
-    if config_file is default_config_file() and not config_file.parent.exists():
-        configs_src = Dataset_path.parent
-        configs_dest = default_config_file().parent
-        shutil.copytree(configs_src, configs_dest, dirs_exist_ok=True)
-
-    yaml = new_config_file_contents(successfully_downloaded, config_file)
-
-    try:
-        backup = None
-        if os.path.exists(config_file):
-            logger.warning(
-                f"{config_file.name} exists. Renaming to {config_file.stem}.yaml.orig"
-            )
-            backup = config_file.with_suffix(".yaml.orig")
-            ## Ugh. Windows is unable to overwrite an existing backup file, raises a WinError 183
-            if sys.platform == "win32" and backup.is_file():
-                backup.unlink()
-            config_file.rename(backup)
-
-        with TemporaryFile() as tmp:
-            tmp.write(Config_preamble.encode())
-            tmp.write(yaml.encode())
-
-            with open(str(config_file.expanduser().resolve()), "wb") as new_config:
-                tmp.seek(0)
-                new_config.write(tmp.read())
-
-    except Exception as e:
-        logger.error(f"Error creating config file {config_file}: {str(e)}")
-        if backup is not None:
-            logger.info("restoring previous config file")
-            ## workaround, for WinError 183, see above
-            if sys.platform == "win32" and config_file.is_file():
-                config_file.unlink()
-            backup.rename(config_file)
-        return
-    
-    logger.info(f"Successfully created new configuration file {config_file}")
-
-
-# ---------------------------------------------
-def new_config_file_contents(
-    successfully_downloaded: dict,
-    config_file: Path,
-) -> str:
-    if config_file.exists():
-        conf = OmegaConf.load(str(config_file.expanduser().resolve()))
-    else:
-        conf = OmegaConf.create()
-
-    default_selected = None
-    for model in successfully_downloaded:
-        # a bit hacky - what we are doing here is seeing whether a checkpoint
-        # version of the model was previously defined, and whether the current
-        # model is a diffusers (indicated with a path)
-        if conf.get(model) and Path(successfully_downloaded[model]).is_dir():
-            delete_weights(model, conf[model])
-
-        stanza = {}
-        mod = initial_models()[model]
-        stanza["description"] = mod["description"]
-        stanza["repo_id"] = mod["repo_id"]
-        stanza["format"] = mod["format"]
-        # diffusers don't need width and height (probably .ckpt doesn't either)
-        # so we no longer require these in INITIAL_MODELS.yaml
-        if "width" in mod:
-            stanza["width"] = mod["width"]
-        if "height" in mod:
-            stanza["height"] = mod["height"]
-        if "file" in mod:
-            stanza["weights"] = os.path.relpath(
-                successfully_downloaded[model], start=config.root_dir
-            )
-            stanza["config"] = os.path.normpath(
-                os.path.join(sd_configs(), mod["config"])
-            )
-        if "vae" in mod:
-            if "file" in mod["vae"]:
-                stanza["vae"] = os.path.normpath(
-                    os.path.join(Model_dir, Weights_dir, mod["vae"]["file"])
-                )
-            else:
-                stanza["vae"] = mod["vae"]
-        if mod.get("default", False):
-            stanza["default"] = True
-            default_selected = True
-
-        conf[model] = stanza
-
-    # if no default model was chosen, then we select the first
-    # one in the list
-    if not default_selected:
-        conf[list(successfully_downloaded.keys())[0]]["default"] = True
-
-    return OmegaConf.to_yaml(conf)
-
-
-# ---------------------------------------------
-def delete_weights(model_name: str, conf_stanza: dict):
-    if not (weights := conf_stanza.get("weights")):
-        return
-    if re.match("/VAE/", conf_stanza.get("config")):
-        return
-
-    logger.warning(
-        f"\nThe checkpoint version of {model_name} is superseded by the diffusers version. Deleting the original file {weights}?"
-    )
-
-    weights = Path(weights)
-    if not weights.is_absolute():
-        weights = config.root_dir / weights
-        try:
-            weights.unlink()
-        except OSError as e:
-            logger.error(str(e))

invokeai/backend/model_management/__init__.py

@@ -1,6 +1,8 @@
 """
 Initialization file for invokeai.backend.model_management
 """
-from .model_manager import ModelManager, ModelInfo
+from .model_manager import ModelManager, ModelInfo, AddModelResult, SchedulerPredictionType
 from .model_cache import ModelCache
 from .models import BaseModelType, ModelType, SubModelType, ModelVariantType
+from .model_merge import ModelMerger, MergeInterpolationMethod
+

invokeai/backend/model_management/convert_ckpt_to_diffusers.py

@@ -29,8 +29,8 @@ import invokeai.backend.util.logging as logger
 from invokeai.app.services.config import InvokeAIAppConfig
 
 from .model_manager import ModelManager
-from .model_cache import ModelCache
-from .models import SchedulerPredictionType, BaseModelType, ModelVariantType
+from picklescan.scanner import scan_file_path
+from .models import BaseModelType, ModelVariantType
 
 try:
     from omegaconf import OmegaConf
@@ -73,7 +73,9 @@ from transformers import (
 
 from ..stable_diffusion import StableDiffusionGeneratorPipeline
 
-MODEL_ROOT = None
+# TODO: redo in future
+#CONVERT_MODEL_ROOT = InvokeAIAppConfig.get_config().models_path / "core" / "convert"
+CONVERT_MODEL_ROOT = InvokeAIAppConfig.get_config().root_path / "models" / "core" / "convert"
 
 def shave_segments(path, n_shave_prefix_segments=1):
     """
@@ -605,7 +607,7 @@ def convert_ldm_vae_checkpoint(checkpoint, config):
     else:
         vae_state_dict = checkpoint
         
-    new_checkpoint = convert_ldm_vae_state_dict(vae_state_dict,config)
+    new_checkpoint = convert_ldm_vae_state_dict(vae_state_dict, config)
     return new_checkpoint
 
 def convert_ldm_vae_state_dict(vae_state_dict, config):
@@ -828,7 +830,7 @@ def convert_ldm_bert_checkpoint(checkpoint, config):
 
 
 def convert_ldm_clip_checkpoint(checkpoint):
-    text_model = CLIPTextModel.from_pretrained(MODEL_ROOT / 'clip-vit-large-patch14')
+    text_model = CLIPTextModel.from_pretrained(CONVERT_MODEL_ROOT / 'clip-vit-large-patch14')
     keys = list(checkpoint.keys())
 
     text_model_dict = {}
@@ -882,7 +884,7 @@ textenc_pattern = re.compile("|".join(protected.keys()))
 
 def convert_open_clip_checkpoint(checkpoint):
     text_model = CLIPTextModel.from_pretrained(
-        MODEL_ROOT / 'stable-diffusion-2-clip',
+        CONVERT_MODEL_ROOT / 'stable-diffusion-2-clip',
         subfolder='text_encoder',
     )
 
@@ -949,7 +951,7 @@ def convert_open_clip_checkpoint(checkpoint):
 
     return text_model
 
-def replace_checkpoint_vae(checkpoint, vae_path:str):
+def replace_checkpoint_vae(checkpoint, vae_path: str):
     if vae_path.endswith(".safetensors"):
         vae_ckpt = load_file(vae_path)
     else:
@@ -959,7 +961,7 @@ def replace_checkpoint_vae(checkpoint, vae_path:str):
         new_key = f'first_stage_model.{vae_key}'
         checkpoint[new_key] = state_dict[vae_key]
 
-def convert_ldm_vae_to_diffusers(checkpoint, vae_config: DictConfig, image_size: int)->AutoencoderKL:
+def convert_ldm_vae_to_diffusers(checkpoint, vae_config: DictConfig, image_size: int) -> AutoencoderKL:
     vae_config = create_vae_diffusers_config(
         vae_config, image_size=image_size
     )
@@ -979,8 +981,6 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
     original_config_file: str,
     extract_ema: bool = True,
     precision: torch.dtype = torch.float32,
-    upcast_attention: bool = False,
-    prediction_type: SchedulerPredictionType = SchedulerPredictionType.Epsilon,
     scan_needed: bool = True,
 ) -> StableDiffusionPipeline:
     """
@@ -994,8 +994,6 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
     :param checkpoint_path: Path to `.ckpt` file.
     :param original_config_file: Path to `.yaml` config file corresponding to the original architecture.
       If `None`, will be automatically inferred by looking for a key that only exists in SD2.0 models.
-    :param prediction_type: The prediction type that the model was trained on. Use `'epsilon'` for Stable Diffusion
-     v1.X and Stable Diffusion v2 Base. Use `'v-prediction'` for Stable Diffusion v2.
     :param scheduler_type: Type of scheduler to use. Should be one of `["pndm", "lms", "heun", "euler",
      "euler-ancestral", "dpm", "ddim"]`. :param model_type: The pipeline type. `None` to automatically infer, or one of
      `["FrozenOpenCLIPEmbedder", "FrozenCLIPEmbedder"]`. :param extract_ema: Only relevant for
@@ -1003,21 +1001,23 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
      or not. Defaults to `False`. Pass `True` to extract the EMA weights. EMA weights usually yield higher
      quality images for inference. Non-EMA weights are usually better to continue fine-tuning.
     :param precision: precision to use - torch.float16, torch.float32 or torch.autocast
-    :param upcast_attention: Whether the attention computation should always be upcasted. This is necessary when
-    running stable diffusion 2.1.
     """
-    config = InvokeAIAppConfig.get_config()
+    if not isinstance(checkpoint_path, Path):
+        checkpoint_path = Path(checkpoint_path)
 
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         verbosity = dlogging.get_verbosity()
         dlogging.set_verbosity_error()
 
-        if str(checkpoint_path).endswith(".safetensors"):
+        if checkpoint_path.suffix == ".safetensors":
             checkpoint = load_file(checkpoint_path)
         else:
             if scan_needed:
-                ModelCache.scan_model(checkpoint_path, checkpoint_path)
+                # scan model
+                scan_result = scan_file_path(checkpoint_path)
+                if scan_result.infected_files != 0:
+                    raise "The model {checkpoint_path} is potentially infected by malware. Aborting import."
             checkpoint = torch.load(checkpoint_path)
 
         # sometimes there is a state_dict key and sometimes not
@@ -1026,9 +1026,13 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
 
         original_config = OmegaConf.load(original_config_file)
 
-        if model_version == BaseModelType.StableDiffusion2 and prediction_type == SchedulerPredictionType.VPrediction:
+        if model_version == BaseModelType.StableDiffusion2 and original_config["model"]["params"]["parameterization"] == "v":
+            prediction_type = "v_prediction"
+            upcast_attention = True
             image_size = 768
         else:
+            prediction_type = "epsilon"
+            upcast_attention = False
             image_size = 512
 
         #
@@ -1083,7 +1087,7 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
         if model_type == "FrozenOpenCLIPEmbedder":
             text_model = convert_open_clip_checkpoint(checkpoint)
             tokenizer = CLIPTokenizer.from_pretrained(
-                MODEL_ROOT / 'stable-diffusion-2-clip',
+                CONVERT_MODEL_ROOT / 'stable-diffusion-2-clip',
                 subfolder='tokenizer',
             )
             pipe = StableDiffusionPipeline(
@@ -1099,9 +1103,9 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
 
         elif model_type in ["FrozenCLIPEmbedder", "WeightedFrozenCLIPEmbedder"]:
             text_model = convert_ldm_clip_checkpoint(checkpoint)
-            tokenizer = CLIPTokenizer.from_pretrained(MODEL_ROOT / 'clip-vit-large-patch14')
-            safety_checker = StableDiffusionSafetyChecker.from_pretrained(MODEL_ROOT / 'stable-diffusion-safety-checker')
-            feature_extractor = AutoFeatureExtractor.from_pretrained(MODEL_ROOT / 'stable-diffusion-safety-checker')
+            tokenizer = CLIPTokenizer.from_pretrained(CONVERT_MODEL_ROOT / 'clip-vit-large-patch14')
+            safety_checker = StableDiffusionSafetyChecker.from_pretrained(CONVERT_MODEL_ROOT / 'stable-diffusion-safety-checker')
+            feature_extractor = AutoFeatureExtractor.from_pretrained(CONVERT_MODEL_ROOT / 'stable-diffusion-safety-checker')
             pipe = StableDiffusionPipeline(
                 vae=vae.to(precision),
                 text_encoder=text_model.to(precision),
@@ -1115,7 +1119,7 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
         else:
             text_config = create_ldm_bert_config(original_config)
             text_model = convert_ldm_bert_checkpoint(checkpoint, text_config)
-            tokenizer = BertTokenizerFast.from_pretrained(MODEL_ROOT / "bert-base-uncased")
+            tokenizer = BertTokenizerFast.from_pretrained(CONVERT_MODEL_ROOT / "bert-base-uncased")
             pipe = LDMTextToImagePipeline(
                 vqvae=vae,
                 bert=text_model,
@@ -1131,7 +1135,6 @@ def load_pipeline_from_original_stable_diffusion_ckpt(
 def convert_ckpt_to_diffusers(
         checkpoint_path: Union[str, Path],
         dump_path: Union[str, Path],
-        model_root: Union[str, Path],
         **kwargs,
 ):
     """
@@ -1139,9 +1142,6 @@ def convert_ckpt_to_diffusers(
     and in addition a path-like object indicating the location of the desired diffusers
     model to be written.
     """
-    # setting global here to avoid massive changes late at night
-    global MODEL_ROOT
-    MODEL_ROOT = Path(model_root) / 'core/convert'
     pipe = load_pipeline_from_original_stable_diffusion_ckpt(checkpoint_path, **kwargs)
 
     pipe.save_pretrained(

invokeai/backend/model_management/lora.py

@@ -1,18 +1,15 @@
 from __future__ import annotations
 
 import copy
-from pathlib import Path
 from contextlib import contextmanager
-from typing import Optional, Dict, Tuple, Any
+from typing import Optional, Dict, Tuple, Any, Union, List
+from pathlib import Path
 
 import torch
-from safetensors.torch import load_file
-from torch.utils.hooks import RemovableHandle
-
-from diffusers.models import UNet2DConditionModel
-from transformers import CLIPTextModel
-
 from compel.embeddings_provider import BaseTextualInversionManager
+from diffusers.models import UNet2DConditionModel
+from safetensors.torch import load_file
+from transformers import CLIPTextModel, CLIPTokenizer
 
 class LoRALayerBase:
     #rank: Optional[int]
@@ -70,7 +67,7 @@ class LoRALayerBase:
             op = torch.nn.functional.linear
             extra_args = {}
 
-        weight = self.get_weight(module)
+        weight = self.get_weight()
 
         bias = self.bias if self.bias is not None else 0
         scale = self.alpha / self.rank if (self.alpha and self.rank) else 1.0
@@ -81,7 +78,7 @@ class LoRALayerBase:
             **extra_args,
         ) * multiplier * scale
 
-    def get_weight(self, module: torch.nn.Module):
+    def get_weight(self):
         raise NotImplementedError()
 
     def calc_size(self) -> int:
@@ -122,10 +119,10 @@ class LoRALayer(LoRALayerBase):
 
         self.rank = self.down.shape[0]
 
-    def get_weight(self, module: torch.nn.Module):
+    def get_weight(self):
         if self.mid is not None:
-            up = self.up.reshape(up.shape[0], up.shape[1])
-            down = self.down.reshape(up.shape[0], up.shape[1])
+            up = self.up.reshape(self.up.shape[0], self.up.shape[1])
+            down = self.down.reshape(self.down.shape[0], self.down.shape[1])
             weight = torch.einsum("m n w h, i m, n j -> i j w h", self.mid, up, down)
         else:
             weight = self.up.reshape(self.up.shape[0], -1) @ self.down.reshape(self.down.shape[0], -1)
@@ -166,7 +163,7 @@ class LoHALayer(LoRALayerBase):
         layer_key: str,
         values: dict,
     ):
-        super().__init__(module_key, rank, alpha, bias)
+        super().__init__(layer_key, values)
 
         self.w1_a = values["hada_w1_a"]
         self.w1_b = values["hada_w1_b"]
@@ -185,7 +182,7 @@ class LoHALayer(LoRALayerBase):
 
         self.rank = self.w1_b.shape[0]
 
-    def get_weight(self, module: torch.nn.Module):
+    def get_weight(self):
         if self.t1 is None:
             weight = (self.w1_a @ self.w1_b) * (self.w2_a @ self.w2_b)
 
@@ -239,7 +236,7 @@ class LoKRLayer(LoRALayerBase):
         layer_key: str,
         values: dict,
     ):
-        super().__init__(module_key, rank, alpha, bias)        
+        super().__init__(layer_key, values)        
 
         if "lokr_w1" in values:
             self.w1 = values["lokr_w1"]
@@ -271,7 +268,7 @@ class LoKRLayer(LoRALayerBase):
         else:
             self.rank = None # unscaled
 
-    def get_weight(self, module: torch.nn.Module):
+    def get_weight(self):
         w1 = self.w1
         if w1 is None:
             w1 = self.w1_a @ self.w1_b
@@ -286,7 +283,7 @@ class LoKRLayer(LoRALayerBase):
         if len(w2.shape) == 4:
             w1 = w1.unsqueeze(2).unsqueeze(2)
         w2 = w2.contiguous()
-        weight = torch.kron(w1, w2).reshape(module.weight.shape) # TODO: can we remove reshape?
+        weight = torch.kron(w1, w2)
 
         return weight
 
@@ -411,7 +408,7 @@ class LoRAModel: #(torch.nn.Module):
             else:
                 # TODO: diff/ia3/... format
                 print(
-                    f">> Encountered unknown lora layer module in {self.name}: {layer_key}"
+                    f">> Encountered unknown lora layer module in {model.name}: {layer_key}"
                 )
                 return
 
@@ -471,7 +468,7 @@ class ModelPatcher:
                 submodule_name += "_" + key_parts.pop(0)
 
         module = module.get_submodule(submodule_name)
-        module_key = module_key.rstrip(".")
+        module_key = (module_key + "." + submodule_name).lstrip(".")
 
         return (module_key, module)
 
@@ -525,23 +522,37 @@ class ModelPatcher:
         loras: List[Tuple[LoraModel, float]],
         prefix: str,
     ):
-        hooks = dict()
+        original_weights = dict()
         try:
-            for lora, lora_weight in loras:
-                for layer_key, layer in lora.layers.items():
-                    if not layer_key.startswith(prefix):
-                        continue
+            with torch.no_grad():
+                for lora, lora_weight in loras:
+                    #assert lora.device.type == "cpu"
+                    for layer_key, layer in lora.layers.items():
+                        if not layer_key.startswith(prefix):
+                            continue
 
-                    module_key, module = cls._resolve_lora_key(model, layer_key, prefix)
-                    if module_key not in hooks:
-                        hooks[module_key] = module.register_forward_hook(cls._lora_forward_hook(loras, layer_key))
+                        module_key, module = cls._resolve_lora_key(model, layer_key, prefix)
+                        if module_key not in original_weights:
+                            original_weights[module_key] = module.weight.detach().to(device="cpu", copy=True)
+
+                        # enable autocast to calc fp16 loras on cpu
+                        #with torch.autocast(device_type="cpu"):
+                        layer.to(dtype=torch.float32)
+                        layer_scale = layer.alpha / layer.rank if (layer.alpha and layer.rank) else 1.0
+                        layer_weight = layer.get_weight() * lora_weight * layer_scale
+
+                        if module.weight.shape != layer_weight.shape:
+                            # TODO: debug on lycoris
+                            layer_weight = layer_weight.reshape(module.weight.shape)
+
+                        module.weight += layer_weight.to(device=module.weight.device, dtype=module.weight.dtype)
 
             yield # wait for context manager exit
 
         finally:
-            for module_key, hook in hooks.items():
-                hook.remove()
-            hooks.clear()
+            with torch.no_grad():
+                for module_key, weight in original_weights.items():
+                    model.get_submodule(module_key).weight.copy_(weight)
 
 
     @classmethod
@@ -591,7 +602,7 @@ class ModelPatcher:
                             f"Cannot load embedding for {trigger}. It was trained on a model with token dimension {embedding.shape[0]}, but the current model has token dimension {model_embeddings.weight.data[token_id].shape[0]}."
                         )
 
-                    model_embeddings.weight.data[token_id] = embedding
+                    model_embeddings.weight.data[token_id] = embedding.to(device=text_encoder.device, dtype=text_encoder.dtype)
                     ti_tokens.append(token_id)
 
                 if len(ti_tokens) > 1:
@@ -604,6 +615,24 @@ class ModelPatcher:
                 text_encoder.resize_token_embeddings(init_tokens_count)
 
 
+    @classmethod
+    @contextmanager
+    def apply_clip_skip(
+        cls,
+        text_encoder: CLIPTextModel,
+        clip_skip: int,
+    ):
+        skipped_layers = []
+        try:
+            for i in range(clip_skip):
+                skipped_layers.append(text_encoder.text_model.encoder.layers.pop(-1))
+
+            yield
+
+        finally:
+            while len(skipped_layers) > 0:
+                text_encoder.text_model.encoder.layers.append(skipped_layers.pop())
+
 class TextualInversionModel:
     name: str
     embedding: torch.Tensor # [n, 768]|[n, 1280]
@@ -642,6 +671,9 @@ class TextualInversionModel:
         else:
             result.embedding = next(iter(state_dict.values()))
 
+            if len(result.embedding.shape) == 1:
+                result.embedding = result.embedding.unsqueeze(0)
+
             if not isinstance(result.embedding, torch.Tensor):
                 raise ValueError(f"Invalid embeddings file: {file_path.name}")
 

invokeai/backend/model_management/model_cache.py

@@ -8,7 +8,7 @@ The cache returns context manager generators designed to load the
 model into the GPU within the context, and unload outside the
 context. Use like this:
 
-   cache = ModelCache(max_models_cached=6)
+   cache = ModelCache(max_cache_size=7.5)
    with cache.get_model('runwayml/stable-diffusion-1-5') as SD1,
           cache.get_model('stabilityai/stable-diffusion-2') as SD2:
        do_something_in_GPU(SD1,SD2)
@@ -91,7 +91,7 @@ class ModelCache(object):
         logger: types.ModuleType = logger
     ):
         '''
-        :param max_models: Maximum number of models to cache in CPU RAM [4]
+        :param max_cache_size: Maximum size of the RAM cache [6.0 GB]
         :param execution_device: Torch device to load active model into [torch.device('cuda')]
         :param storage_device: Torch device to save inactive model in [torch.device('cpu')]
         :param precision: Precision for loaded models [torch.float16]
@@ -100,8 +100,6 @@ class ModelCache(object):
         :param sha_chunksize: Chunksize to use when calculating sha256 model hash
         '''
         #max_cache_size = 9999
-        execution_device = torch.device('cuda')
-
         self.model_infos: Dict[str, ModelBase] = dict()
         self.lazy_offloading = lazy_offloading
         #self.sequential_offload: bool=sequential_offload
@@ -128,16 +126,6 @@ class ModelCache(object):
             key += f":{submodel_type}"
         return key
 
-    #def get_model(
-    #    self,
-    #    repo_id_or_path: Union[str, Path],
-    #    model_type: ModelType = ModelType.Diffusers,
-    #    subfolder: Path = None,
-    #    submodel: ModelType = None,
-    #    revision: str = None,
-    #    attach_model_part: Tuple[ModelType, str] = (None, None),
-    #    gpu_load: bool = True,
-    #) -> ModelLocker:  # ?? what does it return
     def _get_model_info(
         self,
         model_path: str,
@@ -354,7 +342,9 @@ class ModelCache(object):
         for model_key, cache_entry in self._cached_models.items():
             if not cache_entry.locked and cache_entry.loaded:
                 self.logger.debug(f'Offloading {model_key} from {self.execution_device} into {self.storage_device}')
-                cache_entry.model.to(self.storage_device)
+                with VRAMUsage() as mem:
+                    cache_entry.model.to(self.storage_device)
+                self.logger.debug(f'GPU VRAM freed: {(mem.vram_used/GIG):.2f} GB')
         
     def _local_model_hash(self, model_path: Union[str, Path]) -> str:
         sha = hashlib.sha256()

invokeai/backend/model_management/model_install.py

@@ -1,118 +0,0 @@
-"""
-Routines for downloading and installing models.
-"""
-import json
-import safetensors
-import safetensors.torch
-import shutil
-import tempfile
-import torch
-import traceback
-from dataclasses import dataclass
-from diffusers import ModelMixin
-from enum import Enum
-from typing import Callable
-from pathlib import Path
-
-import invokeai.backend.util.logging as logger
-from invokeai.app.services.config import InvokeAIAppConfig
-from . import ModelManager
-from .models import BaseModelType, ModelType, VariantType
-from .model_probe import ModelProbe, ModelVariantInfo
-from .model_cache import SilenceWarnings
-
-class ModelInstall(object):
-    '''
-    This class is able to download and install several different kinds of 
-    InvokeAI models. The helper function, if provided, is called on to distinguish
-    between v2-base and v2-768 stable diffusion pipelines. This usually involves
-    asking the user to select the proper type, as there is no way of distinguishing
-    the two type of v2 file programmatically (as far as I know).
-    '''
-    def __init__(self,
-                 config: InvokeAIAppConfig,
-                 model_base_helper: Callable[[Path],BaseModelType]=None,
-                 clobber:bool = False
-                 ):
-        '''
-        :param config: InvokeAI configuration object
-        :param model_base_helper: A function call that accepts the Path to a checkpoint model and returns a ModelType enum
-        :param clobber: If true, models with colliding names will be overwritten
-        '''
-        self.config = config
-        self.clogger = clobber
-        self.helper = model_base_helper
-        self.prober = ModelProbe()
-
-    def install_checkpoint_file(self, checkpoint: Path)->dict:
-        '''
-        Install the checkpoint file at path and return a
-        configuration entry that can be added to `models.yaml`.
-        Model checkpoints and VAEs will be converted into 
-        diffusers before installation. Note that the model manager
-        does not hold entries for anything but diffusers pipelines,
-        and the configuration file stanzas returned from such models
-        can be safely ignored.
-        '''
-        model_info = self.prober.probe(checkpoint, self.helper)
-        if not model_info:
-            raise ValueError(f"Unable to determine type of checkpoint file {checkpoint}")
-
-        key = ModelManager.create_key(
-            model_name = checkpoint.stem,
-            base_model = model_info.base_type,
-            model_type = model_info.model_type,
-        )
-        destination_path = self._dest_path(model_info) / checkpoint
-        destination_path.parent.mkdir(parents=True, exist_ok=True)
-        self._check_for_collision(destination_path)
-        stanza = {
-            key: dict(
-                name = checkpoint.stem,
-                description = f'{model_info.model_type} model {checkpoint.stem}',
-                base = model_info.base_model.value,
-                type = model_info.model_type.value,
-                variant = model_info.variant_type.value,
-                path = str(destination_path),
-            )
-       }
-        
-        # non-pipeline; no conversion needed, just copy into right place
-        if model_info.model_type != ModelType.Pipeline:
-            shutil.copyfile(checkpoint, destination_path)
-            stanza[key].update({'format': 'checkpoint'})
-            
-        # pipeline - conversion needed here
-        else:
-            destination_path = self._dest_path(model_info) / checkpoint.stem
-            config_file = self._pipeline_type_to_config_file(model_info.model_type)
-
-            from .convert_ckpt_to_diffusers import convert_ckpt_to_diffusers
-            with SilenceWarnings:
-                convert_ckpt_to_diffusers(
-                    checkpoint,
-                    destination_path,
-                    extract_ema=True,
-                    original_config_file=config_file,
-                    scan_needed=False,
-                )
-            stanza[key].update({'format': 'folder',
-                                'path': destination_path, # no suffix on this
-                                })
-            
-        return stanza
-
-
-    def _check_for_collision(self, path: Path):
-        if not path.exists():
-            return
-        if self.clobber:
-            shutil.rmtree(path)
-        else:
-            raise ValueError(f"Destination {path} already exists. Won't overwrite unless clobber=True.")
-
-    def _staging_directory(self)->tempfile.TemporaryDirectory:
-        return tempfile.TemporaryDirectory(dir=self.config.root_path)
-
-    
-        

invokeai/backend/model_management/model_manager.py

@@ -1,53 +1,209 @@
 """This module manages the InvokeAI `models.yaml` file, mapping
-symbolic diffusers model names to the paths and repo_ids used
-by the underlying `from_pretrained()` call.
+symbolic diffusers model names to the paths and repo_ids used by the
+underlying `from_pretrained()` call.
 
-For fetching models, use manager.get_model('symbolic name'). This will
-return a ModelInfo object that contains the following attributes:
-   
-   * context -- a context manager Generator that loads and locks the 
-                model into GPU VRAM and returns the model for use. 
-                See below for usage.
-   * name -- symbolic name of the model
-   * type -- SubModelType of the model
-   * hash -- unique hash for the model
-   * location -- path or repo_id of the model
-   * revision -- revision of the model if coming from a repo id,
-                e.g. 'fp16'
-   * precision -- torch precision of the model
+SYNOPSIS:
 
-Typical usage:
+ mgr = ModelManager('/home/phi/invokeai/configs/models.yaml')
+ sd1_5 = mgr.get_model('stable-diffusion-v1-5',
+                       model_type=ModelType.Main,
+                       base_model=BaseModelType.StableDiffusion1,
+                       submodel_type=SubModelType.Unet)
+ with sd1_5 as unet:
+    run_some_inference(unet)
 
-   from invokeai.backend import ModelManager
+FETCHING MODELS:
 
-   manager = ModelManager(
-                 config='./configs/models.yaml',
-                 max_cache_size=8
-             ) # gigabytes
+Models are described using four attributes:
 
-   model_info = manager.get_model('stable-diffusion-1.5', SubModelType.Diffusers)
-   with model_info.context as my_model:
-      my_model.latents_from_embeddings(...)
+  1) model_name -- the symbolic name for the model
 
-The manager uses the underlying ModelCache class to keep
-frequently-used models in RAM and move them into GPU as needed for
-generation operations. The optional `max_cache_size` argument
-indicates the maximum size the cache can grow to, in gigabytes. The
-underlying ModelCache object can be accessed using the manager's "cache"
-attribute.
+  2) ModelType  -- an enum describing the type of the model. Currently
+                  defined types are:
+         ModelType.Main -- a full model capable of generating images
+         ModelType.Vae  -- a VAE model
+         ModelType.Lora -- a LoRA or LyCORIS fine-tune
+         ModelType.TextualInversion -- a textual inversion embedding
+         ModelType.ControlNet -- a ControlNet model
 
-Because the model manager can return multiple different types of
-models, you may wish to add additional type checking on the class
-of model returned. To do this, provide the option `model_type`
-parameter:
+  3) BaseModelType -- an enum indicating the stable diffusion base model, one of:
+         BaseModelType.StableDiffusion1
+         BaseModelType.StableDiffusion2
 
-    model_info = manager.get_model(
-                      'clip-tokenizer',
-                       model_type=SubModelType.Tokenizer
-                      )
+  4) SubModelType (optional) -- an enum that refers to one of the submodels contained
+                                within the main model. Values are:
 
-This will raise an InvalidModelError if the format defined in the
-config file doesn't match the requested model type.
+         SubModelType.UNet
+         SubModelType.TextEncoder
+         SubModelType.Tokenizer
+         SubModelType.Scheduler
+         SubModelType.SafetyChecker
+
+To fetch a model, use `manager.get_model()`. This takes the symbolic
+name of the model, the ModelType, the BaseModelType and the
+SubModelType. The latter is required for ModelType.Main.
+
+get_model() will return a ModelInfo object that can then be used in
+context to retrieve the model and move it into GPU VRAM (on GPU
+systems).
+
+A typical example is:
+
+ sd1_5 = mgr.get_model('stable-diffusion-v1-5',
+                       model_type=ModelType.Main,
+                       base_model=BaseModelType.StableDiffusion1,
+                       submodel_type=SubModelType.UNet)
+ with sd1_5 as unet:
+    run_some_inference(unet)
+
+The ModelInfo object provides a number of useful fields describing the
+model, including:
+
+   name  -- symbolic name of the model
+   base_model -- base model (BaseModelType)
+   type -- model type (ModelType)
+   location -- path to the model file
+   precision -- torch precision of the model
+   hash -- unique sha256 checksum for this model
+
+SUBMODELS:
+
+When fetching a main model, you must specify the submodel. Retrieval
+of full pipelines is not supported.
+
+ vae_info = mgr.get_model('stable-diffusion-1.5',
+                          model_type = ModelType.Main,
+                          base_model = BaseModelType.StableDiffusion1,
+                          submodel_type = SubModelType.Vae
+                          )
+ with vae_info as vae:
+    do_something(vae)
+
+This rule does not apply to controlnets, embeddings, loras and standalone
+VAEs, which do not have submodels.
+
+LISTING MODELS
+
+The model_names() method will return a list of Tuples describing each
+model it knows about:
+
+  >> mgr.model_names()
+  [
+    ('stable-diffusion-1.5', <BaseModelType.StableDiffusion1: 'sd-1'>, <ModelType.Main: 'main'>),
+    ('stable-diffusion-2.1', <BaseModelType.StableDiffusion2: 'sd-2'>, <ModelType.Main: 'main'>),
+    ('inpaint', <BaseModelType.StableDiffusion1: 'sd-1'>, <ModelType.ControlNet: 'controlnet'>)
+    ('Ink scenery', <BaseModelType.StableDiffusion1: 'sd-1'>, <ModelType.Lora: 'lora'>)
+    ...
+  ]
+
+The tuple is in the correct order to pass to get_model():
+
+   for m in mgr.model_names():
+       info = get_model(*m)
+
+In contrast, the list_models() method returns a list of dicts, each
+providing information about a model defined in models.yaml. For example:
+
+   >>> models = mgr.list_models()
+   >>> json.dumps(models[0])
+  {"path": "/home/lstein/invokeai-main/models/sd-1/controlnet/canny", 
+    "model_format": "diffusers", 
+    "name": "canny", 
+    "base_model": "sd-1", 
+    "type": "controlnet"
+   }
+
+You can filter by model type and base model as shown here:
+
+  
+  controlnets = mgr.list_models(model_type=ModelType.ControlNet,
+                                base_model=BaseModelType.StableDiffusion1)
+  for c in controlnets:
+     name = c['name']
+     format = c['model_format']
+     path = c['path']
+     type = c['type']
+     # etc
+
+ADDING AND REMOVING MODELS
+
+At startup time, the `models` directory will be scanned for
+checkpoints, diffusers pipelines, controlnets, LoRAs and TI
+embeddings. New entries will be added to the model manager and defunct
+ones removed. Anything that is a main model (ModelType.Main) will be
+added to models.yaml. For scanning to succeed, files need to be in
+their proper places. For example, a controlnet folder built on the
+stable diffusion 2 base, will need to be placed in
+`models/sd-2/controlnet`.
+
+Layout of the `models` directory:
+
+ models
+ ├── sd-1
+ │   ├── controlnet
+ │   ├── lora
+ │   ├── main
+ │   └── embedding
+ ├── sd-2
+ │   ├── controlnet
+ │   ├── lora
+ │   ├── main
+ │   └── embedding
+ └── core
+     ├── face_reconstruction
+     │   ├── codeformer
+     │   └── gfpgan
+     ├── sd-conversion
+     │   ├── clip-vit-large-patch14 - tokenizer, text_encoder subdirs
+     │   ├── stable-diffusion-2 - tokenizer, text_encoder subdirs
+     │   └── stable-diffusion-safety-checker
+     └── upscaling
+         └─── esrgan
+
+
+
+class ConfigMeta(BaseModel):Loras, textual_inversion and controlnet models are not listed
+explicitly in models.yaml, but are added to the in-memory data
+structure at initialization time by scanning the models directory. The
+in-memory data structure can be resynchronized by calling
+`manager.scan_models_directory()`.
+
+Files and folders placed inside the `autoimport` paths (paths
+defined in `invokeai.yaml`) will also be scanned for new models at
+initialization time and added to `models.yaml`. Files will not be
+moved from this location but preserved in-place. These directories
+are:
+
+  configuration    default              description
+  -------------    -------              -----------
+  autoimport_dir  autoimport/main       main models
+  lora_dir        autoimport/lora       LoRA/LyCORIS models
+  embedding_dir   autoimport/embedding  TI embeddings
+  controlnet_dir  autoimport/controlnet ControlNet models
+
+In actuality, models located in any of these directories are scanned
+to determine their type, so it isn't strictly necessary to organize
+the different types in this way. This entry in `invokeai.yaml` will
+recursively scan all subdirectories within `autoimport`, scan models
+files it finds, and import them if recognized.
+
+  Paths:
+     autoimport_dir: autoimport
+
+A model can be manually added using `add_model()` using the model's
+name, base model, type and a dict of model attributes. See
+`invokeai/backend/model_management/models` for the attributes required
+by each model type.
+
+A model can be deleted using `del_model()`, providing the same 
+identifying information as `get_model()`
+
+The `heuristic_import()` method will take a set of strings
+corresponding to local paths, remote URLs, and repo_ids, probe the
+object to determine what type of model it is (if any), and import new
+models into the manager. If passed a directory, it will recursively
+scan it for models to import. The return value is a set of the models
+successfully added.
 
 MODELS.YAML
 
@@ -56,93 +212,18 @@ The general format of a models.yaml section is:
  type-of-model/name-of-model:
      path: /path/to/local/file/or/directory
      description: a description
-     format: folder|ckpt|safetensors|pt
-     base: SD-1|SD-2
-     subfolder: subfolder-name
+     format: diffusers|checkpoint
+     variant: normal|inpaint|depth
 
 The type of model is given in the stanza key, and is one of
-{diffusers, ckpt, vae, text_encoder, tokenizer, unet, scheduler,
-safety_checker, feature_extractor, lora, textual_inversion,
-controlnet}, and correspond to items in the SubModelType enum defined
-in model_cache.py
+{main, vae, lora, controlnet, textual}
 
-The format indicates whether the model is organized as a folder with
-model subdirectories, or is contained in a single checkpoint or
-safetensors file.
+The format indicates whether the model is organized as a diffusers
+folder with model subdirectories, or is contained in a single
+checkpoint or safetensors file.
 
-One, but not both, of repo_id and path are provided. repo_id is the
-HuggingFace repository ID of the model, and path points to the file or
-directory on disk.
-
-If subfolder is provided, then the model exists in a subdirectory of
-the main model. These are usually named after the model type, such as
-"unet".
-
-This example summarizes the two ways of getting a non-diffuser model:
-
- text_encoder/clip-test-1:
-   format: folder
-   path: /path/to/folder
-   description: Returns standalone CLIPTextModel
-
- text_encoder/clip-test-2:
-   format: folder
-   repo_id: /path/to/folder
-   subfolder: text_encoder
-   description: Returns the text_encoder in the subfolder of the diffusers model (just the encoder in RAM)
-
-SUBMODELS:
-
-It is also possible to fetch an isolated submodel from a diffusers
-model. Use the `submodel` parameter to select which part:
-
- vae = manager.get_model('stable-diffusion-1.5',submodel=SubModelType.Vae)
- with vae.context as my_vae:
-    print(type(my_vae))
-    # "AutoencoderKL"
-
-DIRECTORY_SCANNING:
-
-Loras, textual_inversion and controlnet models are usually not listed
-explicitly in models.yaml, but are added to the in-memory data
-structure at initialization time by scanning the models directory. The
-in-memory data structure can be resynchronized by calling
-`manager.scan_models_directory`.
-
-DISAMBIGUATION:
-
-You may wish to use the same name for a related family of models. To
-do this, disambiguate the stanza key with the model and and format
-separated by "/". Example:
-
- tokenizer/clip-large:
-   format: tokenizer
-   path: /path/to/folder
-   description: Returns standalone tokenizer
-
- text_encoder/clip-large:
-   format: text_encoder
-   path: /path/to/folder
-   description: Returns standalone text encoder
-
-You can now use the `model_type` argument to indicate which model you
-want:
-
- tokenizer = mgr.get('clip-large',model_type=SubModelType.Tokenizer)
- encoder = mgr.get('clip-large',model_type=SubModelType.TextEncoder)
-
-OTHER FUNCTIONS:
-
-Other methods provided by ModelManager support importing, editing,
-converting and deleting models.
-
-IMPORTANT CHANGES AND LIMITATIONS SINCE 2.3:
-
-1. Only local paths are supported. Repo_ids are no longer accepted. This
-simplifies the logic.
-
-2. VAEs can't be swapped in and out at load time. They must be baked
-into the model when downloaded or converted.
+The path points to a file or directory on disk. If a relative path,
+the root is the InvokeAI ROOTDIR.
 
 """
 from __future__ import annotations
@@ -151,23 +232,25 @@ import os
 import hashlib
 import textwrap
 from dataclasses import dataclass
-from packaging import version
 from pathlib import Path
-from typing import Dict, Optional, List, Tuple, Union, types
-from shutil import rmtree
+from typing import Optional, List, Tuple, Union, Dict, Set, Callable, types
+from shutil import rmtree, move
 
 import torch
-from huggingface_hub import scan_cache_dir
 from omegaconf import OmegaConf
 from omegaconf.dictconfig import DictConfig
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 import invokeai.backend.util.logging as logger
 from invokeai.app.services.config import InvokeAIAppConfig
-from invokeai.backend.util import CUDA_DEVICE, download_with_resume
+from invokeai.backend.util import CUDA_DEVICE, Chdir
 from .model_cache import ModelCache, ModelLocker
-from .models import BaseModelType, ModelType, SubModelType, ModelError, MODEL_CLASSES
+from .models import (
+    BaseModelType, ModelType, SubModelType,
+    ModelError, SchedulerPredictionType, MODEL_CLASSES,
+    ModelConfigBase, ModelNotFoundException,
+    )
 
 # We are only starting to number the config file with release 3.
 # The config file version doesn't have to start at release version, but it will help
@@ -183,7 +266,6 @@ class ModelInfo():
     hash: str
     location: Union[Path, str]
     precision: torch.dtype
-    revision: str = None
     _cache: ModelCache = None
 
     def __enter__(self):
@@ -196,34 +278,14 @@ class InvalidModelError(Exception):
     "Raised when an invalid model is requested"
     pass
 
+class AddModelResult(BaseModel):
+    name: str = Field(description="The name of the model after installation")
+    model_type: ModelType = Field(description="The type of model")
+    base_model: BaseModelType = Field(description="The base model")
+    config: ModelConfigBase = Field(description="The configuration of the model")
+
 MAX_CACHE_SIZE = 6.0  # GB
 
-
-# layout of the models directory:
-# models
-# ├── sd-1
-# │   ├── controlnet
-# │   ├── lora
-# │   ├── pipeline
-# │   └── textual_inversion
-# ├── sd-2
-# │   ├── controlnet
-# │   ├── lora
-# │   ├── pipeline
-# │   └── textual_inversion
-# └── core
-#     ├── face_reconstruction
-#     │   ├── codeformer
-#     │   └── gfpgan
-#     ├── sd-conversion
-#     │   ├── clip-vit-large-patch14 - tokenizer, text_encoder subdirs
-#     │   ├── stable-diffusion-2 - tokenizer, text_encoder subdirs
-#     │   └── stable-diffusion-safety-checker
-#     └── upscaling
-#         └─── esrgan
-
-
-
 class ConfigMeta(BaseModel):
     version: str
 
@@ -249,7 +311,6 @@ class ModelManager(object):
         and sequential_offload boolean. Note that the default device
         type and precision are set up for a CUDA system running at half precision.
         """
-
         self.config_path = None
         if isinstance(config, (str, Path)):
             self.config_path = Path(config)
@@ -271,7 +332,7 @@ class ModelManager(object):
             self.models[model_key] = model_class.create_config(**model_config)
 
         # check config version number and update on disk/RAM if necessary
-        self.globals = InvokeAIAppConfig.get_config()
+        self.app_config = InvokeAIAppConfig.get_config()
         self.logger = logger
         self.cache = ModelCache(
             max_cache_size=max_cache_size,
@@ -307,7 +368,8 @@ class ModelManager(object):
     ) -> str:
         return f"{base_model}/{model_type}/{model_name}"
 
-    def parse_key(self, model_key: str) -> Tuple[str, BaseModelType, ModelType]:
+    @classmethod
+    def parse_key(cls, model_key: str) -> Tuple[str, BaseModelType, ModelType]:
         base_model_str, model_type_str, model_name = model_key.split('/', 2)
         try:
             model_type = ModelType(model_type_str)
@@ -321,103 +383,62 @@ class ModelManager(object):
 
         return (model_name, base_model, model_type)
 
+    def _get_model_cache_path(self, model_path):
+        return self.app_config.models_path / ".cache" / hashlib.md5(str(model_path).encode()).hexdigest()
+
     def get_model(
         self,
         model_name: str,
         base_model: BaseModelType,
         model_type: ModelType,
         submodel_type: Optional[SubModelType] = None
-    ):
+    )->ModelInfo:
         """Given a model named identified in models.yaml, return
         an ModelInfo object describing it.
         :param model_name: symbolic name of the model in models.yaml
         :param model_type: ModelType enum indicating the type of model to return
+        :param base_model: BaseModelType enum indicating the base model used by this model
         :param submode_typel: an ModelType enum indicating the portion of 
                the model to retrieve (e.g. ModelType.Vae)
-
-        If not provided, the model_type will be read from the `format` field
-        of the corresponding stanza. If provided, the model_type will be used
-        to disambiguate stanzas in the configuration file. The default is to
-        assume a diffusers pipeline. The behavior is illustrated here:
-
-        [models.yaml]
-        diffusers/test1:
-           repo_id: foo/bar
-           description: Typical diffusers pipeline
-
-        lora/test1:
-           repo_id: /tmp/loras/test1.safetensors
-           description: Typical lora file
-
-        test1_pipeline = mgr.get_model('test1')
-        # returns a StableDiffusionGeneratorPipeline
-
-        test1_vae1 = mgr.get_model('test1', submodel=ModelType.Vae)
-        # returns the VAE part of a diffusers model as an AutoencoderKL
-
-        test1_vae2 = mgr.get_model('test1', model_type=ModelType.Diffusers, submodel=ModelType.Vae)
-        # does the same thing as the previous  statement. Note that model_type
-        # is for the parent model, and submodel is for the part
-
-        test1_lora = mgr.get_model('test1', model_type=ModelType.Lora)
-        # returns a LoRA embed (as a 'dict' of tensors)
-
-        test1_encoder = mgr.get_modelI('test1', model_type=ModelType.TextEncoder)
-        # raises an InvalidModelError
-
         """
         model_class = MODEL_CLASSES[base_model][model_type]
         model_key = self.create_key(model_name, base_model, model_type)
 
         # if model not found try to find it (maybe file just pasted)
         if model_key not in self.models:
-            # TODO: find by mask or try rescan?
-            path_mask = f"/models/{base_model}/{model_type}/{model_name}*"
-            if False: # model_path = next(find_by_mask(path_mask)):
-                model_path = None # TODO:
-                model_config = model_class.probe_config(model_path)
-                self.models[model_key] = model_config
-            else:
-                raise Exception(f"Model not found - {model_key}")
-
-        # if it known model check that target path exists (if manualy deleted)
-        else:
-            # logic repeated twice(in rescan too) any way to optimize?
-            if not os.path.exists(self.models[model_key].path):
-                if model_class.save_to_config:
-                    self.models[model_key].error = ModelError.NotFound
-                    raise Exception(f"Files for model \"{model_key}\" not found")
-
-                else:
-                    self.models.pop(model_key, None)
-                    raise Exception(f"Model not found - {model_key}")
-
-            # reset model errors?
-
-
+            self.scan_models_directory(base_model=base_model, model_type=model_type)
+            if model_key not in self.models:
+                raise ModelNotFoundException(f"Model not found - {model_key}")
 
         model_config = self.models[model_key]
+        model_path = self.app_config.root_path / model_config.path
 
-        # /models/{base_model}/{model_type}/{name}.ckpt or .safentesors
-        # /models/{base_model}/{model_type}/{name}/
-        model_path = model_config.path
+        if not model_path.exists():
+            if model_class.save_to_config:
+                self.models[model_key].error = ModelError.NotFound
+                raise Exception(f"Files for model \"{model_key}\" not found")
+
+            else:
+                self.models.pop(model_key, None)
+                raise ModelNotFoundException(f"Model not found - {model_key}")
 
         # vae/movq override
         # TODO: 
         if submodel_type is not None and hasattr(model_config, submodel_type):
             override_path = getattr(model_config, submodel_type)
             if override_path:
-                model_path = override_path
+                model_path = self.app_config.root_path / override_path
                 model_type = submodel_type
                 submodel_type = None
                 model_class = MODEL_CLASSES[base_model][model_type]
 
         # TODO: path
         # TODO: is it accurate to use path as id
-        dst_convert_path = self.globals.models_dir / ".cache" / hashlib.md5(model_path.encode()).hexdigest()
+        dst_convert_path = self._get_model_cache_path(model_path)
+
         model_path = model_class.convert_if_required(
             base_model=base_model,
-            model_path=model_path,
+            model_path=str(model_path), # TODO: refactor str/Path types logic
             output_path=dst_convert_path,
             config=model_config,
         )
@@ -469,22 +490,32 @@ class ModelManager(object):
         """
         return [(self.parse_key(x)) for x in self.models.keys()]
 
+    def list_model(
+            self,
+            model_name: str,
+            base_model: BaseModelType,
+            model_type: ModelType,
+    ) -> dict:
+        """
+        Returns a dict describing one installed model, using
+        the combined format of the list_models() method.
+        """
+        models = self.list_models(base_model,model_type,model_name)
+        return models[0] if models else None
+
     def list_models(
         self,
         base_model: Optional[BaseModelType] = None,
         model_type: Optional[ModelType] = None,
+        model_name: Optional[str] = None,
     ) -> list[dict]:
         """
         Return a list of models.
-
-        Please use model_manager.models() to get all the model names,
-        model_manager.model_info('model-name') to get the stanza for the model
-        named 'model-name', and model_manager.config to get the full OmegaConf
-        object derived from models.yaml
         """
 
+        model_keys = [self.create_key(model_name, base_model, model_type)] if model_name else sorted(self.models, key=str.casefold)
         models = []
-        for model_key in sorted(self.models, key=str.casefold):
+        for model_key in model_keys:
             model_config = self.models[model_key]
 
             cur_model_name, cur_base_model, cur_model_type = self.parse_key(model_key)
@@ -507,7 +538,7 @@ class ModelManager(object):
 
     def print_models(self) -> None:
         """
-        Print a table of models, their descriptions
+        Print a table of models and their descriptions. This needs to be redone
         """
         # TODO: redo
         for model_type, model_dict in self.list_models().items():
@@ -515,7 +546,7 @@ class ModelManager(object):
                 line = f'{model_info["name"]:25s} {model_info["type"]:10s} {model_info["description"]}'
                 print(line)
 
-    # TODO: test when ui implemented
+    # Tested - LS
     def del_model(
         self,
         model_name: str,
@@ -525,15 +556,11 @@ class ModelManager(object):
         """
         Delete the named model.
         """
-        raise Exception("TODO: del_model") # TODO: redo
         model_key = self.create_key(model_name, base_model, model_type)
         model_cfg = self.models.pop(model_key, None)
 
         if model_cfg is None:
-            self.logger.error(
-                f"Unknown model {model_key}"
-            )
-            return
+            raise KeyError(f"Unknown model {model_key}")
 
         # note: it not garantie to release memory(model can has other references)
         cache_ids = self.cache_keys.pop(model_key, [])
@@ -541,14 +568,18 @@ class ModelManager(object):
             self.cache.uncache_model(cache_id)
 
         # if model inside invoke models folder - delete files
-        if model_cfg.path.startswith("models/") or model_cfg.path.startswith("models\\"):
-            model_path = self.globals.root_dir / model_cfg.path
-            if model_path.isdir():
-                shutil.rmtree(str(model_path))
+        model_path = self.app_config.root_path / model_cfg.path
+        cache_path = self._get_model_cache_path(model_path)
+        if cache_path.exists():
+            rmtree(str(cache_path))
+
+        if model_path.is_relative_to(self.app_config.models_path):
+            if model_path.is_dir():
+                rmtree(str(model_path))
             else:
                 model_path.unlink()
 
-    # TODO: test when ui implemented
+    # LS: tested
     def add_model(
         self,
         model_name: str,
@@ -556,31 +587,107 @@ class ModelManager(object):
         model_type: ModelType,
         model_attributes: dict,
         clobber: bool = False,
-    ) -> None:
+    ) -> AddModelResult:
         """
         Update the named model with a dictionary of attributes. Will fail with an
         assertion error if the name already exists. Pass clobber=True to overwrite.
         On a successful update, the config will be changed in memory and the
         method will return True. Will fail with an assertion error if provided
         attributes are incorrect or the model name is missing.
+
+        The returned dict has the same format as the dict returned by
+        model_info().
         """
 
         model_class = MODEL_CLASSES[base_model][model_type]
         model_config = model_class.create_config(**model_attributes)
         model_key = self.create_key(model_name, base_model, model_type)
 
-        assert (
-            clobber or model_key not in self.models
-        ), f'attempt to overwrite existing model definition "{model_key}"'
+        if  model_key in self.models and not clobber:
+            raise Exception(f'Attempt to overwrite existing model definition "{model_key}"')
 
-        self.models[model_key] = model_config
-            
-        if clobber and model_key in self.cache_keys:
-            # note: it not garantie to release memory(model can has other references)
+        old_model = self.models.pop(model_key, None)
+        if old_model is not None:
+            # TODO: if path changed and old_model.path inside models folder should we delete this too?
+
+            # remove conversion cache as config changed
+            old_model_path = self.app_config.root_path / old_model.path
+            old_model_cache = self._get_model_cache_path(old_model_path)
+            if old_model_cache.exists():
+                if old_model_cache.is_dir():
+                    rmtree(str(old_model_cache))
+                else:
+                    old_model_cache.unlink()
+
+            # remove in-memory cache
+            # note: it not guaranteed to release memory(model can has other references)
             cache_ids = self.cache_keys.pop(model_key, [])
             for cache_id in cache_ids:
                 self.cache.uncache_model(cache_id)
 
+        self.models[model_key] = model_config
+        self.commit()
+        return AddModelResult(
+            name = model_name,
+            model_type = model_type,
+            base_model = base_model,
+            config = model_config,
+        )
+
+    def convert_model (
+            self,
+            model_name: str,
+            base_model: BaseModelType,
+            model_type: Union[ModelType.Main,ModelType.Vae],
+    ) -> AddModelResult:
+        '''
+        Convert a checkpoint file into a diffusers folder, deleting the cached
+        version and deleting the original checkpoint file if it is in the models
+        directory.
+        :param model_name: Name of the model to convert
+        :param base_model: Base model type
+        :param model_type: Type of model ['vae' or 'main']
+
+        This will raise a ValueError unless the model is a checkpoint.
+        '''
+        info = self.model_info(model_name, base_model, model_type)
+        if info["model_format"] != "checkpoint":
+            raise ValueError(f"not a checkpoint format model: {model_name}")
+
+        # We are taking advantage of a side effect of get_model() that converts check points
+        # into cached diffusers directories stored at `location`. It doesn't matter
+        # what submodeltype we request here, so we get the smallest.
+        submodel = {"submodel_type": SubModelType.Tokenizer} if model_type==ModelType.Main else {}
+        model = self.get_model(model_name,
+                               base_model,
+                               model_type,
+                               **submodel,
+                               )
+        checkpoint_path = self.app_config.root_path / info["path"]
+        old_diffusers_path = self.app_config.models_path / model.location
+        new_diffusers_path = self.app_config.models_path / base_model.value / model_type.value / model_name
+        if new_diffusers_path.exists():
+            raise ValueError(f"A diffusers model already exists at {new_diffusers_path}")
+
+        try:
+            move(old_diffusers_path,new_diffusers_path)
+            info["model_format"] = "diffusers"
+            info["path"] = str(new_diffusers_path.relative_to(self.app_config.root_path))
+            info.pop('config')
+
+            result = self.add_model(model_name, base_model, model_type,
+                                    model_attributes = info,
+                                    clobber=True)
+        except:
+            # something went wrong, so don't leave dangling diffusers model in directory or it will cause a duplicate model error!
+            rmtree(new_diffusers_path)
+            raise
+        
+        if checkpoint_path.exists() and checkpoint_path.is_relative_to(self.app_config.models_path):
+            checkpoint_path.unlink()
+        
+        return result
+    
     def search_models(self, search_folder):
         self.logger.info(f"Finding Models In: {search_folder}")
         models_folder_ckpt = Path(search_folder).glob("**/*.ckpt")
@@ -621,7 +728,7 @@ class ModelManager(object):
         yaml_str = OmegaConf.to_yaml(data_to_save)
         config_file_path = conf_file or self.config_path
         assert config_file_path is not None,'no config file path to write to'
-        config_file_path = self.globals.root_dir / config_file_path
+        config_file_path = self.app_config.root_path / config_file_path
         tmpfile = os.path.join(os.path.dirname(config_file_path), "new_config.tmp")
         with open(tmpfile, "w", encoding="utf-8") as outfile:
             outfile.write(self.preamble())
@@ -644,42 +751,157 @@ class ModelManager(object):
         """
         )
 
-    def scan_models_directory(self):
+    def scan_models_directory(
+        self,
+        base_model: Optional[BaseModelType] = None,
+        model_type: Optional[ModelType] = None,
+    ):
+
         loaded_files = set()
         new_models_found = False
 
-        for model_key, model_config in list(self.models.items()):
-            model_name, base_model, model_type = self.parse_key(model_key)
-            model_path = str(self.globals.root / model_config.path)
-            if not os.path.exists(model_path):
-                model_class = MODEL_CLASSES[base_model][model_type]
-                if model_class.save_to_config:
-                    model_config.error = ModelError.NotFound
+        self.logger.info(f'scanning {self.app_config.models_path} for new models')
+        with Chdir(self.app_config.root_path):
+            for model_key, model_config in list(self.models.items()):
+                model_name, cur_base_model, cur_model_type = self.parse_key(model_key)
+                model_path = self.app_config.root_path.absolute() / model_config.path
+                if not model_path.exists():
+                    model_class = MODEL_CLASSES[cur_base_model][cur_model_type]
+                    if model_class.save_to_config:
+                        model_config.error = ModelError.NotFound
+                        self.models.pop(model_key, None)
+                    else:
+                        self.models.pop(model_key, None)
                 else:
-                    self.models.pop(model_key, None)
-            else:
-                loaded_files.add(model_path)
+                    loaded_files.add(model_path)
 
-        for base_model in BaseModelType:
-            for model_type in ModelType:
-                model_class = MODEL_CLASSES[base_model][model_type]
-                models_dir = os.path.join(self.globals.models_path, base_model, model_type)
+            for cur_base_model in BaseModelType:
+                if base_model is not None and cur_base_model != base_model:
+                    continue
 
-                if not os.path.exists(models_dir):
-                    continue # TODO: or create all folders?
-                
-                for entry_name in os.listdir(models_dir):
-                    model_path = os.path.join(models_dir, entry_name)
-                    if model_path not in loaded_files: # TODO: check
-                        model_name = Path(model_path).stem
-                        model_key = self.create_key(model_name, base_model, model_type)
+                for cur_model_type in ModelType:
+                    if model_type is not None and cur_model_type != model_type:
+                        continue
+                    model_class = MODEL_CLASSES[cur_base_model][cur_model_type]
+                    models_dir = self.app_config.models_path / cur_base_model.value / cur_model_type.value
 
-                        if model_key in self.models:
-                            raise Exception(f"Model with key {model_key} added twice")
+                    if not models_dir.exists():
+                        continue # TODO: or create all folders?
 
-                        model_config: ModelConfigBase = model_class.probe_config(model_path)
-                        self.models[model_key] = model_config
-                        new_models_found = True
+                    for model_path in models_dir.iterdir():
+                        if model_path not in loaded_files: # TODO: check
+                            model_name = model_path.name if model_path.is_dir() else model_path.stem
+                            model_key = self.create_key(model_name, cur_base_model, cur_model_type)
 
-        if new_models_found:
+                            if model_key in self.models:
+                                raise Exception(f"Model with key {model_key} added twice")
+
+                            if model_path.is_relative_to(self.app_config.root_path):
+                                model_path = model_path.relative_to(self.app_config.root_path)
+                            try:
+                                model_config: ModelConfigBase = model_class.probe_config(str(model_path))
+                                self.models[model_key] = model_config
+                                new_models_found = True
+                            except NotImplementedError as e:
+                                self.logger.warning(e)
+
+        imported_models = self.autoimport()
+
+        if (new_models_found or imported_models) and self.config_path:
             self.commit()
+
+    def autoimport(self)->Dict[str, AddModelResult]:
+        '''
+        Scan the autoimport directory (if defined) and import new models, delete defunct models.
+        '''
+        # avoid circular import
+        from invokeai.backend.install.model_install_backend import ModelInstall
+        from invokeai.frontend.install.model_install import ask_user_for_prediction_type
+        
+        installer = ModelInstall(config = self.app_config,
+                                 model_manager = self,
+                                 prediction_type_helper = ask_user_for_prediction_type,
+                                 )
+        
+        scanned_dirs = set()
+        
+        config = self.app_config
+        known_paths = {(self.app_config.root_path / x['path']) for x in self.list_models()}
+
+        for autodir in [config.autoimport_dir,
+                        config.lora_dir,
+                        config.embedding_dir,
+                        config.controlnet_dir]:
+            if autodir is None:
+                continue
+
+            self.logger.info(f'Scanning {autodir} for models to import')
+            installed = dict()
+        
+            autodir = self.app_config.root_path / autodir
+            if not autodir.exists():
+                continue
+
+            items_scanned = 0
+            new_models_found = dict()
+            
+            for root, dirs, files in os.walk(autodir):
+                items_scanned += len(dirs) + len(files)
+                for d in dirs:
+                    path = Path(root) / d
+                    if path in known_paths or path.parent in scanned_dirs:
+                        scanned_dirs.add(path)
+                        continue
+                    if any([(path/x).exists() for x in {'config.json','model_index.json','learned_embeds.bin','pytorch_lora_weights.bin'}]):
+                        new_models_found.update(installer.heuristic_import(path))
+                        scanned_dirs.add(path)
+
+                for f in files:
+                    path = Path(root) / f
+                    if path in known_paths or path.parent in scanned_dirs:
+                        continue
+                    if path.suffix in {'.ckpt','.bin','.pth','.safetensors','.pt'}:
+                        import_result = installer.heuristic_import(path)
+                        new_models_found.update(import_result)
+
+            self.logger.info(f'Scanned {items_scanned} files and directories, imported {len(new_models_found)} models')
+            installed.update(new_models_found)
+
+        return installed
+
+    def heuristic_import(self,
+                         items_to_import: Set[str],
+                         prediction_type_helper: Callable[[Path],SchedulerPredictionType]=None,
+                         )->Dict[str, AddModelResult]:
+        '''Import a list of paths, repo_ids or URLs. Returns the set of
+        successfully imported items.
+        :param items_to_import: Set of strings corresponding to models to be imported.
+        :param prediction_type_helper: A callback that receives the Path of a Stable Diffusion 2 checkpoint model and returns a SchedulerPredictionType.
+
+        The prediction type helper is necessary to distinguish between
+        models based on Stable Diffusion 2 Base (requiring
+        SchedulerPredictionType.Epsilson) and Stable Diffusion 768
+        (requiring SchedulerPredictionType.VPrediction). It is
+        generally impossible to do this programmatically, so the
+        prediction_type_helper usually asks the user to choose.
+
+        The result is a set of successfully installed models. Each element
+        of the set is a dict corresponding to the newly-created OmegaConf stanza for
+        that model.
+
+        May return the following exceptions:
+        - KeyError   - one or more of the items to import is not a valid path, repo_id or URL
+        - ValueError - a corresponding model already exists
+        '''
+        # avoid circular import here
+        from invokeai.backend.install.model_install_backend import ModelInstall
+        successfully_installed = dict()
+        
+        installer = ModelInstall(config = self.app_config,
+                                 prediction_type_helper = prediction_type_helper,
+                                 model_manager = self)
+        for thing in items_to_import:
+            installed = installer.heuristic_import(thing)
+            successfully_installed.update(installed)
+        self.commit()                
+        return successfully_installed

invokeai/backend/model_management/model_merge.py

@@ -0,0 +1,131 @@
+"""
+invokeai.backend.model_management.model_merge exports:
+merge_diffusion_models() -- combine multiple models by location and return a pipeline object
+merge_diffusion_models_and_commit() -- combine multiple models by ModelManager ID and write to models.yaml
+
+Copyright (c) 2023 Lincoln Stein and the InvokeAI Development Team
+"""
+
+import warnings
+from enum import Enum
+from pathlib import Path
+from diffusers import DiffusionPipeline
+from diffusers import logging as dlogging
+from typing import List, Union
+
+import invokeai.backend.util.logging as logger
+
+from ...backend.model_management import ModelManager, ModelType, BaseModelType, ModelVariantType, AddModelResult
+
+class MergeInterpolationMethod(str, Enum):
+    WeightedSum = "weighted_sum"
+    Sigmoid = "sigmoid"
+    InvSigmoid = "inv_sigmoid"
+    AddDifference = "add_difference"
+
+class ModelMerger(object):
+    def __init__(self, manager: ModelManager):
+        self.manager = manager
+
+    def merge_diffusion_models(
+            self,
+            model_paths: List[Path],
+            alpha: float = 0.5,
+            interp: MergeInterpolationMethod = None,
+            force: bool = False,
+            **kwargs,
+    ) -> DiffusionPipeline:
+        """
+        :param model_paths:  up to three models, designated by their local paths or HuggingFace repo_ids
+        :param alpha: The interpolation parameter. Ranges from 0 to 1.  It affects the ratio in which the checkpoints are merged. A 0.8 alpha
+                   would mean that the first model checkpoints would affect the final result far less than an alpha of 0.2
+        :param interp: The interpolation method to use for the merging. Supports "sigmoid", "inv_sigmoid", "add_difference" and None.
+                   Passing None uses the default interpolation which is weighted sum interpolation. For merging three checkpoints, only "add_difference" is supported.
+        :param force:  Whether to ignore mismatch in model_config.json for the current models. Defaults to False.
+
+        **kwargs - the default DiffusionPipeline.get_config_dict kwargs:
+             cache_dir, resume_download, force_download, proxies, local_files_only, use_auth_token, revision, torch_dtype, device_map
+        """
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            verbosity = dlogging.get_verbosity()
+            dlogging.set_verbosity_error()
+
+            pipe = DiffusionPipeline.from_pretrained(
+                model_paths[0],
+                custom_pipeline="checkpoint_merger",
+            )
+            merged_pipe = pipe.merge(
+                pretrained_model_name_or_path_list=model_paths,
+                alpha=alpha,
+                interp=interp.value if interp else None, #diffusers API treats None as "weighted sum"
+                force=force,
+                **kwargs,
+            )
+            dlogging.set_verbosity(verbosity)
+        return merged_pipe
+
+
+    def merge_diffusion_models_and_save (
+            self,
+            model_names: List[str],
+            base_model: Union[BaseModelType,str],
+            merged_model_name: str,
+            alpha: float = 0.5,
+            interp: MergeInterpolationMethod = None,
+            force: bool = False,
+            **kwargs,
+    ) -> AddModelResult:
+        """
+        :param models: up to three models, designated by their InvokeAI models.yaml model name
+        :param base_model: base model (must be the same for all merged models!)
+        :param merged_model_name: name for new model
+        :param alpha: The interpolation parameter. Ranges from 0 to 1.  It affects the ratio in which the checkpoints are merged. A 0.8 alpha
+                   would mean that the first model checkpoints would affect the final result far less than an alpha of 0.2
+        :param interp: The interpolation method to use for the merging. Supports "weighted_average", "sigmoid", "inv_sigmoid", "add_difference" and None.
+                   Passing None uses the default interpolation which is weighted sum interpolation. For merging three checkpoints, only "add_difference" is supported. Add_difference is A+(B-C).
+        :param force:  Whether to ignore mismatch in model_config.json for the current models. Defaults to False.
+
+        **kwargs - the default DiffusionPipeline.get_config_dict kwargs:
+             cache_dir, resume_download, force_download, proxies, local_files_only, use_auth_token, revision, torch_dtype, device_map
+        """
+        model_paths = list()
+        config = self.manager.app_config
+        base_model = BaseModelType(base_model)
+        vae = None
+        
+        for mod in model_names:
+            info = self.manager.list_model(mod, base_model=base_model, model_type=ModelType.Main)
+            assert info,                                f"model {mod}, base_model {base_model}, is unknown"
+            assert info["model_format"] == "diffusers", f"{mod} is not a diffusers model. It must be optimized before merging"
+            assert info["variant"] == "normal",         f"{mod} is a {info['variant']} model, which cannot currently be merged"
+            assert len(model_names) <= 2 or \
+                interp==MergeInterpolationMethod.AddDifference, "When merging three models, only the 'add_difference' merge method is supported"
+            # pick up the first model's vae
+            if mod == model_names[0]:
+                vae = info.get("vae")
+            model_paths.extend([config.root_path / info["path"]])
+
+        merge_method = None if interp == 'weighted_sum' else MergeInterpolationMethod(interp)
+        logger.debug(f'interp = {interp}, merge_method={merge_method}')
+        merged_pipe = self.merge_diffusion_models(
+           model_paths, alpha, merge_method, force, **kwargs
+        )
+        dump_path = config.models_path / base_model.value / ModelType.Main.value
+        dump_path.mkdir(parents=True, exist_ok=True)
+        dump_path = dump_path / merged_model_name
+
+        merged_pipe.save_pretrained(dump_path, safe_serialization=1)
+        attributes = dict(
+            path = str(dump_path),
+            description = f"Merge of models {', '.join(model_names)}",
+            model_format = "diffusers",
+            variant = ModelVariantType.Normal.value,
+            vae = vae,
+        )
+        return self.manager.add_model(merged_model_name,
+                                      base_model = base_model,
+                                      model_type = ModelType.Main,
+                                      model_attributes = attributes,
+                                      clobber = True
+                                      )

invokeai/backend/model_management/model_probe.py

@@ -1,27 +1,28 @@
 import json
-import traceback
 import torch
 import safetensors.torch
 
 from dataclasses import dataclass
-from enum import Enum
 
-from diffusers import ModelMixin, ConfigMixin, StableDiffusionPipeline, AutoencoderKL, ControlNetModel
+from diffusers import ModelMixin, ConfigMixin
 from pathlib import Path
-from typing import Callable, Literal, Union, Dict
+from typing import Callable, Literal, Union, Dict, Optional
 from picklescan.scanner import scan_file_path
 
-import invokeai.backend.util.logging as logger
-from .models import BaseModelType, ModelType, ModelVariantType, SchedulerPredictionType, SilenceWarnings
+from .models import (
+    BaseModelType, ModelType, ModelVariantType,
+    SchedulerPredictionType, SilenceWarnings,
+)
+from .models.base import read_checkpoint_meta
 
 @dataclass
-class ModelVariantInfo(object):
+class ModelProbeInfo(object):
     model_type: ModelType
     base_type: BaseModelType
     variant_type: ModelVariantType
     prediction_type: SchedulerPredictionType
     upcast_attention: bool
-    format: Literal['folder','checkpoint']
+    format: Literal['diffusers','checkpoint', 'lycoris']
     image_size: int
 
 class ProbeBase(object):
@@ -31,19 +32,19 @@ class ProbeBase(object):
 class ModelProbe(object):
     
     PROBES = {
-        'folder': { },
+        'diffusers': { },
         'checkpoint': { },
     }
 
     CLASS2TYPE = {
-        'StableDiffusionPipeline' : ModelType.Pipeline,
+        'StableDiffusionPipeline' : ModelType.Main,
         'AutoencoderKL' : ModelType.Vae,
         'ControlNetModel' : ModelType.ControlNet,
     }
     
     @classmethod
     def register_probe(cls,
-                       format: Literal['folder','file'],
+                       format: Literal['diffusers','checkpoint'],
                        model_type: ModelType,
                        probe_class: ProbeBase):
         cls.PROBES[format][model_type] = probe_class
@@ -51,8 +52,8 @@ class ModelProbe(object):
     @classmethod
     def heuristic_probe(cls,
                         model: Union[Dict, ModelMixin, Path],
-                        prediction_type_helper: Callable[[Path],BaseModelType]=None,
-                        )->ModelVariantInfo:
+                        prediction_type_helper: Callable[[Path],SchedulerPredictionType]=None,
+                        )->ModelProbeInfo:
         if isinstance(model,Path):
             return cls.probe(model_path=model,prediction_type_helper=prediction_type_helper)
         elif isinstance(model,(dict,ModelMixin,ConfigMixin)):
@@ -63,8 +64,8 @@ class ModelProbe(object):
     @classmethod
     def probe(cls,
               model_path: Path,
-              model: Union[Dict, ModelMixin] = None,
-              prediction_type_helper: Callable[[Path],BaseModelType] = None)->ModelVariantInfo:
+              model: Optional[Union[Dict, ModelMixin]] = None,
+              prediction_type_helper: Optional[Callable[[Path],SchedulerPredictionType]] = None)->ModelProbeInfo:
         '''
         Probe the model at model_path and return sufficient information about it
         to place it somewhere in the models directory hierarchy. If the model is
@@ -74,23 +75,23 @@ class ModelProbe(object):
         between V2-Base and V2-768 SD models.
         '''
         if model_path:
-            format = 'folder' if model_path.is_dir() else 'checkpoint'
+            format_type = 'diffusers' if model_path.is_dir() else 'checkpoint'
         else:
-            format = 'folder' if isinstance(model,(ConfigMixin,ModelMixin)) else 'checkpoint'
-
+            format_type = 'diffusers' if isinstance(model,(ConfigMixin,ModelMixin)) else 'checkpoint'
         model_info = None
         try:
             model_type = cls.get_model_type_from_folder(model_path, model) \
-                if format == 'folder' \
+                if format_type == 'diffusers' \
                    else cls.get_model_type_from_checkpoint(model_path, model)
-            probe_class = cls.PROBES[format].get(model_type)
+            probe_class = cls.PROBES[format_type].get(model_type)
             if not probe_class:
                 return None
             probe = probe_class(model_path, model, prediction_type_helper)
             base_type = probe.get_base_type()
             variant_type = probe.get_variant_type()
             prediction_type = probe.get_scheduler_prediction_type()
-            model_info = ModelVariantInfo(
+            format = probe.get_format()
+            model_info = ModelProbeInfo(
                 model_type = model_type,
                 base_type = base_type,
                 variant_type = variant_type,
@@ -102,32 +103,42 @@ class ModelProbe(object):
                                      and prediction_type==SchedulerPredictionType.VPrediction \
                                      ) else 512,
             )
-        except Exception as e:
-            return None
+        except Exception:
+            raise
 
         return model_info
 
     @classmethod
-    def get_model_type_from_checkpoint(cls, model_path: Path, checkpoint: dict)->ModelType:
-        if model_path.suffix not in ('.bin','.pt','.ckpt','.safetensors'):
+    def get_model_type_from_checkpoint(cls, model_path: Path, checkpoint: dict) -> ModelType:
+        if model_path.suffix not in ('.bin','.pt','.ckpt','.safetensors','.pth'):
             return None
-        if model_path.name=='learned_embeds.bin':
+
+        if model_path.name == "learned_embeds.bin":
             return ModelType.TextualInversion
-        checkpoint = checkpoint or cls._scan_and_load_checkpoint(model_path)
-        state_dict = checkpoint.get("state_dict") or checkpoint
-        if any([x.startswith("model.diffusion_model") for x in state_dict.keys()]):
-            return ModelType.Pipeline
-        if any([x.startswith("encoder.conv_in") for x in state_dict.keys()]):
-            return ModelType.Vae
-        if "string_to_token" in state_dict or "emb_params" in state_dict:
-            return ModelType.TextualInversion
-        if any([x.startswith("lora") for x in state_dict.keys()]):
-            return ModelType.Lora
-        if any([x.startswith("control_model") for x in state_dict.keys()]):
-            return ModelType.ControlNet
-        if any([x.startswith("input_blocks") for x in state_dict.keys()]):
-            return ModelType.ControlNet
-        return None # give up
+
+        ckpt = checkpoint if checkpoint else read_checkpoint_meta(model_path, scan=True)
+        ckpt = ckpt.get("state_dict", ckpt)
+
+        for key in ckpt.keys():
+            if any(key.startswith(v) for v in {"cond_stage_model.", "first_stage_model.", "model.diffusion_model."}):
+                return ModelType.Main
+            elif any(key.startswith(v) for v in {"encoder.conv_in", "decoder.conv_in"}):
+                return ModelType.Vae
+            elif any(key.startswith(v) for v in {"lora_te_", "lora_unet_"}):
+                return ModelType.Lora
+            elif any(key.endswith(v) for v in {"to_k_lora.up.weight", "to_q_lora.down.weight"}):
+                return ModelType.Lora
+            elif any(key.startswith(v) for v in {"control_model", "input_blocks"}):
+                return ModelType.ControlNet
+            elif key in {"emb_params", "string_to_param"}:
+                return ModelType.TextualInversion
+
+        else:
+            # diffusers-ti
+            if len(ckpt) < 10 and all(isinstance(v, torch.Tensor) for v in ckpt.values()):
+                return ModelType.TextualInversion
+        
+        raise ValueError(f"Unable to determine model type for {model_path}")
 
     @classmethod
     def get_model_type_from_folder(cls, folder_path: Path, model: ModelMixin)->ModelType:
@@ -157,7 +168,7 @@ class ModelProbe(object):
             return type
 
         # give up
-        raise ValueError("Unable to determine model type")
+        raise ValueError(f"Unable to determine model type for {folder_path}")
 
     @classmethod
     def _scan_and_load_checkpoint(cls,model_path: Path)->dict:
@@ -192,11 +203,14 @@ class ProbeBase(object):
     def get_scheduler_prediction_type(self)->SchedulerPredictionType:
         pass
 
+    def get_format(self)->str:
+        pass
+
 class CheckpointProbeBase(ProbeBase):
     def __init__(self,
                  checkpoint_path: Path,
                  checkpoint: dict,
-                 helper: Callable[[Path],BaseModelType] = None
+                 helper: Callable[[Path],SchedulerPredictionType] = None
                  )->BaseModelType:
         self.checkpoint = checkpoint or ModelProbe._scan_and_load_checkpoint(checkpoint_path)
         self.checkpoint_path = checkpoint_path
@@ -205,9 +219,12 @@ class CheckpointProbeBase(ProbeBase):
     def get_base_type(self)->BaseModelType:
         pass
 
+    def get_format(self)->str:
+        return 'checkpoint'
+
     def get_variant_type(self)-> ModelVariantType:
         model_type = ModelProbe.get_model_type_from_checkpoint(self.checkpoint_path,self.checkpoint)
-        if model_type != ModelType.Pipeline:
+        if model_type != ModelType.Main:
             return ModelVariantType.Normal
         state_dict = self.checkpoint.get('state_dict') or self.checkpoint
         in_channels = state_dict[
@@ -246,7 +263,8 @@ class PipelineCheckpointProbe(CheckpointProbeBase):
                     return SchedulerPredictionType.Epsilon
                 elif checkpoint["global_step"] == 110000:
                     return SchedulerPredictionType.VPrediction
-            if self.checkpoint_path and self.helper:
+            if self.checkpoint_path and self.helper \
+               and not self.checkpoint_path.with_suffix('.yaml').exists():  # if a .yaml config file exists, then this step not needed
                 return self.helper(self.checkpoint_path)
             else:
                 return None
@@ -257,6 +275,9 @@ class VaeCheckpointProbe(CheckpointProbeBase):
         return BaseModelType.StableDiffusion1
 
 class LoRACheckpointProbe(CheckpointProbeBase):
+    def get_format(self)->str:
+        return 'lycoris'
+
     def get_base_type(self)->BaseModelType:
         checkpoint = self.checkpoint
         key1 = "lora_te_text_model_encoder_layers_0_mlp_fc1.lora_down.weight"
@@ -276,6 +297,9 @@ class LoRACheckpointProbe(CheckpointProbeBase):
             return None
 
 class TextualInversionCheckpointProbe(CheckpointProbeBase):
+    def get_format(self)->str:
+        return None
+
     def get_base_type(self)->BaseModelType:
         checkpoint = self.checkpoint
         if 'string_to_token' in checkpoint:
@@ -322,17 +346,16 @@ class FolderProbeBase(ProbeBase):
     def get_variant_type(self)->ModelVariantType:
         return ModelVariantType.Normal
 
+    def get_format(self)->str:
+        return 'diffusers'
+    
 class PipelineFolderProbe(FolderProbeBase):
     def get_base_type(self)->BaseModelType:
         if self.model:
             unet_conf = self.model.unet.config
-            scheduler_conf = self.model.scheduler.config
         else:
             with open(self.folder_path / 'unet' / 'config.json','r') as file:
                 unet_conf = json.load(file)
-            with open(self.folder_path / 'scheduler' / 'scheduler_config.json','r') as file:
-                scheduler_conf = json.load(file)
-            
         if unet_conf['cross_attention_dim'] == 768:
             return BaseModelType.StableDiffusion1  
         elif unet_conf['cross_attention_dim'] == 1024:
@@ -381,6 +404,9 @@ class VaeFolderProbe(FolderProbeBase):
         return BaseModelType.StableDiffusion1
 
 class TextualInversionFolderProbe(FolderProbeBase):
+    def get_format(self)->str:
+        return None
+    
     def get_base_type(self)->BaseModelType:
         path = self.folder_path / 'learned_embeds.bin'
         if not path.exists():
@@ -401,16 +427,24 @@ class ControlNetFolderProbe(FolderProbeBase):
                else BaseModelType.StableDiffusion2
 
 class LoRAFolderProbe(FolderProbeBase):
-    # I've never seen one of these in the wild, so this is a noop
-    pass
+    def get_base_type(self)->BaseModelType:
+        model_file = None
+        for suffix in ['safetensors','bin']:
+            base_file = self.folder_path / f'pytorch_lora_weights.{suffix}'
+            if base_file.exists():
+                model_file = base_file
+                break
+        if not model_file:
+            raise Exception('Unknown LoRA format encountered')
+        return LoRACheckpointProbe(model_file,None).get_base_type()
 
 ############## register probe classes ######
-ModelProbe.register_probe('folder', ModelType.Pipeline,  PipelineFolderProbe)
-ModelProbe.register_probe('folder', ModelType.Vae, VaeFolderProbe)
-ModelProbe.register_probe('folder', ModelType.Lora, LoRAFolderProbe)
-ModelProbe.register_probe('folder', ModelType.TextualInversion, TextualInversionFolderProbe)
-ModelProbe.register_probe('folder', ModelType.ControlNet, ControlNetFolderProbe)
-ModelProbe.register_probe('checkpoint', ModelType.Pipeline, PipelineCheckpointProbe)
+ModelProbe.register_probe('diffusers', ModelType.Main,  PipelineFolderProbe)
+ModelProbe.register_probe('diffusers', ModelType.Vae, VaeFolderProbe)
+ModelProbe.register_probe('diffusers', ModelType.Lora, LoRAFolderProbe)
+ModelProbe.register_probe('diffusers', ModelType.TextualInversion, TextualInversionFolderProbe)
+ModelProbe.register_probe('diffusers', ModelType.ControlNet, ControlNetFolderProbe)
+ModelProbe.register_probe('checkpoint', ModelType.Main, PipelineCheckpointProbe)
 ModelProbe.register_probe('checkpoint', ModelType.Vae, VaeCheckpointProbe)
 ModelProbe.register_probe('checkpoint', ModelType.Lora, LoRACheckpointProbe)
 ModelProbe.register_probe('checkpoint', ModelType.TextualInversion, TextualInversionCheckpointProbe)

invokeai/backend/model_management/models/__init__.py

@@ -2,7 +2,7 @@ import inspect
 from enum import Enum
 from pydantic import BaseModel
 from typing import Literal, get_origin
-from .base import BaseModelType, ModelType, SubModelType, ModelBase, ModelConfigBase, ModelVariantType, SchedulerPredictionType, ModelError, SilenceWarnings
+from .base import BaseModelType, ModelType, SubModelType, ModelBase, ModelConfigBase, ModelVariantType, SchedulerPredictionType, ModelError, SilenceWarnings, ModelNotFoundException
 from .stable_diffusion import StableDiffusion1Model, StableDiffusion2Model
 from .vae import VaeModel
 from .lora import LoRAModel
@@ -11,21 +11,21 @@ from .textual_inversion import TextualInversionModel
 
 MODEL_CLASSES = {
     BaseModelType.StableDiffusion1: {
-        ModelType.Pipeline: StableDiffusion1Model,
+        ModelType.Main: StableDiffusion1Model,
         ModelType.Vae: VaeModel,
         ModelType.Lora: LoRAModel,
         ModelType.ControlNet: ControlNetModel,
         ModelType.TextualInversion: TextualInversionModel,
     },
     BaseModelType.StableDiffusion2: {
-        ModelType.Pipeline: StableDiffusion2Model,
+        ModelType.Main: StableDiffusion2Model,
         ModelType.Vae: VaeModel,
         ModelType.Lora: LoRAModel,
         ModelType.ControlNet: ControlNetModel,
         ModelType.TextualInversion: TextualInversionModel,
     },
     #BaseModelType.Kandinsky2_1: {
-    #    ModelType.Pipeline: Kandinsky2_1Model,
+    #    ModelType.Main: Kandinsky2_1Model,
     #    ModelType.MoVQ: MoVQModel,
     #    ModelType.Lora: LoRAModel,
     #    ModelType.ControlNet: ControlNetModel,
@@ -68,7 +68,11 @@ def get_model_config_enums():
     enums = list()
 
     for model_config in MODEL_CONFIGS:
-        fields = inspect.get_annotations(model_config)
+
+        if hasattr(inspect,'get_annotations'):
+            fields = inspect.get_annotations(model_config)
+        else:
+            fields = model_config.__annotations__
         try:
             field = fields["model_format"]
         except:

invokeai/backend/model_management/models/base.py

@@ -1,9 +1,12 @@
+import json
 import os
 import sys
 import typing
 import inspect
 from enum import Enum
 from abc import ABCMeta, abstractmethod
+from pathlib import Path
+from picklescan.scanner import scan_file_path
 import torch
 import safetensors.torch
 from diffusers import DiffusionPipeline, ConfigMixin
@@ -12,13 +15,16 @@ from contextlib import suppress
 from pydantic import BaseModel, Field
 from typing import List, Dict, Optional, Type, Literal, TypeVar, Generic, Callable, Any, Union
 
+class ModelNotFoundException(Exception):
+    pass
+
 class BaseModelType(str, Enum):
     StableDiffusion1 = "sd-1"
     StableDiffusion2 = "sd-2"
     #Kandinsky2_1 = "kandinsky-2.1"
 
 class ModelType(str, Enum):
-    Pipeline = "pipeline"
+    Main = "main"
     Vae = "vae"
     Lora = "lora"
     ControlNet = "controlnet" # used by model_probe
@@ -56,7 +62,6 @@ class ModelConfigBase(BaseModel):
     class Config:
         use_enum_values = True
 
-
 class EmptyConfigLoader(ConfigMixin):
     @classmethod
     def load_config(cls, *args, **kwargs):
@@ -124,7 +129,10 @@ class ModelBase(metaclass=ABCMeta):
             if not isinstance(value, type) or not issubclass(value, ModelConfigBase):
                 continue
 
-            fields = inspect.get_annotations(value)
+            if hasattr(inspect,'get_annotations'):
+                fields = inspect.get_annotations(value)
+            else:
+                fields = value.__annotations__
             try:
                 field = fields["model_format"]
             except:
@@ -383,15 +391,18 @@ def _fast_safetensors_reader(path: str):
 
     return checkpoint
 
-
-def read_checkpoint_meta(path: str):
-    if path.endswith(".safetensors"):
+def read_checkpoint_meta(path: Union[str, Path], scan: bool = False):
+    if str(path).endswith(".safetensors"):
         try:
             checkpoint = _fast_safetensors_reader(path)
         except:
             # TODO: create issue for support "meta"?
             checkpoint = safetensors.torch.load_file(path, device="cpu")
     else:
+        if scan:
+            scan_result = scan_file_path(path)
+            if scan_result.infected_files != 0:
+                raise Exception(f"The model file \"{path}\" is potentially infected by malware. Aborting import.")
         checkpoint = torch.load(path, map_location=torch.device("meta"))
     return checkpoint
 

invokeai/backend/model_management/models/stable_diffusion.py

@@ -34,17 +34,17 @@ class StableDiffusion1Model(DiffusersModel):
     class CheckpointConfig(ModelConfigBase):
         model_format: Literal[StableDiffusion1ModelFormat.Checkpoint]
         vae: Optional[str] = Field(None)
-        config: Optional[str] = Field(None)
+        config: str
         variant: ModelVariantType
 
 
     def __init__(self, model_path: str, base_model: BaseModelType, model_type: ModelType):
         assert base_model == BaseModelType.StableDiffusion1
-        assert model_type == ModelType.Pipeline
+        assert model_type == ModelType.Main
         super().__init__(
             model_path=model_path,
             base_model=BaseModelType.StableDiffusion1,
-            model_type=ModelType.Pipeline,
+            model_type=ModelType.Main,
         )
 
     @classmethod
@@ -69,7 +69,7 @@ class StableDiffusion1Model(DiffusersModel):
                 in_channels = unet_config['in_channels']
 
             else:
-                raise Exception("Not supported stable diffusion diffusers format(possibly onnx?)")
+                raise NotImplementedError(f"{path} is not a supported stable diffusion diffusers format")
 
         else:
             raise NotImplementedError(f"Unknown stable diffusion 1.* format: {model_format}")
@@ -81,6 +81,8 @@ class StableDiffusion1Model(DiffusersModel):
         else:
             raise Exception("Unkown stable diffusion 1.* model format")
 
+        if ckpt_config_path is None:
+            ckpt_config_path = _select_ckpt_config(BaseModelType.StableDiffusion1, variant)
 
         return cls.create_config(
             path=path,
@@ -109,14 +111,12 @@ class StableDiffusion1Model(DiffusersModel):
         config: ModelConfigBase,
         base_model: BaseModelType,
     ) -> str:
-        assert model_path == config.path
-
         if isinstance(config, cls.CheckpointConfig):
             return _convert_ckpt_and_cache(
                 version=BaseModelType.StableDiffusion1,
                 model_config=config,
                 output_path=output_path,
-            ) # TODO: args
+           )
         else:
             return model_path
 
@@ -131,25 +131,20 @@ class StableDiffusion2Model(DiffusersModel):
         model_format: Literal[StableDiffusion2ModelFormat.Diffusers]
         vae: Optional[str] = Field(None)
         variant: ModelVariantType
-        prediction_type: SchedulerPredictionType
-        upcast_attention: bool
 
     class CheckpointConfig(ModelConfigBase):
         model_format: Literal[StableDiffusion2ModelFormat.Checkpoint]
         vae: Optional[str] = Field(None)
-        config: Optional[str] = Field(None)
+        config: str
         variant: ModelVariantType
-        prediction_type: SchedulerPredictionType
-        upcast_attention: bool
-
 
     def __init__(self, model_path: str, base_model: BaseModelType, model_type: ModelType):
         assert base_model == BaseModelType.StableDiffusion2
-        assert model_type == ModelType.Pipeline
+        assert model_type == ModelType.Main
         super().__init__(
             model_path=model_path,
             base_model=BaseModelType.StableDiffusion2,
-            model_type=ModelType.Pipeline,
+            model_type=ModelType.Main,
         )
 
     @classmethod
@@ -188,13 +183,8 @@ class StableDiffusion2Model(DiffusersModel):
         else:
             raise Exception("Unkown stable diffusion 2.* model format")
 
-        if variant == ModelVariantType.Normal:
-            prediction_type = SchedulerPredictionType.VPrediction
-            upcast_attention = True
-
-        else:
-            prediction_type = SchedulerPredictionType.Epsilon
-            upcast_attention = False
+        if ckpt_config_path is None:
+            ckpt_config_path = _select_ckpt_config(BaseModelType.StableDiffusion2, variant)
 
         return cls.create_config(
             path=path,
@@ -202,8 +192,6 @@ class StableDiffusion2Model(DiffusersModel):
 
             config=ckpt_config_path,
             variant=variant,
-            prediction_type=prediction_type,
-            upcast_attention=upcast_attention,
         )
 
     @classproperty
@@ -225,14 +213,12 @@ class StableDiffusion2Model(DiffusersModel):
         config: ModelConfigBase,
         base_model: BaseModelType,
     ) -> str:
-        assert model_path == config.path
-
         if isinstance(config, cls.CheckpointConfig):
             return _convert_ckpt_and_cache(
                 version=BaseModelType.StableDiffusion2,
                 model_config=config,
                 output_path=output_path,
-            ) # TODO: args
+            )
         else:
             return model_path
 
@@ -243,18 +229,18 @@ def _select_ckpt_config(version: BaseModelType, variant: ModelVariantType):
             ModelVariantType.Inpaint: "v1-inpainting-inference.yaml",
         },
         BaseModelType.StableDiffusion2: {
-            # code further will manually set upcast_attention and v_prediction
-            ModelVariantType.Normal: "v2-inference.yaml",
+            ModelVariantType.Normal: "v2-inference-v.yaml", # best guess, as we can't differentiate with base(512)
             ModelVariantType.Inpaint: "v2-inpainting-inference.yaml",
             ModelVariantType.Depth: "v2-midas-inference.yaml",
         }
     }
 
+    app_config = InvokeAIAppConfig.get_config()
     try:
-        # TODO: path
-        #model_config.config = app_config.config_dir / "stable-diffusion" / ckpt_configs[version][model_config.variant]
-        #return InvokeAIAppConfig.get_config().legacy_conf_dir / ckpt_configs[version][variant]
-        return InvokeAIAppConfig.get_config().root_dir / "configs" / "stable-diffusion" / ckpt_configs[version][variant]
+        config_path = app_config.legacy_conf_path / ckpt_configs[version][variant]
+        if config_path.is_relative_to(app_config.root_path):
+            config_path = config_path.relative_to(app_config.root_path)
+        return str(config_path)
             
     except:
         return None
@@ -273,36 +259,14 @@ def _convert_ckpt_and_cache(
     """
     app_config = InvokeAIAppConfig.get_config()
 
-    if model_config.config is None:
-        model_config.config = _select_ckpt_config(version, model_config.variant)
-        if model_config.config is None:
-            raise Exception(f"Model variant {model_config.variant} not supported for {version}")
-
-
     weights = app_config.root_path / model_config.path
     config_file = app_config.root_path / model_config.config
     output_path = Path(output_path)
 
-    if version == BaseModelType.StableDiffusion1:
-        upcast_attention = False
-        prediction_type = SchedulerPredictionType.Epsilon
-
-    elif version == BaseModelType.StableDiffusion2:
-        upcast_attention = model_config.upcast_attention
-        prediction_type = model_config.prediction_type
-
-    else:
-        raise Exception(f"Unknown model provided: {version}")
-
-
     # return cached version if it exists
     if output_path.exists():
         return output_path
 
-    # TODO: I think that it more correctly to convert with embedded vae
-    #       as if user will delete custom vae he will got not embedded but also custom vae
-    #vae_ckpt_path, vae_model = self._get_vae_for_conversion(weights, mconfig)
-
     # to avoid circular import errors
     from ..convert_ckpt_to_diffusers import convert_ckpt_to_diffusers
     with SilenceWarnings():        
@@ -313,9 +277,6 @@ def _convert_ckpt_and_cache(
             model_variant=model_config.variant,
             original_config_file=config_file,
             extract_ema=True,
-            upcast_attention=upcast_attention,
-            prediction_type=prediction_type,
             scan_needed=True,
-            model_root=app_config.models_path,
         )
     return output_path

invokeai/backend/model_management/models/textual_inversion.py

@@ -8,6 +8,7 @@ from .base import (
     ModelType,
     SubModelType,
     classproperty,
+    ModelNotFoundException,
 )
 # TODO: naming
 from ..lora import TextualInversionModel as TextualInversionModelRaw
@@ -37,8 +38,15 @@ class TextualInversionModel(ModelBase):
         if child_type is not None:
             raise Exception("There is no child models in textual inversion")
 
+        checkpoint_path = self.model_path
+        if os.path.isdir(checkpoint_path):
+            checkpoint_path = os.path.join(checkpoint_path, "learned_embeds.bin")
+
+        if not os.path.exists(checkpoint_path):
+            raise ModelNotFoundException()
+
         model = TextualInversionModelRaw.from_checkpoint(
-            file_path=self.model_path,
+            file_path=checkpoint_path,
             dtype=torch_dtype,
         )
 

invokeai/backend/model_management/models/vae.py

@@ -137,7 +137,6 @@ def _convert_vae_ckpt_and_cache(
         from .stable_diffusion import _select_ckpt_config
         # all sd models use same vae settings
         config_file = _select_ckpt_config(base_model, ModelVariantType.Normal)
-
     else:
         raise Exception(f"Vae conversion not supported for model type: {base_model}")
 
@@ -152,7 +151,7 @@ def _convert_vae_ckpt_and_cache(
     if "state_dict" in checkpoint:
         checkpoint = checkpoint["state_dict"]
 
-    config = OmegaConf.load(config_file)
+    config = OmegaConf.load(app_config.root_path/config_file)
 
     vae_model = convert_ldm_vae_to_diffusers(
         checkpoint = checkpoint,

invokeai/backend/stable_diffusion/diffusers_pipeline.py

@@ -7,7 +7,7 @@ import secrets
 from collections.abc import Sequence
 from dataclasses import dataclass, field
 from typing import Any, Callable, Generic, List, Optional, Type, TypeVar, Union
-from pydantic import BaseModel, Field
+from pydantic import Field
 
 import einops
 import PIL.Image
@@ -17,12 +17,11 @@ import psutil
 import torch
 import torchvision.transforms as T
 from diffusers.models import AutoencoderKL, UNet2DConditionModel
-from diffusers.models.controlnet import ControlNetModel, ControlNetOutput
+from diffusers.models.controlnet import ControlNetModel
 from diffusers.pipelines.stable_diffusion import StableDiffusionPipelineOutput
 from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion import (
     StableDiffusionPipeline,
 )
-from diffusers.pipelines.controlnet import MultiControlNetModel
 
 from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_img2img import (
     StableDiffusionImg2ImgPipeline,
@@ -46,7 +45,7 @@ from .diffusion import (
     InvokeAIDiffuserComponent,
     PostprocessingSettings,
 )
-from .offloading import FullyLoadedModelGroup, LazilyLoadedModelGroup, ModelGroup
+from .offloading import FullyLoadedModelGroup, ModelGroup
 
 @dataclass
 class PipelineIntermediateState:
@@ -105,7 +104,7 @@ class AddsMaskGuidance:
     _debug: Optional[Callable] = None
 
     def __call__(
-        self, step_output: BaseOutput | SchedulerOutput, t: torch.Tensor, conditioning
+        self, step_output: Union[BaseOutput, SchedulerOutput], t: torch.Tensor, conditioning
     ) -> BaseOutput:
         output_class = step_output.__class__  # We'll create a new one with masked data.
 
@@ -361,37 +360,34 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
         ):
             self.enable_xformers_memory_efficient_attention()
         else:
-            if torch.backends.mps.is_available():
-                # until pytorch #91617 is fixed, slicing is borked on MPS
-                # https://github.com/pytorch/pytorch/issues/91617
-                # fix is in https://github.com/kulinseth/pytorch/pull/222 but no idea when it will get merged to pytorch mainline.
-                pass
+            if self.device.type == "cpu" or self.device.type == "mps":
+                mem_free = psutil.virtual_memory().free
+            elif self.device.type == "cuda":
+                mem_free, _ = torch.cuda.mem_get_info(normalize_device(self.device))
             else:
-                if self.device.type == "cpu" or self.device.type == "mps":
-                    mem_free = psutil.virtual_memory().free
-                elif self.device.type == "cuda":
-                    mem_free, _ = torch.cuda.mem_get_info(normalize_device(self.device))
-                else:
-                    raise ValueError(f"unrecognized device {self.device}")
-                # input tensor of [1, 4, h/8, w/8]
-                # output tensor of [16, (h/8 * w/8), (h/8 * w/8)]
-                bytes_per_element_needed_for_baddbmm_duplication = (
-                    latents.element_size() + 4
-                )
-                max_size_required_for_baddbmm = (
-                    16
-                    * latents.size(dim=2)
-                    * latents.size(dim=3)
-                    * latents.size(dim=2)
-                    * latents.size(dim=3)
-                    * bytes_per_element_needed_for_baddbmm_duplication
-                )
-                if max_size_required_for_baddbmm > (
-                    mem_free * 3.0 / 4.0
-                ):  # 3.3 / 4.0 is from old Invoke code
-                    self.enable_attention_slicing(slice_size="max")
-                else:
-                    self.disable_attention_slicing()
+                raise ValueError(f"unrecognized device {self.device}")
+            # input tensor of [1, 4, h/8, w/8]
+            # output tensor of [16, (h/8 * w/8), (h/8 * w/8)]
+            bytes_per_element_needed_for_baddbmm_duplication = (
+                latents.element_size() + 4
+            )
+            max_size_required_for_baddbmm = (
+                16
+                * latents.size(dim=2)
+                * latents.size(dim=3)
+                * latents.size(dim=2)
+                * latents.size(dim=3)
+                * bytes_per_element_needed_for_baddbmm_duplication
+            )
+            if max_size_required_for_baddbmm > (
+                mem_free * 3.0 / 4.0
+            ):  # 3.3 / 4.0 is from old Invoke code
+                self.enable_attention_slicing(slice_size="max")
+            elif torch.backends.mps.is_available():
+                # diffusers recommends always enabling for mps
+                self.enable_attention_slicing(slice_size="max")
+            else:
+                self.disable_attention_slicing()
 
     def to(self, torch_device: Optional[Union[str, torch.device]] = None, silence_dtype_warnings=False):
         # overridden method; types match the superclass.
@@ -917,20 +913,11 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
     def non_noised_latents_from_image(self, init_image, *, device: torch.device, dtype):
         init_image = init_image.to(device=device, dtype=dtype)
         with torch.inference_mode():
-            if device.type == "mps":
-                # workaround for torch MPS bug that has been fixed in https://github.com/kulinseth/pytorch/pull/222
-                # TODO remove this workaround once kulinseth#222 is merged to pytorch mainline
-                self.vae.to(CPU_DEVICE)
-                init_image = init_image.to(CPU_DEVICE)
-            else:
-                self._model_group.load(self.vae)
+            self._model_group.load(self.vae)
             init_latent_dist = self.vae.encode(init_image).latent_dist
             init_latents = init_latent_dist.sample().to(
                 dtype=dtype
             )  # FIXME: uses torch.randn. make reproducible!
-            if device.type == "mps":
-                self.vae.to(device)
-                init_latents = init_latents.to(device)
 
         init_latents = 0.18215 * init_latents
         return init_latents

invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py

@@ -248,9 +248,6 @@ class InvokeAIDiffuserComponent:
             x_twice, sigma_twice, both_conditionings, **kwargs,
         )
         unconditioned_next_x, conditioned_next_x = both_results.chunk(2)
-        if conditioned_next_x.device.type == "mps":
-            # prevent a result filled with zeros. seems to be a torch bug.
-            conditioned_next_x = conditioned_next_x.clone()
         return unconditioned_next_x, conditioned_next_x
 
     def _apply_standard_conditioning_sequentially(
@@ -264,9 +261,6 @@ class InvokeAIDiffuserComponent:
         # low-memory sequential path
         unconditioned_next_x = self.model_forward_callback(x, sigma, unconditioning, **kwargs)
         conditioned_next_x = self.model_forward_callback(x, sigma, conditioning, **kwargs)
-        if conditioned_next_x.device.type == "mps":
-            # prevent a result filled with zeros. seems to be a torch bug.
-            conditioned_next_x = conditioned_next_x.clone()
         return unconditioned_next_x, conditioned_next_x
 
     # TODO: looks unused

invokeai/backend/stable_diffusion/offloading.py

@@ -4,7 +4,7 @@ import warnings
 import weakref
 from abc import ABCMeta, abstractmethod
 from collections.abc import MutableMapping
-from typing import Callable
+from typing import Callable, Union
 
 import torch
 from accelerate.utils import send_to_device
@@ -117,7 +117,7 @@ class LazilyLoadedModelGroup(ModelGroup):
     """
 
     _hooks: MutableMapping[torch.nn.Module, RemovableHandle]
-    _current_model_ref: Callable[[], torch.nn.Module | _NoModel]
+    _current_model_ref: Callable[[], Union[torch.nn.Module, _NoModel]]
 
     def __init__(self, execution_device: torch.device):
         super().__init__(execution_device)

invokeai/backend/util/__init__.py

@@ -16,6 +16,7 @@ from .util import (
     download_with_resume,
     instantiate_from_config,
     url_attachment_name,
+    Chdir
 )
 
 

invokeai/backend/util/devices.py

@@ -4,6 +4,7 @@ from contextlib import nullcontext
 
 import torch
 from torch import autocast
+from typing import Union
 from invokeai.app.services.config import InvokeAIAppConfig
 
 CPU_DEVICE = torch.device("cpu")
@@ -28,6 +29,8 @@ def choose_precision(device: torch.device) -> str:
         device_name = torch.cuda.get_device_name(device)
         if not ("GeForce GTX 1660" in device_name or "GeForce GTX 1650" in device_name):
             return "float16"
+    elif device.type == "mps":
+        return "float16"
     return "float32"
 
 
@@ -49,7 +52,7 @@ def choose_autocast(precision):
     return nullcontext
 
 
-def normalize_device(device: str | torch.device) -> torch.device:
+def normalize_device(device: Union[str, torch.device]) -> torch.device:
     """Ensure device has a device index defined, if appropriate."""
     device = torch.device(device)
     if device.index is None:

invokeai/backend/util/mps_fixes.py

@@ -0,0 +1,63 @@
+import torch
+
+
+if torch.backends.mps.is_available():
+    torch.empty = torch.zeros
+
+
+_torch_layer_norm = torch.nn.functional.layer_norm
+def new_layer_norm(input, normalized_shape, weight=None, bias=None, eps=1e-05):
+    if input.device.type == "mps" and input.dtype == torch.float16:
+        input = input.float()
+        if weight is not None:
+            weight = weight.float()
+        if bias is not None:
+            bias = bias.float()
+        return _torch_layer_norm(input, normalized_shape, weight, bias, eps).half()
+    else:
+        return _torch_layer_norm(input, normalized_shape, weight, bias, eps)
+
+torch.nn.functional.layer_norm = new_layer_norm
+
+
+_torch_tensor_permute = torch.Tensor.permute
+def new_torch_tensor_permute(input, *dims):
+    result = _torch_tensor_permute(input, *dims)
+    if input.device == "mps" and input.dtype == torch.float16:
+        result = result.contiguous()
+    return result
+
+torch.Tensor.permute = new_torch_tensor_permute
+
+
+_torch_lerp = torch.lerp
+def new_torch_lerp(input, end, weight, *, out=None):
+    if input.device.type == "mps" and input.dtype == torch.float16:
+        input = input.float()
+        end = end.float()
+        if isinstance(weight, torch.Tensor):
+            weight = weight.float()
+        if out is not None:
+            out_fp32 = torch.zeros_like(out, dtype=torch.float32)
+        else:
+            out_fp32 = None
+        result = _torch_lerp(input, end, weight, out=out_fp32)
+        if out is not None:
+            out.copy_(out_fp32.half())
+            del out_fp32
+        return result.half()
+
+    else:
+        return _torch_lerp(input, end, weight, out=out)
+
+torch.lerp = new_torch_lerp
+
+
+_torch_interpolate = torch.nn.functional.interpolate
+def new_torch_interpolate(input, size=None, scale_factor=None, mode='nearest', align_corners=None, recompute_scale_factor=None, antialias=False):
+    if input.device.type == "mps" and input.dtype == torch.float16:
+        return _torch_interpolate(input.float(), size, scale_factor, mode, align_corners, recompute_scale_factor, antialias).half()
+    else:
+        return _torch_interpolate(input, size, scale_factor, mode, align_corners, recompute_scale_factor, antialias)
+
+torch.nn.functional.interpolate = new_torch_interpolate

invokeai/backend/util/util.py

@@ -381,3 +381,18 @@ def image_to_dataURL(image: Image.Image, image_format: str = "PNG") -> str:
         buffered.getvalue()
     ).decode("UTF-8")
     return image_base64
+
+class Chdir(object):
+    '''Context manager to chdir to desired directory and change back after context exits:
+    Args:
+        path (Path): The path to the cwd
+    '''
+    def __init__(self, path: Path):
+        self.path = path
+        self.original = Path().absolute()
+
+    def __enter__(self):
+        os.chdir(self.path)
+
+    def __exit__(self,*args):
+        os.chdir(self.original)

invokeai/configs/INITIAL_MODELS.yaml

@@ -1,107 +1,92 @@
 # This file predefines a few models that the user may want to install.
-diffusers:
-   stable-diffusion-1.5:
-      description: Stable Diffusion version 1.5 diffusers model (4.27 GB)
-      repo_id: runwayml/stable-diffusion-v1-5
-      format: diffusers
-      vae:
-        repo_id: stabilityai/sd-vae-ft-mse
-      recommended: True
-      default: True
-   sd-inpainting-1.5:
-     description: RunwayML SD 1.5 model optimized for inpainting, diffusers version (4.27 GB)
-     repo_id: runwayml/stable-diffusion-inpainting
-     format: diffusers
-     vae:
-       repo_id: stabilityai/sd-vae-ft-mse
-     recommended: True
-   stable-diffusion-2.1:
-      description: Stable Diffusion version 2.1 diffusers model, trained on 768 pixel images (5.21 GB)
-      repo_id: stabilityai/stable-diffusion-2-1
-      format: diffusers
-      recommended: True
-   sd-inpainting-2.0:
-      description: Stable Diffusion version 2.0 inpainting model (5.21 GB)
-      repo_id: stabilityai/stable-diffusion-2-inpainting
-      format: diffusers
-      recommended: False
-   analog-diffusion-1.0:
-      description: An SD-1.5 model trained on diverse analog photographs (2.13 GB)
-      repo_id: wavymulder/Analog-Diffusion
-      format: diffusers
-      recommended: false
-   deliberate-1.0:
-      description: Versatile model that produces detailed images up to 768px (4.27 GB)
-      format: diffusers
-      repo_id: XpucT/Deliberate
-      recommended: False
-   d&d-diffusion-1.0:
-      description: Dungeons & Dragons characters (2.13 GB)
-      format: diffusers
-      repo_id: 0xJustin/Dungeons-and-Diffusion
-      recommended: False
-   dreamlike-photoreal-2.0:
-      description: A photorealistic model trained on 768 pixel images based on SD 1.5 (2.13 GB)
-      format: diffusers
-      repo_id: dreamlike-art/dreamlike-photoreal-2.0
-      recommended: False
-   inkpunk-1.0:
-      description: Stylized illustrations inspired by Gorillaz, FLCL and Shinkawa; prompt with "nvinkpunk" (4.27 GB)
-      format: diffusers
-      repo_id: Envvi/Inkpunk-Diffusion
-      recommended: False
-   openjourney-4.0:
-      description: An SD 1.5 model fine tuned on Midjourney; prompt with "mdjrny-v4 style" (2.13 GB)
-      format: diffusers
-      repo_id: prompthero/openjourney
-      vae:
-        repo_id: stabilityai/sd-vae-ft-mse
-      recommended: False
-   portrait-plus-1.0:
-      description: An SD-1.5 model trained on close range portraits of people; prompt with "portrait+" (2.13 GB)
-      format: diffusers
-      repo_id: wavymulder/portraitplus
-      recommended: False
-   seek-art-mega-1.0:
-      description: A general use SD-1.5 "anything" model that supports multiple styles (2.1 GB)
-      repo_id: coreco/seek.art_MEGA
-      format: diffusers
-      vae:
-        repo_id: stabilityai/sd-vae-ft-mse
-      recommended: False
-   trinart-2.0:
-      description: An SD-1.5 model finetuned with ~40K assorted high resolution manga/anime-style images (2.13 GB)
-      repo_id: naclbit/trinart_stable_diffusion_v2
-      format: diffusers
-      vae:
-        repo_id: stabilityai/sd-vae-ft-mse
-      recommended: False
-   waifu-diffusion-1.4:
-      description: An SD-1.5 model trained on 680k anime/manga-style images (2.13 GB)
-      repo_id: hakurei/waifu-diffusion
-      format: diffusers
-      vae:
-        repo_id: stabilityai/sd-vae-ft-mse
-      recommended: False
-controlnet:
-   canny: lllyasviel/control_v11p_sd15_canny
-   inpaint: lllyasviel/control_v11p_sd15_inpaint
-   mlsd: lllyasviel/control_v11p_sd15_mlsd
-   depth: lllyasviel/control_v11f1p_sd15_depth
-   normal_bae: lllyasviel/control_v11p_sd15_normalbae
-   seg: lllyasviel/control_v11p_sd15_seg
-   lineart: lllyasviel/control_v11p_sd15_lineart
-   lineart_anime: lllyasviel/control_v11p_sd15s2_lineart_anime
-   scribble: lllyasviel/control_v11p_sd15_scribble
-   softedge: lllyasviel/control_v11p_sd15_softedge
-   shuffle: lllyasviel/control_v11e_sd15_shuffle
-   tile: lllyasviel/control_v11f1e_sd15_tile
-   ip2p: lllyasviel/control_v11e_sd15_ip2p
-textual_inversion:
-   'EasyNegative': https://huggingface.co/embed/EasyNegative/resolve/main/EasyNegative.safetensors
-   'ahx-beta-453407d': sd-concepts-library/ahx-beta-453407d
-lora:
-   'LowRA': https://civitai.com/api/download/models/63006
-   'Ink scenery': https://civitai.com/api/download/models/83390
-   'sd-model-finetuned-lora-t4': sayakpaul/sd-model-finetuned-lora-t4
- 
+sd-1/main/stable-diffusion-v1-5:
+   description: Stable Diffusion version 1.5 diffusers model (4.27 GB)
+   repo_id: runwayml/stable-diffusion-v1-5
+   recommended: True
+   default: True
+sd-1/main/stable-diffusion-inpainting:
+   description: RunwayML SD 1.5 model optimized for inpainting, diffusers version (4.27 GB)
+   repo_id: runwayml/stable-diffusion-inpainting
+   recommended: True
+sd-2/main/stable-diffusion-2-1:
+   description: Stable Diffusion version 2.1 diffusers model, trained on 768 pixel images (5.21 GB)
+   repo_id: stabilityai/stable-diffusion-2-1
+   recommended: True
+sd-2/main/stable-diffusion-2-inpainting:
+   description: Stable Diffusion version 2.0 inpainting model (5.21 GB)
+   repo_id: stabilityai/stable-diffusion-2-inpainting
+   recommended: False
+sd-1/main/Analog-Diffusion:
+   description: An SD-1.5 model trained on diverse analog photographs (2.13 GB)
+   repo_id: wavymulder/Analog-Diffusion
+   recommended: false
+sd-1/main/Deliberate:
+   description: Versatile model that produces detailed images up to 768px (4.27 GB)
+   repo_id: XpucT/Deliberate
+   recommended: False
+sd-1/main/Dungeons-and-Diffusion:
+   description: Dungeons & Dragons characters (2.13 GB)
+   repo_id: 0xJustin/Dungeons-and-Diffusion
+   recommended: False
+sd-1/main/dreamlike-photoreal-2:
+   description: A photorealistic model trained on 768 pixel images based on SD 1.5 (2.13 GB)
+   repo_id: dreamlike-art/dreamlike-photoreal-2.0
+   recommended: False
+sd-1/main/Inkpunk-Diffusion:
+   description: Stylized illustrations inspired by Gorillaz, FLCL and Shinkawa; prompt with "nvinkpunk" (4.27 GB)
+   repo_id: Envvi/Inkpunk-Diffusion
+   recommended: False
+sd-1/main/openjourney:
+   description: An SD 1.5 model fine tuned on Midjourney; prompt with "mdjrny-v4 style" (2.13 GB)
+   repo_id: prompthero/openjourney
+   recommended: False
+sd-1/main/portraitplus:
+   description: An SD-1.5 model trained on close range portraits of people; prompt with "portrait+" (2.13 GB)
+   repo_id: wavymulder/portraitplus
+   recommended: False
+sd-1/main/seek.art_MEGA:
+   repo_id: coreco/seek.art_MEGA
+   description: A general use SD-1.5 "anything" model that supports multiple styles (2.1 GB)
+   recommended: False
+sd-1/main/trinart_stable_diffusion_v2:
+   description: An SD-1.5 model finetuned with ~40K assorted high resolution manga/anime-style images (2.13 GB)
+   repo_id: naclbit/trinart_stable_diffusion_v2
+   recommended: False
+sd-1/main/waifu-diffusion:
+   description: An SD-1.5 model trained on 680k anime/manga-style images (2.13 GB)
+   repo_id: hakurei/waifu-diffusion
+   recommended: False
+sd-1/controlnet/canny:
+   repo_id: lllyasviel/control_v11p_sd15_canny
+sd-1/controlnet/inpaint:
+   repo_id: lllyasviel/control_v11p_sd15_inpaint
+sd-1/controlnet/mlsd:
+   repo_id: lllyasviel/control_v11p_sd15_mlsd
+sd-1/controlnet/depth:
+   repo_id: lllyasviel/control_v11f1p_sd15_depth
+sd-1/controlnet/normal_bae:
+   repo_id: lllyasviel/control_v11p_sd15_normalbae
+sd-1/controlnet/seg:
+   repo_id: lllyasviel/control_v11p_sd15_seg
+sd-1/controlnet/lineart:
+   repo_id: lllyasviel/control_v11p_sd15_lineart
+sd-1/controlnet/lineart_anime:
+   repo_id: lllyasviel/control_v11p_sd15s2_lineart_anime
+sd-1/controlnet/scribble:
+   repo_id: lllyasviel/control_v11p_sd15_scribble
+sd-1/controlnet/softedge:
+   repo_id: lllyasviel/control_v11p_sd15_softedge
+sd-1/controlnet/shuffle:
+   repo_id: lllyasviel/control_v11e_sd15_shuffle
+sd-1/controlnet/tile:
+   repo_id: lllyasviel/control_v11f1e_sd15_tile
+sd-1/controlnet/ip2p:
+   repo_id: lllyasviel/control_v11e_sd15_ip2p
+sd-1/embedding/EasyNegative:
+   path: https://huggingface.co/embed/EasyNegative/resolve/main/EasyNegative.safetensors
+sd-1/embedding/ahx-beta-453407d:
+   repo_id: sd-concepts-library/ahx-beta-453407d
+sd-1/lora/LowRA:
+   path: https://civitai.com/api/download/models/63006
+sd-1/lora/Ink scenery:
+   path: https://civitai.com/api/download/models/83390

invokeai/configs/stable-diffusion/v2-inpainting-inference-v.yaml

@@ -0,0 +1,159 @@
+model:
+  base_learning_rate: 5.0e-05
+  target: ldm.models.diffusion.ddpm.LatentInpaintDiffusion
+  params:
+    linear_start: 0.00085
+    linear_end: 0.0120
+    parameterization: "v"
+    num_timesteps_cond: 1
+    log_every_t: 200
+    timesteps: 1000
+    first_stage_key: "jpg"
+    cond_stage_key: "txt"
+    image_size: 64
+    channels: 4
+    cond_stage_trainable: false
+    conditioning_key: hybrid
+    scale_factor: 0.18215
+    monitor: val/loss_simple_ema
+    finetune_keys: null
+    use_ema: False
+
+    unet_config:
+      target: ldm.modules.diffusionmodules.openaimodel.UNetModel
+      params:
+        use_checkpoint: True
+        image_size: 32 # unused
+        in_channels: 9
+        out_channels: 4
+        model_channels: 320
+        attention_resolutions: [ 4, 2, 1 ]
+        num_res_blocks: 2
+        channel_mult: [ 1, 2, 4, 4 ]
+        num_head_channels: 64 # need to fix for flash-attn
+        use_spatial_transformer: True
+        use_linear_in_transformer: True
+        transformer_depth: 1
+        context_dim: 1024
+        legacy: False
+
+    first_stage_config:
+      target: ldm.models.autoencoder.AutoencoderKL
+      params:
+        embed_dim: 4
+        monitor: val/rec_loss
+        ddconfig:
+          #attn_type: "vanilla-xformers"
+          double_z: true
+          z_channels: 4
+          resolution: 256
+          in_channels: 3
+          out_ch: 3
+          ch: 128
+          ch_mult:
+            - 1
+            - 2
+            - 4
+            - 4
+          num_res_blocks: 2
+          attn_resolutions: [ ]
+          dropout: 0.0
+        lossconfig:
+          target: torch.nn.Identity
+
+    cond_stage_config:
+      target: ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder
+      params:
+        freeze: True
+        layer: "penultimate"
+
+
+data:
+  target: ldm.data.laion.WebDataModuleFromConfig
+  params:
+    tar_base: null  # for concat as in LAION-A
+    p_unsafe_threshold: 0.1
+    filter_word_list: "data/filters.yaml"
+    max_pwatermark: 0.45
+    batch_size: 8
+    num_workers: 6
+    multinode: True
+    min_size: 512
+    train:
+      shards:
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-0/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-1/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-2/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-3/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-4/{00000..18699}.tar -"  #{00000-94333}.tar"
+      shuffle: 10000
+      image_key: jpg
+      image_transforms:
+      - target: torchvision.transforms.Resize
+        params:
+          size: 512
+          interpolation: 3
+      - target: torchvision.transforms.RandomCrop
+        params:
+          size: 512
+      postprocess:
+        target: ldm.data.laion.AddMask
+        params:
+          mode: "512train-large"
+          p_drop: 0.25
+    # NOTE use enough shards to avoid empty validation loops in workers
+    validation:
+      shards:
+        - "pipe:aws s3 cp s3://deep-floyd-s3/datasets/laion_cleaned-part5/{93001..94333}.tar - "
+      shuffle: 0
+      image_key: jpg
+      image_transforms:
+      - target: torchvision.transforms.Resize
+        params:
+          size: 512
+          interpolation: 3
+      - target: torchvision.transforms.CenterCrop
+        params:
+          size: 512
+      postprocess:
+        target: ldm.data.laion.AddMask
+        params:
+          mode: "512train-large"
+          p_drop: 0.25
+
+lightning:
+  find_unused_parameters: True
+  modelcheckpoint:
+    params:
+      every_n_train_steps: 5000
+
+  callbacks:
+    metrics_over_trainsteps_checkpoint:
+      params:
+        every_n_train_steps: 10000
+
+    image_logger:
+      target: main.ImageLogger
+      params:
+        enable_autocast: False
+        disabled: False
+        batch_frequency: 1000
+        max_images: 4
+        increase_log_steps: False
+        log_first_step: False
+        log_images_kwargs:
+          use_ema_scope: False
+          inpaint: False
+          plot_progressive_rows: False
+          plot_diffusion_rows: False
+          N: 4
+          unconditional_guidance_scale: 5.0
+          unconditional_guidance_label: [""]
+          ddim_steps: 50  # todo check these out for depth2img,
+          ddim_eta: 0.0   # todo check these out for depth2img,
+
+  trainer:
+    benchmark: True
+    val_check_interval: 5000000
+    num_sanity_val_steps: 0
+    accumulate_grad_batches: 1

invokeai/configs/stable-diffusion/v2-inpainting-inference.yaml

@@ -0,0 +1,158 @@
+model:
+  base_learning_rate: 5.0e-05
+  target: ldm.models.diffusion.ddpm.LatentInpaintDiffusion
+  params:
+    linear_start: 0.00085
+    linear_end: 0.0120
+    num_timesteps_cond: 1
+    log_every_t: 200
+    timesteps: 1000
+    first_stage_key: "jpg"
+    cond_stage_key: "txt"
+    image_size: 64
+    channels: 4
+    cond_stage_trainable: false
+    conditioning_key: hybrid
+    scale_factor: 0.18215
+    monitor: val/loss_simple_ema
+    finetune_keys: null
+    use_ema: False
+
+    unet_config:
+      target: ldm.modules.diffusionmodules.openaimodel.UNetModel
+      params:
+        use_checkpoint: True
+        image_size: 32 # unused
+        in_channels: 9
+        out_channels: 4
+        model_channels: 320
+        attention_resolutions: [ 4, 2, 1 ]
+        num_res_blocks: 2
+        channel_mult: [ 1, 2, 4, 4 ]
+        num_head_channels: 64 # need to fix for flash-attn
+        use_spatial_transformer: True
+        use_linear_in_transformer: True
+        transformer_depth: 1
+        context_dim: 1024
+        legacy: False
+
+    first_stage_config:
+      target: ldm.models.autoencoder.AutoencoderKL
+      params:
+        embed_dim: 4
+        monitor: val/rec_loss
+        ddconfig:
+          #attn_type: "vanilla-xformers"
+          double_z: true
+          z_channels: 4
+          resolution: 256
+          in_channels: 3
+          out_ch: 3
+          ch: 128
+          ch_mult:
+            - 1
+            - 2
+            - 4
+            - 4
+          num_res_blocks: 2
+          attn_resolutions: [ ]
+          dropout: 0.0
+        lossconfig:
+          target: torch.nn.Identity
+
+    cond_stage_config:
+      target: ldm.modules.encoders.modules.FrozenOpenCLIPEmbedder
+      params:
+        freeze: True
+        layer: "penultimate"
+
+
+data:
+  target: ldm.data.laion.WebDataModuleFromConfig
+  params:
+    tar_base: null  # for concat as in LAION-A
+    p_unsafe_threshold: 0.1
+    filter_word_list: "data/filters.yaml"
+    max_pwatermark: 0.45
+    batch_size: 8
+    num_workers: 6
+    multinode: True
+    min_size: 512
+    train:
+      shards:
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-0/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-1/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-2/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-3/{00000..18699}.tar -"
+        - "pipe:aws s3 cp s3://stability-aws/laion-a-native/part-4/{00000..18699}.tar -"  #{00000-94333}.tar"
+      shuffle: 10000
+      image_key: jpg
+      image_transforms:
+      - target: torchvision.transforms.Resize
+        params:
+          size: 512
+          interpolation: 3
+      - target: torchvision.transforms.RandomCrop
+        params:
+          size: 512
+      postprocess:
+        target: ldm.data.laion.AddMask
+        params:
+          mode: "512train-large"
+          p_drop: 0.25
+    # NOTE use enough shards to avoid empty validation loops in workers
+    validation:
+      shards:
+        - "pipe:aws s3 cp s3://deep-floyd-s3/datasets/laion_cleaned-part5/{93001..94333}.tar - "
+      shuffle: 0
+      image_key: jpg
+      image_transforms:
+      - target: torchvision.transforms.Resize
+        params:
+          size: 512
+          interpolation: 3
+      - target: torchvision.transforms.CenterCrop
+        params:
+          size: 512
+      postprocess:
+        target: ldm.data.laion.AddMask
+        params:
+          mode: "512train-large"
+          p_drop: 0.25
+
+lightning:
+  find_unused_parameters: True
+  modelcheckpoint:
+    params:
+      every_n_train_steps: 5000
+
+  callbacks:
+    metrics_over_trainsteps_checkpoint:
+      params:
+        every_n_train_steps: 10000
+
+    image_logger:
+      target: main.ImageLogger
+      params:
+        enable_autocast: False
+        disabled: False
+        batch_frequency: 1000
+        max_images: 4
+        increase_log_steps: False
+        log_first_step: False
+        log_images_kwargs:
+          use_ema_scope: False
+          inpaint: False
+          plot_progressive_rows: False
+          plot_diffusion_rows: False
+          N: 4
+          unconditional_guidance_scale: 5.0
+          unconditional_guidance_label: [""]
+          ddim_steps: 50  # todo check these out for depth2img,
+          ddim_eta: 0.0   # todo check these out for depth2img,
+
+  trainer:
+    benchmark: True
+    val_check_interval: 5000000
+    num_sanity_val_steps: 0
+    accumulate_grad_batches: 1

invokeai/frontend/install/invokeai_update.py

@@ -108,11 +108,11 @@ def main():
 
     print(f':crossed_fingers: Upgrading to [yellow]{tag if tag else release}[/yellow]')
     if release:
-        cmd = f"pip install 'invokeai{extras} @ {INVOKE_AI_SRC}/{release}.zip' --use-pep517 --upgrade"
+        cmd = f'pip install "invokeai{extras} @ {INVOKE_AI_SRC}/{release}.zip" --use-pep517 --upgrade'
     elif tag:
-        cmd = f"pip install 'invokeai{extras} @ {INVOKE_AI_TAG}/{tag}.zip' --use-pep517 --upgrade"
+        cmd = f'pip install "invokeai{extras} @ {INVOKE_AI_TAG}/{tag}.zip" --use-pep517 --upgrade'
     else:
-        cmd = f"pip install 'invokeai{extras} @ {INVOKE_AI_BRANCH}/{branch}.zip' --use-pep517 --upgrade"
+        cmd = f'pip install "invokeai{extras} @ {INVOKE_AI_BRANCH}/{branch}.zip" --use-pep517 --upgrade'
     print('')
     print('')
     if os.system(cmd)==0:

invokeai/frontend/install/model_install.py

@@ -11,7 +11,6 @@ The work is actually done in backend code in model_install_backend.py.
 
 import argparse
 import curses
-import os
 import sys
 import textwrap
 import traceback
@@ -20,28 +19,22 @@ from multiprocessing import Process
 from multiprocessing.connection import Connection, Pipe
 from pathlib import Path
 from shutil import get_terminal_size
-from typing import List
 
 import logging
 import npyscreen
 import torch
 from npyscreen import widget
-from omegaconf import OmegaConf
 
 from invokeai.backend.util.logging import InvokeAILogger
 
 from invokeai.backend.install.model_install_backend import (
-    Dataset_path,
-    default_config_file,
-    default_dataset,
-    install_requested_models,
-    recommended_datasets,
     ModelInstallList,
-    UserSelections,
+    InstallSelections,
+    ModelInstall,
+    SchedulerPredictionType,
 )
-from invokeai.backend import ModelManager
+from invokeai.backend.model_management import ModelManager, ModelType
 from invokeai.backend.util import choose_precision, choose_torch_device
-from invokeai.backend.util.logging import InvokeAILogger
 from invokeai.frontend.install.widgets import (
     CenteredTitleText,
     MultiSelectColumns,
@@ -58,6 +51,7 @@ from invokeai.frontend.install.widgets import (
 from invokeai.app.services.config import InvokeAIAppConfig
 
 config = InvokeAIAppConfig.get_config()
+logger = InvokeAILogger.getLogger()
 
 # build a table mapping all non-printable characters to None
 # for stripping control characters
@@ -71,8 +65,8 @@ def make_printable(s:str)->str:
     return s.translate(NOPRINT_TRANS_TABLE)
 
 class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
-    # for responsive resizing - disabled
-    # FIX_MINIMUM_SIZE_WHEN_CREATED = False
+    # for responsive resizing set to False, but this seems to cause a crash!
+    FIX_MINIMUM_SIZE_WHEN_CREATED = True
     
     # for persistence
     current_tab = 0
@@ -90,25 +84,10 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         if not config.model_conf_path.exists():
             with open(config.model_conf_path,'w') as file:
                 print('# InvokeAI model configuration file',file=file)
-        model_manager = ModelManager(config.model_conf_path)
-        
-        self.starter_models = OmegaConf.load(Dataset_path)['diffusers']
-        self.installed_diffusers_models = self.list_additional_diffusers_models(
-             model_manager,
-             self.starter_models,
-        )
-        self.installed_cn_models = model_manager.list_controlnet_models()
-        self.installed_lora_models = model_manager.list_lora_models()
-        self.installed_ti_models = model_manager.list_ti_models()
-
-        try:
-            self.existing_models = OmegaConf.load(default_config_file())
-        except:
-            self.existing_models = dict()
-            
-        self.starter_model_list = list(self.starter_models.keys())
-        self.installed_models = dict()
-
+        self.installer = ModelInstall(config)
+        self.all_models = self.installer.all_models()
+        self.starter_models = self.installer.starter_models()
+        self.model_labels = self._get_model_labels()        
         window_width, window_height = get_terminal_size()
 
         self.nextrely -= 1
@@ -141,39 +120,37 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
             scroll_exit = True,
         )
         self.tabs.on_changed = self._toggle_tables
-        
+
         top_of_table = self.nextrely
-        self.starter_diffusers_models = self.add_starter_diffusers()
+        self.starter_pipelines = self.add_starter_pipelines()
         bottom_of_table = self.nextrely
 
         self.nextrely = top_of_table
-        self.diffusers_models = self.add_diffusers_widgets(
-            predefined_models=self.installed_diffusers_models,
-            model_type='Diffusers',
+        self.pipeline_models = self.add_pipeline_widgets(
+            model_type=ModelType.Main,
             window_width=window_width,
+            exclude = self.starter_models
         )
+        # self.pipeline_models['autoload_pending'] = True
         bottom_of_table = max(bottom_of_table,self.nextrely)
 
         self.nextrely = top_of_table
         self.controlnet_models = self.add_model_widgets(
-            predefined_models=self.installed_cn_models,
-            model_type='ControlNet',
+            model_type=ModelType.ControlNet,
             window_width=window_width,
         )
         bottom_of_table = max(bottom_of_table,self.nextrely)
 
         self.nextrely = top_of_table
         self.lora_models = self.add_model_widgets(
-            predefined_models=self.installed_lora_models,
-            model_type="LoRA/LyCORIS",
+            model_type=ModelType.Lora,
             window_width=window_width,
         )
         bottom_of_table = max(bottom_of_table,self.nextrely)
 
         self.nextrely = top_of_table
         self.ti_models = self.add_model_widgets(
-            predefined_models=self.installed_ti_models,
-            model_type="Textual Inversion Embeddings",
+            model_type=ModelType.TextualInversion,
             window_width=window_width,
         )
         bottom_of_table = max(bottom_of_table,self.nextrely)
@@ -184,7 +161,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
             BufferBox,
             name='Log Messages',
             editable=False,
-            max_height = 16,
+            max_height = 10,
         )
         
         self.nextrely += 1
@@ -197,13 +174,14 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
                 rely=-3,
                 when_pressed_function=self.on_back,
             )
-        self.ok_button = self.add_widget_intelligent(
-            npyscreen.ButtonPress,
-            name=done_label,
-            relx=(window_width - len(done_label)) // 2,
-            rely=-3,
-            when_pressed_function=self.on_execute
-        )
+        else:
+            self.ok_button = self.add_widget_intelligent(
+                npyscreen.ButtonPress,
+                name=done_label,
+                relx=(window_width - len(done_label)) // 2,
+                rely=-3,
+                when_pressed_function=self.on_execute
+            )
 
         label = "APPLY CHANGES & EXIT"
         self.done = self.add_widget_intelligent(
@@ -220,18 +198,15 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         self._toggle_tables([self.current_tab])
 
     ############# diffusers tab ##########        
-    def add_starter_diffusers(self)->dict[str, npyscreen.widget]:
+    def add_starter_pipelines(self)->dict[str, npyscreen.widget]:
         '''Add widgets responsible for selecting diffusers models'''
         widgets = dict()
-
-        starter_model_labels = self._get_starter_model_labels()
-        recommended_models = [
-            x
-            for x in self.starter_model_list
-            if self.starter_models[x].get("recommended", False)
-        ]
+        models = self.all_models
+        starters = self.starter_models
+        starter_model_labels = self.model_labels
+        
         self.installed_models = sorted(
-            [x for x in list(self.starter_models.keys()) if x in self.existing_models]
+            [x for x in starters if models[x].installed]
         )
 
         widgets.update(
@@ -246,55 +221,46 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         self.nextrely -= 1
         # if user has already installed some initial models, then don't patronize them
         # by showing more recommendations
-        show_recommended = not self.existing_models
+        show_recommended = len(self.installed_models)==0
+        keys = [x for x in models.keys() if x in starters]
         widgets.update(
             models_selected = self.add_widget_intelligent(
                 MultiSelectColumns,
                 columns=1,
                 name="Install Starter Models",
-                values=starter_model_labels,
+                values=[starter_model_labels[x] for x in keys],
                 value=[
-                    self.starter_model_list.index(x)
-                    for x in self.starter_model_list
-                    if (show_recommended and x in recommended_models)\
-                    or (x in self.existing_models)
+                    keys.index(x)
+                    for x in keys
+                    if (show_recommended and models[x].recommended) \
+                    or (x in self.installed_models)
                 ],
-                max_height=len(starter_model_labels) + 1,
+                max_height=len(starters) + 1,
                 relx=4,
                 scroll_exit=True,
-            )
+            ),
+            models = keys,
         )
 
-        widgets.update(
-            purge_deleted = self.add_widget_intelligent(
-                npyscreen.Checkbox,
-                name="Purge unchecked diffusers models from disk",
-                value=False,
-                scroll_exit=True,
-                relx=4,
-            )
-        )
-        widgets['purge_deleted'].when_value_edited = lambda: self.sync_purge_buttons(widgets['purge_deleted'])
-        
         self.nextrely += 1
         return widgets
 
     ############# Add a set of model install widgets ########
     def add_model_widgets(self,
-                          predefined_models: dict[str,bool],
-                          model_type: str,
+                          model_type: ModelType,
                           window_width: int=120,
                           install_prompt: str=None,
-                          add_purge_deleted: bool=False,
+                          exclude: set=set(),
                           )->dict[str,npyscreen.widget]:
         '''Generic code to create model selection widgets'''
         widgets = dict()
-        model_list = sorted(predefined_models.keys())
+        model_list = [x for x in self.all_models if self.all_models[x].model_type==model_type and not x in exclude]
+        model_labels = [self.model_labels[x] for x in model_list]
         if len(model_list) > 0:
-            max_width = max([len(x) for x in model_list])
+            max_width = max([len(x) for x in model_labels])
             columns = window_width // (max_width+8)  # 8 characters for "[x] " and padding
             columns = min(len(model_list),columns) or 1
-            prompt = install_prompt or f"Select the desired {model_type} models to install. Unchecked models will be purged from disk."
+            prompt = install_prompt or f"Select the desired {model_type.value.title()} models to install. Unchecked models will be purged from disk."
 
             widgets.update(
                 label1 = self.add_widget_intelligent(
@@ -310,31 +276,19 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
                     MultiSelectColumns,
                     columns=columns,
                     name=f"Install {model_type} Models",
-                    values=model_list,
+                    values=model_labels,
                     value=[
                         model_list.index(x)
                         for x in model_list
-                        if predefined_models[x]
+                        if self.all_models[x].installed
                     ],
                     max_height=len(model_list)//columns + 1,
                     relx=4,
                     scroll_exit=True,
-                )
+                ),
+                models = model_list,
             )
 
-            if add_purge_deleted:
-                self.nextrely += 1
-                widgets.update(
-                    purge_deleted = self.add_widget_intelligent(
-                        npyscreen.Checkbox,
-                        name="Purge unchecked diffusers models from disk",
-                        value=False,
-                        scroll_exit=True,
-                        relx=4,
-                    )
-                )
-                widgets['purge_deleted'].when_value_edited = lambda: self.sync_purge_buttons(widgets['purge_deleted'])
-
         self.nextrely += 1
         widgets.update(
             download_ids = self.add_widget_intelligent(
@@ -348,63 +302,33 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         return widgets
 
     ### Tab for arbitrary diffusers widgets ###
-    def add_diffusers_widgets(self,
-                              predefined_models: dict[str,bool],
-                              model_type: str='Diffusers',
-                              window_width: int=120,
-                              )->dict[str,npyscreen.widget]:
+    def add_pipeline_widgets(self,
+                             model_type: ModelType=ModelType.Main,
+                             window_width: int=120,
+                             **kwargs,
+                             )->dict[str,npyscreen.widget]:
         '''Similar to add_model_widgets() but adds some additional widgets at the bottom
         to support the autoload directory'''
         widgets = self.add_model_widgets(
-            predefined_models,
-            'Diffusers',
-            window_width,
-            install_prompt="Additional diffusers models already installed.",
-            add_purge_deleted=True
+            model_type = model_type,
+            window_width = window_width,
+            install_prompt=f"Additional {model_type.value.title()} models already installed.",
+            **kwargs,
         )
 
-        label = "Directory to scan for models to automatically import (<tab> autocompletes):"
-        self.nextrely += 1
-        widgets.update(
-            autoload_directory = self.add_widget_intelligent(
-                FileBox,
-                max_height=3,
-                name=label,
-                value=str(config.autoconvert_dir) if config.autoconvert_dir else None,
-                select_dir=True,
-                must_exist=True,
-                use_two_lines=False,
-                labelColor="DANGER",
-                begin_entry_at=len(label)+1,
-                scroll_exit=True,
-            )
-        )
-        widgets.update(
-            autoscan_on_startup = self.add_widget_intelligent(
-                npyscreen.Checkbox,
-                name="Scan and import from this directory each time InvokeAI starts",
-                value=config.autoconvert_dir is not None,
-                relx=4,
-                scroll_exit=True,
-            )
-        )
         return widgets
 
-    def sync_purge_buttons(self,checkbox):
-        value = checkbox.value
-        self.starter_diffusers_models['purge_deleted'].value = value
-        self.diffusers_models['purge_deleted'].value = value
-        
     def resize(self):
         super().resize()
-        if (s := self.starter_diffusers_models.get("models_selected")):
-            s.values = self._get_starter_model_labels()
+        if (s := self.starter_pipelines.get("models_selected")):
+            keys = [x for x in self.all_models.keys() if x in self.starter_models]
+            s.values = [self.model_labels[x] for x in keys]
 
     def _toggle_tables(self, value=None):
         selected_tab = value[0]
         widgets = [
-            self.starter_diffusers_models,
-            self.diffusers_models,
+            self.starter_pipelines,
+            self.pipeline_models,
             self.controlnet_models,
             self.lora_models,
             self.ti_models,
@@ -412,34 +336,38 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
 
         for group in widgets:
             for k,v in group.items():
-                v.hidden = True
-                v.editable = False
+                try:
+                    v.hidden = True
+                    v.editable = False
+                except:
+                    pass
         for k,v in widgets[selected_tab].items():
-            v.hidden = False
-            if not isinstance(v,(npyscreen.FixedText, npyscreen.TitleFixedText, CenteredTitleText)):
-                v.editable = True
+            try:
+                v.hidden = False
+                if not isinstance(v,(npyscreen.FixedText, npyscreen.TitleFixedText, CenteredTitleText)):
+                    v.editable = True
+            except:
+                pass
         self.__class__.current_tab = selected_tab  # for persistence
         self.display()
 
-    def _get_starter_model_labels(self) -> List[str]:
+    def _get_model_labels(self) -> dict[str,str]:
         window_width, window_height = get_terminal_size()
-        label_width = 25
         checkbox_width = 4
         spacing_width = 2
+        
+        models = self.all_models
+        label_width = max([len(models[x].name) for x in models])
         description_width = window_width - label_width - checkbox_width - spacing_width
-        im = self.starter_models
-        names = self.starter_model_list
-        descriptions = [
-            im[x].description[0 : description_width - 3] + "..."
-            if len(im[x].description) > description_width
-            else im[x].description
-            for x in names
-        ]
-        return [
-            f"%-{label_width}s %s" % (names[x], descriptions[x])
-            for x in range(0, len(names))
-        ]
 
+        result = dict()
+        for x in models.keys():
+            description = models[x].description
+            description = description[0 : description_width - 3] + "..." \
+                if description and len(description) > description_width \
+                   else description if description else ''
+            result[x] =  f"%-{label_width}s %s" % (models[x].name, description)
+        return result
             
     def _get_columns(self) -> int:
         window_width, window_height = get_terminal_size()
@@ -454,10 +382,21 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         )
         return min(cols, len(self.installed_models))
 
+    def confirm_deletions(self, selections: InstallSelections)->bool:
+        remove_models = selections.remove_models
+        if len(remove_models) > 0:
+            mods = "\n".join([ModelManager.parse_key(x)[0] for x in remove_models])
+            return npyscreen.notify_ok_cancel(f"These unchecked models will be deleted from disk. Continue?\n---------\n{mods}")
+        else:
+            return True
+
     def on_execute(self):
-        self.monitor.entry_widget.buffer(['Processing...'],scroll_end=True)
         self.marshall_arguments()
         app = self.parentApp
+        if not self.confirm_deletions(app.install_selections):
+            return
+            
+        self.monitor.entry_widget.buffer(['Processing...'],scroll_end=True)
         self.ok_button.hidden = True
         self.display()
         
@@ -467,7 +406,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
             target = process_and_execute,
             kwargs=dict(
                 opt = app.program_opts,
-                selections = app.user_selections,
+                selections = app.install_selections,
                 conn_out = child_conn,
             )
         )
@@ -475,8 +414,8 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         child_conn.close()
         self.subprocess_connection = parent_conn
         self.subprocess = p
-        app.user_selections = UserSelections()
-        # process_and_execute(app.opt, app.user_selections)
+        app.install_selections = InstallSelections()
+        # process_and_execute(app.opt, app.install_selections)
 
     def on_back(self):
         self.parentApp.switchFormPrevious()
@@ -489,10 +428,12 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         
     def on_done(self):
         self.marshall_arguments()
+        if not self.confirm_deletions(self.parentApp.install_selections):
+            return
         self.parentApp.setNextForm(None)
         self.parentApp.user_cancelled = False
         self.editing = False
-
+        
     ########## This routine monitors the child process that is performing model installation and removal #####
     def while_waiting(self):
         '''Called during idle periods. Main task is to update the Log Messages box with messages
@@ -548,8 +489,8 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         
         # rebuild the form, saving and restoring some of the fields that need to be preserved.
         saved_messages = self.monitor.entry_widget.values
-        autoload_dir = self.diffusers_models['autoload_directory'].value
-        autoscan = self.diffusers_models['autoscan_on_startup'].value
+        # autoload_dir = str(config.root_path / self.pipeline_models['autoload_directory'].value)
+        # autoscan = self.pipeline_models['autoscan_on_startup'].value
         
         app.main_form = app.addForm(
             "MAIN", addModelsForm, name="Install Stable Diffusion Models", multipage=self.multipage,
@@ -558,23 +499,8 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         
         app.main_form.monitor.entry_widget.values = saved_messages
         app.main_form.monitor.entry_widget.buffer([''],scroll_end=True)
-        app.main_form.diffusers_models['autoload_directory'].value = autoload_dir
-        app.main_form.diffusers_models['autoscan_on_startup'].value = autoscan
-        
-    ###############################################################
-    
-    def list_additional_diffusers_models(self,
-                                         manager: ModelManager,
-                                         starters:dict
-                                         )->dict[str,bool]:
-        '''Return a dict of all the currently installed models that are not on the starter list'''
-        model_info = manager.list_models()
-        additional_models = {
-            x:True for x in model_info \
-            if model_info[x]['format']=='diffusers' \
-            and x not in starters
-        }
-        return additional_models
+        # app.main_form.pipeline_models['autoload_directory'].value = autoload_dir
+        # app.main_form.pipeline_models['autoscan_on_startup'].value = autoscan
         
     def marshall_arguments(self):
         """
@@ -586,89 +512,40 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         .autoscan_on_startup:  True if invokeai should scan and import at startup time
         .import_model_paths:   list of URLs, repo_ids and file paths to import
         """
-        # we're using a global here rather than storing the result in the parentapp
-        # due to some bug in npyscreen that is causing attributes to be lost
-        selections = self.parentApp.user_selections
+        selections = self.parentApp.install_selections
+        all_models = self.all_models
 
-        # Starter models to install/remove
-        starter_models = dict(
-            map(
-                lambda x: (self.starter_model_list[x], True),
-                self.starter_diffusers_models['models_selected'].value,
-            )
-        )
-        selections.purge_deleted_models = self.starter_diffusers_models['purge_deleted'].value or \
-            self.diffusers_models['purge_deleted'].value
-        
-        selections.install_models = [x for x in starter_models if x not in self.existing_models]
-        selections.remove_models = [x for x in self.starter_model_list if x in self.existing_models and x not in starter_models]
+        # Defined models (in INITIAL_CONFIG.yaml or models.yaml) to add/remove
+        ui_sections = [self.starter_pipelines, self.pipeline_models,
+                       self.controlnet_models, self.lora_models, self.ti_models]
+        for section in ui_sections:
+            if not 'models_selected' in section:
+                continue
+            selected = set([section['models'][x] for x in section['models_selected'].value])
+            models_to_install = [x for x in selected if not self.all_models[x].installed]
+            models_to_remove = [x for x in section['models'] if x not in selected and self.all_models[x].installed]
+            selections.remove_models.extend(models_to_remove)
+            selections.install_models.extend(all_models[x].path or all_models[x].repo_id \
+                                             for x in models_to_install if all_models[x].path or all_models[x].repo_id)
 
-        # "More" models
-        selections.import_model_paths = self.diffusers_models['download_ids'].value.split()
-        if diffusers_selected := self.diffusers_models.get('models_selected'):
-            selections.remove_models.extend([x
-                                             for x in diffusers_selected.values
-                                             if self.installed_diffusers_models[x]
-                                             and diffusers_selected.values.index(x) not in diffusers_selected.value
-                                             ]
-                                            )
-                                        
-        # TODO: REFACTOR THIS REPETITIVE CODE
-        if cn_models_selected := self.controlnet_models.get('models_selected'):
-            selections.install_cn_models = [cn_models_selected.values[x]
-                                            for x in cn_models_selected.value
-                                            if not self.installed_cn_models[cn_models_selected.values[x]]
-                                            ]
-            selections.remove_cn_models = [x
-                                           for x in cn_models_selected.values
-                                           if self.installed_cn_models[x]
-                                           and cn_models_selected.values.index(x) not in cn_models_selected.value
-                                           ]
-        if (additional_cns := self.controlnet_models['download_ids'].value.split()):
-            valid_cns = [x for x in additional_cns if '/' in x]
-            selections.install_cn_models.extend(valid_cns)
+        # models located in the 'download_ids" section
+        for section in ui_sections:
+            if downloads := section.get('download_ids'):
+                selections.install_models.extend(downloads.value.split())
 
-        # same thing, for LoRAs
-        if loras_selected := self.lora_models.get('models_selected'):
-            selections.install_lora_models = [loras_selected.values[x]
-                                              for x in loras_selected.value
-                                              if not self.installed_lora_models[loras_selected.values[x]]
-                                              ]
-            selections.remove_lora_models = [x
-                                             for x in loras_selected.values
-                                             if self.installed_lora_models[x]
-                                             and loras_selected.values.index(x) not in loras_selected.value
-                                             ]
-        if (additional_loras := self.lora_models['download_ids'].value.split()):
-            selections.install_lora_models.extend(additional_loras)
-
-        # same thing, for TIs
-        # TODO: refactor
-        if tis_selected := self.ti_models.get('models_selected'):
-            selections.install_ti_models = [tis_selected.values[x]
-                                            for x in tis_selected.value
-                                            if not self.installed_ti_models[tis_selected.values[x]]
-                                            ]
-            selections.remove_ti_models = [x
-                                           for x in tis_selected.values
-                                           if self.installed_ti_models[x]
-                                           and tis_selected.values.index(x) not in tis_selected.value
-                                           ]
-                
-        if (additional_tis := self.ti_models['download_ids'].value.split()):
-            selections.install_ti_models.extend(additional_tis)
-            
         # load directory and whether to scan on startup
-        selections.scan_directory = self.diffusers_models['autoload_directory'].value
-        selections.autoscan_on_startup = self.diffusers_models['autoscan_on_startup'].value
-
+        # if self.parentApp.autoload_pending:
+        #     selections.scan_directory = str(config.root_path / self.pipeline_models['autoload_directory'].value)
+        #     self.parentApp.autoload_pending = False
+        # selections.autoscan_on_startup = self.pipeline_models['autoscan_on_startup'].value
 
 class AddModelApplication(npyscreen.NPSAppManaged):
     def __init__(self,opt):
         super().__init__()
         self.program_opts = opt
         self.user_cancelled = False
-        self.user_selections = UserSelections()
+        # self.autoload_pending = True
+        self.install_selections = InstallSelections()
 
     def onStart(self):
         npyscreen.setTheme(npyscreen.Themes.DefaultTheme)
@@ -687,26 +564,22 @@ class StderrToMessage():
         pass
 
 # --------------------------------------------------------
-def ask_user_for_config_file(model_path: Path,
-                             tui_conn: Connection=None
-                             )->Path:
+def ask_user_for_prediction_type(model_path: Path,
+                                 tui_conn: Connection=None
+                                 )->SchedulerPredictionType:
     if tui_conn:
         logger.debug('Waiting for user response...')
-        return _ask_user_for_cf_tui(model_path, tui_conn)        
+        return _ask_user_for_pt_tui(model_path, tui_conn)        
     else:
-        return _ask_user_for_cf_cmdline(model_path)
+        return _ask_user_for_pt_cmdline(model_path)
 
-def _ask_user_for_cf_cmdline(model_path):
-    choices = [
-        config.legacy_conf_path / x
-        for x in ['v2-inference.yaml','v2-inference-v.yaml']
-    ]
-    choices.extend([None])
+def _ask_user_for_pt_cmdline(model_path: Path)->SchedulerPredictionType:
+    choices = [SchedulerPredictionType.Epsilon, SchedulerPredictionType.VPrediction, None]
     print(
 f"""
 Please select the type of the V2 checkpoint named {model_path.name}:
-[1] A Stable Diffusion v2.x base model (512 pixels; there should be no 'parameterization:' line in its yaml file)
-[2] A Stable Diffusion v2.x v-predictive model (768 pixels; look for a 'parameterization: "v"' line in its yaml file)
+[1] A model based on Stable Diffusion v2 trained on 512 pixel images (SD-2-base)
+[2] A model based on Stable Diffusion v2 trained on 768 pixel images (SD-2-768)
 [3] Skip this model and come back later.
 """
         )
@@ -723,7 +596,7 @@ Please select the type of the V2 checkpoint named {model_path.name}:
             return
     return choice
         
-def _ask_user_for_cf_tui(model_path: Path, tui_conn: Connection)->Path:
+def _ask_user_for_pt_tui(model_path: Path, tui_conn: Connection)->SchedulerPredictionType:
     try:
         tui_conn.send_bytes(f'*need v2 config for:{model_path}'.encode('utf-8'))
         # note that we don't do any status checking here
@@ -731,20 +604,20 @@ def _ask_user_for_cf_tui(model_path: Path, tui_conn: Connection)->Path:
         if response is None:
             return None
         elif response == 'epsilon':
-            return config.legacy_conf_path / 'v2-inference.yaml'
+            return SchedulerPredictionType.epsilon
         elif response == 'v':
-            return config.legacy_conf_path  / 'v2-inference-v.yaml'
+            return SchedulerPredictionType.VPrediction
         elif response == 'abort':
             logger.info('Conversion aborted')
             return None
         else:
-            return Path(response)
+            return response
     except:
         return None
         
 # --------------------------------------------------------
 def process_and_execute(opt: Namespace,
-                        selections: UserSelections,
+                        selections: InstallSelections,
                         conn_out: Connection=None,
                         ):
     # set up so that stderr is sent to conn_out
@@ -755,34 +628,14 @@ def process_and_execute(opt: Namespace,
         logger = InvokeAILogger.getLogger()
         logger.handlers.clear()
         logger.addHandler(logging.StreamHandler(translator))
-    
-    models_to_install = selections.install_models
-    models_to_remove = selections.remove_models
-    directory_to_scan = selections.scan_directory
-    scan_at_startup = selections.autoscan_on_startup
-    potential_models_to_install = selections.import_model_paths
 
-    install_requested_models(
-        diffusers = ModelInstallList(models_to_install, models_to_remove),
-        controlnet = ModelInstallList(selections.install_cn_models, selections.remove_cn_models),
-        lora = ModelInstallList(selections.install_lora_models, selections.remove_lora_models),
-        ti = ModelInstallList(selections.install_ti_models, selections.remove_ti_models),
-        scan_directory=Path(directory_to_scan) if directory_to_scan else None,
-        external_models=potential_models_to_install,
-        scan_at_startup=scan_at_startup,
-        precision="float32"
-        if opt.full_precision
-        else choose_precision(torch.device(choose_torch_device())),
-        purge_deleted=selections.purge_deleted_models,
-        config_file_path=Path(opt.config_file) if opt.config_file else config.model_conf_path,
-        model_config_file_callback = lambda x: ask_user_for_config_file(x,conn_out)
-    )
+    installer = ModelInstall(config, prediction_type_helper=lambda x: ask_user_for_prediction_type(x,conn_out))
+    installer.install(selections)
 
     if conn_out:
         conn_out.send_bytes('*done*'.encode('utf-8'))
         conn_out.close()
 
-
 def do_listings(opt)->bool:
     """List installed models of various sorts, and return
     True if any were requested."""
@@ -813,38 +666,32 @@ def select_and_download_models(opt: Namespace):
         if opt.full_precision
         else choose_precision(torch.device(choose_torch_device()))
     )
-
-    if do_listings(opt):
-        pass
-    # this processes command line additions/removals
-    elif opt.diffusers or opt.controlnets or opt.textual_inversions or opt.loras:
-        action = 'remove_models' if opt.delete else 'install_models'
-        diffusers_args = {'diffusers':ModelInstallList(remove_models=opt.diffusers or [])} \
-                          if opt.delete \
-                          else {'external_models':opt.diffusers or []} 
-        install_requested_models(
-            **diffusers_args,
-            controlnet=ModelInstallList(**{action:opt.controlnets or []}),
-            ti=ModelInstallList(**{action:opt.textual_inversions or []}),
-            lora=ModelInstallList(**{action:opt.loras or []}),
-            precision=precision,
-            purge_deleted=True,
-            model_config_file_callback=lambda x: ask_user_for_config_file(x),
+    config.precision = precision
+    helper = lambda x: ask_user_for_prediction_type(x)
+    # if do_listings(opt):
+    # pass
+    
+    installer = ModelInstall(config, prediction_type_helper=helper)
+    if opt.add or opt.delete:
+        selections = InstallSelections(
+            install_models = opt.add or [],
+            remove_models = opt.delete or []
         )
+        installer.install(selections)
     elif opt.default_only:
-        install_requested_models(
-            diffusers=ModelInstallList(install_models=default_dataset()),
-            precision=precision,
+        selections = InstallSelections(
+            install_models = installer.default_model()
         )
+        installer.install(selections)
     elif opt.yes_to_all:
-        install_requested_models(
-            diffusers=ModelInstallList(install_models=recommended_datasets()),
-            precision=precision,
+        selections = InstallSelections(
+            install_models = installer.recommended_models()
         )
+        installer.install(selections)
 
     # this is where the TUI is called
     else:
-        # needed because the torch library is loaded, even though we don't use it
+        # needed to support the probe() method running under a subprocess
         torch.multiprocessing.set_start_method("spawn")
 
         # the third argument is needed in the Windows 11 environment in
@@ -861,35 +708,20 @@ def select_and_download_models(opt: Namespace):
                     installApp.main_form.subprocess.terminate()
                     installApp.main_form.subprocess = None
             raise e
-        process_and_execute(opt, installApp.user_selections)
+        process_and_execute(opt, installApp.install_selections)
 
 # -------------------------------------
 def main():
     parser = argparse.ArgumentParser(description="InvokeAI model downloader")
     parser.add_argument(
-        "--diffusers",
+        "--add",
         nargs="*",
-        help="List of URLs or repo_ids of diffusers to install/delete",
-    )
-    parser.add_argument(
-        "--loras",
-        nargs="*",
-        help="List of URLs or repo_ids of LoRA/LyCORIS models to install/delete",
-    )
-    parser.add_argument(
-        "--controlnets",
-        nargs="*",
-        help="List of URLs or repo_ids of controlnet models to install/delete",
-    )
-    parser.add_argument(
-        "--textual-inversions",
-        nargs="*",
-        help="List of URLs or repo_ids of textual inversion embeddings to install/delete",
+        help="List of URLs, local paths or repo_ids of models to install",
     )
     parser.add_argument(
         "--delete",
-        action="store_true",
-        help="Delete models listed on command line rather than installing them",
+        nargs="*",
+        help="List of names of models to idelete",
     )
     parser.add_argument(
         "--full-precision",
@@ -909,7 +741,7 @@ def main():
     parser.add_argument(
         "--default_only",
         action="store_true",
-        help="only install the default model",
+        help="Only install the default model",
     )
     parser.add_argument(
         "--list-models",

invokeai/frontend/install/widgets.py

@@ -17,8 +17,8 @@ from shutil import get_terminal_size
 from curses import BUTTON2_CLICKED,BUTTON3_CLICKED
 
 # minimum size for UIs
-MIN_COLS = 120
-MIN_LINES = 50
+MIN_COLS = 130
+MIN_LINES = 45
 
 # -------------------------------------
 def set_terminal_size(columns: int, lines: int, launch_command: str=None):
@@ -73,6 +73,12 @@ def _set_terminal_size_unix(width: int, height: int):
     import fcntl
     import termios
 
+    # These terminals accept the size command and report that the
+    # size changed, but they lie!!!
+    for bad_terminal in ['TERMINATOR_UUID', 'ALACRITTY_WINDOW_ID']:
+        if os.environ.get(bad_terminal):
+            return
+    
     winsize = struct.pack("HHHH", height, width, 0, 0)
     fcntl.ioctl(sys.stdout.fileno(), termios.TIOCSWINSZ, winsize)
     sys.stdout.write("\x1b[8;{height};{width}t".format(height=height, width=width))
@@ -87,6 +93,12 @@ def set_min_terminal_size(min_cols: int, min_lines: int, launch_command: str=Non
     lines = max(term_lines, min_lines)
     set_terminal_size(cols, lines, launch_command)
 
+    # did it work?
+    term_cols, term_lines = get_terminal_size()
+    if term_cols < cols or term_lines < lines:
+        print(f'This window is too small for optimal display. For best results please enlarge it.')
+        input('After resizing, press any key to continue...')
+
 class IntSlider(npyscreen.Slider):
     def translate_value(self):
         stri = "%2d / %2d" % (self.value, self.out_of)
@@ -390,13 +402,12 @@ def select_stable_diffusion_config_file(
         wrap:bool =True,
         model_name:str='Unknown',
 ):
-    message = "Please select the correct base model for the V2 checkpoint named {model_name}. Press <CANCEL> to skip installation."
+    message = f"Please select the correct base model for the V2 checkpoint named '{model_name}'. Press <CANCEL> to skip installation."
     title = "CONFIG FILE SELECTION"
     options=[
         "An SD v2.x base model (512 pixels; no 'parameterization:' line in its yaml file)",
         "An SD v2.x v-predictive model (768 pixels; 'parameterization: \"v\"' line in its yaml file)",
         "Skip installation for now and come back later",
-        "Enter config file path manually",
     ]
 
     F = ConfirmCancelPopup(
@@ -418,35 +429,17 @@ def select_stable_diffusion_config_file(
     mlw.values = message
 
     choice = F.add(
-        SingleSelectWithChanged,
+        npyscreen.SelectOne,
         values = options,
         value = [0],
         max_height = len(options)+1,
         scroll_exit=True,
     )
-    file = F.add(
-        FileBox,
-        name='Path to config file',
-        max_height=3,
-        hidden=True,
-        must_exist=True,
-        scroll_exit=True
-    )
-
-    def toggle_visible(value):
-        value = value[0]
-        if value==3:
-            file.hidden=False
-        else:
-            file.hidden=True
-        F.display()
-        
-    choice.on_changed = toggle_visible
 
     F.editw = 1
     F.edit()
     if not F.value:
         return None
-    assert choice.value[0] in range(0,4),'invalid choice'
-    choices = ['epsilon','v','abort',file.value]
+    assert choice.value[0] in range(0,3),'invalid choice'
+    choices = ['epsilon','v','abort']
     return choices[choice.value[0]]

invokeai/frontend/legacy_launch_invokeai.py

@@ -0,0 +1,19 @@
+import os
+import sys
+import argparse
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--web', action='store_true')
+    opts,_ = parser.parse_known_args()
+
+    if opts.web:
+        sys.argv.pop(sys.argv.index('--web'))
+        from invokeai.app.api_app import invoke_api
+        invoke_api()
+    else:
+        from invokeai.app.cli_app import invoke_cli
+        invoke_cli()
+
+if __name__ == '__main__':
+    main()

invokeai/frontend/merge/__init__.py

@@ -1,4 +1,5 @@
 """
 Initialization file for invokeai.frontend.merge
 """
-from .merge_diffusers import main as invokeai_merge_diffusers, merge_diffusion_models
+from .merge_diffusers import main as invokeai_merge_diffusers
+

invokeai/frontend/merge/merge_diffusers.py

@@ -6,9 +6,7 @@ Copyright (c) 2023 Lincoln Stein and the InvokeAI Development Team
 """
 import argparse
 import curses
-import os
 import sys
-import warnings
 from argparse import Namespace
 from pathlib import Path
 from typing import List, Union
@@ -20,99 +18,15 @@ from npyscreen import widget
 from omegaconf import OmegaConf
 
 import invokeai.backend.util.logging as logger
-from invokeai.services.config import InvokeAIAppConfig
-from ...backend.model_management import ModelManager
-from ...frontend.install.widgets import FloatTitleSlider
+from invokeai.app.services.config import InvokeAIAppConfig
+from invokeai.backend.model_management import (
+    ModelMerger, MergeInterpolationMethod,
+    ModelManager, ModelType, BaseModelType,
+)
+from invokeai.frontend.install.widgets import FloatTitleSlider, TextBox, SingleSelectColumns
 
-DEST_MERGED_MODEL_DIR = "merged_models"
 config = InvokeAIAppConfig.get_config()
 
-def merge_diffusion_models(
-    model_ids_or_paths: List[Union[str, Path]],
-    alpha: float = 0.5,
-    interp: str = None,
-    force: bool = False,
-    **kwargs,
-) -> DiffusionPipeline:
-    """
-    model_ids_or_paths - up to three models, designated by their local paths or HuggingFace repo_ids
-    alpha  - The interpolation parameter. Ranges from 0 to 1.  It affects the ratio in which the checkpoints are merged. A 0.8 alpha
-               would mean that the first model checkpoints would affect the final result far less than an alpha of 0.2
-    interp - The interpolation method to use for the merging. Supports "sigmoid", "inv_sigmoid", "add_difference" and None.
-               Passing None uses the default interpolation which is weighted sum interpolation. For merging three checkpoints, only "add_difference" is supported.
-    force  - Whether to ignore mismatch in model_config.json for the current models. Defaults to False.
-
-    **kwargs - the default DiffusionPipeline.get_config_dict kwargs:
-         cache_dir, resume_download, force_download, proxies, local_files_only, use_auth_token, revision, torch_dtype, device_map
-    """
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        verbosity = dlogging.get_verbosity()
-        dlogging.set_verbosity_error()
-
-        pipe = DiffusionPipeline.from_pretrained(
-            model_ids_or_paths[0],
-            cache_dir=kwargs.get("cache_dir", config.cache_dir),
-            custom_pipeline="checkpoint_merger",
-        )
-        merged_pipe = pipe.merge(
-            pretrained_model_name_or_path_list=model_ids_or_paths,
-            alpha=alpha,
-            interp=interp,
-            force=force,
-            **kwargs,
-        )
-        dlogging.set_verbosity(verbosity)
-    return merged_pipe
-
-
-def merge_diffusion_models_and_commit(
-    models: List["str"],
-    merged_model_name: str,
-    alpha: float = 0.5,
-    interp: str = None,
-    force: bool = False,
-    **kwargs,
-):
-    """
-    models - up to three models, designated by their InvokeAI models.yaml model name
-    merged_model_name = name for new model
-    alpha  - The interpolation parameter. Ranges from 0 to 1.  It affects the ratio in which the checkpoints are merged. A 0.8 alpha
-               would mean that the first model checkpoints would affect the final result far less than an alpha of 0.2
-    interp - The interpolation method to use for the merging. Supports "weighted_average", "sigmoid", "inv_sigmoid", "add_difference" and None.
-               Passing None uses the default interpolation which is weighted sum interpolation. For merging three checkpoints, only "add_difference" is supported. Add_difference is A+(B-C).
-    force  - Whether to ignore mismatch in model_config.json for the current models. Defaults to False.
-
-    **kwargs - the default DiffusionPipeline.get_config_dict kwargs:
-         cache_dir, resume_download, force_download, proxies, local_files_only, use_auth_token, revision, torch_dtype, device_map
-    """
-    config_file = config.model_conf_path
-    model_manager = ModelManager(OmegaConf.load(config_file))
-    for mod in models:
-        assert mod in model_manager.model_names(), f'** Unknown model "{mod}"'
-        assert (
-            model_manager.model_info(mod).get("format", None) == "diffusers"
-        ), f"** {mod} is not a diffusers model. It must be optimized before merging."
-    model_ids_or_paths = [model_manager.model_name_or_path(x) for x in models]
-
-    merged_pipe = merge_diffusion_models(
-        model_ids_or_paths, alpha, interp, force, **kwargs
-    )
-    dump_path = config.models_dir / DEST_MERGED_MODEL_DIR
-
-    os.makedirs(dump_path, exist_ok=True)
-    dump_path = dump_path / merged_model_name
-    merged_pipe.save_pretrained(dump_path, safe_serialization=1)
-    import_args = dict(
-        model_name=merged_model_name, description=f'Merge of models {", ".join(models)}'
-    )
-    if vae := model_manager.config[models[0]].get("vae", None):
-        logger.info(f"Using configured VAE assigned to {models[0]}")
-        import_args.update(vae=vae)
-    model_manager.import_diffuser_model(dump_path, **import_args)
-    model_manager.commit(config_file)
-
-
 def _parse_args() -> Namespace:
     parser = argparse.ArgumentParser(description="InvokeAI model merging")
     parser.add_argument(
@@ -131,10 +45,17 @@ def _parse_args() -> Namespace:
     )
     parser.add_argument(
         "--models",
+        dest="model_names",
         type=str,
         nargs="+",
         help="Two to three model names to be merged",
     )
+    parser.add_argument(
+        "--base_model",
+        type=str,
+        choices=[x.value for x in BaseModelType],
+        help="The base model shared by the models to be merged",
+    )
     parser.add_argument(
         "--merged_model_name",
         "--destination",
@@ -192,6 +113,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
         window_height, window_width = curses.initscr().getmaxyx()
 
         self.model_names = self.get_model_names()
+        self.current_base = 0
         max_width = max([len(x) for x in self.model_names])
         max_width += 6
         horizontal_layout = max_width * 3 < window_width
@@ -208,12 +130,26 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             value="Use up and down arrows to move, <space> to select an item, <tab> and <shift-tab> to move from one field to the next.",
             editable=False,
         )
+        self.nextrely += 1
+        self.base_select = self.add_widget_intelligent(
+            SingleSelectColumns,
+            values=[
+                'Models Built on SD-1.x',
+                'Models Built on SD-2.x',
+            ],
+            value=[self.current_base],
+            columns = 4,
+            max_height = 2,
+            relx=8,
+            scroll_exit = True,
+        )
+        self.base_select.on_changed = self._populate_models
         self.add_widget_intelligent(
             npyscreen.FixedText,
             value="MODEL 1",
             color="GOOD",
             editable=False,
-            rely=4 if horizontal_layout else None,
+            rely=6 if horizontal_layout else None,
         )
         self.model1 = self.add_widget_intelligent(
             npyscreen.SelectOne,
@@ -222,7 +158,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             max_height=len(self.model_names),
             max_width=max_width,
             scroll_exit=True,
-            rely=5,
+            rely=7,
         )
         self.add_widget_intelligent(
             npyscreen.FixedText,
@@ -230,7 +166,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             color="GOOD",
             editable=False,
             relx=max_width + 3 if horizontal_layout else None,
-            rely=4 if horizontal_layout else None,
+            rely=6 if horizontal_layout else None,
         )
         self.model2 = self.add_widget_intelligent(
             npyscreen.SelectOne,
@@ -240,7 +176,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             max_height=len(self.model_names),
             max_width=max_width,
             relx=max_width + 3 if horizontal_layout else None,
-            rely=5 if horizontal_layout else None,
+            rely=7 if horizontal_layout else None,
             scroll_exit=True,
         )
         self.add_widget_intelligent(
@@ -249,7 +185,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             color="GOOD",
             editable=False,
             relx=max_width * 2 + 3 if horizontal_layout else None,
-            rely=4 if horizontal_layout else None,
+            rely=6 if horizontal_layout else None,
         )
         models_plus_none = self.model_names.copy()
         models_plus_none.insert(0, "None")
@@ -262,24 +198,26 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             max_width=max_width,
             scroll_exit=True,
             relx=max_width * 2 + 3 if horizontal_layout else None,
-            rely=5 if horizontal_layout else None,
+            rely=7 if horizontal_layout else None,
         )
         for m in [self.model1, self.model2, self.model3]:
             m.when_value_edited = self.models_changed
         self.merged_model_name = self.add_widget_intelligent(
-            npyscreen.TitleText,
+            TextBox,
             name="Name for merged model:",
             labelColor="CONTROL",
+            max_height=3,
             value="",
             scroll_exit=True,
         )
         self.force = self.add_widget_intelligent(
             npyscreen.Checkbox,
-            name="Force merge of incompatible models",
+            name="Force merge of models created by different diffusers library versions",
             labelColor="CONTROL",
-            value=False,
+            value=True,
             scroll_exit=True,
         )
+        self.nextrely += 1
         self.merge_method = self.add_widget_intelligent(
             npyscreen.TitleSelectOne,
             name="Merge Method:",
@@ -341,7 +279,8 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
             interp = self.interpolations[self.merge_method.value[0]]
 
         args = dict(
-            models=models,
+            model_names=models,
+            base_model=tuple(BaseModelType)[self.base_select.value[0]],
             alpha=self.alpha.value,
             interp=interp,
             force=self.force.value,
@@ -379,21 +318,30 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
         else:
             return True
 
-    def get_model_names(self) -> List[str]:
+    def get_model_names(self, base_model: BaseModelType=None) -> List[str]:
         model_names = [
-            name
-            for name in self.model_manager.model_names()
-            if self.model_manager.model_info(name).get("format") == "diffusers"
+            info["name"]
+            for info in self.model_manager.list_models(model_type=ModelType.Main, base_model=base_model)
+            if info["model_format"] == "diffusers"
         ]
         return sorted(model_names)
 
+    def _populate_models(self,value=None):
+        base_model = tuple(BaseModelType)[value[0]]
+        self.model_names = self.get_model_names(base_model)
+        
+        models_plus_none = self.model_names.copy()
+        models_plus_none.insert(0, "None")
+        self.model1.values = self.model_names
+        self.model2.values = self.model_names
+        self.model3.values = models_plus_none
+                  
+        self.display()
+
 class Mergeapp(npyscreen.NPSAppManaged):
-    def __init__(self):
+    def __init__(self, model_manager:ModelManager):
         super().__init__()
-        conf = OmegaConf.load(config.model_conf_path)
-        self.model_manager = ModelManager(
-            conf, "cpu", "float16"
-        )  # precision doesn't really matter here
+        self.model_manager = model_manager
 
     def onStart(self):
         npyscreen.setTheme(npyscreen.Themes.ElegantTheme)
@@ -401,44 +349,41 @@ class Mergeapp(npyscreen.NPSAppManaged):
 
 
 def run_gui(args: Namespace):
-    mergeapp = Mergeapp()
+    model_manager = ModelManager(config.model_conf_path)
+    mergeapp = Mergeapp(model_manager)
     mergeapp.run()
 
     args = mergeapp.merge_arguments
-    merge_diffusion_models_and_commit(**args)
+    merger = ModelMerger(model_manager)
+    merger.merge_diffusion_models_and_save(**args)
     logger.info(f'Models merged into new model: "{args["merged_model_name"]}".')
 
 
 def run_cli(args: Namespace):
     assert args.alpha >= 0 and args.alpha <= 1.0, "alpha must be between 0 and 1"
     assert (
-        args.models and len(args.models) >= 1 and len(args.models) <= 3
+        args.model_names and len(args.model_names) >= 1 and len(args.model_names) <= 3
     ), "Please provide the --models argument to list 2 to 3 models to merge. Use --help for full usage."
 
     if not args.merged_model_name:
-        args.merged_model_name = "+".join(args.models)
+        args.merged_model_name = "+".join(args.model_names)
         logger.info(
             f'No --merged_model_name provided. Defaulting to "{args.merged_model_name}"'
         )
 
-        model_manager = ModelManager(OmegaConf.load(config.model_conf_path))
-        assert (
-            args.clobber or args.merged_model_name not in model_manager.model_names()
-        ), f'A model named "{args.merged_model_name}" already exists. Use --clobber to overwrite.'
+    model_manager = ModelManager(config.model_conf_path)
+    assert (
+        not model_manager.model_exists(args.merged_model_name, args.base_model, ModelType.Main) or args.clobber
+    ), f'A model named "{args.merged_model_name}" already exists. Use --clobber to overwrite.'
 
-        merge_diffusion_models_and_commit(**vars(args))
-        logger.info(f'Models merged into new model: "{args.merged_model_name}".')
+    merger = ModelMerger(model_manager)
+    merger.merge_diffusion_models_and_save(**vars(args))
+    logger.info(f'Models merged into new model: "{args.merged_model_name}".')
 
 
 def main():
     args = _parse_args()
-    config.root = args.root_dir
-
-    cache_dir = config.cache_dir
-    os.environ[
-        "HF_HOME"
-    ] = cache_dir  # because not clear the merge pipeline is honoring cache_dir
-    args.cache_dir = cache_dir
+    config.parse_args(['--root',str(args.root_dir)])
 
     try:
         if args.front_end: