diff --git a/nodes.py b/nodes.py index 8ffac46..42cd8cb 100644 --- a/nodes.py +++ b/nodes.py @@ -330,7 +330,7 @@ class SaveExpData: RETURN_TYPES = ("STRING",) RETURN_NAMES = ("file_name",) FUNCTION = "run" - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" OUTPUT_NODE = True def run(self, file_name, save_exp:ExpressionSet=None): @@ -355,7 +355,7 @@ class LoadExpData: RETURN_TYPES = ("EXP_DATA",) RETURN_NAMES = ("exp",) FUNCTION = "run" - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" def run(self, file_name, ratio): # es = ExpressionSet() @@ -386,7 +386,7 @@ class ExpData: RETURN_TYPES = ("EXP_DATA",) RETURN_NAMES = ("exp",) FUNCTION = "run" - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" def run(self, code1, value1, code2, value2, code3, value3, code4, value4, code5, value5, add_exp=None): #print(f"type(None):{type(None)}") @@ -420,7 +420,7 @@ class PrintExpData: RETURN_TYPES = ("EXP_DATA",) RETURN_NAMES = ("exp",) FUNCTION = "run" - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" OUTPUT_NODE = True def run(self, cut_noise, exp = None): @@ -469,7 +469,7 @@ class AdvancedLivePortrait: RETURN_NAMES = ("images",) FUNCTION = "run" OUTPUT_NODE = True - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" # INPUT_IS_LIST = False # OUTPUT_IS_LIST = (False,) @@ -490,7 +490,6 @@ class AdvancedLivePortrait: if line == '': continue try: cmds = line.split('=') - #assert len(cmds) == 2, f"(파워집돌이) 명령어오류 {i}번줄: {line}: '=' 기호가 1개 들어가야 합니다" idx = int(cmds[0]) if idx == 0: es = ExpressionSet() else: es = ExpressionSet(es = motoin_link[idx]) @@ -498,8 +497,7 @@ class AdvancedLivePortrait: change = int(cmds[0]) keep = int(cmds[1]) except: - #log(f"(파워집돌이) 명령어오류 {i}번줄: {line}") - assert False, f"(파워집돌이) 명령어오류 {i}번줄: {line}" + assert False, f"(AdvancedLivePortrait) Command Err Line {i}: {line}" return None, None @@ -659,7 +657,7 @@ class ExpressionEditor: OUTPUT_NODE = True - CATEGORY = "파워집돌이" + CATEGORY = "AdvancedLivePortrait" # INPUT_IS_LIST = False # OUTPUT_IS_LIST = (False,) @@ -723,6 +721,8 @@ class ExpressionEditor: crop_with_fullsize = cv2.warpAffine(crop_out, psi.crop_trans_m, get_rgb_size(psi.src_rgb), cv2.INTER_LINEAR) out = np.clip(psi.mask_ori * crop_with_fullsize + (1 - psi.mask_ori) * psi.src_rgb, 0, 255).astype(np.uint8) + print(psi.mask_ori.shape) + out_img = pil2tensor(out) filename = "fe_edit_preview.png" @@ -736,41 +736,18 @@ class ExpressionEditor: return {"ui": {"images": results}, "result": (out_img, new_editor_link, es)} -class TestNode: - - def __init__(s): - s.pbar = comfy.utils.ProgressBar(1) - - @classmethod - def INPUT_TYPES(s): - return {"required": { - #"images": ("IMAGE",), - #"test_value": ("INT", {"default": 1, "min": 1}), - "command": ("STRING", {"multiline": True, "default": ""}), - }, - } - - RETURN_TYPES = ("IMAGE",) - RETURN_NAMES = ("images",) - FUNCTION = "run" - OUTPUT_NODE = True - - def run(self, command): - self.parsing_command(command) - - return (None,) - NODE_CLASS_MAPPINGS = { "AdvancedLivePortrait": AdvancedLivePortrait, "ExpressionEditor": ExpressionEditor, - "ExpData": ExpData, "LoadExpData": LoadExpData, "SaveExpData": SaveExpData, + "ExpData": ExpData, "PrintExpData:": PrintExpData, - #"TestNode": TestNode, } NODE_DISPLAY_NAME_MAPPINGS = { - "AdvancedLivePortrait": "Advanced Live Portrait (파워집돌이)", - "ExpressionEditor": "Expression Editor (파워집돌이)", + "AdvancedLivePortrait": "Advanced Live Portrait (PHM)", + "ExpressionEditor": "Expression Editor (PHM)", + "LoadExpData": "Load Exp Data (PHM)", + "SaveExpData": "Save Exp Data (PHM)" } \ No newline at end of file diff --git a/sample/exp_image.png b/sample/exp_image.png new file mode 100644 index 0000000..b0a719b Binary files /dev/null and b/sample/exp_image.png differ diff --git a/sample/sample.json b/sample/sample.json deleted file mode 100644 index 8085518..0000000 --- a/sample/sample.json +++ /dev/null @@ -1,376 +0,0 @@ -{ - "last_node_id": 9, - "last_link_id": 8, - "nodes": [ - { - "id": 5, - "type": "AdvancedLivePortrait", - "pos": [ - 1464, - 324 - ], - "size": { - "0": 263.14520263671875, - "1": 417.1697998046875 - }, - "flags": {}, - "order": 3, - "mode": 0, - "inputs": [ - { - "name": "src_images", - "type": "IMAGE", - "link": 8 - }, - { - "name": "motion_link", - "type": "EDITOR_LINK", - "link": null - }, - { - "name": "driving_images", - "type": "IMAGE", - "link": 3, - "slot_index": 2 - } - ], - "outputs": [ - { - "name": "images", - "type": "IMAGE", - "links": [ - 5 - ], - "shape": 3, - "slot_index": 0 - } - ], - "properties": { - "Node name for S&R": "AdvancedLivePortrait" - }, - "widgets_values": [ - 0, - 0, - true, - "" - ] - }, - { - "id": 8, - "type": "VHS_VideoCombine", - "pos": [ - 1760, - 327 - ], - "size": [ - 248.96339416503906, - 552.9633941650391 - ], - "flags": {}, - "order": 4, - "mode": 0, - "inputs": [ - { - "name": "images", - "type": "IMAGE", - "link": 5 - }, - { - "name": "audio", - "type": "AUDIO", - "link": null - }, - { - "name": "meta_batch", - "type": "VHS_BatchManager", - "link": null - }, - { - "name": "vae", - "type": "VAE", - "link": null - } - ], - "outputs": [ - { - "name": "Filenames", - "type": "VHS_FILENAMES", - "links": null, - "shape": 3 - } - ], - "properties": { - "Node name for S&R": "VHS_VideoCombine" - }, - "widgets_values": { - "frame_rate": 15, - "loop_count": 0, - "filename_prefix": "AnimateDiff", - "format": "video/h264-mp4", - "pix_fmt": "yuv420p", - "crf": 19, - "save_metadata": true, - "pingpong": false, - "save_output": true, - "videopreview": { - "hidden": false, - "paused": false, - "params": { - "filename": "AnimateDiff_00027.mp4", - "subfolder": "", - "type": "output", - "format": "video/h264-mp4", - "frame_rate": 15 - } - } - } - }, - { - "id": 9, - "type": "ExpressionEditor", - "pos": [ - 932, - 333 - ], - "size": { - "0": 245.65225219726562, - "1": 642 - }, - "flags": {}, - "order": 2, - "mode": 0, - "inputs": [ - { - "name": "src_image", - "type": "IMAGE", - "link": 7 - }, - { - "name": "motion_link", - "type": "EDITOR_LINK", - "link": null - }, - { - "name": "sample_image", - "type": "IMAGE", - "link": null - }, - { - "name": "add_exp", - "type": "EXP_DATA", - "link": null - } - ], - "outputs": [ - { - "name": "image", - "type": "IMAGE", - "links": [ - 8 - ], - "shape": 3, - "slot_index": 0 - }, - { - "name": "motion_link", - "type": "EDITOR_LINK", - "links": null, - "shape": 3 - }, - { - "name": "save_exp", - "type": "EXP_DATA", - "links": null, - "shape": 3 - } - ], - "properties": { - "Node name for S&R": "ExpressionEditor" - }, - "widgets_values": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1.3, - 1, - 1 - ] - }, - { - "id": 3, - "type": "LoadImage", - "pos": [ - 689, - 328 - ], - "size": { - "0": 210, - "1": 314 - }, - "flags": {}, - "order": 0, - "mode": 0, - "outputs": [ - { - "name": "IMAGE", - "type": "IMAGE", - "links": [ - 7 - ], - "shape": 3, - "slot_index": 0 - }, - { - "name": "MASK", - "type": "MASK", - "links": null, - "shape": 3 - } - ], - "properties": { - "Node name for S&R": "LoadImage" - }, - "widgets_values": [ - "source_image.png", - "image" - ] - }, - { - "id": 6, - "type": "VHS_LoadVideo", - "pos": [ - 1200, - 393 - ], - "size": [ - 235.1999969482422, - 491.1999969482422 - ], - "flags": {}, - "order": 1, - "mode": 0, - "inputs": [ - { - "name": "meta_batch", - "type": "VHS_BatchManager", - "link": null - }, - { - "name": "vae", - "type": "VAE", - "link": null - } - ], - "outputs": [ - { - "name": "IMAGE", - "type": "IMAGE", - "links": [ - 3 - ], - "shape": 3, - "slot_index": 0 - }, - { - "name": "frame_count", - "type": "INT", - "links": null, - "shape": 3 - }, - { - "name": "audio", - "type": "AUDIO", - "links": null, - "shape": 3 - }, - { - "name": "video_info", - "type": "VHS_VIDEOINFO", - "links": null, - "shape": 3 - } - ], - "properties": { - "Node name for S&R": "VHS_LoadVideo" - }, - "widgets_values": { - "video": "driving_video.mp4", - "force_rate": 0, - "force_size": "Disabled", - "custom_width": 512, - "custom_height": 512, - "frame_load_cap": 0, - "skip_first_frames": 0, - "select_every_nth": 2, - "choose video to upload": "image", - "videopreview": { - "hidden": false, - "paused": false, - "params": { - "frame_load_cap": 0, - "skip_first_frames": 0, - "force_rate": 0, - "filename": "driving_video.mp4", - "type": "input", - "format": "video/mp4", - "select_every_nth": 2 - } - } - } - } - ], - "links": [ - [ - 3, - 6, - 0, - 5, - 2, - "IMAGE" - ], - [ - 5, - 5, - 0, - 8, - 0, - "IMAGE" - ], - [ - 7, - 3, - 0, - 9, - 0, - "IMAGE" - ], - [ - 8, - 9, - 0, - 5, - 0, - "IMAGE" - ] - ], - "groups": [], - "config": {}, - "extra": { - "ds": { - "scale": 0.8264462809917354, - "offset": [ - 245.85866448431153, - 197.69871165469377 - ] - } - }, - "version": 0.4 -} \ No newline at end of file diff --git a/sample/workflow1_basic.json b/sample/workflow1_basic.json new file mode 100644 index 0000000..386b003 --- /dev/null +++ b/sample/workflow1_basic.json @@ -0,0 +1,983 @@ +{ + "last_node_id": 31, + "last_link_id": 33, + "nodes": [ + { + "id": 15, + "type": "LoadImage", + "pos": [ + 76.29927722229004, + 81.9939816479493 + ], + "size": { + "0": 210, + "1": 314 + }, + "flags": {}, + "order": 0, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 19 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "source_image.png", + "image" + ] + }, + { + "id": 19, + "type": "LoadImage", + "pos": [ + 694.093866035156, + 358.5242431079103 + ], + "size": { + "0": 220.3717041015625, + "1": 314 + }, + "flags": {}, + "order": 1, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 25 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "exp_image (1).png", + "image" + ] + }, + { + "id": 22, + "type": "LoadImage", + "pos": [ + 1374.1744140625015, + 82.12568228759815 + ], + "size": { + "0": 210, + "1": 314 + }, + "flags": {}, + "order": 2, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 27 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "source_image.png", + "image" + ] + }, + { + "id": 24, + "type": "VHS_LoadVideo", + "pos": [ + 1607.174414062501, + 162.1256822875981 + ], + "size": [ + 235.1999969482422, + 491.1999969482422 + ], + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [ + { + "name": "meta_batch", + "type": "VHS_BatchManager", + "link": null + }, + { + "name": "vae", + "type": "VAE", + "link": null + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 28 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "frame_count", + "type": "INT", + "links": null, + "shape": 3 + }, + { + "name": "audio", + "type": "AUDIO", + "links": null, + "shape": 3 + }, + { + "name": "video_info", + "type": "VHS_VIDEOINFO", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "VHS_LoadVideo" + }, + "widgets_values": { + "video": "driving_video.mp4", + "force_rate": 0, + "force_size": "Disabled", + "custom_width": 512, + "custom_height": 512, + "frame_load_cap": 0, + "skip_first_frames": 0, + "select_every_nth": 2, + "choose video to upload": "image", + "videopreview": { + "hidden": false, + "paused": false, + "params": { + "frame_load_cap": 0, + "skip_first_frames": 0, + "force_rate": 0, + "filename": "driving_video.mp4", + "type": "input", + "format": "video/mp4", + "select_every_nth": 2 + } + } + } + }, + { + "id": 23, + "type": "AdvancedLivePortrait", + "pos": [ + 1896.174414062501, + 71.12568228759817 + ], + "size": { + "0": 235.1999969482422, + "1": 408 + }, + "flags": {}, + "order": 8, + "mode": 0, + "inputs": [ + { + "name": "src_images", + "type": "IMAGE", + "link": 27 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "link": null + }, + { + "name": "driving_images", + "type": "IMAGE", + "link": 28 + } + ], + "outputs": [ + { + "name": "images", + "type": "IMAGE", + "links": [ + 29 + ], + "shape": 3, + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "AdvancedLivePortrait" + }, + "widgets_values": [ + 0, + 0, + true, + "" + ] + }, + { + "id": 21, + "type": "ExpressionEditor", + "pos": [ + 986.4307320312498, + 15.292402087402365 + ], + "size": [ + 210, + 642 + ], + "flags": {}, + "order": 10, + "mode": 0, + "inputs": [ + { + "name": "src_image", + "type": "IMAGE", + "link": 26 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "link": null + }, + { + "name": "sample_image", + "type": "IMAGE", + "link": 25 + }, + { + "name": "add_exp", + "type": "EXP_DATA", + "link": null + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": null, + "shape": 3, + "slot_index": 0 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "links": null, + "shape": 3 + }, + { + "name": "save_exp", + "type": "EXP_DATA", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ExpressionEditor" + }, + "widgets_values": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1 + ] + }, + { + "id": 26, + "type": "LoadImage", + "pos": [ + 1043.4893678710926, + 844.0075893554671 + ], + "size": { + "0": 210, + "1": 314 + }, + "flags": {}, + "order": 4, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 30 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "source_image.png", + "image" + ] + }, + { + "id": 27, + "type": "VHS_LoadVideo", + "pos": [ + 1550.4893678710941, + 969.0075893554671 + ], + "size": [ + 235.1999969482422, + 491.1999969482422 + ], + "flags": {}, + "order": 5, + "mode": 0, + "inputs": [ + { + "name": "meta_batch", + "type": "VHS_BatchManager", + "link": null + }, + { + "name": "vae", + "type": "VAE", + "link": null + } + ], + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 31 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "frame_count", + "type": "INT", + "links": null, + "shape": 3 + }, + { + "name": "audio", + "type": "AUDIO", + "links": null, + "shape": 3 + }, + { + "name": "video_info", + "type": "VHS_VIDEOINFO", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "VHS_LoadVideo" + }, + "widgets_values": { + "video": "driving_video.mp4", + "force_rate": 0, + "force_size": "Disabled", + "custom_width": 512, + "custom_height": 512, + "frame_load_cap": 0, + "skip_first_frames": 0, + "select_every_nth": 2, + "choose video to upload": "image", + "videopreview": { + "hidden": false, + "paused": false, + "params": { + "frame_load_cap": 0, + "skip_first_frames": 0, + "force_rate": 0, + "filename": "driving_video.mp4", + "type": "input", + "format": "video/mp4", + "select_every_nth": 2 + } + } + } + }, + { + "id": 28, + "type": "AdvancedLivePortrait", + "pos": [ + 1824.4893678710996, + 860.0075893554671 + ], + "size": { + "0": 235.1999969482422, + "1": 408.0000305175781 + }, + "flags": {}, + "order": 12, + "mode": 0, + "inputs": [ + { + "name": "src_images", + "type": "IMAGE", + "link": 32 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "link": null + }, + { + "name": "driving_images", + "type": "IMAGE", + "link": 31 + } + ], + "outputs": [ + { + "name": "images", + "type": "IMAGE", + "links": [ + 33 + ], + "shape": 3, + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "AdvancedLivePortrait" + }, + "widgets_values": [ + 0, + 0, + true, + "" + ] + }, + { + "id": 30, + "type": "ExpressionEditor", + "pos": [ + 1287.4893678710926, + 850.0075893554672 + ], + "size": { + "0": 210, + "1": 642 + }, + "flags": {}, + "order": 9, + "mode": 0, + "inputs": [ + { + "name": "src_image", + "type": "IMAGE", + "link": 30 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "link": null + }, + { + "name": "sample_image", + "type": "IMAGE", + "link": null + }, + { + "name": "add_exp", + "type": "EXP_DATA", + "link": null + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 32 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "links": null, + "shape": 3 + }, + { + "name": "save_exp", + "type": "EXP_DATA", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ExpressionEditor" + }, + "widgets_values": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1.3, + 1, + 1 + ] + }, + { + "id": 29, + "type": "VHS_VideoCombine", + "pos": [ + 2117.4893678710987, + 864.0075893554671 + ], + "size": [ + 272.9300842285156, + 576.9300842285156 + ], + "flags": {}, + "order": 13, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 33 + }, + { + "name": "audio", + "type": "AUDIO", + "link": null + }, + { + "name": "meta_batch", + "type": "VHS_BatchManager", + "link": null + }, + { + "name": "vae", + "type": "VAE", + "link": null + } + ], + "outputs": [ + { + "name": "Filenames", + "type": "VHS_FILENAMES", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "VHS_VideoCombine" + }, + "widgets_values": { + "frame_rate": 15, + "loop_count": 0, + "filename_prefix": "AdvancedLivePortrait", + "format": "video/h264-mp4", + "pix_fmt": "yuv420p", + "crf": 19, + "save_metadata": true, + "pingpong": false, + "save_output": true, + "videopreview": { + "hidden": false, + "paused": false, + "params": { + "filename": "AdvancedLivePortrait_00002.mp4", + "subfolder": "", + "type": "temp", + "format": "video/h264-mp4", + "frame_rate": 15 + } + } + } + }, + { + "id": 25, + "type": "VHS_VideoCombine", + "pos": [ + 2177.1744140624965, + 69.12568228759815 + ], + "size": [ + 272.9300842285156, + 576.9300842285156 + ], + "flags": {}, + "order": 11, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 29 + }, + { + "name": "audio", + "type": "AUDIO", + "link": null + }, + { + "name": "meta_batch", + "type": "VHS_BatchManager", + "link": null + }, + { + "name": "vae", + "type": "VAE", + "link": null + } + ], + "outputs": [ + { + "name": "Filenames", + "type": "VHS_FILENAMES", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "VHS_VideoCombine" + }, + "widgets_values": { + "frame_rate": 15, + "loop_count": 0, + "filename_prefix": "AdvancedLivePortrait", + "format": "video/h264-mp4", + "pix_fmt": "yuv420p", + "crf": 19, + "save_metadata": true, + "pingpong": false, + "save_output": true, + "videopreview": { + "hidden": false, + "paused": false, + "params": { + "filename": "AdvancedLivePortrait_00001.mp4", + "subfolder": "", + "type": "temp", + "format": "video/h264-mp4", + "frame_rate": 15 + } + } + } + }, + { + "id": 20, + "type": "LoadImage", + "pos": [ + 703.4307320312498, + 25.292402087402362 + ], + "size": [ + 210.9286651611328, + 314 + ], + "flags": {}, + "order": 6, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 26 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "source_image.png", + "image" + ] + }, + { + "id": 14, + "type": "ExpressionEditor", + "pos": [ + 352.9947983764647, + 46.43602139282229 + ], + "size": [ + 210, + 642 + ], + "flags": {}, + "order": 7, + "mode": 0, + "inputs": [ + { + "name": "src_image", + "type": "IMAGE", + "link": 19 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "link": null + }, + { + "name": "sample_image", + "type": "IMAGE", + "link": null + }, + { + "name": "add_exp", + "type": "EXP_DATA", + "link": null + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": null, + "shape": 3, + "slot_index": 0 + }, + { + "name": "motion_link", + "type": "EDITOR_LINK", + "links": null, + "shape": 3 + }, + { + "name": "save_exp", + "type": "EXP_DATA", + "links": null, + "shape": 3 + } + ], + "properties": { + "Node name for S&R": "ExpressionEditor" + }, + "widgets_values": [ + 0, + 0, + 0, + 0, + 0, + 23.5, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1 + ] + } + ], + "links": [ + [ + 19, + 15, + 0, + 14, + 0, + "IMAGE" + ], + [ + 25, + 19, + 0, + 21, + 2, + "IMAGE" + ], + [ + 26, + 20, + 0, + 21, + 0, + "IMAGE" + ], + [ + 27, + 22, + 0, + 23, + 0, + "IMAGE" + ], + [ + 28, + 24, + 0, + 23, + 2, + "IMAGE" + ], + [ + 29, + 23, + 0, + 25, + 0, + "IMAGE" + ], + [ + 30, + 26, + 0, + 30, + 0, + "IMAGE" + ], + [ + 31, + 27, + 0, + 28, + 2, + "IMAGE" + ], + [ + 32, + 30, + 0, + 28, + 0, + "IMAGE" + ], + [ + 33, + 28, + 0, + 29, + 0, + "IMAGE" + ] + ], + "groups": [ + { + "title": "Simple facial expression editing", + "bounding": [ + 29, + -52, + 571, + 768 + ], + "color": "#88A", + "font_size": 30 + }, + { + "title": "Extracting facial expressions from photos", + "bounding": [ + 634, + -52, + 605, + 753 + ], + "color": "#a1309b", + "font_size": 30 + }, + { + "title": "Live Portait", + "bounding": [ + 1320, + -14, + 1193, + 705 + ], + "color": "#3f789e", + "font_size": 30 + }, + { + "title": "Live Portrait with facial expression editing", + "bounding": [ + 1021, + 763, + 1449, + 771 + ], + "color": "#3f789e", + "font_size": 30 + } + ], + "config": {}, + "extra": { + "ds": { + "scale": 0.6209213230591555, + "offset": [ + 550.93444395092, + 459.81407391929736 + ] + } + }, + "version": 0.4 +} \ No newline at end of file diff --git a/sample/sample2.json b/sample/workflow2_advanced.json similarity index 96% rename from sample/sample2.json rename to sample/workflow2_advanced.json index 6c1c152..a2f1df1 100644 --- a/sample/sample2.json +++ b/sample/workflow2_advanced.json @@ -290,10 +290,10 @@ 1823, 301 ], - "size": [ - 289.7234384275689, - 513.2487798331999 - ], + "size": { + "0": 289.72344970703125, + "1": 513.248779296875 + }, "flags": {}, "order": 4, "mode": 0, @@ -343,8 +343,8 @@ 307 ], "size": [ - 261.8000000000002, - 565.8000000000002 + 261.79998779296875, + 565.7999877929688 ], "flags": {}, "order": 5, @@ -396,7 +396,7 @@ "hidden": false, "paused": false, "params": { - "filename": "AnimateDiff_00003.mp4", + "filename": "AnimateDiff_00001.mp4", "subfolder": "", "type": "temp", "format": "video/h264-mp4", @@ -452,10 +452,10 @@ "config": {}, "extra": { "ds": { - "scale": 0.620921323059155, + "scale": 0.7513148009015777, "offset": [ - 501.16957927340843, - 325.0434083711576 + 38.677019273408085, + 465.2026083711572 ] } },