Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2cfdd0b3f5 | ||
|
|
9c06cc666c | ||
|
|
710917d507 | ||
|
|
16f4312c9e | ||
|
|
20801f4d3f | ||
|
|
ba2f942b29 | ||
|
|
0dfa83f486 | ||
|
|
5954092f25 | ||
|
|
a2990ca833 | ||
|
|
d673c4a00b |
@@ -25,10 +25,10 @@ class ComfyUIDeployExternalLora:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_lora_name": (folder_paths.get_filename_list("loras"),),
|
"default_lora_name": (folder_paths.get_filename_list("loras"),),
|
||||||
"lora_save_name": ( # if `default_lora_name` is a link to download a file, we will attempt to save it with this name
|
"lora_save_name": ( # if `default_lora_name` is a link to download a file, we will attempt to save it with this name
|
||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": False, "default": ""},
|
{"multiline": False, "default": ""},
|
||||||
),
|
),
|
||||||
"display_name": (
|
"display_name": (
|
||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": False, "default": ""},
|
{"multiline": False, "default": ""},
|
||||||
@@ -51,15 +51,7 @@ class ComfyUIDeployExternalLora:
|
|||||||
|
|
||||||
CATEGORY = "deploy"
|
CATEGORY = "deploy"
|
||||||
|
|
||||||
def run(
|
def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None, lora_url=None):
|
||||||
self,
|
|
||||||
input_id,
|
|
||||||
default_lora_name=None,
|
|
||||||
lora_save_name=None,
|
|
||||||
display_name=None,
|
|
||||||
description=None,
|
|
||||||
lora_url=None,
|
|
||||||
):
|
|
||||||
import requests
|
import requests
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
@@ -79,9 +71,9 @@ class ComfyUIDeployExternalLora:
|
|||||||
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
|
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
|
||||||
)
|
)
|
||||||
print(destination_path)
|
print(destination_path)
|
||||||
print("Downloading external lora - " + lora_url + " to " + destination_path)
|
print("Downloading external lora - " + input_id + " to " + destination_path)
|
||||||
response = requests.get(
|
response = requests.get(
|
||||||
lora_url,
|
input_id,
|
||||||
headers={"User-Agent": "Mozilla/5.0"},
|
headers={"User-Agent": "Mozilla/5.0"},
|
||||||
allow_redirects=True,
|
allow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -764,7 +764,7 @@ class ComfyUIDeployExternalVideo:
|
|||||||
"optional": {
|
"optional": {
|
||||||
"meta_batch": ("VHS_BatchManager",),
|
"meta_batch": ("VHS_BatchManager",),
|
||||||
"vae": ("VAE",),
|
"vae": ("VAE",),
|
||||||
"default_video": (sorted(files),),
|
"default_value": (sorted(files),),
|
||||||
"display_name": (
|
"display_name": (
|
||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": False, "default": ""},
|
{"multiline": False, "default": ""},
|
||||||
@@ -834,7 +834,7 @@ class ComfyUIDeployExternalVideo:
|
|||||||
):
|
):
|
||||||
out_file.write(chunk)
|
out_file.write(chunk)
|
||||||
else:
|
else:
|
||||||
video = kwargs.get("default_video", None)
|
video = kwargs.get("default_value", "")
|
||||||
if video is None:
|
if video is None:
|
||||||
raise "No default video given and no external video provided"
|
raise "No default video given and no external video provided"
|
||||||
video_path = folder_paths.get_annotated_filepath(video.strip('"'))
|
video_path = folder_paths.get_annotated_filepath(video.strip('"'))
|
||||||
|
|||||||
+88
-89
@@ -192,13 +192,11 @@ const ext = {
|
|||||||
|
|
||||||
registerCustomNodes() {
|
registerCustomNodes() {
|
||||||
/** @type {LGraphNode}*/
|
/** @type {LGraphNode}*/
|
||||||
class ComfyDeploy extends LGraphNode {
|
class ComfyDeploy {
|
||||||
|
color = LGraphCanvas.node_colors.yellow.color;
|
||||||
|
bgcolor = LGraphCanvas.node_colors.yellow.bgcolor;
|
||||||
|
groupcolor = LGraphCanvas.node_colors.yellow.groupcolor;
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
|
||||||
this.color = LGraphCanvas.node_colors.yellow.color;
|
|
||||||
this.bgcolor = LGraphCanvas.node_colors.yellow.bgcolor;
|
|
||||||
this.groupcolor = LGraphCanvas.node_colors.yellow.groupcolor;
|
|
||||||
|
|
||||||
if (!this.properties) {
|
if (!this.properties) {
|
||||||
this.properties = {};
|
this.properties = {};
|
||||||
this.properties.workflow_name = "";
|
this.properties.workflow_name = "";
|
||||||
@@ -206,75 +204,65 @@ const ext = {
|
|||||||
this.properties.version = "";
|
this.properties.version = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
this.addWidget(
|
ComfyWidgets.STRING(
|
||||||
"text",
|
this,
|
||||||
"workflow_name",
|
"workflow_name",
|
||||||
this.properties.workflow_name,
|
[
|
||||||
(v) => {
|
"",
|
||||||
this.properties.workflow_name = v;
|
{
|
||||||
},
|
default: this.properties.workflow_name,
|
||||||
{ multiline: false }
|
multiline: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
app,
|
||||||
);
|
);
|
||||||
|
|
||||||
this.addWidget(
|
ComfyWidgets.STRING(
|
||||||
"text",
|
this,
|
||||||
"workflow_id",
|
"workflow_id",
|
||||||
this.properties.workflow_id,
|
[
|
||||||
(v) => {
|
"",
|
||||||
this.properties.workflow_id = v;
|
{
|
||||||
},
|
default: this.properties.workflow_id,
|
||||||
{ multiline: false }
|
multiline: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
app,
|
||||||
);
|
);
|
||||||
|
|
||||||
this.addWidget(
|
ComfyWidgets.STRING(
|
||||||
"text",
|
this,
|
||||||
"version",
|
"version",
|
||||||
this.properties.version,
|
["", { default: this.properties.version, multiline: false }],
|
||||||
(v) => {
|
app,
|
||||||
this.properties.version = v;
|
|
||||||
},
|
|
||||||
{ multiline: false }
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// this.widgets.forEach((w) => {
|
||||||
|
// // w.computeSize = () => [200,10]
|
||||||
|
// w.computedHeight = 2;
|
||||||
|
// })
|
||||||
|
|
||||||
this.widgets_start_y = 10;
|
this.widgets_start_y = 10;
|
||||||
|
this.setSize(this.computeSize());
|
||||||
|
|
||||||
|
// const config = { };
|
||||||
|
|
||||||
|
// console.log(this);
|
||||||
this.serialize_widgets = true;
|
this.serialize_widgets = true;
|
||||||
this.isVirtualNode = true;
|
this.isVirtualNode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
onExecute() {
|
|
||||||
// This method is called when the node is executed
|
|
||||||
// You can add any necessary logic here
|
|
||||||
}
|
|
||||||
|
|
||||||
onSerialize(o) {
|
|
||||||
// This method is called when the node is being serialized
|
|
||||||
// Ensure all necessary data is saved
|
|
||||||
if (!o.properties) {
|
|
||||||
o.properties = {};
|
|
||||||
}
|
|
||||||
o.properties.workflow_name = this.properties.workflow_name;
|
|
||||||
o.properties.workflow_id = this.properties.workflow_id;
|
|
||||||
o.properties.version = this.properties.version;
|
|
||||||
}
|
|
||||||
|
|
||||||
onConfigure(o) {
|
|
||||||
// This method is called when the node is being configured (e.g., when loading a saved graph)
|
|
||||||
// Ensure all necessary data is restored
|
|
||||||
if (o.properties) {
|
|
||||||
this.properties = { ...this.properties, ...o.properties };
|
|
||||||
this.widgets[0].value = this.properties.workflow_name || "";
|
|
||||||
this.widgets[1].value = this.properties.workflow_id || "";
|
|
||||||
this.widgets[2].value = this.properties.version || "1";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register the node type
|
// Load default visibility
|
||||||
LiteGraph.registerNodeType("ComfyDeploy", Object.assign(ComfyDeploy, {
|
|
||||||
title: "Comfy Deploy",
|
LiteGraph.registerNodeType(
|
||||||
title_mode: LiteGraph.NORMAL_TITLE,
|
"ComfyDeploy",
|
||||||
collapsable: true,
|
Object.assign(ComfyDeploy, {
|
||||||
}));
|
title_mode: LiteGraph.NORMAL_TITLE,
|
||||||
|
title: "Comfy Deploy",
|
||||||
|
collapsable: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
ComfyDeploy.category = "deploy";
|
ComfyDeploy.category = "deploy";
|
||||||
},
|
},
|
||||||
@@ -443,10 +431,10 @@ function createDynamicUIHtml(data) {
|
|||||||
<h3 style="font-size: 14px; font-weight: semibold; margin-bottom: 8px;">Missing Nodes</h3>
|
<h3 style="font-size: 14px; font-weight: semibold; margin-bottom: 8px;">Missing Nodes</h3>
|
||||||
<p style="font-size: 12px;">These nodes are not found with any matching custom_nodes in the ComfyUI Manager Database</p>
|
<p style="font-size: 12px;">These nodes are not found with any matching custom_nodes in the ComfyUI Manager Database</p>
|
||||||
${data.missing_nodes
|
${data.missing_nodes
|
||||||
.map((node) => {
|
.map((node) => {
|
||||||
return `<p style="font-size: 14px; color: #d69e2e;">${node}</p>`;
|
return `<p style="font-size: 14px; color: #d69e2e;">${node}</p>`;
|
||||||
})
|
})
|
||||||
.join("")}
|
.join("")}
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
@@ -454,14 +442,17 @@ function createDynamicUIHtml(data) {
|
|||||||
Object.values(data.custom_nodes).forEach((node) => {
|
Object.values(data.custom_nodes).forEach((node) => {
|
||||||
html += `
|
html += `
|
||||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
|
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
|
||||||
<a href="${node.url
|
<a href="${
|
||||||
}" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${node.name
|
node.url
|
||||||
}</a>
|
}" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${
|
||||||
|
node.name
|
||||||
|
}</a>
|
||||||
<p style="font-size: 14px; color: #4b5563;">${node.hash}</p>
|
<p style="font-size: 14px; color: #4b5563;">${node.hash}</p>
|
||||||
${node.warning
|
${
|
||||||
? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
|
node.warning
|
||||||
: ""
|
? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
|
||||||
}
|
: ""
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
});
|
});
|
||||||
@@ -475,8 +466,9 @@ function createDynamicUIHtml(data) {
|
|||||||
Object.entries(data.models).forEach(([section, items]) => {
|
Object.entries(data.models).forEach(([section, items]) => {
|
||||||
html += `
|
html += `
|
||||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
||||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
|
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
|
||||||
}</h3>`;
|
section.charAt(0).toUpperCase() + section.slice(1)
|
||||||
|
}</h3>`;
|
||||||
items.forEach((item) => {
|
items.forEach((item) => {
|
||||||
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
||||||
});
|
});
|
||||||
@@ -492,8 +484,9 @@ function createDynamicUIHtml(data) {
|
|||||||
Object.entries(data.files).forEach(([section, items]) => {
|
Object.entries(data.files).forEach(([section, items]) => {
|
||||||
html += `
|
html += `
|
||||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
||||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
|
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
|
||||||
}</h3>`;
|
section.charAt(0).toUpperCase() + section.slice(1)
|
||||||
|
}</h3>`;
|
||||||
items.forEach((item) => {
|
items.forEach((item) => {
|
||||||
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
||||||
});
|
});
|
||||||
@@ -1013,12 +1006,14 @@ export class LoadingDialog extends ComfyDialog {
|
|||||||
showLoading(title, message) {
|
showLoading(title, message) {
|
||||||
this.show(`
|
this.show(`
|
||||||
<div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
|
<div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
|
||||||
<h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${this.loadingIcon
|
<h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${
|
||||||
}</h3>
|
this.loadingIcon
|
||||||
${message
|
}</h3>
|
||||||
? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
|
${
|
||||||
: ""
|
message
|
||||||
}
|
? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
|
||||||
|
: ""
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
`);
|
`);
|
||||||
}
|
}
|
||||||
@@ -1284,17 +1279,21 @@ export class ConfigDialog extends ComfyDialog {
|
|||||||
</label>
|
</label>
|
||||||
<label style="color: white; width: 100%;">
|
<label style="color: white; width: 100%;">
|
||||||
Endpoint:
|
Endpoint:
|
||||||
<input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${data.endpoint
|
<input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${
|
||||||
}">
|
data.endpoint
|
||||||
|
}">
|
||||||
</label>
|
</label>
|
||||||
<div style="color: white;">
|
<div style="color: white;">
|
||||||
API Key: User / Org <button style="font-size: 18px;">${data.displayName ?? ""
|
API Key: User / Org <button style="font-size: 18px;">${
|
||||||
}</button>
|
data.displayName ?? ""
|
||||||
<input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${data.apiKey
|
}</button>
|
||||||
}">
|
<input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${
|
||||||
|
data.apiKey
|
||||||
|
}">
|
||||||
<button id="loginButton" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;">
|
<button id="loginButton" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;">
|
||||||
${data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
|
${
|
||||||
}
|
data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
|
||||||
|
}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user