Code lint
This commit is contained in:
Cohee
parent
91429ce516
commit
52d9855916
|
|
@ -1,86 +1,86 @@
|
|||
{
|
||||
"3": {
|
||||
"class_type": "KSampler",
|
||||
"inputs": {
|
||||
"cfg": "%scale%",
|
||||
"denoise": 1,
|
||||
"latent_image": [
|
||||
"5",
|
||||
0
|
||||
],
|
||||
"model": [
|
||||
"4",
|
||||
0
|
||||
],
|
||||
"negative": [
|
||||
"7",
|
||||
0
|
||||
],
|
||||
"positive": [
|
||||
"6",
|
||||
0
|
||||
],
|
||||
"sampler_name": "%sampler%",
|
||||
"scheduler": "%scheduler%",
|
||||
"seed": "%seed%",
|
||||
"steps": "%steps%"
|
||||
}
|
||||
},
|
||||
"4": {
|
||||
"class_type": "CheckpointLoaderSimple",
|
||||
"inputs": {
|
||||
"ckpt_name": "%model%"
|
||||
}
|
||||
},
|
||||
"5": {
|
||||
"class_type": "EmptyLatentImage",
|
||||
"inputs": {
|
||||
"batch_size": 1,
|
||||
"height": "%height%",
|
||||
"width": "%width%"
|
||||
}
|
||||
},
|
||||
"6": {
|
||||
"class_type": "CLIPTextEncode",
|
||||
"inputs": {
|
||||
"clip": [
|
||||
"4",
|
||||
1
|
||||
],
|
||||
"text": "%prompt%"
|
||||
}
|
||||
},
|
||||
"7": {
|
||||
"class_type": "CLIPTextEncode",
|
||||
"inputs": {
|
||||
"clip": [
|
||||
"4",
|
||||
1
|
||||
],
|
||||
"text": "%negative_prompt%"
|
||||
}
|
||||
},
|
||||
"8": {
|
||||
"class_type": "VAEDecode",
|
||||
"inputs": {
|
||||
"samples": [
|
||||
"3",
|
||||
0
|
||||
],
|
||||
"vae": [
|
||||
"4",
|
||||
2
|
||||
]
|
||||
}
|
||||
},
|
||||
"9": {
|
||||
"class_type": "SaveImage",
|
||||
"inputs": {
|
||||
"filename_prefix": "SillyTavern",
|
||||
"images": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
"3": {
|
||||
"class_type": "KSampler",
|
||||
"inputs": {
|
||||
"cfg": "%scale%",
|
||||
"denoise": 1,
|
||||
"latent_image": [
|
||||
"5",
|
||||
0
|
||||
],
|
||||
"model": [
|
||||
"4",
|
||||
0
|
||||
],
|
||||
"negative": [
|
||||
"7",
|
||||
0
|
||||
],
|
||||
"positive": [
|
||||
"6",
|
||||
0
|
||||
],
|
||||
"sampler_name": "%sampler%",
|
||||
"scheduler": "%scheduler%",
|
||||
"seed": "%seed%",
|
||||
"steps": "%steps%"
|
||||
}
|
||||
},
|
||||
"4": {
|
||||
"class_type": "CheckpointLoaderSimple",
|
||||
"inputs": {
|
||||
"ckpt_name": "%model%"
|
||||
}
|
||||
},
|
||||
"5": {
|
||||
"class_type": "EmptyLatentImage",
|
||||
"inputs": {
|
||||
"batch_size": 1,
|
||||
"height": "%height%",
|
||||
"width": "%width%"
|
||||
}
|
||||
},
|
||||
"6": {
|
||||
"class_type": "CLIPTextEncode",
|
||||
"inputs": {
|
||||
"clip": [
|
||||
"4",
|
||||
1
|
||||
],
|
||||
"text": "%prompt%"
|
||||
}
|
||||
},
|
||||
"7": {
|
||||
"class_type": "CLIPTextEncode",
|
||||
"inputs": {
|
||||
"clip": [
|
||||
"4",
|
||||
1
|
||||
],
|
||||
"text": "%negative_prompt%"
|
||||
}
|
||||
},
|
||||
"8": {
|
||||
"class_type": "VAEDecode",
|
||||
"inputs": {
|
||||
"samples": [
|
||||
"3",
|
||||
0
|
||||
],
|
||||
"vae": [
|
||||
"4",
|
||||
2
|
||||
]
|
||||
}
|
||||
},
|
||||
"9": {
|
||||
"class_type": "SaveImage",
|
||||
"inputs": {
|
||||
"filename_prefix": "SillyTavern",
|
||||
"images": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
<div id="sd_comfy_workflow_editor_template">
|
||||
<div class="sd_comfy_workflow_editor">
|
||||
<h3><strong>ComfyUI Workflow Editor: <span id="sd_comfy_workflow_editor_name"></span></strong></h3>
|
||||
<div class="sd_comfy_workflow_editor_content">
|
||||
<div class="flex-container flexFlowColumn sd_comfy_workflow_editor_workflow_container">
|
||||
<label for="sd_comfy_workflow_editor_workflow">Workflow (JSON)</label>
|
||||
<textarea id="sd_comfy_workflow_editor_workflow" class="text_pole wide100p textarea_compact flex1" placeholder="Put the ComfyUI's workflow (JSON) here and replace the variable settings with placeholders."></textarea>
|
||||
</div>
|
||||
<div class="sd_comfy_workflow_editor_placeholder_container">
|
||||
<div>Placeholders</div>
|
||||
<ul class="sd_comfy_workflow_editor_placeholder_list">
|
||||
<li data-placeholder="prompt" class="sd_comfy_workflow_editor_not_found">"%prompt%"</li>
|
||||
<li data-placeholder="negative_prompt" class="sd_comfy_workflow_editor_not_found">"%negative_prompt%"</li>
|
||||
<li data-placeholder="model" class="sd_comfy_workflow_editor_not_found">"%model%"</li>
|
||||
<li data-placeholder="vae" class="sd_comfy_workflow_editor_not_found">"%vae%"</li>
|
||||
<li data-placeholder="sampler" class="sd_comfy_workflow_editor_not_found">"%sampler%"</li>
|
||||
<li data-placeholder="scheduler" class="sd_comfy_workflow_editor_not_found">"%scheduler%"</li>
|
||||
<li data-placeholder="steps" class="sd_comfy_workflow_editor_not_found">"%steps%"</li>
|
||||
<li data-placeholder="scale" class="sd_comfy_workflow_editor_not_found">"%scale%"</li>
|
||||
<li data-placeholder="width" class="sd_comfy_workflow_editor_not_found">"%width%"</li>
|
||||
<li data-placeholder="height" class="sd_comfy_workflow_editor_not_found">"%height%"</li>
|
||||
<li><hr></li>
|
||||
<li data-placeholder="seed" class="sd_comfy_workflow_editor_not_found">
|
||||
"%seed%"
|
||||
<a href="javascript:;" class="notes-link"><span class="note-link-span" title="Will generate a new random seed in SillyTavern that is then used in the ComfyUI workflow.">?</span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sd_comfy_workflow_editor">
|
||||
<h3><strong>ComfyUI Workflow Editor: <span id="sd_comfy_workflow_editor_name"></span></strong></h3>
|
||||
<div class="sd_comfy_workflow_editor_content">
|
||||
<div class="flex-container flexFlowColumn sd_comfy_workflow_editor_workflow_container">
|
||||
<label for="sd_comfy_workflow_editor_workflow">Workflow (JSON)</label>
|
||||
<textarea id="sd_comfy_workflow_editor_workflow" class="text_pole wide100p textarea_compact flex1" placeholder="Put the ComfyUI's workflow (JSON) here and replace the variable settings with placeholders."></textarea>
|
||||
</div>
|
||||
<div class="sd_comfy_workflow_editor_placeholder_container">
|
||||
<div>Placeholders</div>
|
||||
<ul class="sd_comfy_workflow_editor_placeholder_list">
|
||||
<li data-placeholder="prompt" class="sd_comfy_workflow_editor_not_found">"%prompt%"</li>
|
||||
<li data-placeholder="negative_prompt" class="sd_comfy_workflow_editor_not_found">"%negative_prompt%"</li>
|
||||
<li data-placeholder="model" class="sd_comfy_workflow_editor_not_found">"%model%"</li>
|
||||
<li data-placeholder="vae" class="sd_comfy_workflow_editor_not_found">"%vae%"</li>
|
||||
<li data-placeholder="sampler" class="sd_comfy_workflow_editor_not_found">"%sampler%"</li>
|
||||
<li data-placeholder="scheduler" class="sd_comfy_workflow_editor_not_found">"%scheduler%"</li>
|
||||
<li data-placeholder="steps" class="sd_comfy_workflow_editor_not_found">"%steps%"</li>
|
||||
<li data-placeholder="scale" class="sd_comfy_workflow_editor_not_found">"%scale%"</li>
|
||||
<li data-placeholder="width" class="sd_comfy_workflow_editor_not_found">"%width%"</li>
|
||||
<li data-placeholder="height" class="sd_comfy_workflow_editor_not_found">"%height%"</li>
|
||||
<li><hr></li>
|
||||
<li data-placeholder="seed" class="sd_comfy_workflow_editor_not_found">
|
||||
"%seed%"
|
||||
<a href="javascript:;" class="notes-link"><span class="note-link-span" title="Will generate a new random seed in SillyTavern that is then used in the ComfyUI workflow.">?</span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -659,7 +659,7 @@ async function onSourceChange() {
|
|||
extension_settings.sd.sampler = null;
|
||||
toggleSourceControls();
|
||||
saveSettingsDebounced();
|
||||
await Promise.all([loadModels(), loadSamplers()]);
|
||||
await loadSettingOptions();
|
||||
}
|
||||
|
||||
async function onOpenAiStyleSelect() {
|
||||
|
|
@ -791,8 +791,7 @@ async function validateAutoUrl() {
|
|||
throw new Error('SD WebUI returned an error.');
|
||||
}
|
||||
|
||||
await loadSamplers();
|
||||
await loadModels();
|
||||
await loadSettingOptions();
|
||||
toastr.success('SD WebUI API connected.');
|
||||
} catch (error) {
|
||||
toastr.error(`Could not validate SD WebUI API: ${error.message}`);
|
||||
|
|
@ -815,8 +814,7 @@ async function validateVladUrl() {
|
|||
throw new Error('SD.Next returned an error.');
|
||||
}
|
||||
|
||||
await loadSamplers();
|
||||
await loadModels();
|
||||
await loadSettingOptions();
|
||||
toastr.success('SD.Next API connected.');
|
||||
} catch (error) {
|
||||
toastr.error(`Could not validate SD.Next API: ${error.message}`);
|
||||
|
|
@ -840,11 +838,7 @@ async function validateComfyUrl() {
|
|||
throw new Error('ComfyUI returned an error.');
|
||||
}
|
||||
|
||||
await loadSamplers();
|
||||
await loadSchedulers();
|
||||
await loadModels();
|
||||
await loadVaes();
|
||||
await loadComfyWorkflows();
|
||||
await loadSettingOptions();
|
||||
toastr.success('ComfyUI API connected.');
|
||||
} catch (error) {
|
||||
toastr.error(`Could not validate ComfyUI API: ${error.message}`);
|
||||
|
|
@ -2444,7 +2438,7 @@ jQuery(async () => {
|
|||
})
|
||||
|
||||
eventSource.on(event_types.EXTRAS_CONNECTED, async () => {
|
||||
await Promise.all([loadSamplers(), loadModels()]);
|
||||
await loadSettingOptions();
|
||||
});
|
||||
|
||||
eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ function removePattern(x, pattern) {
|
|||
function getComfyWorkflows() {
|
||||
return fs
|
||||
.readdirSync(DIRECTORIES.comfyWorkflows)
|
||||
.filter(file => file[0]!='.' && file.toLowerCase().endsWith('.json'))
|
||||
.filter(file => file[0] != '.' && file.toLowerCase().endsWith('.json'))
|
||||
.sort(Intl.Collator().compare);
|
||||
}
|
||||
|
||||
|
|
@ -465,7 +465,7 @@ function registerEndpoints(app, jsonParser) {
|
|||
}
|
||||
const data = fs.readFileSync(
|
||||
path,
|
||||
{encoding:'utf-8'}
|
||||
{ encoding: 'utf-8' }
|
||||
);
|
||||
return response.send(JSON.stringify(data));
|
||||
} catch (error) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue