Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configuration option for Power Prompts to bypass stabilizeInputsOutputs() #281

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions py/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ def write_user_config():
if 'progress_bar' not in DEFAULT_CONFIG["features"]:
DEFAULT_CONFIG["features"]["progress_bar"] = {"enabled": False}

if 'do_clip_model_input_validation_check' not in DEFAULT_CONFIG["features"]:
DEFAULT_CONFIG["features"]["clip_model_input_validation_check"] = {"enabled": True}

USER_CONFIG = get_rgthree_user_config()

# Migrate old config options into "features"
Expand Down
3 changes: 3 additions & 0 deletions rgthree_config.json.default
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
// entry in case it causes issues. This is only for the nodeCreated event/function as of now.
"invoke_extensions_async": {
"node_created": true
},
"do_clip_model_input_validation_check": {
"enabled": true
}
},
"nodes": {
Expand Down
7 changes: 7 additions & 0 deletions src_web/comfyui/base_power_prompt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import type {LLink, IComboWidget, LGraphNode as TLGraphNode, LiteGraph as TLiteG
import type {ComfyObjectInfo, ComfyGraphNode} from 'typings/comfy.js';
import { wait } from "rgthree/common/shared_utils.js";
import { rgthree } from "./rgthree.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";

declare const LiteGraph: typeof TLiteGraph;
declare const LGraphNode: typeof TLGraphNode;
Expand All @@ -23,6 +24,7 @@ export class PowerPrompt {
readonly combos: {[key:string]: IComboWidget} = {};
readonly combosValues: {[key:string]: string[]} = {};
boundOnFreshNodeDefs!: (event: CustomEvent) => void;
doInputValidation: boolean = CONFIG_SERVICE.getConfigValue("features.do_clip_model_input_validation_check.enabled", true);

private configuring = false;

Expand Down Expand Up @@ -110,6 +112,11 @@ export class PowerPrompt {
const clipLinked = this.node.inputs.some(i=>i.name.includes('clip') && !!i.link);
const modelLinked = this.node.inputs.some(i=>i.name.includes('model') && !!i.link);
for (const output of this.node.outputs) {
// If input validation is disabled by config we should return all outputs are enabled
if (!this.doInputValidation) {
output.disabled = false;
continue;
}
const type = (output.type as string).toLowerCase();
if (type.includes('model')) {
output.disabled = !modelLinked;
Expand Down
10 changes: 10 additions & 0 deletions src_web/comfyui/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ const CONFIGURABLE: { features: ConfigurationSchema[] } = {
"event on some rgthree-comfy nodes. Now it's possible and this option is only here in " +
"for easy if something is wrong.",
},
{
key: "features.do_clip_model_input_validation_check.enabled",
type: ConfigType.BOOLEAN,
label: "Power Prompt input checking",
isDevOnly: false,
description:
"Recommended to leave this enabled unles you are experiencing conflicts with other custom nodes" +
"e.g the Anything Everywhere nodes which connect nodes in ways not detected by our validation" +
"Setting to false will make conditioning/model/clip outputs always available"
},
],
};

Expand Down
6 changes: 6 additions & 0 deletions web/comfyui/base_power_prompt.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { api } from '../../scripts/api.js';
import { wait } from "../../rgthree/common/shared_utils.js";
import { rgthree } from "./rgthree.js";
import { SERVICE as CONFIG_SERVICE } from "./config_service.js";
export class PowerPrompt {
constructor(node, nodeData) {
this.combos = {};
this.combosValues = {};
this.doInputValidation = CONFIG_SERVICE.getConfigValue("features.do_clip_model_input_validation_check.enabled", true);
this.configuring = false;
this.node = node;
this.node.properties = this.node.properties || {};
Expand Down Expand Up @@ -68,6 +70,10 @@ export class PowerPrompt {
const clipLinked = this.node.inputs.some(i => i.name.includes('clip') && !!i.link);
const modelLinked = this.node.inputs.some(i => i.name.includes('model') && !!i.link);
for (const output of this.node.outputs) {
if (!this.doInputValidation) {
output.disabled = false;
continue;
}
const type = output.type.toLowerCase();
if (type.includes('model')) {
output.disabled = !modelLinked;
Expand Down
9 changes: 9 additions & 0 deletions web/comfyui/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,15 @@ const CONFIGURABLE = {
"event on some rgthree-comfy nodes. Now it's possible and this option is only here in " +
"for easy if something is wrong.",
},
{
key: "features.do_clip_model_input_validation_check.enabled",
type: ConfigType.BOOLEAN,
label: "Power Prompt input checking",
isDevOnly: false,
description: "Recommended to leave this enabled unles you are experiencing conflicts with other custom nodes" +
"e.g the Anything Everywhere nodes which connect nodes in ways not detected by our validation" +
"Setting to false will make conditioning/model/clip outputs always available"
},
],
};
function fieldrow(item) {
Expand Down