Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: check all dirs instead of only the first one #3495

Merged
merged 8 commits into from
Aug 11, 2024
Merged

fix: check all dirs instead of only the first one #3495

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2dc17e
Merge pull request #3384 from lllyasviel/develop
mashb1t Jul 27, 2024
f0dcf5a
Merge pull request #3433 from lllyasviel/develop
mashb1t Aug 3, 2024
60af8d2
Merge pull request #3434 from lllyasviel/develop
mashb1t Aug 3, 2024
2c78cec
Merge pull request #3436 from lllyasviel/develop
mashb1t Aug 3, 2024
fd74b57
Merge pull request #3472 from lllyasviel/develop
mashb1t Aug 8, 2024
5df0a65
fix: check all checkpoint dirs instead of only the first one for models
mashb1t Aug 11, 2024
e9d3be8
fix: use get_file_from_folder_list instead of manually iterating over…
mashb1t Aug 11, 2024
198423f
refactor: code cleanup
mashb1t Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions launch.py
View file
Open in desktop
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