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

Fix a bug where the default model would not load if the user hadn't already configured a custom model (e.g. in a fresh installation); Check for the model in the models/stable-diffusion folder first, before checking in the direct folder

Browse Source
This commit is contained in:
cmdr2 2022-10-27 22:34:23 +05:30
parent 7c5bbca2fa
commit 01a2fa7c2d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/server.py
View File

@ -137,13 +137,14 @@ def resolve_model_to_use(model_name:str=None):
if 'model' in config and 'stable-diffusion' in config['model']: if 'model' in config and 'stable-diffusion' in config['model']:
model_name = config['model']['stable-diffusion'] model_name = config['model']['stable-diffusion']
if model_name: if model_name:
if os.path.exists(model_name + '.ckpt'):
# Direct Path to file
return model_name
# Check models directory # Check models directory
models_dir_path = os.path.join(MODELS_DIR, 'stable-diffusion', model_name) models_dir_path = os.path.join(MODELS_DIR, 'stable-diffusion', model_name)
if os.path.exists(models_dir_path + '.ckpt'): if os.path.exists(models_dir_path + '.ckpt'):
return models_dir_path return models_dir_path
models_direct_dir_path = os.path.join(SD_DIR, model_name)
if os.path.exists(models_direct_dir_path + '.ckpt'):
# Direct Path to file
return models_direct_dir_path
# Default locations # Default locations
if model_name in APP_CONFIG_DEFAULT_MODELS: if model_name in APP_CONFIG_DEFAULT_MODELS:
default_model_path = os.path.join(SD_DIR, model_name) default_model_path = os.path.join(SD_DIR, model_name)
@ -151,9 +152,10 @@ def resolve_model_to_use(model_name:str=None):
return default_model_path return default_model_path
# Can't find requested model, check the default paths. # Can't find requested model, check the default paths.
for default_model in APP_CONFIG_DEFAULT_MODELS: for default_model in APP_CONFIG_DEFAULT_MODELS:
default_model_path = os.path.join(SD_DIR, default_model + '.ckpt') default_model_path = os.path.join(SD_DIR, default_model)
if os.path.exists(default_model_path): if os.path.exists(default_model_path + '.ckpt'):
print(f'Could not find the configured custom model {model_name}.ckpt. Using the default one: {default_model_path}.ckpt') if model_name is not None:
print(f'Could not find the configured custom model {model_name}.ckpt. Using the default one: {default_model_path}.ckpt')
return default_model_path return default_model_path
raise Exception('No valid models found.') raise Exception('No valid models found.')