Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/add-preset-selection'

Browse Source 
# Conflicts:
#	launch.py
#	modules/config.py
#	presets/realistic.json
#	webui.py
This commit is contained in:
Manuel Schmid
2024-01-28 00:58:36 +01:00
parent 9685a90090 6031f85f49
commit f8f081b33f
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launch.py
+7 -6
View File
@@ -103,12 +103,12 @@ def download_models(default_model, previous_default_models, checkpoint_downloads
if not os.path.exists(os.path.join(config.path_checkpoints, default_model)): if not os.path.exists(os.path.join(config.path_checkpoints, default_model)):
for alternative_model_name in previous_default_models: for alternative_model_name in previous_default_models:
if os.path.exists(os.path.join(config.path_checkpoints, alternative_model_name)): if os.path.exists(os.path.join(config.path_checkpoints, alternative_model_name)):
print(f'You do not have [{config.default_base_model_name}] but you have [{alternative_model_name}].') print(f'You do not have [{default_model}] but you have [{alternative_model_name}].')
print(f'Fooocus will use [{alternative_model_name}] to avoid downloading new models, ' print(f'Fooocus will use [{alternative_model_name}] to avoid downloading new models, '
f'but you are not using latest models.') f'but you are not using the latest models.')
print('Use --always-download-new-model to avoid fallback and always get new models.') print('Use --always-download-new-model to avoid fallback and always get new models.')
config.checkpoint_downloads = {} checkpoint_downloads = {}
config.default_base_model_name = alternative_model_name default_model = alternative_model_name
break break
for file_name, url in checkpoint_downloads.items(): for file_name, url in checkpoint_downloads.items():
@@ -118,10 +118,11 @@ def download_models(default_model, previous_default_models, checkpoint_downloads
for file_name, url in lora_downloads.items(): for file_name, url in lora_downloads.items():
load_file_from_url(url=url, model_dir=config.path_loras, file_name=file_name) load_file_from_url(url=url, model_dir=config.path_loras, file_name=file_name)
return return default_model, checkpoint_downloads
download_models(config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads, config.default_base_model_name, config.checkpoint_downloads = download_models(
config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads,
config.embeddings_downloads, config.lora_downloads) config.embeddings_downloads, config.lora_downloads)
from webui import * from webui import *
presets/realistic.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"default_model": "realisticStockPhoto_v20.safetensors", "default_model": "realisticStockPhoto_v20.safetensors",
"default_refiner": "", "default_refiner": "None",
"default_refiner_switch": 0.5, "default_refiner_switch": 0.5,
"default_loras": [ "default_loras": [
[ [
webui.py
+3 -1
View File
@@ -634,7 +634,9 @@ with shared.gradio_root:
checkpoint_downloads = preset_prepared['checkpoint_downloads'] checkpoint_downloads = preset_prepared['checkpoint_downloads']
embeddings_downloads = preset_prepared['embeddings_downloads'] embeddings_downloads = preset_prepared['embeddings_downloads']
lora_downloads = preset_prepared['lora_downloads'] lora_downloads = preset_prepared['lora_downloads']
launch.download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads)
preset_prepared['Base Model'], preset_prepared['lora_downloads'] = launch.download_models(
default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads)
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating) return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)