Skip to content

use lora.loaded_loras if available #88

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use lora.loaded_loras if available #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion scripts/gen_hashing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os

import civitai.lib as civitai
from modules import script_callbacks, sd_vae, shared
from modules import script_callbacks, sd_vae, shared, hashes

additional_network_type_map = {
'lora': 'LORA',
Expand Down Expand Up @@ -62,6 +62,30 @@ def add_resource_hashes(params):
short_hash = matching_resource[0]['hash'][:10]
resource_hashes[f'{network_type}:{network_name}'] = short_hash

# check loaded_loras
loaded = []
try:
import lora
loaded = lora.loaded_lora
except Exception:
pass
for item in loaded:
name = item.name
if f'lora:{name}' in resource_hashes.keys():
continue

lora_on_disk = item.lora_on_disk if hasattr(item, "lora_on_disk") else item.network_on_disk if hasattr(item, "network_on_disk") else None
if lora_on_disk is None:
continue

hash = hashes.sha256(lora_on_disk.filename, "lora/" + lora_on_disk.name)
if not hash:
continue
short_hash = hash[0:10]

name = name.replace(":", "").replace(",", "")
resource_hashes[f'lora:{name}'] = short_hash

# Check for model hash in generation parameters
model_match = re.search(model_hash_pattern, generation_params)
if hashify_resources and model_match:
Expand Down