Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

wip: code cleanup, update todos

Browse Source
This commit is contained in:
Manuel Schmid
2024-01-29 16:38:39 +01:00
parent 33d644f4a5
commit e388f6fff6
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/flags.py
+1
View File
@@ -60,6 +60,7 @@ lora_count_with_lcm = lora_count + 1
controlnet_image_count = 4 controlnet_image_count = 4
class Steps(Enum): class Steps(Enum):
QUALITY = 60 QUALITY = 60
SPEED = 30 SPEED = 30
modules/metadata.py
+4 -9
View File
@@ -64,15 +64,12 @@ class A1111MetadataParser(MetadataParser):
else: else:
prompt += ('' if prompt == '' else "\n") + line prompt += ('' if prompt == '' else "\n") + line
# set defaults
data = {}
found_styles, prompt, negative_prompt = extract_styles_from_prompt(prompt, negative_prompt) found_styles, prompt, negative_prompt = extract_styles_from_prompt(prompt, negative_prompt)
data['styles'] = str(found_styles)
data |= { data = {
'prompt': prompt, 'prompt': prompt,
'negative_prompt': negative_prompt, 'negative_prompt': negative_prompt,
'styles': str(found_styles)
} }
for k, v in re_param.findall(lastline): for k, v in re_param.findall(lastline):
@@ -98,8 +95,6 @@ class A1111MetadataParser(MetadataParser):
return data return data
def parse_string(self, metadata: dict) -> str: def parse_string(self, metadata: dict) -> str:
# TODO add correct mapping
data = {k: v for _, k, v, _, _ in metadata} data = {k: v for _, k, v, _, _ in metadata}
# TODO check if correct # TODO check if correct
@@ -110,6 +105,7 @@ class A1111MetadataParser(MetadataParser):
key = f'lora_name_{index + 1}' key = f'lora_name_{index + 1}'
if key in data: if key in data:
name = data[f'lora_name_{index + 1}'] name = data[f'lora_name_{index + 1}']
# TODO handle LoRA weight
# weight = data[f'lora_weight_{index + 1}'] # weight = data[f'lora_weight_{index + 1}']
hash = data[f'lora_hash_{index + 1}'] hash = data[f'lora_hash_{index + 1}']
lora_hashes.append(f'{name.split(".")[0]}: {hash}') lora_hashes.append(f'{name.split(".")[0]}: {hash}')
@@ -122,6 +118,7 @@ class A1111MetadataParser(MetadataParser):
self.fooocus_to_a1111['seed']: data['seed'], self.fooocus_to_a1111['seed']: data['seed'],
# TODO check resolution value, should be string # TODO check resolution value, should be string
self.fooocus_to_a1111['resolution']: f'{width}x{heigth}', self.fooocus_to_a1111['resolution']: f'{width}x{heigth}',
# TODO load model by name / hash
self.fooocus_to_a1111['base_model']: data['base_model'].split('.')[0], self.fooocus_to_a1111['base_model']: data['base_model'].split('.')[0],
self.fooocus_to_a1111['base_model_hash']: data['base_model_hash'] self.fooocus_to_a1111['base_model_hash']: data['base_model_hash']
} }
@@ -150,11 +147,9 @@ class A1111MetadataParser(MetadataParser):
class FooocusMetadataParser(MetadataParser): class FooocusMetadataParser(MetadataParser):
def parse_json(self, metadata: dict) -> dict: def parse_json(self, metadata: dict) -> dict:
# TODO add mapping if necessary
return metadata return metadata
def parse_string(self, metadata: dict) -> str: def parse_string(self, metadata: dict) -> str:
return json.dumps({k: v for _, k, v, _, _ in metadata}) return json.dumps({k: v for _, k, v, _, _ in metadata})
# metadata = { # metadata = {
# # prompt with wildcards # # prompt with wildcards