From f147f99befa572c82c23862220b36c08f2fd0a50 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed, 8 May 2024 11:02:07 +1000
Subject: [PATCH] feat(ui): better metadata labels for layers
---
invokeai/frontend/web/public/locales/en.json | 2 --
.../src/features/metadata/util/handlers.ts | 33 ++++++++++++++++---
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json
index 0c7c6cd6e1..375f691ab2 100644
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -1547,8 +1547,6 @@
"addIPAdapter": "Add $t(common.ipAdapter)",
"regionalGuidance": "Regional Guidance",
"regionalGuidanceLayer": "$t(controlLayers.regionalGuidance) $t(unifiedCanvas.layer)",
- "controlNetLayer": "$t(common.controlNet) $t(unifiedCanvas.layer)",
- "ipAdapterLayer": "$t(common.ipAdapter) $t(unifiedCanvas.layer)",
"opacity": "Opacity",
"globalControlAdapter": "Global $t(controlnet.controlAdapter_one)",
"globalControlAdapterLayer": "Global $t(controlnet.controlAdapter_one) $t(unifiedCanvas.layer)",
diff --git a/invokeai/frontend/web/src/features/metadata/util/handlers.ts b/invokeai/frontend/web/src/features/metadata/util/handlers.ts
index da8150fff4..bf5fa2eaec 100644
--- a/invokeai/frontend/web/src/features/metadata/util/handlers.ts
+++ b/invokeai/frontend/web/src/features/metadata/util/handlers.ts
@@ -47,16 +47,41 @@ const renderControlAdapterValue: MetadataRenderValueFunc<AnyControlAdapterConfig
};
const renderLayerValue: MetadataRenderValueFunc<Layer> = async (layer) => {
if (layer.type === 'initial_image_layer') {
- return t('controlLayers.initialImageLayer');
+ let rendered = t('controlLayers.globalInitialImageLayer');
+ if (layer.image) {
+ rendered += ` (${layer.image})`;
+ }
+ return rendered;
}
if (layer.type === 'control_adapter_layer') {
- return t('controlLayers.controlAdapterLayer');
+ let rendered = t('controlLayers.globalControlAdapterLayer');
+ const model = layer.controlAdapter.model;
+ if (model) {
+ rendered += ` (${model.name} - ${model.base.toUpperCase()})`;
+ }
+ return rendered;
}
if (layer.type === 'ip_adapter_layer') {
- return t('controlLayers.ipAdapterLayer');
+ let rendered = t('controlLayers.globalIPAdapterLayer');
+ const model = layer.ipAdapter.model;
+ if (model) {
+ rendered += ` (${model.name} - ${model.base.toUpperCase()})`;
+ }
+ return rendered;
}
if (layer.type === 'regional_guidance_layer') {
- return t('controlLayers.regionalGuidanceLayer');
+ const rendered = t('controlLayers.regionalGuidanceLayer');
+ const items: string[] = [];
+ if (layer.positivePrompt) {
+ items.push(`Positive: ${layer.positivePrompt}`);
+ }
+ if (layer.negativePrompt) {
+ items.push(`Negative: ${layer.negativePrompt}`);
+ }
+ if (layer.ipAdapters.length > 0) {
+ items.push(`${layer.ipAdapters.length} IP Adapters`);
+ }
+ return `${rendered} (${items.join(', ')})`;
}
assert(false, 'Unknown layer type');
};