resolve doc conflicts during merge

Author: lstein

backend/invoke_ai_web_server.py

@@ -319,7 +319,7 @@ def handle_run_postprocessing(
                 elif postprocessing_parameters['type'] == 'gfpgan':
                     image = self.gfpgan.process(
                         image=image,
-                        strength=postprocessing_parameters['gfpgan_strength'],
+                        strength=postprocessing_parameters['facetool_strength'],
                         seed=seed,
                     )
                 else:
@@ -625,7 +625,7 @@ def image_done(image, seed, first_seed):
                         seed=seed,
                     )
                     postprocessing = True
-                    all_parameters['gfpgan_strength'] = gfpgan_parameters[
+                    all_parameters['facetool_strength'] = gfpgan_parameters[
                         'strength'
                     ]
 
@@ -723,6 +723,7 @@ def parameters_to_generated_image_metadata(self, parameters):
                 'height',
                 'extra',
                 'seamless',
+                'hires_fix',
             ]
 
             rfc_dict = {}
@@ -735,12 +736,12 @@ def parameters_to_generated_image_metadata(self, parameters):
             postprocessing = []
 
             # 'postprocessing' is either null or an
-            if 'gfpgan_strength' in parameters:
+            if 'facetool_strength' in parameters:
 
                 postprocessing.append(
                     {
                         'type': 'gfpgan',
-                        'strength': float(parameters['gfpgan_strength']),
+                        'strength': float(parameters['facetool_strength']),
                     }
                 )
 
@@ -837,7 +838,7 @@ def parameters_to_post_processed_image_metadata(
             elif parameters['type'] == 'gfpgan':
                 postprocessing_metadata['type'] = 'gfpgan'
                 postprocessing_metadata['strength'] = parameters[
-                    'gfpgan_strength'
+                    'facetool_strength'
                 ]
             else:
                 raise TypeError(f"Invalid type: {parameters['type']}")

backend/modules/parameters.py

@@ -36,6 +36,8 @@ def parameters_to_command(params):
         switches.append(f'-A {params["sampler_name"]}')
     if "seamless" in params and params["seamless"] == True:
         switches.append(f"--seamless")
+    if "hires_fix" in params and params["hires_fix"] == True:
+        switches.append(f"--hires")
     if "init_img" in params and len(params["init_img"]) > 0:
         switches.append(f'-I {params["init_img"]}')
     if "init_mask" in params and len(params["init_mask"]) > 0:
@@ -46,8 +48,14 @@ def parameters_to_command(params):
         switches.append(f'-f {params["strength"]}')
         if "fit" in params and params["fit"] == True:
             switches.append(f"--fit")
-    if "gfpgan_strength" in params and params["gfpgan_strength"]:
+    if "facetool" in params:
+        switches.append(f'-ft {params["facetool"]}')
+    if "facetool_strength" in params and params["facetool_strength"]:
+        switches.append(f'-G {params["facetool_strength"]}')
+    elif "gfpgan_strength" in params and params["gfpgan_strength"]:
         switches.append(f'-G {params["gfpgan_strength"]}')
+    if "codeformer_fidelity" in params:
+        switches.append(f'-cf {params["codeformer_fidelity"]}')
     if "upscale" in params and params["upscale"]:
         switches.append(f'-U {params["upscale"][0]} {params["upscale"][1]}')
     if "variation_amount" in params and params["variation_amount"] > 0:

backend/server.py

@@ -349,7 +349,7 @@ def handle_run_gfpgan_event(original_image, gfpgan_parameters):
     eventlet.sleep(0)
 
     image = gfpgan.process(
-        image=image, strength=gfpgan_parameters["gfpgan_strength"], seed=seed
+        image=image, strength=gfpgan_parameters["facetool_strength"], seed=seed
     )
 
     progress["currentStatus"] = "Saving image"
@@ -464,7 +464,7 @@ def parameters_to_post_processed_image_metadata(parameters, original_image_path,
         image["strength"] = parameters["upscale"][1]
     elif type == "gfpgan":
         image["type"] = "gfpgan"
-        image["strength"] = parameters["gfpgan_strength"]
+        image["strength"] = parameters["facetool_strength"]
     else:
         raise TypeError(f"Invalid type: {type}")
 
@@ -493,6 +493,7 @@ def parameters_to_generated_image_metadata(parameters):
         "height",
         "extra",
         "seamless",
+        "hires_fix",
     ]
 
     rfc_dict = {}
@@ -505,10 +506,10 @@ def parameters_to_generated_image_metadata(parameters):
     postprocessing = []
 
     # 'postprocessing' is either null or an
-    if "gfpgan_strength" in parameters:
+    if "facetool_strength" in parameters:
 
         postprocessing.append(
-            {"type": "gfpgan", "strength": float(parameters["gfpgan_strength"])}
+            {"type": "gfpgan", "strength": float(parameters["facetool_strength"])}
         )
 
     if "upscale" in parameters:
@@ -751,7 +752,7 @@ def image_done(image, seed, first_seed):
                 image=image, strength=gfpgan_parameters["strength"], seed=seed
             )
             postprocessing = True
-            all_parameters["gfpgan_strength"] = gfpgan_parameters["strength"]
+            all_parameters["facetool_strength"] = gfpgan_parameters["strength"]
 
         progress["currentStatus"] = "Saving image"
         socketio.emit("progressUpdate", progress)

configs/models.yaml

@@ -9,10 +9,12 @@
 laion400m:
     config:  configs/latent-diffusion/txt2img-1p4B-eval.yaml
     weights: models/ldm/text2img-large/model.ckpt
+    description: Latent Diffusion LAION400M model
     width: 256
     height: 256
 stable-diffusion-1.4:
     config:  configs/stable-diffusion/v1-inference.yaml
     weights: models/ldm/stable-diffusion-v1/model.ckpt
+    description: Stable Diffusion inference model version 1.4
     width: 512
     height: 512