Merge branch 'main' into refactor/model-manager-2

invokeai/backend/install/invokeai_configure.py

@@ -32,7 +32,7 @@ from diffusers.pipelines.stable_diffusion.safety_checker import StableDiffusionS
 from huggingface_hub import HfFolder
 from huggingface_hub import login as hf_hub_login
 from omegaconf import OmegaConf
-from pydantic.error_wrappers import ValidationError
+from pydantic import ValidationError
 from tqdm import tqdm
 from transformers import AutoFeatureExtractor, BertTokenizerFast, CLIPTextConfig, CLIPTextModel, CLIPTokenizer
 

invokeai/backend/install/legacy_arg_parsing.py

@@ -38,6 +38,7 @@ SAMPLER_CHOICES = [
     "k_heun",
     "k_lms",
     "plms",
+    "lcm",
 ]
 
 PRECISION_CHOICES = [

invokeai/backend/model_management/lora.py

@@ -12,7 +12,7 @@ from diffusers.models import UNet2DConditionModel
 from safetensors.torch import load_file
 from transformers import CLIPTextModel, CLIPTokenizer
 
-from invokeai.app.invocations.shared import FreeUConfig
+from invokeai.app.shared.models import FreeUConfig
 
 from .models.lora import LoRAModel
 

invokeai/backend/stable_diffusion/schedulers/schedulers.py

@@ -10,6 +10,7 @@ from diffusers import (
     HeunDiscreteScheduler,
     KDPM2AncestralDiscreteScheduler,
     KDPM2DiscreteScheduler,
+    LCMScheduler,
     LMSDiscreteScheduler,
     PNDMScheduler,
     UniPCMultistepScheduler,
@@ -38,4 +39,5 @@ SCHEDULER_MAP = dict(
     dpmpp_sde=(DPMSolverSDEScheduler, dict(use_karras_sigmas=False, noise_sampler_seed=0)),
     dpmpp_sde_k=(DPMSolverSDEScheduler, dict(use_karras_sigmas=True, noise_sampler_seed=0)),
     unipc=(UniPCMultistepScheduler, dict(cpu_only=True)),
+    lcm=(LCMScheduler, dict()),
 )