Skip to content

Fix i18n workaround breaks node configure & subgraphs #4481

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix i18n workaround breaks node configure & subgraphs #4481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c72f5d
Fix i18n workaround breaks node configure & subgraphs
webfiltered Jul 20, 2025
0a88b68
Merge branch 'main' into configure-override
webfiltered Jul 20, 2025
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
137 changes: 48 additions & 89 deletions src/services/litegraphService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ import {
} from '@comfyorg/litegraph'
import type {
ExportedSubgraphInstance,
ISerialisableNodeInput,
ISerialisableNodeOutput,
ISerialisedNode
} from '@comfyorg/litegraph/dist/types/serialisation'
import _ from 'lodash'

import { useNodeAnimatedImage } from '@/composables/node/useNodeAnimatedImage'
import { useNodeCanvasImagePreview } from '@/composables/node/useNodeCanvasImagePreview'
Expand Down Expand Up @@ -249,51 +246,35 @@ export const useLitegraphService = () => {
* and 'localized_name' information from the original node definition.
*/
override configure(data: ISerialisedNode): void {
const RESERVED_KEYS = ['name', 'type', 'shape', 'localized_name']

// Note: input name is unique in a node definition, so we can lookup
// input by name.
const inputByName = new Map<string, ISerialisableNodeInput>(
data.inputs?.map((input) => [input.name, input]) ?? []
)
// Inputs defined by the node definition.
const definedInputNames = new Set(
this.inputs.map((input) => input.name)
)
const definedInputs = this.inputs.map((input) => {
const inputData = inputByName.get(input.name)
return inputData
? {
...inputData,
// Whether the input has associated widget follows the
// original node definition.
..._.pick(input, RESERVED_KEYS.concat('widget'))
}
: input
})
// Extra inputs that potentially dynamically added by custom js logic.
const extraInputs = data.inputs?.filter(
(input) => !definedInputNames.has(input.name)
)
data.inputs = [...definedInputs, ...(extraInputs ?? [])]
const thisInputsByName = new Map(this.inputs?.map((x) => [x.name, x]))

for (const input of data.inputs ?? []) {
const currentInput = thisInputsByName.get(input.name)
if (!currentInput) continue

input.name = currentInput.name
input.type = currentInput.type
input.shape = currentInput.shape
input.localized_name = currentInput.localized_name

// Whether the input has associated widget follows the original node
// definition.
input.widget = currentInput.widget
}

// Note: output name is not unique, so we cannot lookup output by name.
// Use index instead.
data.outputs = _.zip(this.outputs, data.outputs).map(
([output, outputData]) => {
// If there are extra outputs in the serialised node, use them directly.
// There are currently custom nodes that dynamically add outputs via
// js logic.
if (!output) return outputData as ISerialisableNodeOutput

return outputData
? {
...outputData,
..._.pick(output, RESERVED_KEYS)
}
: output
}
)
for (const [index, output] of data.outputs?.entries() ?? []) {
const currentOutput = this.outputs.at(index)
if (!currentOutput) continue

output.name = currentOutput.name
output.type = currentOutput.type
output.shape = currentOutput.shape
output.localized_name = currentOutput.localized_name
}

data.widgets_values = migrateWidgetsValues(
ComfyNode.nodeData.inputs,
Expand Down Expand Up @@ -504,57 +485,35 @@ export const useLitegraphService = () => {
* and 'localized_name' information from the original node definition.
*/
override configure(data: ISerialisedNode): void {
const RESERVED_KEYS = ['name', 'type', 'shape', 'localized_name']

// Note: input name is unique in a node definition, so we can lookup
// input by name.
const inputByName = new Map<string, ISerialisableNodeInput>(
data.inputs?.map((input) => [input.name, input]) ?? []
)
// Inputs defined by the node definition.
const definedInputNames = new Set(
this.inputs.map((input) => input.name)
)
const definedInputs = this.inputs.map((input) => {
const inputData = inputByName.get(input.name)
return inputData
? {
...inputData,
// Whether the input has associated widget follows the
// original node definition.
..._.pick(input, RESERVED_KEYS.concat('widget'))
}
: input
})
// Extra inputs that potentially dynamically added by custom js logic.
const extraInputs = data.inputs?.filter(
(input) => !definedInputNames.has(input.name)
)
data.inputs = [...definedInputs, ...(extraInputs ?? [])]
const thisInputsByName = new Map(this.inputs?.map((x) => [x.name, x]))

for (const input of data.inputs ?? []) {
const currentInput = thisInputsByName.get(input.name)
if (!currentInput) continue

input.name = currentInput.name
input.type = currentInput.type
input.shape = currentInput.shape
input.localized_name = currentInput.localized_name

// Whether the input has associated widget follows the original node
// definition.
input.widget = currentInput.widget
}

// Note: output name is not unique, so we cannot lookup output by name.
// Use index instead.
data.outputs = _.zip(this.outputs, data.outputs).map(
([output, outputData]) => {
// If there are extra outputs in the serialised node, use them directly.
// There are currently custom nodes that dynamically add outputs via
// js logic.
if (!output) return outputData as ISerialisableNodeOutput

return outputData
? {
...outputData,
..._.pick(output, RESERVED_KEYS)
}
: output
}
)

data.widgets_values = migrateWidgetsValues(
ComfyNode.nodeData.inputs,
this.widgets ?? [],
data.widgets_values ?? []
)
for (const [index, output] of data.outputs?.entries() ?? []) {
const currentOutput = this.outputs.at(index)
if (!currentOutput) continue

output.name = currentOutput.name
output.type = currentOutput.type
output.shape = currentOutput.shape
output.localized_name = currentOutput.localized_name
}

super.configure(data)
}
Expand Down
Loading