From cacf9902ea6a9e1710f65c65734b22c4dc0384b4 Mon Sep 17 00:00:00 2001 From: julianbollig Date: Thu, 27 Feb 2025 17:22:38 +0200 Subject: [PATCH] fix: infoTable II Refs: #79 Signed-off-by: julianbollig --- WebUI/src/assets/i18n/de.json | 2 +- WebUI/src/assets/i18n/en-US.json | 2 +- WebUI/src/assets/i18n/es.json | 2 +- WebUI/src/assets/i18n/id.json | 2 +- WebUI/src/assets/i18n/it.json | 2 +- WebUI/src/assets/i18n/ja.json | 2 +- WebUI/src/assets/i18n/ko.json | 2 +- WebUI/src/assets/i18n/pl.json | 2 +- WebUI/src/assets/i18n/th.json | 2 +- WebUI/src/assets/i18n/tr.json | 2 +- WebUI/src/assets/i18n/vi.json | 2 +- WebUI/src/assets/i18n/zh-CN.json | 2 +- WebUI/src/assets/i18n/zh-TW.json | 2 +- WebUI/src/assets/js/store/imageGeneration.ts | 29 ++++++++++---------- WebUI/src/components/DownloadDialog.vue | 2 +- WebUI/src/components/InfoTable.vue | 22 +++++++-------- WebUI/src/components/SettingsModel.vue | 2 +- 17 files changed, 41 insertions(+), 40 deletions(-) diff --git a/WebUI/src/assets/i18n/de.json b/WebUI/src/assets/i18n/de.json index 16d6b0ca..b1b7b6db 100644 --- a/WebUI/src/assets/i18n/de.json +++ b/WebUI/src/assets/i18n/de.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Antwort-Modell", "DOWNLOADER_FOR_RAG_QUERY": "RAG-Embed-Modell", "DOWNLOADER_FOR_IMAGE_GENERATE": "Bild-Modell", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Inpaint/Outpaint-Modell", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Inpaint/Outpaint-Modell", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Image-Preview-Modell", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Image-Upscale-Modell", "DOWNLOADER_FOR_IMAGE_LORA": "Fast-Image-Modell", diff --git a/WebUI/src/assets/i18n/en-US.json b/WebUI/src/assets/i18n/en-US.json index 66b565cd..d1c6402d 100644 --- a/WebUI/src/assets/i18n/en-US.json +++ b/WebUI/src/assets/i18n/en-US.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Answer Model", "DOWNLOADER_FOR_RAG_QUERY": "RAG Embed Model", "DOWNLOADER_FOR_IMAGE_GENERATE": "Image Model", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Inpaint/OutPaint Model", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Inpaint/OutPaint Model", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Image Preview Model", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Image Upscale Model", "DOWNLOADER_FOR_IMAGE_LORA": "Fast Image Model", diff --git a/WebUI/src/assets/i18n/es.json b/WebUI/src/assets/i18n/es.json index 04a59cb2..11ac4a66 100644 --- a/WebUI/src/assets/i18n/es.json +++ b/WebUI/src/assets/i18n/es.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Modelo de respuesta", "DOWNLOADER_FOR_RAG_QUERY": "Modelo Embed RAG", "DOWNLOADER_FOR_IMAGE_GENERATE": "Modelo de imagen", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Modelo Inpaint/Outpaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Modelo Inpaint/Outpaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Modelo de vista previa", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Modelo de aumento de resolución", "DOWNLOADER_FOR_IMAGE_LORA": "Modelo de imagen rápida", diff --git a/WebUI/src/assets/i18n/id.json b/WebUI/src/assets/i18n/id.json index a6494461..ba4ff953 100644 --- a/WebUI/src/assets/i18n/id.json +++ b/WebUI/src/assets/i18n/id.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Model Jawaban", "DOWNLOADER_FOR_RAG_QUERY": "Model Embed RAG", "DOWNLOADER_FOR_IMAGE_GENERATE": "Model Gambar", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Model Inpaint/OutPaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Model Inpaint/OutPaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Model Pratinjau Gambar", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Model Peningkatan Gambar", "DOWNLOADER_FOR_IMAGE_LORA": "Model Gambar Cepat", diff --git a/WebUI/src/assets/i18n/it.json b/WebUI/src/assets/i18n/it.json index caee42cd..65f278e3 100644 --- a/WebUI/src/assets/i18n/it.json +++ b/WebUI/src/assets/i18n/it.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Modello di risposta", "DOWNLOADER_FOR_RAG_QUERY": "Modello Embed RAG", "DOWNLOADER_FOR_IMAGE_GENERATE": "Modello immagine", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Modello Inpaint/Outpaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Modello Inpaint/Outpaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Modello anteprima", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Modello upscaling", "DOWNLOADER_FOR_IMAGE_LORA": "Modello immagine veloce", diff --git a/WebUI/src/assets/i18n/ja.json b/WebUI/src/assets/i18n/ja.json index 402801a6..d6993814 100644 --- a/WebUI/src/assets/i18n/ja.json +++ b/WebUI/src/assets/i18n/ja.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "回答モデル", "DOWNLOADER_FOR_RAG_QUERY": "RAG埋め込みモデル", "DOWNLOADER_FOR_IMAGE_GENERATE": "画像モデル", - "DOWNLOADER_FOR_INAPINT_GENERATE": "インペイント/アウトペイントモデル", + "DOWNLOADER_FOR_INPAINT_GENERATE": "インペイント/アウトペイントモデル", "DOWNLOADER_FOR_IMAGE_PREVIEW": "画像プレビューモデル", "DOWNLOADER_FOR_IMAGE_UPSCALE": "画像アップスケールモデル", "DOWNLOADER_FOR_IMAGE_LORA": "高速画像モデル", diff --git a/WebUI/src/assets/i18n/ko.json b/WebUI/src/assets/i18n/ko.json index bbbe77ce..da504214 100644 --- a/WebUI/src/assets/i18n/ko.json +++ b/WebUI/src/assets/i18n/ko.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "답변 모델", "DOWNLOADER_FOR_RAG_QUERY": "RAG Embed 모델", "DOWNLOADER_FOR_IMAGE_GENERATE": "이미지 모델", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Inpaint/Outpaint 모델", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Inpaint/Outpaint 모델", "DOWNLOADER_FOR_IMAGE_PREVIEW": "이미지 미리보기 모델", "DOWNLOADER_FOR_IMAGE_UPSCALE": "이미지 업스케일 모델", "DOWNLOADER_FOR_IMAGE_LORA": "Fast 이미지 모델", diff --git a/WebUI/src/assets/i18n/pl.json b/WebUI/src/assets/i18n/pl.json index 71765084..14b346fe 100644 --- a/WebUI/src/assets/i18n/pl.json +++ b/WebUI/src/assets/i18n/pl.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Model odpowiedzi", "DOWNLOADER_FOR_RAG_QUERY": "Model RAG Query", "DOWNLOADER_FOR_IMAGE_GENERATE": "Model obrazu", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Model Inpaint/Outpaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Model Inpaint/Outpaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Model podglądu obrazu", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Model skalowania obrazu", "DOWNLOADER_FOR_IMAGE_LORA": "Szybki model obrazu", diff --git a/WebUI/src/assets/i18n/th.json b/WebUI/src/assets/i18n/th.json index 056f1f93..e042b502 100644 --- a/WebUI/src/assets/i18n/th.json +++ b/WebUI/src/assets/i18n/th.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "โมเดลคำตอบ", "DOWNLOADER_FOR_RAG_QUERY": "โมเดลการค้นหา RAG", "DOWNLOADER_FOR_IMAGE_GENERATE": "โมเดลภาพ", - "DOWNLOADER_FOR_INAPINT_GENERATE": "โมเดล Inpaint/Outpaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "โมเดล Inpaint/Outpaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "โมเดลภาพตัวอย่าง", "DOWNLOADER_FOR_IMAGE_UPSCALE": "โมเดลภาพอัปสเกล", "DOWNLOADER_FOR_IMAGE_LORA": "โมเดลภาพ Fast", diff --git a/WebUI/src/assets/i18n/tr.json b/WebUI/src/assets/i18n/tr.json index c570cfcb..a7b34f41 100644 --- a/WebUI/src/assets/i18n/tr.json +++ b/WebUI/src/assets/i18n/tr.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Answer Model", "DOWNLOADER_FOR_RAG_QUERY": "RAG Embed Model", "DOWNLOADER_FOR_IMAGE_GENERATE": "Image Model", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Inpaint/Outpaint Model", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Inpaint/Outpaint Model", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Image Preview Model", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Image Upscale Model", "DOWNLOADER_FOR_IMAGE_LORA": "Fast Image Model", diff --git a/WebUI/src/assets/i18n/vi.json b/WebUI/src/assets/i18n/vi.json index 65031240..30d3dbd5 100644 --- a/WebUI/src/assets/i18n/vi.json +++ b/WebUI/src/assets/i18n/vi.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "Mô hình trả lời", "DOWNLOADER_FOR_RAG_QUERY": "Mô hình RAG Embed", "DOWNLOADER_FOR_IMAGE_GENERATE": "Mô hình ảnh", - "DOWNLOADER_FOR_INAPINT_GENERATE": "Mô hình Inpaint/Outpaint", + "DOWNLOADER_FOR_INPAINT_GENERATE": "Mô hình Inpaint/Outpaint", "DOWNLOADER_FOR_IMAGE_PREVIEW": "Mô hình xem trước ảnh", "DOWNLOADER_FOR_IMAGE_UPSCALE": "Mô hình tăng độ phân giải ảnh", "DOWNLOADER_FOR_IMAGE_LORA": "Mô hình ảnh nhanh", diff --git a/WebUI/src/assets/i18n/zh-CN.json b/WebUI/src/assets/i18n/zh-CN.json index 01359352..b69218a9 100644 --- a/WebUI/src/assets/i18n/zh-CN.json +++ b/WebUI/src/assets/i18n/zh-CN.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "问答模型", "DOWNLOADER_FOR_RAG_QUERY": "RAG 嵌入模型", "DOWNLOADER_FOR_IMAGE_GENERATE": "图像生成模型", - "DOWNLOADER_FOR_INAPINT_GENERATE": "重绘/扩图模型", + "DOWNLOADER_FOR_INPAINT_GENERATE": "重绘/扩图模型", "DOWNLOADER_FOR_IMAGE_PREVIEW": "图像预览模型", "DOWNLOADER_FOR_IMAGE_UPSCALE": "图像放大模型", "DOWNLOADER_FOR_IMAGE_LORA": "快速图像模型", diff --git a/WebUI/src/assets/i18n/zh-TW.json b/WebUI/src/assets/i18n/zh-TW.json index 224355db..5d414f86 100644 --- a/WebUI/src/assets/i18n/zh-TW.json +++ b/WebUI/src/assets/i18n/zh-TW.json @@ -177,7 +177,7 @@ "DOWNLOADER_FOR_ANSWER_GENERATE": "對話模型", "DOWNLOADER_FOR_RAG_QUERY": "RAG嵌入模型", "DOWNLOADER_FOR_IMAGE_GENERATE": "圖像生成模型", - "DOWNLOADER_FOR_INAPINT_GENERATE": "局部重繪/邊緣擴繪模型", + "DOWNLOADER_FOR_INPAINT_GENERATE": "局部重繪/邊緣擴繪模型", "DOWNLOADER_FOR_IMAGE_PREVIEW": "圖像預覽模型", "DOWNLOADER_FOR_IMAGE_UPSCALE": "圖像放大模型", "DOWNLOADER_FOR_IMAGE_LORA": "快速圖像模型", diff --git a/WebUI/src/assets/js/store/imageGeneration.ts b/WebUI/src/assets/js/store/imageGeneration.ts index 6c0174ae..f27e17ba 100644 --- a/WebUI/src/assets/js/store/imageGeneration.ts +++ b/WebUI/src/assets/js/store/imageGeneration.ts @@ -22,10 +22,9 @@ export type GenerateState = export type GenerationSettings = Partial< Settings & { + backend: 'default' | 'comfyui' workflow: string - } & { device: number - backend: 'default' | 'comfyui' } > @@ -464,8 +463,8 @@ export const useImageGeneration = defineStore( const width = ref(globalDefaultSettings.width) const height = ref(globalDefaultSettings.height) const scheduler = ref(globalDefaultSettings.scheduler) - const imageModel = ref(globalDefaultSettings.imageModel) - const inpaintModel = ref( + const imageModel = ref(globalDefaultSettings.imageModel) + const inpaintModel = ref( activeWorkflow.value.defaultSettings?.inpaintModel ?? globalDefaultSettings.inpaintModel, ) const lora = ref(globalDefaultSettings.lora) @@ -486,32 +485,33 @@ export const useImageGeneration = defineStore( activeWorkflow.value.displayedSettings.includes(setting) || activeWorkflow.value.modifiableSettings.includes(setting) - // TODO: restructure this list to make it more cohesive const getGenerationParameters = (): GenerationSettings => { const allSettings = { backend: backend.value, workflow: activeWorkflowName.value ?? 'unknown', device: globalSetup.modelSettings.graphics, prompt: prompt.value, - negativePrompt: negativePrompt.value, - imageModel: imageModel.value, - batchSize: batchSize.value, - inferenceSteps: inferenceSteps.value, - guidanceScale: guidanceScale.value, - seed: seed.value, - height: height.value, width: width.value, + height: height.value, resolution: resolution.value, - lora: lora.value, - scheduler: scheduler.value, imagePreview: imagePreview.value, + inferenceSteps: inferenceSteps.value, + seed: seed.value, + batchSize: batchSize.value, + negativePrompt: negativePrompt.value, safetyCheck: safetyCheck.value, + scheduler: scheduler.value, + guidanceScale: guidanceScale.value, + imageModel: imageModel.value, + inpaintModel: inpaintModel.value, + lora: lora.value, } return Object.fromEntries( Object.entries(allSettings).filter(([key]) => settingIsRelevant(key as Setting)), ) } + // TODO: Why not call this modifiableSettings, can prompt here be easily added? const settings = { seed, inferenceSteps, @@ -526,6 +526,7 @@ export const useImageGeneration = defineStore( imageModel, inpaintModel, } + type ModifiableSettings = keyof typeof settings const backend = computed({ diff --git a/WebUI/src/components/DownloadDialog.vue b/WebUI/src/components/DownloadDialog.vue index 2a99784c..955d3fb2 100644 --- a/WebUI/src/components/DownloadDialog.vue +++ b/WebUI/src/components/DownloadDialog.vue @@ -356,7 +356,7 @@ function getFunctionTip(type: number): string { case Const.MODEL_TYPE_VAE: return i18nState.DOWNLOADER_FOR_IMAGE_GENERATE case Const.MODEL_TYPE_INPAINT: - return i18nState.DOWNLOADER_FOR_INAPINT_GENERATE + return i18nState.DOWNLOADER_FOR_INPAINT_GENERATE case Const.MODEL_TYPE_PREVIEW: return i18nState.DOWNLOADER_FOR_IMAGE_PREVIEW case Const.MODEL_TYPE_ESRGAN: diff --git a/WebUI/src/components/InfoTable.vue b/WebUI/src/components/InfoTable.vue index 3d3efecb..eecdf5bf 100644 --- a/WebUI/src/components/InfoTable.vue +++ b/WebUI/src/components/InfoTable.vue @@ -56,21 +56,21 @@ const settingToTranslationKey: Record = { backend: 'BACKEND', workflow: 'SETTINGS_IMAGE_WORKFLOW', device: 'DEVICE', - imageModel: 'DOWNLOADER_MODEL', - inpaintModel: 'DOWNLOADER_FOR_INAPINT_GENERATE', - negativePrompt: 'SETTINGS_MODEL_NEGATIVE_PROMPT', - resolution: 'SETTINGS_MODEL_IMAGE_RESOLUTION', prompt: 'INPUT_PROMPT', - guidanceScale: 'SETTINGS_MODEL_IMAGE_CFG', + width: 'SETTINGS_MODEL_IMAGE_WIDTH', + height: 'SETTINGS_MODEL_IMAGE_HEIGHT', + resolution: 'SETTINGS_MODEL_IMAGE_RESOLUTION', + imagePreview: 'SETTINGS_MODEL_IMAGE_PREVIEW', inferenceSteps: 'SETTINGS_MODEL_IMAGE_STEPS', seed: 'SETTINGS_MODEL_SEED', - lora: 'SETTINGS_MODEL_LORA', - scheduler: 'SETTINGS_MODEL_SCHEDULER', - imagePreview: 'SETTINGS_MODEL_IMAGE_PREVIEW', - safetyCheck: 'SETTINGS_MODEL_SAFE_CHECK', batchSize: 'SETTINGS_MODEL_GENERATE_NUMBER', - width: 'SETTINGS_MODEL_IMAGE_WIDTH', - height: 'SETTINGS_MODEL_IMAGE_HEIGHT', + negativePrompt: 'SETTINGS_MODEL_NEGATIVE_PROMPT', + safetyCheck: 'SETTINGS_MODEL_SAFE_CHECK', + scheduler: 'SETTINGS_MODEL_SCHEDULER', + guidanceScale: 'SETTINGS_MODEL_IMAGE_CFG', + imageModel: 'DOWNLOADER_MODEL', + inpaintModel: 'DOWNLOADER_FOR_INPAINT_GENERATE', + lora: 'SETTINGS_MODEL_LORA', } const filterRelevantInformation = ( diff --git a/WebUI/src/components/SettingsModel.vue b/WebUI/src/components/SettingsModel.vue index 4b5f652a..d59384ef 100644 --- a/WebUI/src/components/SettingsModel.vue +++ b/WebUI/src/components/SettingsModel.vue @@ -237,7 +237,7 @@
-

{{ languages.DOWNLOADER_FOR_INAPINT_GENERATE }}

+

{{ languages.DOWNLOADER_FOR_INPAINT_GENERATE }}

{{ languages.SETTINGS_MODEL_IMAGE_RESOLUTION_STANDARD }}: dreamshaper-8-inpainting