diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f9876685f..585eb87aa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @mashb1t +* @lllyasviel diff --git a/fooocus_version.py b/fooocus_version.py index 326513ef1..8b343b247 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.5.3' +version = '2.5.5' \ No newline at end of file diff --git a/launch.py b/launch.py index 77c2e2c29..eae5b19eb 100644 --- a/launch.py +++ b/launch.py @@ -80,12 +80,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 @@ -100,6 +101,8 @@ def ini_args(): def download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads, vae_downloads): + from modules.util import get_file_from_folder_list + for file_name, url in vae_approx_filenames: load_file_from_url(url=url, model_dir=config.path_vae_approx, file_name=file_name) @@ -114,9 +117,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.') @@ -126,11 +129,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) diff --git a/modules/async_worker.py b/modules/async_worker.py index f9e277dbf..a0b96a542 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -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 diff --git a/readme.md b/readme.md index d400e1329..e26925e52 100644 --- a/readme.md +++ b/readme.md @@ -119,7 +119,7 @@ See also the common problems and troubleshoots [here](troubleshoot.md). ### Colab -(Last tested - 2024 Mar 18 by [mashb1t](https://github.com/mashb1t)) +(Last tested - 2024 Aug 12 by [mashb1t](https://github.com/mashb1t)) | Colab | Info | --- | --- | diff --git a/update_log.md b/update_log.md index 8dbd653e6..56a337836 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,13 @@ +# [2.5.5](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.5) + +* Fix colab inpaint issue by moving an import statement + +# [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