convert_workflow.py: resolve unwired promoted subgraph inputs from sibling widget defaults

workflows/scripts/convert_workflow.py

@@ -28,6 +28,13 @@ SUBGRAPH_INPUT_ID = -10
 SUBGRAPH_OUTPUT_ID = -20
 
 
+class WidgetDefault:
+    """Literal carried across an unwired promoted subgraph input."""
+
+    def __init__(self, value):
+        self.value = value
+
+
 class Scope:
     """One graph namespace: either the root workflow or a subgraph instance."""
 
@@ -85,9 +92,13 @@ class Converter:
             # ones live in proxyWidgets instead), so match by name, not slot index
             name = self.subgraph_defs[instance["type"]]["inputs"][origin_slot]["name"]
             entry = next((i for i in instance.get("inputs", []) if i["name"] == name), None)
-            if entry is None:
-                return None  # unwired promoted widget: inner node keeps its own value
-            return self.resolve(parent_scope, entry.get("link"))
+            if entry is not None and entry.get("link") is not None:
+                return self.resolve(parent_scope, entry["link"])
+            # unwired promoted widget: the UI backs it with the widget of the
+            # first interior node this boundary slot fans out to, so inputs
+            # without a widget of their own (e.g. math variables) still get a
+            # value -- mirror that lookup here
+            return self._boundary_default(scope, origin_slot)
 
         node = scope.nodes[origin_id]
         ntype = node["type"]
@@ -117,6 +128,25 @@ class Converter:
 
         return (scope.fid(origin_id), origin_slot)
 
+    def _boundary_default(self, scope, origin_slot):
+        """Widget value backing an unwired promoted subgraph input, taken from
+        the first fan-out target of the slot that has that widget itself."""
+        for _, (oid, oslot, tid, tslot) in sorted(scope.links.items()):
+            if oid != SUBGRAPH_INPUT_ID or oslot != origin_slot:
+                continue
+            target = scope.nodes.get(tid)
+            if (target is None or target.get("mode", 0) in (2, 4)
+                    or target["type"] in self.subgraph_defs
+                    or target["type"] not in self.oi):
+                continue
+            if tslot >= len(target.get("inputs", [])):
+                continue
+            widgets = self.widget_inputs(target)
+            name = target["inputs"][tslot]["name"]
+            if name in widgets:
+                return WidgetDefault(widgets[name])
+        return None
+
     def widget_inputs(self, node):
         """Map a node's widgets_values onto named inputs using /object_info order."""
         if "Power Lora Loader" in node["type"]:
@@ -188,7 +218,11 @@ class Converter:
                 inputs = self.widget_inputs(node)
                 for inp in node.get("inputs", []):
                     source = self.resolve(scope, inp.get("link"))
-                    if source is not None:
+                    if isinstance(source, WidgetDefault):
+                        # the node's own widget value (if any) already won via
+                        # widget_inputs; only fill inputs that have none
+                        inputs.setdefault(inp["name"], source.value)
+                    elif source is not None:
                         inputs[inp["name"]] = list(source)
                     elif inp.get("link") is not None and not inp.get("widget"):
                         print(f"warning: {scope.fid(nid)} ({ntype}) input {inp['name']!r} "