Merge branch 'main' into feature-ACE-1-5-Step

Resolve conflicts in audioInference.py (keep 8/16 kbps bitrate with main's OGG tooltip) and settings.py (restore renderingSpeed/magicPrompt handling from main).
This commit is contained in:
Sirshendu Ganguly
2026-05-15 17:32:47 +05:30
17 changed files with 506 additions and 61 deletions
+25
View File
@@ -89,6 +89,11 @@ const RUNWARE_NODE_TYPES = {
TEXTINFERENCEMESSAGES: "Runware Text Inference Messages",
TEXTINFERENCEMESSAGE: "Runware Text Inference Message",
TEXTINFERENCESETTINGS: "Runware Text Inference Settings",
TEXTINFERENCETOOLCHOICE: "Runware Text Inference Tool Choice",
TEXTINFERENCESETTINGSCACHE: "Runware Text Inference Settings Cache",
TEXTINFERENCEINPUTS: "Runware Text Inference Inputs",
TEXTINFERENCEINPUTSIMAGES: "Runware Text Inference Inputs Images",
TEXTINFERENCEINPUTSVIDEOS: "Runware Text Inference Inputs Videos",
AUDIOSECTIONS: "Runware Audio Sections",
AUDIOINFERENCEINPUTS: "Runware Audio Inference Inputs",
AUDIOSETTINGS: "Runware Audio Inference Settings",
@@ -328,6 +333,26 @@ const RUNWARE_NODE_PROPS = {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCETOOLCHOICE]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCESETTINGSCACHE]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCEINPUTSIMAGES]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCEINPUTSVIDEOS]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCEINPUTS]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
},
[RUNWARE_NODE_TYPES.TEXTINFERENCESETTINGS]: {
bgColor: DEFAULT_BGCOLOR,
colorModeOnly: true,
+19 -3
View File
@@ -1360,8 +1360,6 @@ function textInferenceSettingsToggleHandler(settingsNode) {
const frequencyPenaltyWidget = settingsNode.widgets.find(w => w && w.name === "frequencyPenalty");
const useToolsWidget = settingsNode.widgets.find(w => w && w.name === "useTools");
const toolsWidget = settingsNode.widgets.find(w => w && w.name === "tools");
const useToolChoiceWidget = settingsNode.widgets.find(w => w && w.name === "useToolChoice");
const toolChoiceWidget = settingsNode.widgets.find(w => w && w.name === "toolChoice");
function toggleWidgetState(useWidget, paramWidget) {
if (!useWidget || !paramWidget) return;
@@ -1388,7 +1386,6 @@ function textInferenceSettingsToggleHandler(settingsNode) {
if (usePresencePenaltyWidget && presencePenaltyWidget) toggleWidgetState(usePresencePenaltyWidget, presencePenaltyWidget);
if (useFrequencyPenaltyWidget && frequencyPenaltyWidget) toggleWidgetState(useFrequencyPenaltyWidget, frequencyPenaltyWidget);
if (useToolsWidget && toolsWidget) toggleWidgetState(useToolsWidget, toolsWidget);
if (useToolChoiceWidget && toolChoiceWidget) toggleWidgetState(useToolChoiceWidget, toolChoiceWidget);
}
function videoSettingsToggleHandler(settingsNode) {
@@ -3281,9 +3278,17 @@ function textModelSearchFilterHandler(textModelSearchNode) {
"openai:gpt@5.4-mini (GPT-5.4 Mini)",
"openai:gpt@5.4-nano (GPT-5.4 Nano)",
],
"Anthropic": [
"anthropic:claude@opus-4.7 (Claude Opus 4.7)",
"anthropic:claude@sonnet-4.6 (Claude Sonnet 4.6)",
"anthropic:claude@haiku-4.5 (Claude Haiku 4.5)",
],
"Google": [
"google:gemini@3-flash (Gemini 3 Flash)",
],
"MoonshotAI": [
"moonshotai:kimi@k2.6 (Kimi K2.6)",
],
"Zai": [
"zai-glm-5-1 (ZAI GLM 5.1)",
],
@@ -3359,6 +3364,7 @@ function audioModelSearchFilterHandler(audioModelSearchNode) {
"minimax:music@2.6 (MiniMax Music 2.6)",
],
"Inworld": [
"inworld:tts@2 (Inworld Realtime TTS 2)",
"inworld:tts@1.5-mini (Inworld TTS-1.5 Mini)",
"inworld:tts@1.5-max (Inworld TTS-1.5 Max)",
],
@@ -5137,6 +5143,10 @@ function settingsToggleHandler(settingsNode) {
const thinkingLevelWidget = settingsNode.widgets.find(w => w.name === "thinkingLevel");
const useSequentialWidget = settingsNode.widgets.find(w => w.name === "useSequential");
const sequentialWidget = settingsNode.widgets.find(w => w.name === "sequential");
const useRenderingSpeedWidget = settingsNode.widgets.find(w => w.name === "useRenderingSpeed");
const renderingSpeedWidget = settingsNode.widgets.find(w => w.name === "renderingSpeed");
const useMagicPromptWidget = settingsNode.widgets.find(w => w.name === "useMagicPrompt");
const magicPromptWidget = settingsNode.widgets.find(w => w.name === "magicPrompt");
// Helper function to toggle widget enabled state
function toggleWidgetState(useWidget, paramWidget, paramName) {
@@ -5223,6 +5233,12 @@ function settingsToggleHandler(settingsNode) {
if (useSequentialWidget && sequentialWidget) {
toggleWidgetState(useSequentialWidget, sequentialWidget, "sequential");
}
if (useRenderingSpeedWidget && renderingSpeedWidget) {
toggleWidgetState(useRenderingSpeedWidget, renderingSpeedWidget, "renderingSpeed");
}
if (useMagicPromptWidget && magicPromptWidget) {
toggleWidgetState(useMagicPromptWidget, magicPromptWidget, "magicPrompt");
}
}
function safetyInputsToggleHandler(safetyNode) {