Skip to content

Commit

Permalink
Merge pull request #3499 from lllyasviel/develop
Browse files Browse the repository at this point in the history
Release 2.5.4
  • Loading branch information
mashb1t authored Aug 11, 2024
2 parents fd74b57 + 082a526 commit 1068d3f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion fooocus_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.5.3'
version = '2.5.4'
14 changes: 9 additions & 5 deletions launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from build_launcher import build_launcher
from modules.launch_util import is_installed, run, python, run_pip, requirements_met, delete_folder_content
from modules.model_loader import load_file_from_url
from modules.util import get_file_from_folder_list

REINSTALL_ALL = False
TRY_INSTALL_XFORMERS = False
Expand Down Expand Up @@ -80,12 +81,13 @@ def ini_args():
os.environ['CUDA_VISIBLE_DEVICES'] = str(args.gpu_device_id)
print("Set device to:", args.gpu_device_id)

if args.hf_mirror is not None :
if args.hf_mirror is not None:
os.environ['HF_MIRROR'] = str(args.hf_mirror)
print("Set hf_mirror to:", args.hf_mirror)

from modules import config
from modules.hash_cache import init_cache

os.environ["U2NET_HOME"] = config.path_inpaint

os.environ['GRADIO_TEMP_DIR'] = config.temp_path
Expand Down Expand Up @@ -114,9 +116,9 @@ def download_models(default_model, previous_default_models, checkpoint_downloads
return default_model, checkpoint_downloads

if not args.always_download_new_model:
if not os.path.exists(os.path.join(config.paths_checkpoints[0], default_model)):
if not os.path.isfile(get_file_from_folder_list(default_model, config.paths_checkpoints)):
for alternative_model_name in previous_default_models:
if os.path.exists(os.path.join(config.paths_checkpoints[0], alternative_model_name)):
if os.path.isfile(get_file_from_folder_list(alternative_model_name, config.paths_checkpoints)):
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, '
f'but you are not using the latest models.')
Expand All @@ -126,11 +128,13 @@ def download_models(default_model, previous_default_models, checkpoint_downloads
break

for file_name, url in checkpoint_downloads.items():
load_file_from_url(url=url, model_dir=config.paths_checkpoints[0], file_name=file_name)
model_dir = os.path.dirname(get_file_from_folder_list(file_name, config.paths_checkpoints))
load_file_from_url(url=url, model_dir=model_dir, file_name=file_name)
for file_name, url in embeddings_downloads.items():
load_file_from_url(url=url, model_dir=config.path_embeddings, file_name=file_name)
for file_name, url in lora_downloads.items():
load_file_from_url(url=url, model_dir=config.paths_loras[0], file_name=file_name)
model_dir = os.path.dirname(get_file_from_folder_list(file_name, config.paths_loras))
load_file_from_url(url=url, model_dir=model_dir, file_name=file_name)
for file_name, url in vae_downloads.items():
load_file_from_url(url=url, model_dir=config.path_vae, file_name=file_name)

Expand Down
2 changes: 2 additions & 0 deletions modules/async_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1223,6 +1223,8 @@ def handler(async_task: AsyncTask):
height, width, _ = async_task.enhance_input_image.shape
# input image already provided, processing is skipped
steps = 0
yield_result(async_task, async_task.enhance_input_image, current_progress, async_task.black_out_nsfw, False,
async_task.disable_intermediate_results)

all_steps = steps * async_task.image_number

Expand Down
6 changes: 6 additions & 0 deletions update_log.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [2.5.4](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.4)

* Fix validation for default_ip_image_* and default_inpaint_mask_sam_model
* Fix enhance mask debugging in combination with image sorting
* Fix loading of checkpoints and LoRAs when using multiple directories in config and then switching presets

# [2.5.3](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.3)

* Only load weights from non-safetensors files, preventing harmful code injection
Expand Down

0 comments on commit 1068d3f

Please sign in to comment.