refactor the model bases variable

fix model-not-found error
2024-08-30 20:32:17 +00:00 · 2023-11-04 11:25:13 -04:00 · 2023-11-04 11:12:29 -04:00
1 changed files with 3 additions and 3 deletions
--- a/invokeai/frontend/merge/merge_diffusers.py
+++ b/invokeai/frontend/merge/merge_diffusers.py
@ -90,6 +90,7 @@ def _parse_args() -> Namespace:
 # ------------------------- GUI HERE -------------------------
 class mergeModelsForm(npyscreen.FormMultiPageAction):
    interpolations = ["weighted_sum", "sigmoid", "inv_sigmoid"]
    bases = ["sd-1", "sd-2", "sdxl"]
    def __init__(self, parentApp, name):
        self.parentApp = parentApp
@ -276,7 +277,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
        args = dict(
            model_names=models,
-            base_model=tuple(BaseModelType)[self.base_select.value[0]],
+            base_model=BaseModelType(self.bases[self.base_select.value[0]]),
            alpha=self.alpha.value,
            interp=interp,
            force=self.force.value,
@ -319,8 +320,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
        return sorted(model_names)
    def _populate_models(self, value=None):
-        bases = ["sd-1", "sd-2", "sdxl"]
+        base_model = BaseModelType(self.bases[value[0]])
        base_model = BaseModelType(bases[value[0]])
        self.model_names = self.get_model_names(base_model)
        models_plus_none = self.model_names.copy()
Author	SHA1	Message	Date
Lincoln Stein	ec1e66dcd3	refactor the model bases variable	2023-11-04 11:25:13 -04:00
Lincoln Stein	69543c23d0	fix model-not-found error	2023-11-04 11:12:29 -04:00