From 6b9c0bd448a2ef0ddea16730e4c61e5eb5c1ef22 Mon Sep 17 00:00:00 2001
From: Manuel Schmid <manuel.schmid@odt.net>
Date: Wed, 31 Jan 2024 01:35:51 +0100
Subject: [PATCH] refactor: code cleanup

---
 modules/meta_parser.py |  4 +---
 modules/metadata.py    | 22 +++-------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/modules/meta_parser.py b/modules/meta_parser.py
index 6d4e542c..e4f3c813 100644
--- a/modules/meta_parser.py
+++ b/modules/meta_parser.py
@@ -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)
diff --git a/modules/metadata.py b/modules/metadata.py
index 34cc1923..aa0925d6 100644
--- a/modules/metadata.py
+++ b/modules/metadata.py
@@ -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,