Vito
48b1292115
* feat(nodes): let a link drive the prompt text of every PromptManager node The Focused, Split and Pair editors hide their widgets, and ComfyUI only draws a widget's input socket while the widget is visible. `text` (and the Pair's `negative_text`) therefore had no socket, and a STRING link dropped on the editor fell through to the first free STRING input, `prepend_text`, which is how #342's workflow was wired. - Detach those inputs from their hidden widgets on create and after a workflow load, so they are ordinary sockets in Classic and Nodes 2.0. The schema, widget order and saved values are unchanged. - A STRING link dropped on the editor body fills the main prompt, then the negative, before the frontend's own choice. - Each editor says when its text comes from a link; the typed text is kept for disconnect. The Classic nodes now save the typed text under a link instead of null, and "use prompt" no longer overwrites it while linked. - Real-host tests: mouse drags in both renderers, a workflow saved before this change, and executions proving the linked text is saved, counted, recorded in history and linked to the run's image. Closes #343 * test(coverage): floor for the linked-text module * test(nodes): PromptSearchList text takes a dragged link like a core widget * fix(nodes): linked text review round for #343 - A legacy frontend Primitive linked to an editor's text or the Pair's negative now runs with its value: the graphToPrompt wrapper and the queue hook fill it in (through virtual reroutes), in new and pre-#343 workflows. - Moving a linked text and releasing it on the editor keeps it on `text`: a link being moved counts as free, as the frontend counts it. - A link dropped on a prompt box (or its link note) fills that box's input, so the Pair's Negative prompt box takes `negative_text` (Classic through getInputOnPos, Nodes 2.0 through the box's slot key). - Only exact STRING links are steered; wildcards keep the frontend choice. - A linked Classic text box gives its row back and gets it back on disconnect; the PromptManagerText note uses the theme colour. - The metadata parsers map positional widget values through the widget table when an editor's widget-bound inputs do not line up with it. - Real-host cases for the legacy Primitive (new and saved workflows, a real Run), the moved link, the Negative box, paste/clone/undo and Split. * fix(nodes): resolve a legacy Primitive's text like the host, once per run (#343) - Inputs still bound to their widget (Classic PromptManager/PromptManagerText) are left as the host resolved them; the injection no longer overwrites them. - For the editors' detached text inputs, the Primitive's value goes through its "Run widget replace on values" replacement and the hidden widget's own serializer, so {a|b} wildcards and %date% tokens resolve as on main. - Each queued output is filled once (graphToPrompt wrapper, or the queue hook for an output that did not come through it): a wildcard is drawn once. - Editors inside subgraphs are found under their <subgraph>:<inner> id. - Real-host runPrompt installs its request route before the run starts. - Shared parser case pins the widget-table fallback for a core KSampler. * fix(nodes): pin the Classic wildcard behaviour and match queued ids by type (#343) - Classic PromptManager/PromptManagerText expose _pmTextSerializerReady, settled once their own text serializer is installed; the real-host specs wait on it and assert the Classic text is queued as written, as on main. - The Primitive fill only touches an output entry whose class_type matches the graph node at that id. - TESTING.md notes the host's harmless "Invalid widget" warning per Run.
380 lines
6.1 KiB
JSON
380 lines
6.1 KiB
JSON
{
|
|
"id": "37b6baef-94f5-49d2-9b42-1ffc70e7da92",
|
|
"revision": 0,
|
|
"last_node_id": 4,
|
|
"last_link_id": 2,
|
|
"nodes": [
|
|
{
|
|
"id": 1,
|
|
"type": "PromptManagerFocused",
|
|
"pos": [
|
|
600,
|
|
0
|
|
],
|
|
"size": [
|
|
550,
|
|
650
|
|
],
|
|
"flags": {},
|
|
"order": 2,
|
|
"mode": 0,
|
|
"inputs": [
|
|
{
|
|
"localized_name": "clip",
|
|
"name": "clip",
|
|
"type": "CLIP",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "prepend_text",
|
|
"name": "prepend_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "append_text",
|
|
"name": "append_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "text",
|
|
"name": "text",
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "text"
|
|
},
|
|
"link": 1
|
|
},
|
|
{
|
|
"localized_name": "category",
|
|
"name": "category",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "category"
|
|
},
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "tags",
|
|
"name": "tags",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "tags"
|
|
},
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "search_text",
|
|
"name": "search_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "search_text"
|
|
},
|
|
"link": null
|
|
}
|
|
],
|
|
"outputs": [
|
|
{
|
|
"localized_name": "CONDITIONING",
|
|
"name": "CONDITIONING",
|
|
"type": "CONDITIONING",
|
|
"links": null
|
|
},
|
|
{
|
|
"localized_name": "STRING",
|
|
"name": "STRING",
|
|
"type": "STRING",
|
|
"links": null
|
|
}
|
|
],
|
|
"title": "Focused fed by a Primitive",
|
|
"properties": {
|
|
"Node name for S&R": "PromptManagerFocused",
|
|
"focusedUI": {
|
|
"libraryOpen": false,
|
|
"libraryFilters": {
|
|
"category": "",
|
|
"tags": ""
|
|
},
|
|
"composition": false,
|
|
"metadata": false,
|
|
"preview": false
|
|
}
|
|
},
|
|
"widgets_values": [
|
|
"Primitive focused text",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
""
|
|
],
|
|
"widgets_values_named": {
|
|
"text": "Primitive focused text",
|
|
"category": "",
|
|
"tags": "",
|
|
"search_text": "",
|
|
"prepend_text": "",
|
|
"append_text": "",
|
|
"prompt_manager_focused_ui": ""
|
|
}
|
|
},
|
|
{
|
|
"id": 2,
|
|
"type": "PromptManagerPair",
|
|
"pos": [
|
|
600,
|
|
1200
|
|
],
|
|
"size": [
|
|
1100,
|
|
700
|
|
],
|
|
"flags": {},
|
|
"order": 3,
|
|
"mode": 0,
|
|
"inputs": [
|
|
{
|
|
"localized_name": "clip",
|
|
"name": "clip",
|
|
"type": "CLIP",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "prepend_text",
|
|
"name": "prepend_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "append_text",
|
|
"name": "append_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "text",
|
|
"name": "text",
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "text"
|
|
},
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "negative_text",
|
|
"name": "negative_text",
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "negative_text"
|
|
},
|
|
"link": 2
|
|
},
|
|
{
|
|
"localized_name": "category",
|
|
"name": "category",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "category"
|
|
},
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "tags",
|
|
"name": "tags",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "tags"
|
|
},
|
|
"link": null
|
|
},
|
|
{
|
|
"localized_name": "search_text",
|
|
"name": "search_text",
|
|
"shape": 7,
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "search_text"
|
|
},
|
|
"link": null
|
|
}
|
|
],
|
|
"outputs": [
|
|
{
|
|
"localized_name": "positive",
|
|
"name": "positive",
|
|
"type": "CONDITIONING",
|
|
"links": null
|
|
},
|
|
{
|
|
"localized_name": "negative",
|
|
"name": "negative",
|
|
"type": "CONDITIONING",
|
|
"links": null
|
|
},
|
|
{
|
|
"localized_name": "positive_text",
|
|
"name": "positive_text",
|
|
"type": "STRING",
|
|
"links": null
|
|
},
|
|
{
|
|
"localized_name": "negative_text",
|
|
"name": "negative_text",
|
|
"type": "STRING",
|
|
"links": null
|
|
}
|
|
],
|
|
"title": "Pair negative fed by a Primitive",
|
|
"properties": {
|
|
"Node name for S&R": "PromptManagerPair",
|
|
"pairUI": {
|
|
"libraryOpen": true,
|
|
"libraryFilters": {
|
|
"category": "",
|
|
"tags": ""
|
|
},
|
|
"composition": false,
|
|
"metadata": false,
|
|
"preview": false
|
|
}
|
|
},
|
|
"widgets_values": [
|
|
"Typed pair positive",
|
|
"Primitive pair negative",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
""
|
|
],
|
|
"widgets_values_named": {
|
|
"text": "Typed pair positive",
|
|
"negative_text": "Primitive pair negative",
|
|
"category": "",
|
|
"tags": "",
|
|
"search_text": "",
|
|
"prepend_text": "",
|
|
"append_text": "",
|
|
"prompt_manager_focused_ui": ""
|
|
}
|
|
},
|
|
{
|
|
"id": 3,
|
|
"type": "PrimitiveNode",
|
|
"pos": [
|
|
0,
|
|
0
|
|
],
|
|
"size": [
|
|
210,
|
|
88
|
|
],
|
|
"flags": {},
|
|
"order": 0,
|
|
"mode": 0,
|
|
"inputs": [],
|
|
"outputs": [
|
|
{
|
|
"name": "STRING",
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "text"
|
|
},
|
|
"links": [
|
|
1
|
|
]
|
|
}
|
|
],
|
|
"properties": {
|
|
"Run widget replace on values": false
|
|
},
|
|
"widgets_values": [
|
|
"Primitive focused text"
|
|
],
|
|
"widgets_values_named": {
|
|
"text": "Primitive focused text"
|
|
}
|
|
},
|
|
{
|
|
"id": 4,
|
|
"type": "PrimitiveNode",
|
|
"pos": [
|
|
0,
|
|
1200
|
|
],
|
|
"size": [
|
|
210,
|
|
88
|
|
],
|
|
"flags": {},
|
|
"order": 1,
|
|
"mode": 0,
|
|
"inputs": [],
|
|
"outputs": [
|
|
{
|
|
"name": "STRING",
|
|
"type": "STRING",
|
|
"widget": {
|
|
"name": "negative_text"
|
|
},
|
|
"links": [
|
|
2
|
|
]
|
|
}
|
|
],
|
|
"properties": {
|
|
"Run widget replace on values": false
|
|
},
|
|
"widgets_values": [
|
|
"Primitive pair negative"
|
|
],
|
|
"widgets_values_named": {
|
|
"negative_text": "Primitive pair negative"
|
|
}
|
|
}
|
|
],
|
|
"links": [
|
|
[
|
|
1,
|
|
3,
|
|
0,
|
|
1,
|
|
3,
|
|
"STRING"
|
|
],
|
|
[
|
|
2,
|
|
4,
|
|
0,
|
|
2,
|
|
4,
|
|
"STRING"
|
|
]
|
|
],
|
|
"groups": [],
|
|
"config": {},
|
|
"extra": {
|
|
"ds": {
|
|
"scale": 0.9,
|
|
"offset": [
|
|
416,
|
|
110
|
|
]
|
|
}
|
|
},
|
|
"version": 0.4
|
|
}
|