refactor: code cleanup

This commit is contained in:
Manuel Schmid 2024-01-31 01:35:51 +01:00
parent 9bdb65ec5d
commit 6b9c0bd448
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 4 additions and 22 deletions

View File

@ -67,8 +67,6 @@ def get_list(key: str, fallback: str | None, source_dict: dict, results: list, d
results.append(gr.update())
# TODO try get generic
def get_float(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
try:
h = source_dict.get(key, source_dict.get(fallback, default))
@ -153,7 +151,7 @@ def get_freeu(key: str, fallback: str | None, source_dict: dict, results: list,
results.append(gr.update())
def get_lora(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
def get_lora(key: str, fallback: str | None, source_dict: dict, results: list):
try:
n, w = source_dict.get(key, source_dict.get(fallback)).split(' : ')
w = float(w)

View File

@ -158,25 +158,9 @@ class A1111MetadataParser(MetadataParser):
self.fooocus_to_a1111['refiner_model_hash']: data['refiner_model_hash']
}
if 'refiner_swap_method' in data:
generation_params |= {
self.fooocus_to_a1111['refiner_swap_method']: data['refiner_swap_method'],
}
# TODO unify with for and call with key
if 'freeu' in data:
generation_params |= {
self.fooocus_to_a1111['freeu']: data['freeu'],
}
if 'adaptive_cfg' in data:
generation_params |= {
self.fooocus_to_a1111['adaptive_cfg']: data['adaptive_cfg'],
}
if 'overwrite_switch' in data:
generation_params |= {
self.fooocus_to_a1111['overwrite_switch']: data['overwrite_switch'],
}
for key in ['adaptive_cfg', 'overwrite_switch', 'refiner_swap_method', 'freeu']:
if key in data:
generation_params[self.fooocus_to_a1111[key]] = data[key]
generation_params |= {
self.fooocus_to_a1111['lora_hashes']: lora_hashes_string,