mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
refactor the model bases variable
This commit is contained in:
parent
69543c23d0
commit
ec1e66dcd3
@ -90,6 +90,7 @@ def _parse_args() -> Namespace:
|
|||||||
# ------------------------- GUI HERE -------------------------
|
# ------------------------- GUI HERE -------------------------
|
||||||
class mergeModelsForm(npyscreen.FormMultiPageAction):
|
class mergeModelsForm(npyscreen.FormMultiPageAction):
|
||||||
interpolations = ["weighted_sum", "sigmoid", "inv_sigmoid"]
|
interpolations = ["weighted_sum", "sigmoid", "inv_sigmoid"]
|
||||||
|
bases = ["sd-1", "sd-2", "sdxl"]
|
||||||
|
|
||||||
def __init__(self, parentApp, name):
|
def __init__(self, parentApp, name):
|
||||||
self.parentApp = parentApp
|
self.parentApp = parentApp
|
||||||
@ -274,10 +275,9 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
|
|||||||
else:
|
else:
|
||||||
interp = self.interpolations[self.merge_method.value[0]]
|
interp = self.interpolations[self.merge_method.value[0]]
|
||||||
|
|
||||||
bases = ["sd-1", "sd-2", "sdxl"]
|
|
||||||
args = dict(
|
args = dict(
|
||||||
model_names=models,
|
model_names=models,
|
||||||
base_model=BaseModelType(bases[self.base_select.value[0]]),
|
base_model=BaseModelType(self.bases[self.base_select.value[0]]),
|
||||||
alpha=self.alpha.value,
|
alpha=self.alpha.value,
|
||||||
interp=interp,
|
interp=interp,
|
||||||
force=self.force.value,
|
force=self.force.value,
|
||||||
@ -320,8 +320,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
|
|||||||
return sorted(model_names)
|
return sorted(model_names)
|
||||||
|
|
||||||
def _populate_models(self, value=None):
|
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)
|
self.model_names = self.get_model_names(base_model)
|
||||||
|
|
||||||
models_plus_none = self.model_names.copy()
|
models_plus_none = self.model_names.copy()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user