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

chore: remove remaining todos after analysis

Browse Source 
refiner is added when set
restoring multiline prompts has been resolved by using separate parameters "raw_prompt" and "raw_negative_prompt"
This commit is contained in:
Manuel Schmid
2024-02-04 00:44:26 +01:00
parent 1419231e74
commit 8af73e622f
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
-1
View File
@@ -779,7 +779,6 @@ def worker():
('Refiner Model', 'refiner_model', refiner_model_name), ('Refiner Model', 'refiner_model', refiner_model_name),
('Refiner Switch', 'refiner_switch', refiner_switch)] ('Refiner Switch', 'refiner_switch', refiner_switch)]
# TODO evaluate if this should always be added
if refiner_model_name != 'None': if refiner_model_name != 'None':
if advanced_parameters.overwrite_switch > 0: if advanced_parameters.overwrite_switch > 0:
d.append(('Overwrite Switch', 'overwrite_switch', advanced_parameters.overwrite_switch)) d.append(('Overwrite Switch', 'overwrite_switch', advanced_parameters.overwrite_switch))
modules/meta_parser.py
-2
View File
@@ -383,7 +383,6 @@ class A1111MetadataParser(MetadataParser):
self.fooocus_to_a1111['raw_negative_prompt']: self.raw_negative_prompt, self.fooocus_to_a1111['raw_negative_prompt']: self.raw_negative_prompt,
} }
# TODO evaluate if this should always be added
if self.refiner_model_name not in ['', 'None']: if self.refiner_model_name not in ['', 'None']:
generation_params |= { generation_params |= {
self.fooocus_to_a1111['refiner_model']: self.refiner_model_name, self.fooocus_to_a1111['refiner_model']: self.refiner_model_name,
@@ -455,7 +454,6 @@ class FooocusMetadataParser(MetadataParser):
res['base_model'] = self.base_model_name res['base_model'] = self.base_model_name
res['base_model_hash'] = self.base_model_hash res['base_model_hash'] = self.base_model_hash
# TODO evaluate if this should always be added
if self.refiner_model_name not in ['', 'None']: if self.refiner_model_name not in ['', 'None']:
res['refiner_model'] = self.refiner_model_name res['refiner_model'] = self.refiner_model_name
res['refiner_model_hash'] = self.refiner_model_hash res['refiner_model_hash'] = self.refiner_model_hash
modules/util.py
-2
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 check how to resolve multiline input prompts
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
@@ -311,7 +310,6 @@ def extract_styles_from_prompt(prompt, negative_prompt):
applicable_styles.remove(found_style) applicable_styles.remove(found_style)
extracted.append(found_style.name) extracted.append(found_style.name)
# TODO check multiline prompt
# add prompt expansion if not all styles could be resolved # add prompt expansion if not all styles could be resolved
if prompt != '': if prompt != '':
if real_prompt != '': if real_prompt != '':