fix: resolve circular dependency for sha256, update files and init cache after initial model download
fixes https://github.com/lllyasviel/Fooocus/issues/2372
This commit is contained in:
parent
bb0c7fbc3a
commit
5c43a4bece
|
|
@ -21,7 +21,6 @@ import fooocus_version
|
||||||
from build_launcher import build_launcher
|
from build_launcher import build_launcher
|
||||||
from modules.launch_util import is_installed, run, python, run_pip, requirements_met, delete_folder_content
|
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.model_loader import load_file_from_url
|
||||||
from modules import config
|
|
||||||
|
|
||||||
REINSTALL_ALL = False
|
REINSTALL_ALL = False
|
||||||
TRY_INSTALL_XFORMERS = False
|
TRY_INSTALL_XFORMERS = False
|
||||||
|
|
@ -86,6 +85,7 @@ if args.hf_mirror is not None :
|
||||||
print("Set hf_mirror to:", args.hf_mirror)
|
print("Set hf_mirror to:", args.hf_mirror)
|
||||||
|
|
||||||
from modules import config
|
from modules import config
|
||||||
|
from modules.hash_cache import init_cache
|
||||||
os.environ["U2NET_HOME"] = config.path_inpaint
|
os.environ["U2NET_HOME"] = config.path_inpaint
|
||||||
|
|
||||||
os.environ['GRADIO_TEMP_DIR'] = config.temp_path
|
os.environ['GRADIO_TEMP_DIR'] = config.temp_path
|
||||||
|
|
@ -141,4 +141,7 @@ config.default_base_model_name, config.checkpoint_downloads = download_models(
|
||||||
config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads,
|
config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads,
|
||||||
config.embeddings_downloads, config.lora_downloads, config.vae_downloads)
|
config.embeddings_downloads, config.lora_downloads, config.vae_downloads)
|
||||||
|
|
||||||
|
config.update_files()
|
||||||
|
init_cache(config.model_filenames, config.paths_checkpoints, config.lora_filenames, config.paths_loras)
|
||||||
|
|
||||||
from webui import *
|
from webui import *
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import args_manager
|
||||||
import tempfile
|
import tempfile
|
||||||
import modules.flags
|
import modules.flags
|
||||||
import modules.sdxl_styles
|
import modules.sdxl_styles
|
||||||
from modules.hash_cache import init_cache
|
|
||||||
|
|
||||||
from modules.model_loader import load_file_from_url
|
from modules.model_loader import load_file_from_url
|
||||||
from modules.extra_utils import makedirs_with_log, get_files_from_folder, try_eval_env_var
|
from modules.extra_utils import makedirs_with_log, get_files_from_folder, try_eval_env_var
|
||||||
|
|
@ -889,7 +888,3 @@ def downloading_sam_vit_h():
|
||||||
file_name='sam_vit_h_4b8939.pth'
|
file_name='sam_vit_h_4b8939.pth'
|
||||||
)
|
)
|
||||||
return os.path.join(path_sam, 'sam_vit_h_4b8939.pth')
|
return os.path.join(path_sam, 'sam_vit_h_4b8939.pth')
|
||||||
|
|
||||||
|
|
||||||
update_files()
|
|
||||||
init_cache(model_filenames, paths_checkpoints, lora_filenames, paths_loras)
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,7 @@ from concurrent.futures import ThreadPoolExecutor
|
||||||
from multiprocessing import cpu_count
|
from multiprocessing import cpu_count
|
||||||
|
|
||||||
import args_manager
|
import args_manager
|
||||||
from modules.util import get_file_from_folder_list
|
from modules.util import sha256, HASH_SHA256_LENGTH, get_file_from_folder_list
|
||||||
from modules.util import sha256, HASH_SHA256_LENGTH
|
|
||||||
|
|
||||||
hash_cache_filename = 'hash_cache.txt'
|
hash_cache_filename = 'hash_cache.txt'
|
||||||
hash_cache = {}
|
hash_cache = {}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue