extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-02-18 03:11:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow the UI to send (and resolve) multiple model paths

Browse Source
This commit is contained in:
cmdr2 2023-07-15 12:09:20 +05:30
parent c5a06eedbc
commit 959c1a196e
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/easydiffusion/model_manager.py
View File

@ -2,6 +2,7 @@ import os
import shutil import shutil
from glob import glob from glob import glob
import traceback import traceback
from typing import Union
from easydiffusion import app from easydiffusion import app
from easydiffusion.types import TaskData from easydiffusion.types import TaskData
@ -93,7 +94,14 @@ def unload_all(context: Context):
del context.model_load_errors[model_type] del context.model_load_errors[model_type]
def resolve_model_to_use(model_name: str = None, model_type: str = None, fail_if_not_found: bool = True): def resolve_model_to_use(model_name: Union[str, list] = None, model_type: str = None, fail_if_not_found: bool = True):
model_names = model_name if isinstance(model_name, list) else [model_name]
model_paths = [resolve_model_to_use_single(m, model_type, fail_if_not_found) for m in model_names]
return model_paths[0] if len(model_paths) == 1 else model_paths
def resolve_model_to_use_single(model_name: str = None, model_type: str = None, fail_if_not_found: bool = True):
model_extensions = MODEL_EXTENSIONS.get(model_type, []) model_extensions = MODEL_EXTENSIONS.get(model_type, [])
default_models = DEFAULT_MODELS.get(model_type, []) default_models = DEFAULT_MODELS.get(model_type, [])
config = app.getConfig() config = app.getConfig()

17
ui/easydiffusion/types.py
View File

@ -1,4 +1,4 @@
from typing import Any from typing import Any, List, Union
from pydantic import BaseModel from pydantic import BaseModel
@ -22,7 +22,7 @@ class GenerateImageRequest(BaseModel):
sampler_name: str = None # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms" sampler_name: str = None # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms"
hypernetwork_strength: float = 0 hypernetwork_strength: float = 0
lora_alpha: float = 0 lora_alpha: Union[float, List[float]] = 0
tiling: str = "none" # "none", "x", "y", "xy" tiling: str = "none" # "none", "x", "y", "xy"
@ -32,15 +32,14 @@ class TaskData(BaseModel):
save_to_disk_path: str = None save_to_disk_path: str = None
vram_usage_level: str = "balanced" # or "low" or "medium" vram_usage_level: str = "balanced" # or "low" or "medium"
use_face_correction: str = None # or "GFPGANv1.3" use_face_correction: Union[str, List[str]] = None # or "GFPGANv1.3"
use_upscale: str = None # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B" or "latent_upscaler" use_upscale: Union[str, List[str]] = None
upscale_amount: int = 4 # or 2 upscale_amount: int = 4 # or 2
latent_upscaler_steps: int = 10 latent_upscaler_steps: int = 10
use_stable_diffusion_model: str = "sd-v1-4" use_stable_diffusion_model: Union[str, List[str]] = "sd-v1-4"
# use_stable_diffusion_config: str = "v1-inference" use_vae_model: Union[str, List[str]] = None
use_vae_model: str = None use_hypernetwork_model: Union[str, List[str]] = None
use_hypernetwork_model: str = None use_lora_model: Union[str, List[str]] = None
use_lora_model: str = None
show_only_filtered_image: bool = False show_only_filtered_image: bool = False
block_nsfw: bool = False block_nsfw: bool = False