From 85cd721e83e094ccf006f5e8854f3bc946ba0063 Mon Sep 17 00:00:00 2001 From: Maria <77745122+mariaWitch@users.noreply.github.com> Date: Fri, 12 May 2023 17:10:48 -0400 Subject: [PATCH 1/4] Fix Typo in Utils.py Partially Solves #86 --- scripts/core/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/core/utils.py b/scripts/core/utils.py index 9bf89c6..3315564 100644 --- a/scripts/core/utils.py +++ b/scripts/core/utils.py @@ -7,7 +7,7 @@ def get_component_names(): 'v2v_file', 'v2v_width', 'v2v_height', 'v2v_prompt', 'v2v_n_prompt', 'v2v_cfg_scale', 'v2v_seed', 'v2v_processing_strength', 'v2v_fix_frame_strength', 'v2v_sampler_index', 'v2v_steps', 'v2v_override_settings', 't2v_width', 't2v_height', 't2v_prompt', 't2v_n_prompt', 't2v_cfg_scale', 't2v_seed', 't2v_processing_strength', 't2v_fix_frame_strength', - 'v2v_sampler_index', 'v2v_steps', 't2v_length', 't2v_fps' + 't2v_sampler_index', 't2v_steps', 't2v_length', 't2v_fps' ] return components_list @@ -376,4 +376,4 @@ def txt2img(args_dict): #if opts.do_not_show_images: # processed.images = [] - return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments) \ No newline at end of file + return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments) From 9c5611355ddc3ba47bd3747cc7ce5b7200c4b36f Mon Sep 17 00:00:00 2001 From: Maria <77745122+mariaWitch@users.noreply.github.com> Date: Fri, 12 May 2023 17:47:21 -0400 Subject: [PATCH 2/4] Partial Fix in Base_ui --- scripts/base_ui.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/base_ui.py b/scripts/base_ui.py index 06388ac..aba2d3f 100644 --- a/scripts/base_ui.py +++ b/scripts/base_ui.py @@ -100,7 +100,11 @@ def inputs_ui(): with gr.Row(): t2v_length = gr.Slider(label='Length (in frames)', minimum=10, maximum=2048, step=10, value=40, interactive=True) t2v_fps = gr.Slider(label='Video FPS', minimum=4, maximum=64, step=4, value=12, interactive=True) - + with FormRow(elem_id="txt2vid_override_settings_row") as row: + v2v_override_settings = create_override_settings_dropdown("txt2vid", row) + + with FormGroup(elem_id=f"script_container"): + v2v_custom_inputs = scripts.scripts_txt2img.setup_ui() tab_vid2vid.select(fn=lambda: 'vid2vid', inputs=[], outputs=[sdcn_process_mode]) tab_txt2vid.select(fn=lambda: 'txt2vid', inputs=[], outputs=[sdcn_process_mode]) From ca5fdb11518712808af051c30938fc2ab1fc7f8b Mon Sep 17 00:00:00 2001 From: Maria <77745122+mariaWitch@users.noreply.github.com> Date: Fri, 12 May 2023 17:50:05 -0400 Subject: [PATCH 3/4] Update utils.py Fully solves the script issue by just populating txt2vid script inputs as well. --- scripts/core/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/core/utils.py b/scripts/core/utils.py index 3315564..48f6678 100644 --- a/scripts/core/utils.py +++ b/scripts/core/utils.py @@ -85,7 +85,7 @@ def args_to_dict(*args): # converts list of argumets into dictionary for better 't2v_inpainting_mask_invert': False, 't2v_override_settings': [], - 't2v_script_inputs': [0], + #'t2v_script_inputs': [0], 't2v_fps': 12, } @@ -99,6 +99,7 @@ def args_to_dict(*args): # converts list of argumets into dictionary for better args_dict[args_list[i]] = args[i] args_dict['v2v_script_inputs'] = args[len(args_list):] + args_dict['t2v_script_inputs'] = args[len(args_list):] #do it for both return args_dict def get_mode_args(mode, args_dict): @@ -282,7 +283,7 @@ def img2img(args_dict): override_settings=override_settings, ) - p.scripts = modules.scripts.scripts_txt2img + p.scripts = modules.scripts.scripts_img2img p.script_args = args.script_inputs #if shared.cmd_opts.enable_console_prompts: From be9f056657eb6eb5d6cb19fc94f4c2c773ed7a5d Mon Sep 17 00:00:00 2001 From: Maria <77745122+mariaWitch@users.noreply.github.com> Date: Fri, 12 May 2023 22:36:59 -0400 Subject: [PATCH 4/4] Update base_ui.py Typos --- scripts/base_ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/base_ui.py b/scripts/base_ui.py index aba2d3f..9d2ecad 100644 --- a/scripts/base_ui.py +++ b/scripts/base_ui.py @@ -101,10 +101,10 @@ def inputs_ui(): t2v_length = gr.Slider(label='Length (in frames)', minimum=10, maximum=2048, step=10, value=40, interactive=True) t2v_fps = gr.Slider(label='Video FPS', minimum=4, maximum=64, step=4, value=12, interactive=True) with FormRow(elem_id="txt2vid_override_settings_row") as row: - v2v_override_settings = create_override_settings_dropdown("txt2vid", row) + t2v_override_settings = create_override_settings_dropdown("txt2vid", row) with FormGroup(elem_id=f"script_container"): - v2v_custom_inputs = scripts.scripts_txt2img.setup_ui() + t2v_custom_inputs = scripts.scripts_txt2img.setup_ui() tab_vid2vid.select(fn=lambda: 'vid2vid', inputs=[], outputs=[sdcn_process_mode]) tab_txt2vid.select(fn=lambda: 'txt2vid', inputs=[], outputs=[sdcn_process_mode])