resolve merge conflicts

invokeai/frontend/install/invokeai_configure.py

@@ -1,4 +1,4 @@
 """
 Wrapper for invokeai.backend.configure.invokeai_configure
 """
-from ...backend.install.invokeai_configure import main as invokeai_configure
+from ...backend.install.invokeai_configure import main as invokeai_configure  # noqa: F401

invokeai/frontend/install/invokeai_update.py

@@ -80,7 +80,7 @@ def welcome(versions: dict):
 def get_extras():
     extras = ""
     try:
-        dist = pkg_resources.get_distribution("xformers")
+        _ = pkg_resources.get_distribution("xformers")
         extras = "[xformers]"
     except pkg_resources.DistributionNotFound:
         pass
@@ -90,7 +90,7 @@ def get_extras():
 def main():
     versions = get_versions()
     if invokeai_is_running():
-        print(f":exclamation: [bold red]Please terminate all running instances of InvokeAI before updating.[/red bold]")
+        print(":exclamation: [bold red]Please terminate all running instances of InvokeAI before updating.[/red bold]")
         input("Press any key to continue...")
         return
 
@@ -122,9 +122,9 @@ def main():
     print("")
     print("")
     if os.system(cmd) == 0:
-        print(f":heavy_check_mark: Upgrade successful")
+        print(":heavy_check_mark: Upgrade successful")
     else:
-        print(f":exclamation: [bold red]Upgrade failed[/red bold]")
+        print(":exclamation: [bold red]Upgrade failed[/red bold]")
 
 
 if __name__ == "__main__":

invokeai/frontend/install/model_install.py

@@ -251,7 +251,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
     ) -> dict[str, npyscreen.widget]:
         """Generic code to create model selection widgets"""
         widgets = dict()
-        model_list = [x for x in self.all_models if self.all_models[x].model_type == model_type and not x in exclude]
+        model_list = [x for x in self.all_models if self.all_models[x].model_type == model_type and x not in exclude]
         model_labels = [self.model_labels[x] for x in model_list]
 
         show_recommended = len(self.installed_models) == 0
@@ -357,14 +357,14 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
                 try:
                     v.hidden = True
                     v.editable = False
-                except:
+                except Exception:
                     pass
         for k, v in widgets[selected_tab].items():
             try:
                 v.hidden = False
                 if not isinstance(v, (npyscreen.FixedText, npyscreen.TitleFixedText, CenteredTitleText)):
                     v.editable = True
-            except:
+            except Exception:
                 pass
         self.__class__.current_tab = selected_tab  # for persistence
         self.display()
@@ -541,7 +541,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
             self.ti_models,
         ]
         for section in ui_sections:
-            if not "models_selected" in section:
+            if "models_selected" not in section:
                 continue
             selected = set([section["models"][x] for x in section["models_selected"].value])
             models_to_install = [x for x in selected if not self.all_models[x].installed]
@@ -637,7 +637,7 @@ def _ask_user_for_pt_tui(model_path: Path, tui_conn: Connection) -> SchedulerPre
             return None
         else:
             return response
-    except:
+    except Exception:
         return None
 
 
@@ -673,8 +673,7 @@ def process_and_execute(
 def select_and_download_models(opt: Namespace):
     precision = "float32" if opt.full_precision else choose_precision(torch.device(choose_torch_device()))
     config.precision = precision
-    helper = lambda x: ask_user_for_prediction_type(x)
-    installer = ModelInstall(config, prediction_type_helper=helper)
+    installer = ModelInstall(config, prediction_type_helper=ask_user_for_prediction_type)
     if opt.list_models:
         installer.list_models(opt.list_models)
     elif opt.add or opt.delete:

invokeai/frontend/install/widgets.py

@@ -102,8 +102,8 @@ def set_min_terminal_size(min_cols: int, min_lines: int) -> bool:
 class IntSlider(npyscreen.Slider):
     def translate_value(self):
         stri = "%2d / %2d" % (self.value, self.out_of)
-        l = (len(str(self.out_of))) * 2 + 4
-        stri = stri.rjust(l)
+        length = (len(str(self.out_of))) * 2 + 4
+        stri = stri.rjust(length)
         return stri
 
 
@@ -167,8 +167,8 @@ class FloatSlider(npyscreen.Slider):
     # this is supposed to adjust display precision, but doesn't
     def translate_value(self):
         stri = "%3.2f / %3.2f" % (self.value, self.out_of)
-        l = (len(str(self.out_of))) * 2 + 4
-        stri = stri.rjust(l)
+        length = (len(str(self.out_of))) * 2 + 4
+        stri = stri.rjust(length)
         return stri