Revert "Added new settings params for textInference"
This reverts commit 7f2b73fd4a.
This commit is contained in:
Sirshendu Ganguly
+1
-19
@@ -1337,7 +1337,7 @@ function textInferenceSettingsToggleHandler(settingsNode) {
|
||||
if (!settingsNode?.widgets) return;
|
||||
|
||||
const useSystemPromptWidget = settingsNode.widgets.find(w => w && w.name === "useSystemPrompt");
|
||||
const systemWidget = settingsNode.widgets.find(w => w && (w.name === "systemPrompt" || w.name === "system"));
|
||||
const systemWidget = settingsNode.widgets.find(w => w && w.name === "system");
|
||||
const useMaxTokensWidget = settingsNode.widgets.find(w => w && w.name === "useMaxTokens");
|
||||
const maxTokensWidget = settingsNode.widgets.find(w => w && w.name === "maxTokens");
|
||||
const useTemperatureWidget = settingsNode.widgets.find(w => w && w.name === "useTemperature");
|
||||
@@ -1346,16 +1346,6 @@ function textInferenceSettingsToggleHandler(settingsNode) {
|
||||
const topPWidget = settingsNode.widgets.find(w => w && w.name === "topP");
|
||||
const useTopKWidget = settingsNode.widgets.find(w => w && w.name === "useTopK");
|
||||
const topKWidget = settingsNode.widgets.find(w => w && w.name === "topK");
|
||||
const useStopSequencesWidget = settingsNode.widgets.find(w => w && w.name === "useStopSequences");
|
||||
const stopSequencesWidget = settingsNode.widgets.find(w => w && w.name === "stopSequences");
|
||||
const usePresencePenaltyWidget = settingsNode.widgets.find(w => w && w.name === "usePresencePenalty");
|
||||
const presencePenaltyWidget = settingsNode.widgets.find(w => w && w.name === "presencePenalty");
|
||||
const useFrequencyPenaltyWidget = settingsNode.widgets.find(w => w && w.name === "useFrequencyPenalty");
|
||||
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;
|
||||
@@ -1378,11 +1368,6 @@ function textInferenceSettingsToggleHandler(settingsNode) {
|
||||
if (useTemperatureWidget && temperatureWidget) toggleWidgetState(useTemperatureWidget, temperatureWidget);
|
||||
if (useTopPWidget && topPWidget) toggleWidgetState(useTopPWidget, topPWidget);
|
||||
if (useTopKWidget && topKWidget) toggleWidgetState(useTopKWidget, topKWidget);
|
||||
if (useStopSequencesWidget && stopSequencesWidget) toggleWidgetState(useStopSequencesWidget, stopSequencesWidget);
|
||||
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) {
|
||||
@@ -3062,9 +3047,6 @@ function textModelSearchFilterHandler(textModelSearchNode) {
|
||||
"Google": [
|
||||
"google:gemini@3-flash (Gemini 3 Flash)",
|
||||
],
|
||||
"Zai": [
|
||||
"zai-glm-5-1 (ZAI GLM 5.1)",
|
||||
],
|
||||
};
|
||||
|
||||
function filterModelList() {
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
import json
|
||||
from typing import Any, Dict, List, Tuple
|
||||
from typing import Any, Dict, Tuple
|
||||
|
||||
|
||||
class RunwareTextInferenceSettings:
|
||||
"""Optional generation controls for Runware Text Inference (flat task.settings per API)."""
|
||||
|
||||
_MAX_SYSTEM_CHARS = 200000
|
||||
_MAX_TOKENS_CAP = 131072
|
||||
_MAX_TOP_K = 100647
|
||||
_MAX_STOP_ITEMS = 5
|
||||
_MAX_STOP_ITEM_CHARS = 50
|
||||
_MAX_TOKENS_CAP = 196608
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
@@ -20,17 +16,17 @@ class RunwareTextInferenceSettings:
|
||||
"default": False,
|
||||
"tooltip": "Include systemPrompt in settings.",
|
||||
}),
|
||||
"systemPrompt": ("STRING", {
|
||||
"system": ("STRING", {
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
"tooltip": "System instruction (max 200,000 chars).",
|
||||
"tooltip": "System instruction (max 200,000 characters). Sent as systemPrompt.",
|
||||
}),
|
||||
"useMaxTokens": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include maxTokens in settings.",
|
||||
}),
|
||||
"maxTokens": ("INT", {
|
||||
"default": 4096,
|
||||
"default": 32768,
|
||||
"min": 1,
|
||||
"max": cls._MAX_TOKENS_CAP,
|
||||
"step": 1,
|
||||
@@ -42,21 +38,21 @@ class RunwareTextInferenceSettings:
|
||||
}),
|
||||
"temperature": ("FLOAT", {
|
||||
"default": 1.0,
|
||||
"min": 0.0,
|
||||
"min": 0.01,
|
||||
"max": 1.0,
|
||||
"step": 0.01,
|
||||
"tooltip": "Sampling temperature (0.0–1.0).",
|
||||
"tooltip": "Sampling temperature on (0, 1].",
|
||||
}),
|
||||
"useTopP": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include topP in settings.",
|
||||
}),
|
||||
"topP": ("FLOAT", {
|
||||
"default": 1.0,
|
||||
"min": 0.01,
|
||||
"default": 0.95,
|
||||
"min": 0.0,
|
||||
"max": 1.0,
|
||||
"step": 0.01,
|
||||
"tooltip": "Nucleus sampling (0.01–1.0).",
|
||||
"tooltip": "Nucleus sampling (0.0–1.0).",
|
||||
}),
|
||||
"useTopK": ("BOOLEAN", {
|
||||
"default": False,
|
||||
@@ -65,62 +61,13 @@ class RunwareTextInferenceSettings:
|
||||
"topK": ("INT", {
|
||||
"default": 40,
|
||||
"min": 1,
|
||||
"max": cls._MAX_TOP_K,
|
||||
"max": 128,
|
||||
"step": 1,
|
||||
"tooltip": f"Top-k sampling (1–{cls._MAX_TOP_K}).",
|
||||
"tooltip": "Top-k sampling (1–128).",
|
||||
}),
|
||||
"useStopSequences": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include stopSequences in settings.",
|
||||
}),
|
||||
"stopSequences": ("STRING", {
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
"tooltip": "Stop sequences: one per line (max 5 items, 50 chars each).",
|
||||
}),
|
||||
"usePresencePenalty": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include presencePenalty in settings.",
|
||||
}),
|
||||
"presencePenalty": ("FLOAT", {
|
||||
"default": 0.0,
|
||||
"min": -2.0,
|
||||
"max": 2.0,
|
||||
"step": 0.01,
|
||||
"tooltip": "Presence penalty (-2.0 to 2.0).",
|
||||
}),
|
||||
"useFrequencyPenalty": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include frequencyPenalty in settings.",
|
||||
}),
|
||||
"frequencyPenalty": ("FLOAT", {
|
||||
"default": 0.0,
|
||||
"min": -2.0,
|
||||
"max": 2.0,
|
||||
"step": 0.01,
|
||||
"tooltip": "Frequency penalty (-2.0 to 2.0).",
|
||||
}),
|
||||
"useTools": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include tools in settings.",
|
||||
}),
|
||||
"tools": ("STRING", {
|
||||
"multiline": True,
|
||||
"default": "[]",
|
||||
"tooltip": "JSON array for tools.",
|
||||
}),
|
||||
"useToolChoice": ("BOOLEAN", {
|
||||
"default": False,
|
||||
"tooltip": "Include toolChoice in settings.",
|
||||
}),
|
||||
"toolChoice": ("STRING", {
|
||||
"multiline": True,
|
||||
"default": "{}",
|
||||
"tooltip": "JSON object for toolChoice.",
|
||||
}),
|
||||
"thinkingLevel": (["none", "low", "medium", "high"], {
|
||||
"default": "none",
|
||||
"tooltip": "Extended reasoning level: none, low, medium, high.",
|
||||
"thinkingLevel": (["off", "minimal", "low", "medium", "high"], {
|
||||
"default": "off",
|
||||
"tooltip": "thinkingLevel in settings (omit when off).",
|
||||
}),
|
||||
},
|
||||
}
|
||||
@@ -130,102 +77,34 @@ class RunwareTextInferenceSettings:
|
||||
FUNCTION = "create_settings"
|
||||
CATEGORY = "Runware/Text"
|
||||
DESCRIPTION = (
|
||||
"Optional text inference settings (systemPrompt, maxTokens, temperature, topP, topK, "
|
||||
"stopSequences, presencePenalty, frequencyPenalty, tools, toolChoice, thinkingLevel). "
|
||||
"Optional text inference settings (flat: systemPrompt, maxTokens, temperature, topP, topK, thinkingLevel). "
|
||||
"Connect to Runware Text Inference."
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _parse_json_setting(raw: Any, expected_type: type, field_name: str) -> Any:
|
||||
if isinstance(raw, expected_type):
|
||||
return raw
|
||||
if raw is None:
|
||||
return expected_type()
|
||||
|
||||
text = str(raw).strip()
|
||||
if not text:
|
||||
return expected_type()
|
||||
|
||||
try:
|
||||
parsed = json.loads(text)
|
||||
except Exception as exc:
|
||||
raise Exception(f"{field_name} must be valid JSON.") from exc
|
||||
|
||||
if not isinstance(parsed, expected_type):
|
||||
expected = "array" if expected_type is list else "object"
|
||||
raise Exception(f"{field_name} must be a JSON {expected}.")
|
||||
return parsed
|
||||
|
||||
def _parse_stop_sequences(self, raw: Any) -> List[str]:
|
||||
if raw is None:
|
||||
return []
|
||||
|
||||
items: List[str] = []
|
||||
if isinstance(raw, (list, tuple)):
|
||||
for item in raw:
|
||||
text = str(item).strip()
|
||||
if text:
|
||||
items.append(text)
|
||||
else:
|
||||
text = str(raw).strip()
|
||||
if text:
|
||||
normalized = text.replace("\r\n", "\n").replace(",", "\n")
|
||||
items = [segment.strip() for segment in normalized.split("\n") if segment.strip()]
|
||||
|
||||
if len(items) > self._MAX_STOP_ITEMS:
|
||||
raise Exception(f"stopSequences supports up to {self._MAX_STOP_ITEMS} items.")
|
||||
for idx, item in enumerate(items, start=1):
|
||||
if len(item) > self._MAX_STOP_ITEM_CHARS:
|
||||
raise Exception(
|
||||
f"stopSequences item {idx} exceeds {self._MAX_STOP_ITEM_CHARS} characters."
|
||||
)
|
||||
return items
|
||||
|
||||
def create_settings(self, **kwargs) -> Tuple[Dict[str, Any], ...]:
|
||||
out: Dict[str, Any] = {}
|
||||
|
||||
if kwargs.get("useSystemPrompt", False):
|
||||
sys_text = (kwargs.get("systemPrompt") or kwargs.get("system") or "").strip()
|
||||
sys_text = (kwargs.get("system") or "").strip()
|
||||
if sys_text:
|
||||
if len(sys_text) > self._MAX_SYSTEM_CHARS:
|
||||
sys_text = sys_text[: self._MAX_SYSTEM_CHARS]
|
||||
out["systemPrompt"] = sys_text
|
||||
|
||||
if kwargs.get("useMaxTokens", False):
|
||||
out["maxTokens"] = int(kwargs.get("maxTokens", 4096))
|
||||
out["maxTokens"] = int(kwargs.get("maxTokens", 32768))
|
||||
|
||||
if kwargs.get("useTemperature", False):
|
||||
out["temperature"] = float(kwargs.get("temperature", 1.0))
|
||||
|
||||
if kwargs.get("useTopP", False):
|
||||
out["topP"] = float(kwargs.get("topP", 1.0))
|
||||
out["topP"] = float(kwargs.get("topP", 0.95))
|
||||
|
||||
if kwargs.get("useTopK", False):
|
||||
out["topK"] = int(kwargs.get("topK", 40))
|
||||
|
||||
if kwargs.get("useStopSequences", False):
|
||||
parsed_stop = self._parse_stop_sequences(kwargs.get("stopSequences", ""))
|
||||
if parsed_stop:
|
||||
out["stopSequences"] = parsed_stop
|
||||
|
||||
if kwargs.get("usePresencePenalty", False):
|
||||
out["presencePenalty"] = float(kwargs.get("presencePenalty", 0.0))
|
||||
|
||||
if kwargs.get("useFrequencyPenalty", False):
|
||||
out["frequencyPenalty"] = float(kwargs.get("frequencyPenalty", 0.0))
|
||||
|
||||
if kwargs.get("useTools", False):
|
||||
parsed_tools = self._parse_json_setting(kwargs.get("tools"), list, "tools")
|
||||
if parsed_tools:
|
||||
out["tools"] = parsed_tools
|
||||
|
||||
if kwargs.get("useToolChoice", False):
|
||||
parsed_choice = self._parse_json_setting(kwargs.get("toolChoice"), dict, "toolChoice")
|
||||
if parsed_choice:
|
||||
out["toolChoice"] = parsed_choice
|
||||
|
||||
tl = kwargs.get("thinkingLevel", "none")
|
||||
if tl != "none":
|
||||
tl = kwargs.get("thinkingLevel", "off")
|
||||
if tl != "off":
|
||||
out["thinkingLevel"] = tl
|
||||
|
||||
if not out:
|
||||
|
||||
@@ -16,9 +16,6 @@ class RunwareTextModelSearch:
|
||||
"Google": [
|
||||
"google:gemini@3-flash (Gemini 3 Flash)",
|
||||
],
|
||||
"Zai": [
|
||||
"zai-glm-5-1 (ZAI GLM 5.1)",
|
||||
],
|
||||
}
|
||||
|
||||
MODEL_PROVIDERS = [
|
||||
@@ -26,7 +23,6 @@ class RunwareTextModelSearch:
|
||||
"Google",
|
||||
"MiniMax",
|
||||
"OpenAI",
|
||||
"Zai",
|
||||
]
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -158,7 +158,7 @@ def getCustomEndpoint():
|
||||
custom_endpoint = os.getenv("RUNWARE_CUSTOM_ENDPOINT")
|
||||
if custom_endpoint and isinstance(custom_endpoint, str):
|
||||
return custom_endpoint
|
||||
return "https://api.runware.dev/v1"
|
||||
return "https://api.runware.ai/v1"
|
||||
|
||||
SESSION_TIMEOUT = getTimeout()
|
||||
RUNWARE_API_KEY = getAPIKey()
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user