chore: check and remove ToDo's

This commit is contained in:
Manuel Schmid
2024-02-02 01:45:08 +01:00
parent 934bdb180a
commit b438f7b43f
4 changed files with 3 additions and 10 deletions
-1
View File
@@ -51,7 +51,6 @@ class MetadataScheme(Enum):
A1111 = 'a1111' A1111 = 'a1111'
# TODO use translation here
metadata_scheme = [ metadata_scheme = [
('Fooocus (json)', MetadataScheme.FOOOCUS.value), ('Fooocus (json)', MetadataScheme.FOOOCUS.value),
('A1111 (plain text)', MetadataScheme.A1111.value), ('A1111 (plain text)', MetadataScheme.A1111.value),
+3 -5
View File
@@ -3,6 +3,7 @@ import os
import re import re
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from pathlib import Path from pathlib import Path
from PIL import Image from PIL import Image
import modules.config import modules.config
@@ -156,7 +157,6 @@ class A1111MetadataParser(MetadataParser):
break break
if 'lora_hashes' in data: if 'lora_hashes' in data:
# TODO optimize by using hash for matching. Problem is speed of creating the hash per model, even on startup
lora_filenames = modules.config.lora_filenames.copy() lora_filenames = modules.config.lora_filenames.copy()
lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora()) lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora())
for li, lora in enumerate(data['lora_hashes'].split(', ')): for li, lora in enumerate(data['lora_hashes'].split(', ')):
@@ -214,10 +214,8 @@ class A1111MetadataParser(MetadataParser):
generation_params_text = ", ".join( generation_params_text = ", ".join(
[k if k == v else f'{k}: {quote(v)}' for k, v in dict(sorted(generation_params.items())).items() if v is not None]) [k if k == v else f'{k}: {quote(v)}' for k, v in dict(sorted(generation_params.items())).items() if v is not None])
# TODO check if multiline positive prompt is correctly processed positive_prompt_resolved = ', '.join(self.full_prompt)
positive_prompt_resolved = ', '.join(self.full_prompt) # TODO add loras to positive prompt if even possible negative_prompt_resolved = ', '.join(self.full_negative_prompt)
negative_prompt_resolved = ', '.join(
self.full_negative_prompt) # TODO add loras to negative prompt if even possible
negative_prompt_text = f"\nNegative prompt: {negative_prompt_resolved}" if negative_prompt_resolved else "" negative_prompt_text = f"\nNegative prompt: {negative_prompt_resolved}" if negative_prompt_resolved else ""
return f"{positive_prompt_resolved}{negative_prompt_text}\n{generation_params_text}".strip() return f"{positive_prompt_resolved}{negative_prompt_text}\n{generation_params_text}".strip()
-3
View File
@@ -300,7 +300,6 @@ def extract_styles_from_prompt(prompt, negative_prompt):
found_style = style found_style = style
prompt = new_prompt prompt = new_prompt
negative_prompt = new_neg_prompt negative_prompt = new_neg_prompt
# TODO this is a bit hacky tbh but works perfectly fine, check if all conditions are needed
if real_prompt == '' and new_real_prompt != '' and new_real_prompt != prompt: if real_prompt == '' and new_real_prompt != '' and new_real_prompt != prompt:
real_prompt = new_real_prompt real_prompt = new_real_prompt
break break
@@ -312,8 +311,6 @@ def extract_styles_from_prompt(prompt, negative_prompt):
extracted.append(found_style.name) extracted.append(found_style.name)
# add prompt expansion if not all styles could be resolved # add prompt expansion if not all styles could be resolved
# TODO check if it's better to not add fooocus_expansion but just return prompt incl. fooocus_expansion words
# TODO evaluate if adding prompt expansion to metadata is a good idea
if prompt != '': if prompt != '':
if prompt != real_prompt: if prompt != real_prompt:
extracted.append(modules.sdxl_styles.fooocus_expansion) extracted.append(modules.sdxl_styles.fooocus_expansion)
-1
View File
@@ -598,7 +598,6 @@ with shared.gradio_root:
def trigger_metadata_import(filepath, state_is_generating): def trigger_metadata_import(filepath, state_is_generating):
parameters, items, metadata_scheme = modules.metadata.read_info_from_image(filepath) parameters, items, metadata_scheme = modules.metadata.read_info_from_image(filepath)
# TODO check what happens if metadata_scheme is empty and A1111 string
if parameters is None: if parameters is None:
print('Could not find metadata in the image!') print('Could not find metadata in the image!')
pass pass