OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-04-13 00:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15632 from brendanhoar/bgh-handle-metadata-issues-more-cleanly

Browse Source 
QOL Items - handle metadata issues more cleanly for SD models, Loras and embeddings
This commit is contained in:
AUTOMATIC1111 2024-06-08 12:17:01 +03:00 committed by GitHub
commit 6d8d2723a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions-builtin/Lora/ui_edit_user_metadata.py
View File

@ -21,10 +21,12 @@ re_comma = re.compile(r" *, *")
def build_tags(metadata): def build_tags(metadata):
tags = {} tags = {}
for _, tags_dict in metadata.get("ss_tag_frequency", {}).items(): ss_tag_frequency = metadata.get("ss_tag_frequency", {})
for tag, tag_count in tags_dict.items(): if ss_tag_frequency is not None and hasattr(ss_tag_frequency, 'items'):
tag = tag.strip() for _, tags_dict in ss_tag_frequency.items():
tags[tag] = tags.get(tag, 0) + int(tag_count) for tag, tag_count in tags_dict.items():
tag = tag.strip()
tags[tag] = tags.get(tag, 0) + int(tag_count)
if tags and is_non_comma_tagset(tags): if tags and is_non_comma_tagset(tags):
new_tags = {} new_tags = {}

22
modules/sd_models.py
View File

@ -282,17 +282,21 @@ def read_metadata_from_safetensors(filename):
json_start = file.read(2) json_start = file.read(2)
assert metadata_len > 2 and json_start in (b'{"', b"{'"), f"{filename} is not a safetensors file" assert metadata_len > 2 and json_start in (b'{"', b"{'"), f"{filename} is not a safetensors file"
json_data = json_start + file.read(metadata_len-2)
json_obj = json.loads(json_data)
res = {} res = {}
for k, v in json_obj.get("__metadata__", {}).items():
res[k] = v try:
if isinstance(v, str) and v[0:1] == '{': json_data = json_start + file.read(metadata_len-2)
try: json_obj = json.loads(json_data)
res[k] = json.loads(v) for k, v in json_obj.get("__metadata__", {}).items():
except Exception: res[k] = v
pass if isinstance(v, str) and v[0:1] == '{':
try:
res[k] = json.loads(v)
except Exception:
pass
except Exception:
errors.report(f"Error reading metadata from file: {filename}", exc_info=True)
return res return res

12
modules/textual_inversion/textual_inversion.py
View File

@ -181,12 +181,16 @@ class EmbeddingDatabase:
else: else:
return return
embedding = create_embedding_from_data(data, name, filename=filename, filepath=path) if data is not None:
embedding = create_embedding_from_data(data, name, filename=filename, filepath=path)
if self.expected_shape == -1 or self.expected_shape == embedding.shape: if self.expected_shape == -1 or self.expected_shape == embedding.shape:
self.register_embedding(embedding, shared.sd_model) self.register_embedding(embedding, shared.sd_model)
else:
self.skipped_embeddings[name] = embedding
else: else:
self.skipped_embeddings[name] = embedding print(f"Unable to load Textual inversion embedding due to data issue: '{name}'.")
def load_from_dir(self, embdir): def load_from_dir(self, embdir):
if not os.path.isdir(embdir.path): if not os.path.isdir(embdir.path):