-
{$i18n.t('Features')}
+
{$i18n.t('Features')}
diff --git a/src/lib/components/admin/Settings/Images.svelte b/src/lib/components/admin/Settings/Images.svelte
index 0c19e0ba71..ffbe894bc3 100644
--- a/src/lib/components/admin/Settings/Images.svelte
+++ b/src/lib/components/admin/Settings/Images.svelte
@@ -18,55 +18,18 @@
import Switch from '$lib/components/common/Switch.svelte';
import Tooltip from '$lib/components/common/Tooltip.svelte';
import Textarea from '$lib/components/common/Textarea.svelte';
+ import CodeEditorModal from '$lib/components/common/CodeEditorModal.svelte';
const dispatch = createEventDispatcher();
const i18n = getContext('i18n');
let loading = false;
- let config = null;
- let imageGenerationConfig = null;
-
let models = null;
+ let config = null;
- let samplers = [
- 'DPM++ 2M',
- 'DPM++ SDE',
- 'DPM++ 2M SDE',
- 'DPM++ 2M SDE Heun',
- 'DPM++ 2S a',
- 'DPM++ 3M SDE',
- 'Euler a',
- 'Euler',
- 'LMS',
- 'Heun',
- 'DPM2',
- 'DPM2 a',
- 'DPM fast',
- 'DPM adaptive',
- 'Restart',
- 'DDIM',
- 'DDIM CFG++',
- 'PLMS',
- 'UniPC'
- ];
-
- let schedulers = [
- 'Automatic',
- 'Uniform',
- 'Karras',
- 'Exponential',
- 'Polyexponential',
- 'SGM Uniform',
- 'KL Optimal',
- 'Align Your Steps',
- 'Simple',
- 'Normal',
- 'DDIM',
- 'Beta'
- ];
-
- let requiredWorkflowNodes = [
+ let showComfyUIWorkflowEditor = false;
+ let REQUIRED_WORKFLOW_NODES = [
{
type: 'prompt',
key: 'text',
@@ -99,6 +62,35 @@
}
];
+ let showComfyUIEditWorkflowEditor = false;
+ let REQUIRED_EDIT_WORKFLOW_NODES = [
+ {
+ type: 'image',
+ key: 'image',
+ node_ids: ''
+ },
+ {
+ type: 'prompt',
+ key: 'prompt',
+ node_ids: ''
+ },
+ {
+ type: 'model',
+ key: 'unet_name',
+ node_ids: ''
+ },
+ {
+ type: 'width',
+ key: 'width',
+ node_ids: ''
+ },
+ {
+ type: 'height',
+ key: 'height',
+ node_ids: ''
+ }
+ ];
+
const getModels = async () => {
models = await getImageGenerationModels(localStorage.token).catch((error) => {
toast.error(`${error}`);
@@ -107,24 +99,48 @@
};
const updateConfigHandler = async () => {
- const res = await updateConfig(localStorage.token, config)
- .catch((error) => {
- toast.error(`${error}`);
- return null;
- })
- .catch((error) => {
- toast.error(`${error}`);
- return null;
- });
+ if (
+ config.IMAGE_GENERATION_ENGINE === 'automatic1111' &&
+ config.AUTOMATIC1111_BASE_URL === ''
+ ) {
+ toast.error($i18n.t('AUTOMATIC1111 Base URL is required.'));
+ config.ENABLE_IMAGE_GENERATION = false;
+
+ return null;
+ } else if (config.IMAGE_GENERATION_ENGINE === 'comfyui' && config.COMFYUI_BASE_URL === '') {
+ toast.error($i18n.t('ComfyUI Base URL is required.'));
+ config.ENABLE_IMAGE_GENERATION = false;
+
+ return null;
+ } else if (config.IMAGE_GENERATION_ENGINE === 'openai' && config.IMAGES_OPENAI_API_KEY === '') {
+ toast.error($i18n.t('OpenAI API Key is required.'));
+ config.ENABLE_IMAGE_GENERATION = false;
+
+ return null;
+ } else if (config.IMAGE_GENERATION_ENGINE === 'gemini' && config.IMAGES_GEMINI_API_KEY === '') {
+ toast.error($i18n.t('Gemini API Key is required.'));
+ config.ENABLE_IMAGE_GENERATION = false;
+
+ return null;
+ }
+
+ const res = await updateConfig(localStorage.token, config).catch((error) => {
+ toast.error(`${error}`);
+ return null;
+ });
if (res) {
config = res;
+
+ if (config.ENABLE_IMAGE_GENERATION) {
+ backendConfig.set(await getBackendConfig());
+ getModels();
+ }
+
+ return config;
}
- if (config.enabled) {
- backendConfig.set(await getBackendConfig());
- getModels();
- }
+ return null;
};
const validateJSON = (json) => {
@@ -141,16 +157,14 @@
const saveHandler = async () => {
loading = true;
- if (config?.comfyui?.COMFYUI_WORKFLOW) {
- if (!validateJSON(config.comfyui.COMFYUI_WORKFLOW)) {
+ if (config?.COMFYUI_WORKFLOW) {
+ if (!validateJSON(config?.COMFYUI_WORKFLOW)) {
toast.error($i18n.t('Invalid JSON format for ComfyUI Workflow.'));
loading = false;
return;
}
- }
- if (config?.comfyui?.COMFYUI_WORKFLOW) {
- config.comfyui.COMFYUI_WORKFLOW_NODES = requiredWorkflowNodes.map((node) => {
+ config.COMFYUI_WORKFLOW_NODES = REQUIRED_WORKFLOW_NODES.map((node) => {
return {
type: node.type,
key: node.key,
@@ -160,20 +174,28 @@
});
}
- await updateConfig(localStorage.token, config).catch((error) => {
- toast.error(`${error}`);
- loading = false;
- return null;
- });
+ if (config?.IMAGES_EDIT_COMFYUI_WORKFLOW) {
+ if (!validateJSON(config?.IMAGES_EDIT_COMFYUI_WORKFLOW)) {
+ toast.error($i18n.t('Invalid JSON format for ComfyUI Edit Workflow.'));
+ loading = false;
+ return;
+ }
- await updateImageGenerationConfig(localStorage.token, imageGenerationConfig).catch((error) => {
- toast.error(`${error}`);
- loading = false;
- return null;
- });
+ config.IMAGES_EDIT_COMFYUI_WORKFLOW_NODES = REQUIRED_EDIT_WORKFLOW_NODES.map((node) => {
+ return {
+ type: node.type,
+ key: node.key,
+ node_ids:
+ node.node_ids.trim() === '' ? [] : node.node_ids.split(',').map((id) => id.trim())
+ };
+ });
+ }
+
+ const res = await updateConfigHandler();
+ if (res) {
+ dispatch('save');
+ }
- getModels();
- dispatch('save');
loading = false;
};
@@ -188,25 +210,20 @@
config = res;
}
- if (config.enabled) {
+ if (config.ENABLE_IMAGE_GENERATION) {
getModels();
}
- if (config.comfyui.COMFYUI_WORKFLOW) {
+ if (config.COMFYUI_WORKFLOW) {
try {
- config.comfyui.COMFYUI_WORKFLOW = JSON.stringify(
- JSON.parse(config.comfyui.COMFYUI_WORKFLOW),
- null,
- 2
- );
+ config.COMFYUI_WORKFLOW = JSON.stringify(JSON.parse(config.COMFYUI_WORKFLOW), null, 2);
} catch (e) {
console.error(e);
}
}
- requiredWorkflowNodes = requiredWorkflowNodes.map((node) => {
- const n = config.comfyui.COMFYUI_WORKFLOW_NODES.find((n) => n.type === node.type) ?? node;
-
+ REQUIRED_WORKFLOW_NODES = REQUIRED_WORKFLOW_NODES.map((node) => {
+ const n = config.COMFYUI_WORKFLOW_NODES.find((n) => n.type === node.type) ?? node;
console.debug(n);
return {
@@ -216,14 +233,29 @@
};
});
- const imageConfigRes = await getImageGenerationConfig(localStorage.token).catch((error) => {
- toast.error(`${error}`);
- return null;
- });
-
- if (imageConfigRes) {
- imageGenerationConfig = imageConfigRes;
+ if (config.IMAGES_EDIT_COMFYUI_WORKFLOW) {
+ try {
+ config.IMAGES_EDIT_COMFYUI_WORKFLOW = JSON.stringify(
+ JSON.parse(config.IMAGES_EDIT_COMFYUI_WORKFLOW),
+ null,
+ 2
+ );
+ } catch (e) {
+ console.error(e);
+ }
}
+
+ REQUIRED_EDIT_WORKFLOW_NODES = REQUIRED_EDIT_WORKFLOW_NODES.map((node) => {
+ const n =
+ config.IMAGES_EDIT_COMFYUI_WORKFLOW_NODES.find((n) => n.type === node.type) ?? node;
+ console.debug(n);
+
+ return {
+ type: n.type,
+ key: n.key,
+ node_ids: typeof n.node_ids === 'string' ? n.node_ids : n.node_ids.join(',')
+ };
+ });
}
});
@@ -235,493 +267,953 @@
}}
>
-
- 
-
-