turn controlnet into a select list and localize its label, fix name lookup on server
This commit is contained in:
parent
948bec6d0f
commit
555ec5a644
|
@ -122,6 +122,7 @@ def load_pipeline(
|
||||||
):
|
):
|
||||||
inversions = inversions or []
|
inversions = inversions or []
|
||||||
loras = loras or []
|
loras = loras or []
|
||||||
|
control_key = control.name if control is not None else None
|
||||||
|
|
||||||
torch_dtype = (
|
torch_dtype = (
|
||||||
torch.float16 if "torch-fp16" in server.optimizations else torch.float32
|
torch.float16 if "torch-fp16" in server.optimizations else torch.float32
|
||||||
|
@ -133,6 +134,7 @@ def load_pipeline(
|
||||||
device.device,
|
device.device,
|
||||||
device.provider,
|
device.provider,
|
||||||
lpw,
|
lpw,
|
||||||
|
control_key,
|
||||||
inversions,
|
inversions,
|
||||||
loras,
|
loras,
|
||||||
)
|
)
|
||||||
|
@ -282,7 +284,7 @@ def load_pipeline(
|
||||||
if control is not None:
|
if control is not None:
|
||||||
components["controlnet"] = OnnxRuntimeModel(
|
components["controlnet"] = OnnxRuntimeModel(
|
||||||
OnnxRuntimeModel.load_model(
|
OnnxRuntimeModel.load_model(
|
||||||
path.join(server.model_path, "control", f"{control}.onnx"),
|
path.join(server.model_path, "control", f"{control.name}.onnx"),
|
||||||
provider=device.ort_provider(),
|
provider=device.ort_provider(),
|
||||||
sess_options=device.sess_options(),
|
sess_options=device.sess_options(),
|
||||||
)
|
)
|
||||||
|
|
|
@ -210,7 +210,7 @@ class ImageParams:
|
||||||
"lpw": self.lpw,
|
"lpw": self.lpw,
|
||||||
"eta": self.eta,
|
"eta": self.eta,
|
||||||
"batch": self.batch,
|
"batch": self.batch,
|
||||||
"control": self.control,
|
"control": self.control.name,
|
||||||
}
|
}
|
||||||
|
|
||||||
def with_args(self, **kwargs):
|
def with_args(self, **kwargs):
|
||||||
|
|
|
@ -116,7 +116,7 @@ export function ModelControl() {
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<QueryMenu
|
<QueryList
|
||||||
id='control'
|
id='control'
|
||||||
labelKey='model'
|
labelKey='model'
|
||||||
name={t('modelType.control')}
|
name={t('modelType.control')}
|
||||||
|
@ -124,7 +124,8 @@ export function ModelControl() {
|
||||||
result: models,
|
result: models,
|
||||||
selector: (result) => result.networks.filter((network) => network.type === 'control').map((network) => network.name),
|
selector: (result) => result.networks.filter((network) => network.type === 'control').map((network) => network.name),
|
||||||
}}
|
}}
|
||||||
onSelect={(control) => {
|
value={params.control}
|
||||||
|
onChange={(control) => {
|
||||||
setModel({
|
setModel({
|
||||||
control,
|
control,
|
||||||
});
|
});
|
||||||
|
|
|
@ -70,6 +70,7 @@ export const I18N_STRINGS_DE = {
|
||||||
'none': 'Keiner',
|
'none': 'Keiner',
|
||||||
},
|
},
|
||||||
modelType: {
|
modelType: {
|
||||||
|
control: '',
|
||||||
correction: 'Korrekturmodelle',
|
correction: 'Korrekturmodelle',
|
||||||
diffusion: 'Diffusionsmodelle',
|
diffusion: 'Diffusionsmodelle',
|
||||||
inversion: '',
|
inversion: '',
|
||||||
|
|
|
@ -111,6 +111,7 @@ export const I18N_STRINGS_EN = {
|
||||||
'diffusion-unstable-ink-dream-v6': 'Unstable Ink Dream v6',
|
'diffusion-unstable-ink-dream-v6': 'Unstable Ink Dream v6',
|
||||||
},
|
},
|
||||||
modelType: {
|
modelType: {
|
||||||
|
control: 'ControlNet',
|
||||||
correction: 'Correction Model',
|
correction: 'Correction Model',
|
||||||
diffusion: 'Diffusion Model',
|
diffusion: 'Diffusion Model',
|
||||||
inversion: 'Textual Inversion',
|
inversion: 'Textual Inversion',
|
||||||
|
|
|
@ -70,6 +70,7 @@ export const I18N_STRINGS_ES = {
|
||||||
'none': 'Ninguno',
|
'none': 'Ninguno',
|
||||||
},
|
},
|
||||||
modelType: {
|
modelType: {
|
||||||
|
control: '',
|
||||||
correction: 'Modelo de corrección',
|
correction: 'Modelo de corrección',
|
||||||
diffusion: 'Modelo de difusión',
|
diffusion: 'Modelo de difusión',
|
||||||
inversion: '',
|
inversion: '',
|
||||||
|
|
|
@ -70,6 +70,7 @@ export const I18N_STRINGS_FR = {
|
||||||
'none': '',
|
'none': '',
|
||||||
},
|
},
|
||||||
modelType: {
|
modelType: {
|
||||||
|
control: '',
|
||||||
correction: 'modèle de correction',
|
correction: 'modèle de correction',
|
||||||
diffusion: 'modèle de diffusion',
|
diffusion: 'modèle de diffusion',
|
||||||
inversion: '',
|
inversion: '',
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
"ckpt",
|
"ckpt",
|
||||||
"codebook",
|
"codebook",
|
||||||
"codeformer",
|
"codeformer",
|
||||||
|
"controlnet",
|
||||||
"CUDA",
|
"CUDA",
|
||||||
"ddim",
|
"ddim",
|
||||||
"ddpm",
|
"ddpm",
|
||||||
|
|
Loading…
Reference in New Issue