Python
Merge branch 'main' into queue_editor
Chris Malone7b2cafb7f923
diff --cc wgp.pyindex 9309cf4,de8e2f6..08424c8--- a/wgp.py+++ b/wgp.py@@@ -196,157 -197,14 +197,159 @@@ def clean_image_list(gradio_list)gradio_list = [ convert_image( Image.open(img) if isinstance(img, str) else img ) for img in gradio_list ]return gradio_list+def cancel_edit(state):+ state["editing_task_index"] = None+ gr.Info("Edit cancelled.")+ return gr.Tabs(selected="video_gen")+def edit_task_in_queue(+ lset_name,+ image_mode,+ prompt,+ negative_prompt,+ resolution,+ video_length,+ batch_size,+ seed,+ force_fps,+ num_inference_steps,+ guidance_scale,+ guidance2_scale,+ guidance3_scale,+ switch_threshold,+ switch_threshold2,+ guidance_phases,+ model_switch_phase,+ audio_guidance_scale,+ flow_shift,+ sample_solver,+ embedded_guidance_scale,+ repeat_generation,+ multi_prompts_gen_type,+ multi_images_gen_type,+ skip_steps_cache_type,+ skip_steps_multiplier,+ skip_steps_start_step_perc,+ loras_choices,+ loras_multipliers,+ image_prompt_type,+ image_start,+ image_end,+ model_mode,+ video_source,+ keep_frames_video_source,+ video_guide_outpainting,+ video_prompt_type,+ image_refs,+ frames_positions,+ video_guide,+ image_guide,+ keep_frames_video_guide,+ denoising_strength,+ video_mask,+ image_mask,+ control_net_weight,+ control_net_weight2,+ mask_expand,+ audio_guide,+ audio_guide2,+ audio_source,+ audio_prompt_type,+ speakers_locations,+ sliding_window_size,+ sliding_window_overlap,+ sliding_window_color_correction_strength,+ sliding_window_overlap_noise,+ sliding_window_discard_last_frames,+ image_refs_relative_size,+ remove_background_images_ref,+ temporal_upsampling,+ spatial_upsampling,+ film_grain_intensity,+ film_grain_saturation,+ MMAudio_setting,+ MMAudio_prompt,+ MMAudio_neg_prompt,+ RIFLEx_setting,+ NAG_scale,+ NAG_tau,+ NAG_alpha,+ slg_switch,+ slg_layers,+ slg_start_perc,+ slg_end_perc,+ apg_switch,+ cfg_star_switch,+ cfg_zero_step,+ prompt_enhancer,+ min_frames_if_references,+ override_profile,+ mode,+ state,+):+ new_inputs = get_function_arguments(edit_task_in_queue, locals())+ new_inputs.pop('lset_name', None)++ if 'loras_choices' in new_inputs:+ all_loras = state.get("loras", [])+ lora_indices = new_inputs.pop('loras_choices')+ activated_lora_filenames = [Path(all_loras[int(index)]).name for index in lora_indices]+ new_inputs['activated_loras'] = activated_lora_filenames++ gen = get_gen_info(state)+ queue = gen.get("queue", [])+ editing_task_index = state.get("editing_task_index", None)++ if editing_task_index is None:+ gr.Warning("No task selected for editing.")+ return update_queue_data(queue), gr.Tabs(selected="video_gen")++ task_to_edit_index = editing_task_index + 1+ if task_to_edit_index >= len(queue):+ gr.Warning("Task index out of bounds. Cannot edit.")+ return update_queue_data(queue), gr.Tabs(selected="video_gen")++ task_to_edit = queue[task_to_edit_index]+ original_params = task_to_edit['params'].copy()+ media_keys = [+ "image_start", "image_end", "image_refs", "video_source",+ "video_guide", "image_guide", "video_mask", "image_mask",+ "audio_guide", "audio_guide2", "audio_source"+ ]++ multi_image_keys = ["image_refs"]+ single_image_keys = ["image_start", "image_end"]++ for key, new_value in new_inputs.items():+ if key in media_keys:+ if new_value is not None:+ if key in multi_image_keys:+ cleaned_value = clean_image_list(new_value)+ original_params[key] = cleaned_value+ elif key in single_image_keys:+ cleaned_list = clean_image_list(new_value)+ original_params[key] = cleaned_list[0] if cleaned_list else None+ else:+ original_params[key] = new_value+ else:+ original_params[key] = new_value++ task_to_edit['params'] = original_params+ task_to_edit['prompt'] = new_inputs.get('prompt')+ task_to_edit['length'] = new_inputs.get('video_length')+ task_to_edit['steps'] = new_inputs.get('num_inference_steps')+ update_task_thumbnails(task_to_edit, original_params)++ gr.Info(f"Task ID {task_to_edit['id']} has been updated successfully.")+ state["editing_task_index"] = None+ return update_queue_data(queue), gr.Tabs(selected="video_gen")def process_prompt_and_add_tasks(state, model_choice):-+ def ret():+ return gr.update(), gr.update()+if state.get("validate_success",0) != 1:- return+ ret()state["validate_success"] = 0model_filename = state["model_filename"]@@@ -7269,7 -7257,13 +7414,13 @@@ def refresh_video_length_label(state, ccomputed_fps = get_computed_fps(force_fps, base_model_type , video_guide, video_source )return gr.update(label= compute_video_length_label(computed_fps, current_video_length))+ def get_default_value(choices, current_value, default_value = None):+ for label, value in choices:+ if value == current_value:+ return current_value+ return default_value+-def generate_video_tab(update_form = False, state_dict = None, ui_defaults = None, model_family = None, model_choice = None, header = None, main = None, main_tabs= None):+def generate_video_tab(update_form = False, state_dict = None, ui_defaults = None, model_family = None, model_choice = None, header = None, main = None, main_tabs= None, tab_id='generate'):global inputs_names #, advancedif update_form:@@@ -8506,99 -8485,71 +8664,89 @@@inputs=[state],outputs=[gen_status])- generate_btn.click(fn = init_generate, inputs = [state, output, last_choice], outputs=[generate_trigger, mode])+ if tab_id == 'generate':+ generate_btn.click(fn = init_generate, inputs = [state, output, last_choice], outputs=[generate_trigger, mode])+ add_to_queue_btn.click(fn = lambda : (get_unique_id(), ""), inputs = None, outputs=[add_to_queue_trigger, mode])+ # gr.on(triggers=[add_to_queue_btn.click, add_to_queue_trigger.change],fn=validate_wizard_prompt,+ add_to_queue_trigger.change(fn=validate_wizard_prompt,+ inputs =[state, wizard_prompt_activated_var, wizard_variables_var, prompt, wizard_prompt, *prompt_vars] ,+ outputs= [prompt],+ show_progress="hidden",+ ).then(fn=save_inputs,+ inputs =[target_state] + gen_inputs,+ outputs= None+ ).then(fn=process_prompt_and_add_tasks,+ inputs = [state, model_choice],- outputs=queue_df,- show_progress="hidden",- ).then(- fn=lambda s: gr.Accordion(open=True) if len(get_gen_info(s).get("queue", [])) > 1 else gr.update(),- inputs=[state],- outputs=[queue_accordion],++ outputs=[queue_df, queue_accordion],+ show_progress="hidden",+ ).then(+ fn=update_status,+ inputs = [state],+ )- generate_trigger.change(fn=validate_wizard_prompt,- inputs= [state, wizard_prompt_activated_var, wizard_variables_var, prompt, wizard_prompt, *prompt_vars] ,- outputs= [prompt],- show_progress="hidden",- ).then(fn=save_inputs,- inputs =[target_state] + gen_inputs,- outputs= None- ).then(fn=process_prompt_and_add_tasks,- inputs = [state, model_choice],- outputs= [queue_df, queue_accordion],- show_progress="hidden",- ).then(fn=prepare_generate_video,- inputs= [state],- outputs= [generate_btn, add_to_queue_btn, current_gen_column, current_gen_buttons_row]- ).then(fn=activate_status,- inputs= [state],- outputs= [status_trigger],- ).then(fn=process_tasks,- inputs= [state],- outputs= [preview_trigger, output_trigger],- show_progress="hidden",- ).then(finalize_generation,- inputs= [state],- outputs= [output, abort_btn, generate_btn, add_to_queue_btn, current_gen_column, gen_info]- ).then(- fn=lambda s: gr.Accordion(open=False) if len(get_gen_info(s).get("queue", [])) <= 1 else gr.update(),- inputs=[state],- outputs=[queue_accordion]- ).then(unload_model_if_needed,- inputs= [state],- outputs= []- )+ generate_trigger.change(fn=validate_wizard_prompt,+ inputs= [state, wizard_prompt_activated_var, wizard_variables_var, prompt, wizard_prompt, *prompt_vars] ,+ outputs= [prompt],+ show_progress="hidden",+ ).then(fn=save_inputs,+ inputs =[target_state] + gen_inputs,+ outputs= None+ ).then(fn=process_prompt_and_add_tasks,+ inputs = [state, model_choice],- outputs= queue_df,++ outputs= [queue_df, queue_accordion],+ show_progress="hidden",+ ).then(fn=prepare_generate_video,+ inputs= [state],+ outputs= [generate_btn, add_to_queue_btn, current_gen_column, current_gen_buttons_row]+ ).then(fn=activate_status,+ inputs= [state],+ outputs= [status_trigger],- ).then(- fn=lambda s: gr.Accordion(open=True) if len(get_gen_info(s).get("queue", [])) > 1 else gr.update(),- inputs=[state],- outputs=[queue_accordion],- show_progress="hidden",+ ).then(fn=process_tasks,+ inputs= [state],+ outputs= [preview_trigger, output_trigger],+ show_progress="hidden",+ ).then(finalize_generation,+ inputs= [state],+ outputs= [output, abort_btn, generate_btn, add_to_queue_btn, current_gen_column, gen_info]+ ).then(+ fn=lambda s: gr.Accordion(open=False) if len(get_gen_info(s).get("queue", [])) <= 1 else gr.update(),+ inputs=[state],+ outputs=[queue_accordion]+ ).then(unload_model_if_needed,+ inputs= [state],+ outputs= []+ )- gr.on(triggers=[load_queue_btn.upload, main.load],- fn=load_queue_action,- inputs=[load_queue_btn, state],- outputs=[queue_df]- ).then(- fn=lambda s: (gr.update(visible=bool(get_gen_info(s).get("queue",[]))), gr.Accordion(open=True)) if bool(get_gen_info(s).get("queue",[])) else (gr.update(visible=False), gr.update()),- inputs=[state],- outputs=[current_gen_column, queue_accordion]- ).then(- fn=init_process_queue_if_any,- inputs=[state],- outputs=[generate_btn, add_to_queue_btn, current_gen_column, ]- ).then(fn=activate_status,- inputs= [state],- outputs= [status_trigger],- ).then(- fn=process_tasks,- inputs=[state],- outputs=[preview_trigger, output_trigger],- trigger_mode="once"- ).then(- fn=finalize_generation_with_state,- inputs=[state],- outputs=[output, abort_btn, generate_btn, add_to_queue_btn, current_gen_column, gen_info, queue_accordion, state],- trigger_mode="always_last"- ).then(- unload_model_if_needed,- inputs= [state],- outputs= []- )+ gr.on(triggers=[load_queue_btn.upload, main.load],+ fn=load_queue_action,+ inputs=[load_queue_btn, state],+ outputs=[queue_df]+ ).then(+ fn=lambda s: (gr.update(visible=bool(get_gen_info(s).get("queue",[]))), gr.Accordion(open=True)) if bool(get_gen_info(s).get("queue",[])) else (gr.update(visible=False), gr.update()),+ inputs=[state],+ outputs=[current_gen_column, queue_accordion]+ ).then(+ fn=init_process_queue_if_any,+ inputs=[state],+ outputs=[generate_btn, add_to_queue_btn, current_gen_column, ]+ ).then(fn=activate_status,+ inputs= [state],+ outputs= [status_trigger],+ ).then(+ fn=process_tasks,+ inputs=[state],+ outputs=[preview_trigger, output_trigger],+ trigger_mode="once"+ ).then(+ fn=finalize_generation_with_state,+ inputs=[state],+ outputs=[output, abort_btn, generate_btn, add_to_queue_btn, current_gen_column, gen_info, queue_accordion, state],+ trigger_mode="always_last"+ ).then(+ unload_model_if_needed,+ inputs= [state],+ outputs= []+ )