fix: infoTable II

Refs: #79

Signed-off-by: julianbollig <julian.bollig@tngtech.com>

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",

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",

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",

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",

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",

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": "高速画像モデル",

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 이미지 모델",

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",

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",

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",

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",

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": "快速图像模型",

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": "快速圖像模型",

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<number>(globalDefaultSettings.width)
     const height = ref<number>(globalDefaultSettings.height)
     const scheduler = ref<string>(globalDefaultSettings.scheduler)
-    const imageModel = ref(globalDefaultSettings.imageModel)
-    const inpaintModel = ref(
+    const imageModel = ref<string>(globalDefaultSettings.imageModel)
+    const inpaintModel = ref<string>(
       activeWorkflow.value.defaultSettings?.inpaintModel ?? globalDefaultSettings.inpaintModel,
     )
     const lora = ref<string>(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({

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:

WebUI/src/components/InfoTable.vue

@@ -56,21 +56,21 @@ const settingToTranslationKey: Record<keyof GenerationSettings, string> = {
   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 = (

WebUI/src/components/SettingsModel.vue

@@ -237,7 +237,7 @@
       </div>
     </div>
     <div class="flex flex-col gap-3">
-      <p>{{ languages.DOWNLOADER_FOR_INAPINT_GENERATE }}</p>
+      <p>{{ languages.DOWNLOADER_FOR_INPAINT_GENERATE }}</p>
       <div class="flex justify-between items-center gap-6">
         <span class="text-gray-300 flex-auto"
           >{{ languages.SETTINGS_MODEL_IMAGE_RESOLUTION_STANDARD }}: dreamshaper-8-inpainting</span