mirror of
https://git.datalinker.icu/comfyanonymous/ComfyUI
synced 2026-11-18 20:57:09 +08:00
Merge branch 'master' into fd-seedControls
This commit is contained in:
commit
0fb9dc9732
@ -146,9 +146,9 @@ This will let you use: pip3.10 to install all the dependencies.
|
|||||||
|
|
||||||
## How to increase generation speed?
|
## How to increase generation speed?
|
||||||
|
|
||||||
Make sure you use the CheckpointLoaderSimple node to load checkpoints. It will auto pick the right settings depending on your GPU.
|
Make sure you use the regular loaders/Load Checkpoint node to load checkpoints. It will auto pick the right settings depending on your GPU.
|
||||||
|
|
||||||
You can set this command line setting to disable the upcasting to fp32 in some cross attention operations which will increase your speed. Note that this doesn't do anything when xformers is enabled and will very likely give you black images on SD2.x models.
|
You can set this command line setting to disable the upcasting to fp32 in some cross attention operations which will increase your speed. Note that this will very likely give you black images on SD2.x models. If you use xformers this option does not do anything.
|
||||||
|
|
||||||
```--dont-upcast-attention```
|
```--dont-upcast-attention```
|
||||||
|
|
||||||
|
|||||||
@ -5,9 +5,9 @@ import { api } from "/scripts/api.js";
|
|||||||
// Manage color palettes
|
// Manage color palettes
|
||||||
|
|
||||||
const colorPalettes = {
|
const colorPalettes = {
|
||||||
"palette_1": {
|
"dark": {
|
||||||
"id": "palette_1",
|
"id": "dark",
|
||||||
"name": "Palette 1",
|
"name": "Dark (Default)",
|
||||||
"colors": {
|
"colors": {
|
||||||
"node_slot": {
|
"node_slot": {
|
||||||
"CLIP": "#FFD500", // bright yellow
|
"CLIP": "#FFD500", // bright yellow
|
||||||
@ -45,6 +45,70 @@ const colorPalettes = {
|
|||||||
"EVENT_LINK_COLOR": "#A86",
|
"EVENT_LINK_COLOR": "#A86",
|
||||||
"CONNECTING_LINK_COLOR": "#AFA",
|
"CONNECTING_LINK_COLOR": "#AFA",
|
||||||
},
|
},
|
||||||
|
"comfy_base": {
|
||||||
|
"fg-color": "#fff",
|
||||||
|
"bg-color": "#202020",
|
||||||
|
"comfy-menu-bg": "#353535",
|
||||||
|
"comfy-input-bg": "#222",
|
||||||
|
"input-text": "#ddd",
|
||||||
|
"descrip-text": "#999",
|
||||||
|
"drag-text": "#ccc",
|
||||||
|
"error-text": "#ff4444",
|
||||||
|
"border-color": "#4e4e4e"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"light": {
|
||||||
|
"id": "light",
|
||||||
|
"name": "Light",
|
||||||
|
"colors": {
|
||||||
|
"node_slot": {
|
||||||
|
"CLIP": "#FFA726", // orange
|
||||||
|
"CLIP_VISION": "#5C6BC0", // indigo
|
||||||
|
"CLIP_VISION_OUTPUT": "#8D6E63", // brown
|
||||||
|
"CONDITIONING": "#EF5350", // red
|
||||||
|
"CONTROL_NET": "#66BB6A", // green
|
||||||
|
"IMAGE": "#42A5F5", // blue
|
||||||
|
"LATENT": "#AB47BC", // purple
|
||||||
|
"MASK": "#9CCC65", // light green
|
||||||
|
"MODEL": "#7E57C2", // deep purple
|
||||||
|
"STYLE_MODEL": "#D4E157", // lime
|
||||||
|
"VAE": "#FF7043", // deep orange
|
||||||
|
},
|
||||||
|
"litegraph_base": {
|
||||||
|
"NODE_TITLE_COLOR": "#222",
|
||||||
|
"NODE_SELECTED_TITLE_COLOR": "#000",
|
||||||
|
"NODE_TEXT_SIZE": 14,
|
||||||
|
"NODE_TEXT_COLOR": "#444",
|
||||||
|
"NODE_SUBTEXT_SIZE": 12,
|
||||||
|
"NODE_DEFAULT_COLOR": "#F7F7F7",
|
||||||
|
"NODE_DEFAULT_BGCOLOR": "#F5F5F5",
|
||||||
|
"NODE_DEFAULT_BOXCOLOR": "#CCC",
|
||||||
|
"NODE_DEFAULT_SHAPE": "box",
|
||||||
|
"NODE_BOX_OUTLINE_COLOR": "#000",
|
||||||
|
"DEFAULT_SHADOW_COLOR": "rgba(0,0,0,0.1)",
|
||||||
|
"DEFAULT_GROUP_FONT": 24,
|
||||||
|
|
||||||
|
"WIDGET_BGCOLOR": "#D4D4D4",
|
||||||
|
"WIDGET_OUTLINE_COLOR": "#999",
|
||||||
|
"WIDGET_TEXT_COLOR": "#222",
|
||||||
|
"WIDGET_SECONDARY_TEXT_COLOR": "#555",
|
||||||
|
|
||||||
|
"LINK_COLOR": "#4CAF50",
|
||||||
|
"EVENT_LINK_COLOR": "#FF9800",
|
||||||
|
"CONNECTING_LINK_COLOR": "#2196F3",
|
||||||
|
},
|
||||||
|
"comfy_base": {
|
||||||
|
"fg-color": "#222",
|
||||||
|
"bg-color": "#DDD",
|
||||||
|
"comfy-menu-bg": "#F5F5F5",
|
||||||
|
"comfy-input-bg": "#C9C9C9",
|
||||||
|
"input-text": "#222",
|
||||||
|
"descrip-text": "#444",
|
||||||
|
"drag-text": "#555",
|
||||||
|
"error-text": "#F44336",
|
||||||
|
"border-color": "#CCC"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"solarized": {
|
"solarized": {
|
||||||
@ -52,49 +116,60 @@ const colorPalettes = {
|
|||||||
"name": "Solarized",
|
"name": "Solarized",
|
||||||
"colors": {
|
"colors": {
|
||||||
"node_slot": {
|
"node_slot": {
|
||||||
"CLIP": "#859900", // Green
|
"CLIP": "#2AB7CA", // light blue
|
||||||
"CLIP_VISION": "#6c71c4", // Indigo
|
"CLIP_VISION": "#6c71c4", // blue violet
|
||||||
"CLIP_VISION_OUTPUT": "#859900", // Green
|
"CLIP_VISION_OUTPUT": "#859900", // olive green
|
||||||
"CONDITIONING": "#d33682", // Magenta
|
"CONDITIONING": "#d33682", // magenta
|
||||||
"CONTROL_NET": "#cb4b16", // Orange
|
"CONTROL_NET": "#d1ffd7", // light mint green
|
||||||
"IMAGE": "#dc322f", // Red
|
"IMAGE": "#5940bb", // deep blue violet
|
||||||
"LATENT": "#268bd2", // Blue
|
"LATENT": "#268bd2", // blue
|
||||||
"MASK": "#073642", // Base02
|
"MASK": "#CCC9E7", // light purple-gray
|
||||||
"MODEL": "#cb4b16", // Orange
|
"MODEL": "#dc322f", // red
|
||||||
"STYLE_MODEL": "#073642", // Base02
|
"STYLE_MODEL": "#1a998a", // teal
|
||||||
"UPSCALE_MODEL": "#6c71c4", // Indigo
|
"UPSCALE_MODEL": "#054A29", // dark green
|
||||||
"VAE": "#586e75", // Base1
|
"VAE": "#facfad", // light pink-orange
|
||||||
},
|
},
|
||||||
"litegraph_base": {
|
"litegraph_base": {
|
||||||
"NODE_TITLE_COLOR": "#fdf6e3",
|
"NODE_TITLE_COLOR": "#fdf6e3", // Base3
|
||||||
"NODE_SELECTED_TITLE_COLOR": "#b58900",
|
"NODE_SELECTED_TITLE_COLOR": "#A9D400",
|
||||||
"NODE_TEXT_SIZE": 14,
|
"NODE_TEXT_SIZE": 14,
|
||||||
"NODE_TEXT_COLOR": "#657b83",
|
"NODE_TEXT_COLOR": "#657b83", // Base00
|
||||||
"NODE_SUBTEXT_SIZE": 12,
|
"NODE_SUBTEXT_SIZE": 12,
|
||||||
"NODE_DEFAULT_COLOR": "#586e75",
|
"NODE_DEFAULT_COLOR": "#094656",
|
||||||
"NODE_DEFAULT_BGCOLOR": "#073642",
|
"NODE_DEFAULT_BGCOLOR": "#073642", // Base02
|
||||||
"NODE_DEFAULT_BOXCOLOR": "#839496",
|
"NODE_DEFAULT_BOXCOLOR": "#839496", // Base0
|
||||||
"NODE_DEFAULT_SHAPE": "box",
|
"NODE_DEFAULT_SHAPE": "box",
|
||||||
"NODE_BOX_OUTLINE_COLOR": "#fdf6e3",
|
"NODE_BOX_OUTLINE_COLOR": "#fdf6e3", // Base3
|
||||||
"DEFAULT_SHADOW_COLOR": "rgba(0,0,0,0.5)",
|
"DEFAULT_SHADOW_COLOR": "rgba(0,0,0,0.5)",
|
||||||
"DEFAULT_GROUP_FONT": 24,
|
"DEFAULT_GROUP_FONT": 24,
|
||||||
|
|
||||||
"WIDGET_BGCOLOR": "#002b36",
|
"WIDGET_BGCOLOR": "#002b36", // Base03
|
||||||
"WIDGET_OUTLINE_COLOR": "#839496",
|
"WIDGET_OUTLINE_COLOR": "#839496", // Base0
|
||||||
"WIDGET_TEXT_COLOR": "#fdf6e3",
|
"WIDGET_TEXT_COLOR": "#fdf6e3", // Base3
|
||||||
"WIDGET_SECONDARY_TEXT_COLOR": "#93a1a1",
|
"WIDGET_SECONDARY_TEXT_COLOR": "#93a1a1", // Base1
|
||||||
|
|
||||||
"LINK_COLOR": "#2aa198",
|
"LINK_COLOR": "#2aa198", // Solarized Cyan
|
||||||
"EVENT_LINK_COLOR": "#268bd2",
|
"EVENT_LINK_COLOR": "#268bd2", // Solarized Blue
|
||||||
"CONNECTING_LINK_COLOR": "#859900",
|
"CONNECTING_LINK_COLOR": "#859900", // Solarized Green
|
||||||
},
|
},
|
||||||
|
"comfy_base": {
|
||||||
|
"fg-color": "#fdf6e3", // Base3
|
||||||
|
"bg-color": "#002b36", // Base03
|
||||||
|
"comfy-menu-bg": "#073642", // Base02
|
||||||
|
"comfy-input-bg": "#002b36", // Base03
|
||||||
|
"input-text": "#93a1a1", // Base1
|
||||||
|
"descrip-text": "#586e75", // Base01
|
||||||
|
"drag-text": "#839496", // Base0
|
||||||
|
"error-text": "#dc322f", // Solarized Red
|
||||||
|
"border-color": "#657b83" // Base00
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const id = "Comfy.ColorPalette";
|
const id = "Comfy.ColorPalette";
|
||||||
const idCustomColorPalettes = "Comfy.CustomColorPalettes";
|
const idCustomColorPalettes = "Comfy.CustomColorPalettes";
|
||||||
const defaultColorPaletteId = "palette_1";
|
const defaultColorPaletteId = "dark";
|
||||||
const els = {}
|
const els = {}
|
||||||
// const ctxMenu = LiteGraph.ContextMenu;
|
// const ctxMenu = LiteGraph.ContextMenu;
|
||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
@ -236,10 +311,12 @@ app.registerExtension({
|
|||||||
const loadColorPalette = async (colorPalette) => {
|
const loadColorPalette = async (colorPalette) => {
|
||||||
colorPalette = await completeColorPalette(colorPalette);
|
colorPalette = await completeColorPalette(colorPalette);
|
||||||
if (colorPalette.colors) {
|
if (colorPalette.colors) {
|
||||||
|
// Sets the colors of node slots and links
|
||||||
if (colorPalette.colors.node_slot) {
|
if (colorPalette.colors.node_slot) {
|
||||||
Object.assign(app.canvas.default_connection_color_byType, colorPalette.colors.node_slot);
|
Object.assign(app.canvas.default_connection_color_byType, colorPalette.colors.node_slot);
|
||||||
Object.assign(LGraphCanvas.link_type_colors, colorPalette.colors.node_slot);
|
Object.assign(LGraphCanvas.link_type_colors, colorPalette.colors.node_slot);
|
||||||
}
|
}
|
||||||
|
// Sets the colors of the LiteGraph objects
|
||||||
if (colorPalette.colors.litegraph_base) {
|
if (colorPalette.colors.litegraph_base) {
|
||||||
// Everything updates correctly in the loop, except the Node Title and Link Color for some reason
|
// Everything updates correctly in the loop, except the Node Title and Link Color for some reason
|
||||||
app.canvas.node_title_color = colorPalette.colors.litegraph_base.NODE_TITLE_COLOR;
|
app.canvas.node_title_color = colorPalette.colors.litegraph_base.NODE_TITLE_COLOR;
|
||||||
@ -251,6 +328,13 @@ app.registerExtension({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Sets the color of ComfyUI elements
|
||||||
|
if (colorPalette.colors.comfy_base) {
|
||||||
|
const rootStyle = document.documentElement.style;
|
||||||
|
for (const key in colorPalette.colors.comfy_base) {
|
||||||
|
rootStyle.setProperty('--' + key, colorPalette.colors.comfy_base[key]);
|
||||||
|
}
|
||||||
|
}
|
||||||
app.canvas.draw(true, true);
|
app.canvas.draw(true, true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,6 +1,13 @@
|
|||||||
:root {
|
:root {
|
||||||
--fg-color: #000;
|
--fg-color: #000;
|
||||||
--bg-color: #fff;
|
--bg-color: #fff;
|
||||||
|
--comfy-menu-bg: #353535;
|
||||||
|
--comfy-input-bg: #222;
|
||||||
|
--input-text: #ddd;
|
||||||
|
--descrip-text: #999;
|
||||||
|
--drag-text: #ccc;
|
||||||
|
--error-text: #ff4444;
|
||||||
|
--border-color: #4e4e4e;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
@media (prefers-color-scheme: dark) {
|
||||||
@ -25,8 +32,8 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.comfy-multiline-input {
|
.comfy-multiline-input {
|
||||||
background-color: var(--bg-color);
|
background-color: var(--comfy-input-bg);
|
||||||
color: var(--fg-color);
|
color: var(--input-text);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
@ -39,8 +46,8 @@ body {
|
|||||||
position: fixed; /* Stay in place */
|
position: fixed; /* Stay in place */
|
||||||
z-index: 100; /* Sit on top */
|
z-index: 100; /* Sit on top */
|
||||||
padding: 30px 30px 10px 30px;
|
padding: 30px 30px 10px 30px;
|
||||||
background-color: #353535; /* Modal background */
|
background-color: var(--comfy-menu-bg); /* Modal background */
|
||||||
color: #ff4444;
|
color: var(--error-text);
|
||||||
box-shadow: 0px 0px 20px #888888;
|
box-shadow: 0px 0px 20px #888888;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
@ -82,8 +89,8 @@ body {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
color: #999;
|
color: var(--descrip-text);
|
||||||
background-color: #353535;
|
background-color: var(--comfy-menu-bg);
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
border-radius: 0 8px 8px 8px;
|
border-radius: 0 8px 8px 8px;
|
||||||
@ -103,7 +110,7 @@ body {
|
|||||||
.comfy-menu-btns button {
|
.comfy-menu-btns button {
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
width: 50%;
|
width: 50%;
|
||||||
color: #999 !important;
|
color: var(--descrip-text) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comfy-menu > button {
|
.comfy-menu > button {
|
||||||
@ -114,10 +121,10 @@ body {
|
|||||||
.comfy-menu-btns button,
|
.comfy-menu-btns button,
|
||||||
.comfy-menu .comfy-list button,
|
.comfy-menu .comfy-list button,
|
||||||
.comfy-modal button{
|
.comfy-modal button{
|
||||||
color: #ddd;
|
color: var(--input-text);
|
||||||
background-color: #222;
|
background-color: var(--comfy-input-bg);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border-color: #4e4e4e;
|
border-color: var(--border-color);
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
@ -136,7 +143,7 @@ body {
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
letter-spacing: 2px;
|
letter-spacing: 2px;
|
||||||
color: #cccccc;
|
color: var(--drag-text);
|
||||||
text-shadow: 1px 0 1px black;
|
text-shadow: 1px 0 1px black;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
@ -152,7 +159,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.comfy-list {
|
.comfy-list {
|
||||||
color: #999;
|
color: var(--descrip-text);
|
||||||
background-color: #333;
|
background-color: #333;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
border-color: #4e4e4e;
|
border-color: #4e4e4e;
|
||||||
@ -163,7 +170,7 @@ body {
|
|||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
max-height: 100px;
|
max-height: 100px;
|
||||||
min-height: 25px;
|
min-height: 25px;
|
||||||
background-color: #222;
|
background-color: var(--comfy-input-bg);
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -206,16 +213,16 @@ button.comfy-queue-btn {
|
|||||||
.comfy-modal.comfy-manage-templates {
|
.comfy-modal.comfy-manage-templates {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
color: #999;
|
color: var(--descrip-text);
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comfy-modal input,
|
.comfy-modal input,
|
||||||
.comfy-modal select {
|
.comfy-modal select {
|
||||||
color: #ddd;
|
color: var(--input-text);
|
||||||
background-color: #222;
|
background-color: var(--comfy-input-bg);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border-color: #4e4e4e;
|
border-color: var(--border-color);
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
}
|
}
|
||||||
@ -240,7 +247,7 @@ button.comfy-queue-btn {
|
|||||||
.graphdialog .name {
|
.graphdialog .name {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
color: #999999;
|
color: var(--descrip-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
.graphdialog button {
|
.graphdialog button {
|
||||||
@ -251,10 +258,10 @@ button.comfy-queue-btn {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.graphdialog input, .graphdialog textarea, .graphdialog select {
|
.graphdialog input, .graphdialog textarea, .graphdialog select {
|
||||||
background-color: #222;
|
background-color: var(--comfy-input-bg);
|
||||||
border: 2px solid;
|
border: 2px solid;
|
||||||
border-color: #444444;
|
border-color: var(--border-color);
|
||||||
color: #ddd;
|
color: var(--input-text);
|
||||||
border-radius: 12px 0 0 12px;
|
border-radius: 12px 0 0 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user