Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort results of hashes in _hash_dir to always get the same result, remove dependency on os.walk

Browse Source
This commit is contained in:
Brandon Rising 2024-03-07 15:54:54 -05:00
parent 3bb50926af
commit cb99a5f0e4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
invokeai/backend/model_manager/hash.py
View File

@ -114,6 +114,7 @@ class ModelHash:
# BLAKE3 to hash the hashes # BLAKE3 to hash the hashes
composite_hasher = blake3() composite_hasher = blake3()
component_hashes.sort()
for h in component_hashes: for h in component_hashes:
composite_hasher.update(h.encode("utf-8")) composite_hasher.update(h.encode("utf-8"))
return composite_hasher.hexdigest() return composite_hasher.hexdigest()
@ -131,10 +132,12 @@ class ModelHash:
""" """
files: list[Path] = [] files: list[Path] = []
for root, _dirs, _files in os.walk(model_path): entries = [entry for entry in os.scandir(model_path.as_posix()) if not entry.name.startswith(".")]
for file in _files: dirs = [entry for entry in entries if entry.is_dir()]
if file_filter(file): file_paths = [entry.path for entry in entries if entry.is_file() and file_filter(entry.path)]
files.append(Path(root, file)) files.extend([Path(file) for file in file_paths])
for dir in dirs:
files.extend(ModelHash._get_file_paths(Path(dir.path), file_filter))
return files return files
@staticmethod @staticmethod