diff --git a/package-lock.json b/package-lock.json index 20cc3ca85..01022cd30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", "@comfyorg/comfyui-electron-types": "^0.3.34", - "@comfyorg/litegraph": "^0.8.47", + "@comfyorg/litegraph": "^0.8.48", "@primevue/themes": "^4.0.5", "@vueuse/core": "^11.0.0", "@xterm/addon-fit": "^0.10.0", @@ -1957,9 +1957,9 @@ "license": "GPL-3.0-only" }, "node_modules/@comfyorg/litegraph": { - "version": "0.8.47", - "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.47.tgz", - "integrity": "sha512-JWKXWiqDyJjHz8oQ2kW8AVhTwYoGXHjynFuNeJrx1mtXurT6om1ywZoRptJbAwvNcSvbVWmdBdG0mf2NOqqwKQ==", + "version": "0.8.48", + "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.48.tgz", + "integrity": "sha512-acbbo5LXPqgo5mxa+hxWKx6oUalEotkjgk6/UpYyOp+fVN3UPHCD07jgijcujDQTVUYzeNWVj0v9iZBU5DBTpg==", "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { diff --git a/package.json b/package.json index 612c7aa44..319585ade 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", "@comfyorg/comfyui-electron-types": "^0.3.34", - "@comfyorg/litegraph": "^0.8.47", + "@comfyorg/litegraph": "^0.8.48", "@primevue/themes": "^4.0.5", "@vueuse/core": "^11.0.0", "@xterm/addon-fit": "^0.10.0", diff --git a/src/assets/palettes/arc.json b/src/assets/palettes/arc.json index ccf3ecc28..7f54971fc 100644 --- a/src/assets/palettes/arc.json +++ b/src/assets/palettes/arc.json @@ -40,7 +40,7 @@ "NODE_DEFAULT_COLOR": "#2b2f38", "NODE_DEFAULT_BGCOLOR": "#242730", "NODE_DEFAULT_BOXCOLOR": "#6e7581", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#FFF", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/assets/palettes/dark.json b/src/assets/palettes/dark.json index 2cc6707aa..1008f4d47 100644 --- a/src/assets/palettes/dark.json +++ b/src/assets/palettes/dark.json @@ -31,7 +31,7 @@ "NODE_DEFAULT_COLOR": "#333", "NODE_DEFAULT_BGCOLOR": "#353535", "NODE_DEFAULT_BOXCOLOR": "#666", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#FFF", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/assets/palettes/github.json b/src/assets/palettes/github.json index c2b563729..09dec7b39 100644 --- a/src/assets/palettes/github.json +++ b/src/assets/palettes/github.json @@ -40,7 +40,7 @@ "NODE_DEFAULT_COLOR": "#161b22", "NODE_DEFAULT_BGCOLOR": "#13171d", "NODE_DEFAULT_BOXCOLOR": "#30363d", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#e5eaf0", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/assets/palettes/light.json b/src/assets/palettes/light.json index fba9d449c..8da602e97 100644 --- a/src/assets/palettes/light.json +++ b/src/assets/palettes/light.json @@ -26,7 +26,7 @@ "NODE_DEFAULT_COLOR": "#F7F7F7", "NODE_DEFAULT_BGCOLOR": "#F5F5F5", "NODE_DEFAULT_BOXCOLOR": "#CCC", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#000", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/assets/palettes/nord.json b/src/assets/palettes/nord.json index f4518e4e9..92178e62c 100644 --- a/src/assets/palettes/nord.json +++ b/src/assets/palettes/nord.json @@ -40,7 +40,7 @@ "NODE_DEFAULT_COLOR": "#2e3440", "NODE_DEFAULT_BGCOLOR": "#161b22", "NODE_DEFAULT_BOXCOLOR": "#545d70", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#e5eaf0", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/assets/palettes/solarized.json b/src/assets/palettes/solarized.json index 609daeeb8..5053a975b 100644 --- a/src/assets/palettes/solarized.json +++ b/src/assets/palettes/solarized.json @@ -25,7 +25,7 @@ "NODE_DEFAULT_COLOR": "#094656", "NODE_DEFAULT_BGCOLOR": "#073642", "NODE_DEFAULT_BOXCOLOR": "#839496", - "NODE_DEFAULT_SHAPE": "box", + "NODE_DEFAULT_SHAPE": 2, "NODE_BOX_OUTLINE_COLOR": "#fdf6e3", "NODE_BYPASS_BGCOLOR": "#FF00FF", "NODE_ERROR_COLOUR": "#E00", diff --git a/src/extensions/core/colorPalette.ts b/src/extensions/core/colorPalette.ts index 6ac52e959..2fffca9ef 100644 --- a/src/extensions/core/colorPalette.ts +++ b/src/extensions/core/colorPalette.ts @@ -276,7 +276,19 @@ app.registerExtension({ colorPalette.colors.litegraph_base.hasOwnProperty(key) && LiteGraph.hasOwnProperty(key) ) { - LiteGraph[key] = colorPalette.colors.litegraph_base[key] + const value = colorPalette.colors.litegraph_base[key] + if (key === 'NODE_DEFAULT_SHAPE' && typeof value === 'string') { + console.warn( + `litegraph_base.NODE_DEFAULT_SHAPE only accepts [${[ + LiteGraph.BOX_SHAPE, + LiteGraph.ROUND_SHAPE, + LiteGraph.CARD_SHAPE + ].join(', ')}] but got ${value}` + ) + LiteGraph.NODE_DEFAULT_SHAPE = LiteGraph.ROUND_SHAPE + } else { + LiteGraph[key] = value + } } } } diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json index 25f920f78..65184c34f 100644 --- a/src/locales/en/nodeDefs.json +++ b/src/locales/en/nodeDefs.json @@ -5317,6 +5317,14 @@ }, "overlap": { "name": "overlap" + }, + "temporal_size": { + "name": "temporal_size", + "tooltip": "Only used for video VAEs: Amount of frames to decode at a time." + }, + "temporal_overlap": { + "name": "temporal_overlap", + "tooltip": "Only used for video VAEs: Amount of frames to overlap." } } }, diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json index ed9cb812a..f6e04fffa 100644 --- a/src/locales/ja/nodeDefs.json +++ b/src/locales/ja/nodeDefs.json @@ -5287,6 +5287,14 @@ "samples": { "name": "サンプル" }, + "temporal_overlap": { + "name": "temporal_overlap", + "tooltip": "ビデオVAE専用：重複するフレームの数。" + }, + "temporal_size": { + "name": "temporal_size", + "tooltip": "ビデオVAE専用：一度にデコードするフレームの数。" + }, "tile_size": { "name": "タイルサイズ" }, diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json index 95c39a7b2..79243ce6f 100644 --- a/src/locales/ko/nodeDefs.json +++ b/src/locales/ko/nodeDefs.json @@ -5287,6 +5287,14 @@ "samples": { "name": "샘플" }, + "temporal_overlap": { + "name": "temporal_overlap", + "tooltip": "비디오 VAE에만 사용됩니다: 겹치는 프레임의 양." + }, + "temporal_size": { + "name": "temporal_size", + "tooltip": "비디오 VAE에만 사용됩니다: 한 번에 디코딩할 프레임의 양." + }, "tile_size": { "name": "타일_크기" }, diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json index 672004b3d..8dface050 100644 --- a/src/locales/ru/nodeDefs.json +++ b/src/locales/ru/nodeDefs.json @@ -5287,6 +5287,14 @@ "samples": { "name": "образцы" }, + "temporal_overlap": { + "name": "temporal_overlap", + "tooltip": "Используется только для видео VAE: количество кадров для перекрытия." + }, + "temporal_size": { + "name": "temporal_size", + "tooltip": "Используется только для видео VAE: количество кадров для декодирования за раз." + }, "tile_size": { "name": "размер_плитки" }, diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json index 500ccc841..33df20c6e 100644 --- a/src/locales/zh/nodeDefs.json +++ b/src/locales/zh/nodeDefs.json @@ -5287,6 +5287,14 @@ "samples": { "name": "样本" }, + "temporal_overlap": { + "name": "时间重叠", + "tooltip": "仅用于视频VAEs：重叠的帧数。" + }, + "temporal_size": { + "name": "时间尺寸", + "tooltip": "仅用于视频VAEs：一次解码的帧数。" + }, "tile_size": { "name": "瓷砖大小" }, diff --git a/src/types/colorPaletteTypes.ts b/src/types/colorPaletteTypes.ts index 41a5b056a..1eaa4a10b 100644 --- a/src/types/colorPaletteTypes.ts +++ b/src/types/colorPaletteTypes.ts @@ -1,3 +1,4 @@ +import { LiteGraph } from '@comfyorg/litegraph' import { z } from 'zod' const nodeSlotSchema = z @@ -42,7 +43,11 @@ const litegraphBaseSchema = z NODE_DEFAULT_COLOR: z.string(), NODE_DEFAULT_BGCOLOR: z.string(), NODE_DEFAULT_BOXCOLOR: z.string(), - NODE_DEFAULT_SHAPE: z.string(), + NODE_DEFAULT_SHAPE: z.union([ + z.literal(LiteGraph.BOX_SHAPE), + z.literal(LiteGraph.ROUND_SHAPE), + z.literal(LiteGraph.CARD_SHAPE) + ]), NODE_BOX_OUTLINE_COLOR: z.string(), NODE_BYPASS_BGCOLOR: z.string(), NODE_ERROR_COLOUR: z.string(),