Python
updated plugin system to use shared state
Chris Malone7620bb12fe79
diff --git a/plugins/wan2gp-configuration/plugin.py b/plugins/wan2gp-configuration/plugin.pyindex 67ffc7c..ee8178a 100644--- a/plugins/wan2gp-configuration/plugin.py+++ b/plugins/wan2gp-configuration/plugin.py@@ -174,6 +174,42 @@ class ConfigTabPlugin(WAN2GPPlugin):with gr.Row():self.apply_btn = gr.Button("Save Settings")self.apply_and_restart_btn = gr.Button("Save and Restart", variant="primary")++ inputs = [+ self.state,+ self.transformer_types_choices, self.model_hierarchy_type_choice, self.fit_canvas_choice,+ self.attention_choice, self.preload_model_policy_choice, self.clear_file_list_choice,+ self.display_stats_choice, self.max_frames_multiplier_choice, self.checkpoints_paths_choice,+ self.UI_theme_choice, self.queue_color_scheme_choice,+ self.quantization_choice, self.transformer_dtype_policy_choice, self.mixed_precision_choice,+ self.text_encoder_quantization_choice, self.VAE_precision_choice, self.compile_choice,+ self.depth_anything_v2_variant_choice, self.vae_config_choice, self.boost_choice,+ self.profile_choice, self.preload_in_VRAM_choice,+ self.enhancer_enabled_choice, self.enhancer_mode_choice, self.mmaudio_enabled_choice,+ self.video_output_codec_choice, self.image_output_codec_choice, self.audio_output_codec_choice,+ self.metadata_choice, self.embed_source_images_choice,+ self.video_save_path_choice, self.image_save_path_choice,+ self.notification_sound_enabled_choice, self.notification_sound_volume_choice,+ self.resolution+ ]++ self.apply_btn.click(+ fn=self._save_changes,+ inputs=inputs,+ outputs=[self.msg]+ )++ self.apply_and_restart_btn.click(+ fn=self._save_and_restart,+ inputs=inputs,+ outputs=None+ )++ def release_ram_and_notify():+ self.release_model()+ gr.Info("Models unloaded from RAM.")++ self.release_RAM_btn.click(fn=release_ram_and_notify)return [self.release_RAM_btn]def _save_changes(self, state, *args):@@ -250,45 +286,4 @@ class ConfigTabPlugin(WAN2GPPlugin):def _save_and_restart(self, *args):self._save_changes(*args)gr.Info("Settings saved. Restarting application...")- self.quit_application()-- def post_ui_setup(self, components: dict):- state = components['state']- resolution = components['resolution']-- inputs = [- state,- self.transformer_types_choices, self.model_hierarchy_type_choice, self.fit_canvas_choice,- self.attention_choice, self.preload_model_policy_choice, self.clear_file_list_choice,- self.display_stats_choice, self.max_frames_multiplier_choice, self.checkpoints_paths_choice,- self.UI_theme_choice, self.queue_color_scheme_choice,- self.quantization_choice, self.transformer_dtype_policy_choice, self.mixed_precision_choice,- self.text_encoder_quantization_choice, self.VAE_precision_choice, self.compile_choice,- self.depth_anything_v2_variant_choice, self.vae_config_choice, self.boost_choice,- self.profile_choice, self.preload_in_VRAM_choice,- self.enhancer_enabled_choice, self.enhancer_mode_choice, self.mmaudio_enabled_choice,- self.video_output_codec_choice, self.image_output_codec_choice, self.audio_output_codec_choice,- self.metadata_choice, self.embed_source_images_choice,- self.video_save_path_choice, self.image_save_path_choice,- self.notification_sound_enabled_choice, self.notification_sound_volume_choice,- resolution- ]-- self.apply_btn.click(- fn=self._save_changes,- inputs=inputs,- outputs=[self.msg]- )-- self.apply_and_restart_btn.click(- fn=self._save_and_restart,- inputs=inputs,- outputs=None- )-- def release_ram_and_notify():- self.release_model()- gr.Info("Models unloaded from RAM.")-- self.release_RAM_btn.click(fn=release_ram_and_notify)- return {}\ No newline at end of file+ self.quit_application()\ No newline at end of filediff --git a/plugins/wan2gp-downloads/plugin.py b/plugins/wan2gp-downloads/plugin.pyindex 7ef7418..425262b 100644--- a/plugins/wan2gp-downloads/plugin.py+++ b/plugins/wan2gp-downloads/plugin.py@@ -36,6 +36,15 @@ class DownloadsPlugin(WAN2GPPlugin):gr.Markdown("")with gr.Row() as self.download_status_row:self.download_status = gr.Markdown()+ self.download_loras_btn.click(+ fn=self.download_loras_action,+ inputs=[],+ outputs=[self.download_status_row, self.download_status]+ ).then(+ fn=self.refresh_lora_list,+ inputs=[self.state, self.lset_name, self.loras_choices],+ outputs=[self.lset_name, self.loras_choices]+ )def download_loras_action(self):from huggingface_hub import snapshot_download@@ -63,15 +72,4 @@ class DownloadsPlugin(WAN2GPPlugin):dt = datetime.today().strftime('%Y-%m-%d')with open(log_path, "w", encoding="utf-8") as writer:writer.write(f"Loras downloaded on the {dt} at {time.time()} on the {time.time()}")- return-- def post_ui_setup(self, components: dict):- self.download_loras_btn.click(- fn=self.download_loras_action,- inputs=[],- outputs=[self.download_status_row, self.download_status]- ).then(- fn=self.refresh_lora_list,- inputs=[self.state, self.lset_name, self.loras_choices],- outputs=[self.lset_name, self.loras_choices]- )\ No newline at end of file+ return\ No newline at end of filediff --git a/plugins/wan2gp-gallery/plugin.py b/plugins/wan2gp-gallery/plugin.pyindex c55b4af..d66eca4 100644--- a/plugins/wan2gp-gallery/plugin.py+++ b/plugins/wan2gp-gallery/plugin.py@@ -253,6 +253,66 @@ class GalleryPlugin(WAN2GPPlugin):self.cancel_join_btn = gr.Button("Cancel")self.selected_files_for_backend = gr.Text(label="Selected Files", visible=False, elem_id="selected-files-backend")self.path_for_settings_loader = gr.Text(label="Path for Settings Loader", visible=False)++ outputs_list = [+ self.gallery_html_output, self.selected_files_for_backend, self.metadata_panel_output,+ self.join_videos_btn, self.send_to_generator_settings_btn, self.frame_preview_row,+ self.first_frame_preview, self.last_frame_preview, self.join_interface,+ self.recreate_join_btn, self.merge_info_display+ ]+ no_updates = {comp: gr.update() for comp in outputs_list}++ def on_tab_select(current_state, evt: gr.SelectData):+ if evt.value == "Gallery" and not self.loaded_once:+ self.loaded_once = True+ return self.list_output_files_as_html(current_state)+ return no_updates++ self.main_tabs.select(+ fn=on_tab_select,+ inputs=[self.state],+ outputs=outputs_list,+ )++ self.refresh_gallery_files_btn.click(fn=self.list_output_files_as_html, inputs=[self.state], outputs=outputs_list)++ self.selected_files_for_backend.change(fn=self.update_metadata_panel_and_buttons,+ inputs=[self.selected_files_for_backend, self.state],+ outputs=[+ self.join_videos_btn, self.send_to_generator_settings_btn, self.metadata_panel_output,+ self.path_for_settings_loader, self.frame_preview_row, self.first_frame_preview,+ self.last_frame_preview, self.join_interface, self.recreate_join_btn, self.merge_info_display,+ self.merge_source1_prompt, self.merge_source1_image, self.merge_source2_prompt, self.merge_source2_image+ ], show_progress="hidden"+ )+ self.join_videos_btn.click(fn=self.show_join_interface, inputs=[self.selected_files_for_backend, self.state], outputs=[+ self.join_interface, self.frame_preview_row, self.merge_info_display, self.metadata_panel_output,+ self.send_to_generator_settings_btn, self.join_videos_btn, self.recreate_join_btn,+ self.video1_preview, self.video2_preview,+ self.video1_path, self.video2_path, self.video1_frame_slider, self.video2_frame_slider,+ self.video1_info, self.video2_info+ ])+ self.recreate_join_btn.click(+ fn=self.recreate_join_interface, inputs=[self.path_for_settings_loader, self.state], outputs=[+ self.join_interface, self.frame_preview_row, self.merge_info_display, self.metadata_panel_output,+ self.send_to_generator_settings_btn, self.join_videos_btn, self.recreate_join_btn,+ self.video1_preview, self.video2_preview,+ self.video1_path, self.video2_path, self.video1_frame_slider, self.video2_frame_slider,+ self.video1_info, self.video2_info+ ])+ self.send_to_generator_settings_btn.click(fn=self.load_settings_and_frames_from_gallery, inputs=[self.state, self.path_for_settings_loader], outputs=[self.model_family, self.model_choice, self.main_tabs, self.refresh_form_trigger], show_progress="hidden")+ self.send_to_generator_btn.click(fn=self.send_selected_frames_to_generator, inputs=[self.video1_path, self.video1_frame_slider, self.video2_path, self.video2_frame_slider, self.image_prompt_type], outputs=[self.image_start, self.image_end, self.main_tabs, self.join_interface, self.image_prompt_type, self.image_start_row, self.image_end_row, self.image_prompt_type_radio, self.image_prompt_type_endcheckbox, self.plugin_data])+ self.cancel_join_btn.click(+ fn=self.update_metadata_panel_and_buttons,+ inputs=[self.selected_files_for_backend, self.state],+ outputs=[+ self.join_videos_btn, self.send_to_generator_settings_btn, self.metadata_panel_output,+ self.path_for_settings_loader, self.frame_preview_row, self.first_frame_preview,+ self.last_frame_preview, self.join_interface, self.recreate_join_btn, self.merge_info_display,+ self.merge_source1_prompt, self.merge_source1_image, self.merge_source2_prompt, self.merge_source2_image+ ]+ )+return gallery_blocksdef list_output_files_as_html(self, current_state):@@ -510,66 +570,4 @@ class GalleryPlugin(WAN2GPPlugin):self.image_prompt_type_radio: gr.Radio(value="S"),self.image_prompt_type_endcheckbox: gr.Checkbox(value=True),self.plugin_data: {"merge_info": merge_info}- }-- def post_ui_setup(self, components: dict):- outputs_list = [- self.gallery_html_output, self.selected_files_for_backend, self.metadata_panel_output,- self.join_videos_btn, self.send_to_generator_settings_btn, self.frame_preview_row,- self.first_frame_preview, self.last_frame_preview, self.join_interface,- self.recreate_join_btn, self.merge_info_display- ]- no_updates = {comp: gr.update() for comp in outputs_list}-- def on_tab_select(current_state, evt: gr.SelectData):- if evt.value == "Gallery" and not self.loaded_once:- self.loaded_once = True- return self.list_output_files_as_html(current_state)- return no_updates-- self.main_tabs.select(- fn=on_tab_select,- inputs=[self.state],- outputs=outputs_list,- )-- self.refresh_gallery_files_btn.click(fn=self.list_output_files_as_html, inputs=[self.state], outputs=outputs_list)-- self.selected_files_for_backend.change(fn=self.update_metadata_panel_and_buttons,- inputs=[self.selected_files_for_backend, self.state],- outputs=[- self.join_videos_btn, self.send_to_generator_settings_btn, self.metadata_panel_output,- self.path_for_settings_loader, self.frame_preview_row, self.first_frame_preview,- self.last_frame_preview, self.join_interface, self.recreate_join_btn, self.merge_info_display,- self.merge_source1_prompt, self.merge_source1_image, self.merge_source2_prompt, self.merge_source2_image- ], show_progress="hidden"- )- self.join_videos_btn.click(fn=self.show_join_interface, inputs=[self.selected_files_for_backend, self.state], outputs=[- self.join_interface, self.frame_preview_row, self.merge_info_display, self.metadata_panel_output,- self.send_to_generator_settings_btn, self.join_videos_btn, self.recreate_join_btn,- self.video1_preview, self.video2_preview,- self.video1_path, self.video2_path, self.video1_frame_slider, self.video2_frame_slider,- self.video1_info, self.video2_info- ])- self.recreate_join_btn.click(- fn=self.recreate_join_interface, inputs=[self.path_for_settings_loader, self.state], outputs=[- self.join_interface, self.frame_preview_row, self.merge_info_display, self.metadata_panel_output,- self.send_to_generator_settings_btn, self.join_videos_btn, self.recreate_join_btn,- self.video1_preview, self.video2_preview,- self.video1_path, self.video2_path, self.video1_frame_slider, self.video2_frame_slider,- self.video1_info, self.video2_info- ])- self.send_to_generator_settings_btn.click(fn=self.load_settings_and_frames_from_gallery, inputs=[self.state, self.path_for_settings_loader], outputs=[self.model_family, self.model_choice, self.main_tabs, self.refresh_form_trigger], show_progress="hidden")- self.send_to_generator_btn.click(fn=self.send_selected_frames_to_generator, inputs=[self.video1_path, self.video1_frame_slider, self.video2_path, self.video2_frame_slider, self.image_prompt_type], outputs=[self.image_start, self.image_end, self.main_tabs, self.join_interface, self.image_prompt_type, self.image_start_row, self.image_end_row, self.image_prompt_type_radio, self.image_prompt_type_endcheckbox, self.plugin_data])- self.cancel_join_btn.click(- fn=self.update_metadata_panel_and_buttons,- inputs=[self.selected_files_for_backend, self.state],- outputs=[- self.join_videos_btn, self.send_to_generator_settings_btn, self.metadata_panel_output,- self.path_for_settings_loader, self.frame_preview_row, self.first_frame_preview,- self.last_frame_preview, self.join_interface, self.recreate_join_btn, self.merge_info_display,- self.merge_source1_prompt, self.merge_source1_image, self.merge_source2_prompt, self.merge_source2_image- ]- )-- return {}\ No newline at end of file+ }\ No newline at end of filediff --git a/plugins/wan2gp-lora-multipliers-ui/plugin.py b/plugins/wan2gp-lora-multipliers-ui/plugin.pyindex eb4a7b1..348ff82 100644--- a/plugins/wan2gp-lora-multipliers-ui/plugin.py+++ b/plugins/wan2gp-lora-multipliers-ui/plugin.py@@ -9,19 +9,14 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):self.name = "Lora Multipliers UI"self.version = "1.0.9"self.description = "Dynamically set lora multipliers with a fast, JavaScript-powered UI."- self.target_tabs = ['generate', 'edit']+ self.previous_loras_state = {}self.request_component("loras_multipliers")self.request_component("loras_choices")self.request_component("guidance_phases")self.request_component("num_inference_steps")self.request_component("main")- self.previous_loras_state = {}def post_ui_setup(self, components: dict) -> dict:- tab_id = components.get('__tab_id__', 'unknown_tab')- if tab_id not in self.previous_loras_state:- self.previous_loras_state[tab_id] = {'loras': [], 'accelerators': []}-try:loras_multipliers = components["loras_multipliers"]loras_choices = components["loras_choices"]@@ -29,11 +24,16 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):num_inference_steps = components["num_inference_steps"]main_ui_block = components["main"]+ instance_id = loras_multipliers._id+ if instance_id not in self.previous_loras_state:+ self.previous_loras_state[instance_id] = {'loras': [], 'accelerators': [], 'multipliers': {}}++def create_and_wire_ui():- container_id = f"lora_multiplier_ui_container_{tab_id}"- update_btn_id = f"lora_mults_update_btn_{tab_id}"- hidden_input_id = f"lora_mults_hidden_input_{tab_id}"- js_renderer_func = f"wgpLoraUIRenderer_{tab_id}"+ container_id = f"lora_multiplier_ui_container_{instance_id}"+ update_btn_id = f"lora_mults_update_btn_{instance_id}"+ hidden_input_id = f"lora_mults_hidden_input_{instance_id}"+ js_renderer_func = f"wgpLoraUIRenderer_{instance_id}"css = f"""<style>@@ -98,7 +98,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):}};}};- const updatePythonTextbox = debounce(() => {{+ const updatePythonTextbox_{instance_id} = debounce(() => {{const container = document.getElementById('{container_id}');if (!container) return;@@ -144,7 +144,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):}}}}, 200);- function createSlider(phase, value, isVisible) {{+ function createSlider_{instance_id}(phase, value, isVisible) {{const container = document.createElement('div');container.className = 'lora-slider-group';if (!isVisible) container.classList.add('hidden');@@ -175,7 +175,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):numberInput.value = val.toFixed(2);}}}}- updatePythonTextbox();+ updatePythonTextbox_{instance_id}();}};rangeInput.addEventListener('input', () => syncAndUpdate(rangeInput));@@ -184,7 +184,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):return container;}}- function createStepSplit(loraIndex, splitIndex, values, guidancePhases, stepText) {{+ function createStepSplit_{instance_id}(loraIndex, splitIndex, values, guidancePhases, stepText) {{const splitContainer = document.createElement('div');splitContainer.className = 'lora-step-split-container';const sliderRow = document.createElement('div');@@ -196,43 +196,21 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):for (let i = 0; i < 3; i++) {{const isVisible = (i + 1) <= guidancePhases;const sliderValue = values[i] !== undefined ? values[i] : 1.0;- sliderRow.appendChild(createSlider(i + 1, sliderValue, isVisible));+ sliderRow.appendChild(createSlider_{instance_id}(i + 1, sliderValue, isVisible));}}splitContainer.appendChild(sliderRow);return splitContainer;}}- function updateRejoinVisibility(loraContainer) {{+ function updateRejoinVisibility_{instance_id}(loraContainer) {{if (!loraContainer) return;const splits = loraContainer.querySelectorAll('.lora-step-split-container');const rejoinBtn = loraContainer.querySelector('.rejoin-btn');if (rejoinBtn) {{ rejoinBtn.style.display = splits.length > 1 ? 'inline-block' : 'none'; }}}}- function handleSplit(e) {{- const loraIndex = parseInt(e.target.dataset.loraIndex);- const loraContainer = document.getElementById(`lora-container-{tab_id}-${{loraIndex}}`);- const newSplit = createStepSplit(loraIndex, -1, [1.0, 1.0, 1.0], window.wgp_guidance_phases_{tab_id}, "");- loraContainer.appendChild(newSplit);- recalculateStepRanges(loraContainer);- updateRejoinVisibility(loraContainer);- updatePythonTextbox();- }}-- function handleRejoin(e) {{- const loraIndex = parseInt(e.target.dataset.loraIndex);- const loraContainer = document.getElementById(`lora-container-{tab_id}-${{loraIndex}}`);- const splits = loraContainer.querySelectorAll('.lora-step-split-container');- if (splits.length > 1) {{- splits[splits.length - 1].remove();- recalculateStepRanges(loraContainer);- updateRejoinVisibility(loraContainer);- updatePythonTextbox();- }}- }}-- function recalculateStepRanges(loraContainer) {{- const totalSteps = window.wgp_total_steps_{tab_id} || 1;+ function recalculateStepRanges_{instance_id}(loraContainer) {{+ const totalSteps = window.wgp_total_steps_{instance_id} || 1;const splits = loraContainer.querySelectorAll('.lora-step-split-container');const numSplits = splits.length;if (numSplits === 0) return;@@ -250,17 +228,39 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):startStep = endStep;}});}}++ function handleSplit_{instance_id}(e) {{+ const loraIndex = parseInt(e.target.dataset.loraIndex);+ const loraContainer = document.getElementById(`lora-container-{instance_id}-${{loraIndex}}`);+ const newSplit = createStepSplit_{instance_id}(loraIndex, -1, [1.0, 1.0, 1.0], window.wgp_guidance_phases_{instance_id}, "");+ loraContainer.appendChild(newSplit);+ recalculateStepRanges_{instance_id}(loraContainer);+ updateRejoinVisibility_{instance_id}(loraContainer);+ updatePythonTextbox_{instance_id}();+ }}++ function handleRejoin_{instance_id}(e) {{+ const loraIndex = parseInt(e.target.dataset.loraIndex);+ const loraContainer = document.getElementById(`lora-container-{instance_id}-${{loraIndex}}`);+ const splits = loraContainer.querySelectorAll('.lora-step-split-container');+ if (splits.length > 1) {{+ splits[splits.length - 1].remove();+ recalculateStepRanges_{instance_id}(loraContainer);+ updateRejoinVisibility_{instance_id}(loraContainer);+ updatePythonTextbox_{instance_id}();+ }}+ }}window.{js_renderer_func} = (jsonData) => {{let data;- try {{ data = JSON.parse(jsonData); }} catch (e) {{ return; }}+ try {{ data = JSON.parse(jsonData); }} catch (e) {{ console.error('Error parsing Lora UI JSON:', e); return; }}if (!data) return;const container = document.getElementById('{container_id}');if (!container) return;container.innerHTML = '';- window.wgp_guidance_phases_{tab_id} = data.guidance_phases;- window.wgp_total_steps_{tab_id} = data.total_steps;+ window.wgp_guidance_phases_{instance_id} = data.guidance_phases;+ window.wgp_total_steps_{instance_id} = data.total_steps;container.dataset.separatorIndex = data.separator_index;const createHeader = (text) => {{@@ -280,16 +280,16 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):}}const loraContainer = document.createElement('div');loraContainer.className = 'lora-main-container';- loraContainer.id = `lora-container-{tab_id}-${{i}}`;+ loraContainer.id = `lora-container-{instance_id}-${{i}}`;loraContainer.innerHTML = `<div class="gr-row"><h3>${{lora.name}}</h3><div style="display:flex; gap: 8px;"><button class="wgp-lora-button split-btn" data-lora-index="${{i}}" type="button">Split Steps</button><button class="wgp-lora-button rejoin-btn" data-lora-index="${{i}}" type="button" style="display:none;">Rejoin Step</button></div></div>`;lora.splits.forEach((split) => {{- loraContainer.appendChild(createStepSplit(i, -1, split.values, data.guidance_phases, ""));+ loraContainer.appendChild(createStepSplit_{instance_id}(i, -1, split.values, data.guidance_phases, ""));}});container.appendChild(loraContainer);- recalculateStepRanges(loraContainer);- updateRejoinVisibility(loraContainer);- loraContainer.querySelector('.split-btn').addEventListener('click', handleSplit);- loraContainer.querySelector('.rejoin-btn').addEventListener('click', handleRejoin);+ recalculateStepRanges_{instance_id}(loraContainer);+ updateRejoinVisibility_{instance_id}(loraContainer);+ loraContainer.querySelector('.split-btn').addEventListener('click', handleSplit_{instance_id});+ loraContainer.querySelector('.rejoin-btn').addEventListener('click', handleRejoin_{instance_id});}});}};}}@@ -303,7 +303,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):all_stale_multipliers = [s for s in (multipliers_str or "").replace('|', ' ').split(' ') if s]num_stale_multipliers = len(all_stale_multipliers)- previous_state = self.previous_loras_state.get(tab_id, {'loras': [], 'accelerators': [], 'multipliers': {}})+ previous_state = self.previous_loras_state.get(instance_id, {'loras': [], 'accelerators': [], 'multipliers': {}})old_mult_map = previous_state.get('multipliers', {})previous_loras_set = set(previous_state.get('loras', []))@@ -361,7 +361,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):}final_accelerators = lora_names_for_ui[:new_separator_index if new_separator_index != -1 else 0]- self.previous_loras_state[tab_id] = {+ self.previous_loras_state[instance_id] = {'loras': lora_names_for_ui,'accelerators': final_accelerators,'multipliers': final_mult_map@@ -383,7 +383,7 @@ class LoraMultipliersUIPlugin(WAN2GPPlugin):hidden_input = gr.Text(elem_id=hidden_input_id)update_button = gr.Button(elem_id=update_btn_id)- ui_data_json = gr.Text(elem_id=f"ui_data_json_{tab_id}", visible=False)+ ui_data_json = gr.Text(elem_id=f"ui_data_json_{instance_id}", visible=False)main_ui_block.load(fn=None, js=main_js_script)diff --git a/plugins/wan2gp-plugin-manager/plugin.py b/plugins/wan2gp-plugin-manager/plugin.pyindex be14bdd..f644aaf 100644--- a/plugins/wan2gp-plugin-manager/plugin.py+++ b/plugins/wan2gp-plugin-manager/plugin.py@@ -203,6 +203,38 @@ class PluginManagerUIPlugin(WAN2GPPlugin):self.plugin_action_input = gr.Textbox(elem_id="plugin_action_input")self.save_action_input = gr.Textbox(elem_id="save_action_input")+ js=self._get_js_script_html()+ self.main.load(+ fn=self._refresh_ui,+ inputs=[],+ outputs=[self.plugins_html_display],+ js=js+ )+ self.save_plugins_button.click(+ fn=None, js="handleSave(false)"+ )+ self.save_and_restart_button.click(+ fn=None, js="handleSave(true)"+ )++ self.save_action_input.change(+ fn=self._handle_save_action,+ inputs=[self.save_action_input],+ outputs=[self.plugins_html_display]+ )++ self.plugin_action_input.change(+ fn=self._handle_plugin_action_from_json,+ inputs=[self.plugin_action_input],+ outputs=[self.plugins_html_display]+ )++ self.install_plugin_button.click(+ fn=self._install_plugin_and_refresh,+ inputs=[self.plugin_url_textbox],+ outputs=[self.plugins_html_display, self.plugin_url_textbox]+ )+return plugin_blocksdef _refresh_ui(self):@@ -278,39 +310,4 @@ class PluginManagerUIPlugin(WAN2GPPlugin):except (json.JSONDecodeError, ValueError) as e:gr.Warning(f"Could not perform plugin action: {e}")traceback.print_exc()- return self._refresh_ui()-- def post_ui_setup(self, components: dict):- js=self._get_js_script_html()- self.main.load(- fn=self._refresh_ui,- inputs=[],- outputs=[self.plugins_html_display],- js=js- )- self.save_plugins_button.click(- fn=None, js="handleSave(false)"- )- self.save_and_restart_button.click(- fn=None, js="handleSave(true)"- )-- self.save_action_input.change(- fn=self._handle_save_action,- inputs=[self.save_action_input],- outputs=[self.plugins_html_display]- )-- self.plugin_action_input.change(- fn=self._handle_plugin_action_from_json,- inputs=[self.plugin_action_input],- outputs=[self.plugins_html_display]- )-- self.install_plugin_button.click(- fn=self._install_plugin_and_refresh,- inputs=[self.plugin_url_textbox],- outputs=[self.plugins_html_display, self.plugin_url_textbox]- )-- return {}\ No newline at end of file+ return self._refresh_ui()\ No newline at end of filediff --git a/plugins/wan2gp-video-mask-creator/plugin.py b/plugins/wan2gp-video-mask-creator/plugin.pyindex 0aea3f1..5bed6dd 100644--- a/plugins/wan2gp-video-mask-creator/plugin.py+++ b/plugins/wan2gp-video-mask-creator/plugin.py@@ -12,7 +12,6 @@ class VideoMaskCreatorPlugin(WAN2GPPlugin):self.matanyone_app = matanyone_appself.vmc_event_handler = self.matanyone_app.get_vmc_event_handler()- self.mat_components = {}def setup_ui(self):self.request_global("download_shared_done")@@ -32,17 +31,14 @@ class VideoMaskCreatorPlugin(WAN2GPPlugin):)def create_mask_creator_ui(self):- self.mat_components = self.matanyone_app.create_ui_components()-- def post_ui_setup(self, components: dict):- self.matanyone_app.bind_events(- self.mat_components,- self.main_tabs,- None,- self.state,- self.refresh_form_trigger,- self.server_config,- self.get_current_model_settings+ matanyone_tab_state = gr.State({ "tab_no": 0 })+ self.matanyone_app.display(+ tabs=self.main_tabs,+ tab_state=matanyone_tab_state,+ state=self.state,+ refresh_form_trigger=self.refresh_form_trigger,+ server_config=self.server_config,+ get_current_model_settings_fn=self.get_current_model_settings)def on_tab_select(self, state: dict) -> None:diff --git a/preprocessing/matanyone/app.py b/preprocessing/matanyone/app.pyindex a85b15e..2c6a38b 100644--- a/preprocessing/matanyone/app.py+++ b/preprocessing/matanyone/app.py@@ -902,31 +902,50 @@ def teleport_to_video_tab(tab_state, state):set_new_tab(tab_state, state, 0)return gr.Tabs(selected="video_gen")-get_current_model_settings = None-video_output_codec = "libx264_8"-image_output_codec = "jpeg_95"-def create_ui_components():- """- Phase 1: Create UI components and return them in a dictionary.- This function should have NO external dependencies from the main app.- """- gr.Markdown("<B>Mask Edition is provided by MatAnyone, VRAM optimizations & Extended Masks by DeepBeepMeep</B>")+def display(tabs, tab_state, state, refresh_form_trigger, server_config, get_current_model_settings_fn): #, vace_video_input, vace_image_input, vace_video_mask, vace_image_mask, vace_image_refs):+ # my_tab.select(fn=load_unload_models, inputs=[], outputs=[])+ global image_output_codec, video_output_codec, get_current_model_settings+ get_current_model_settings = get_current_model_settings_fn++ image_output_codec = server_config.get("image_output_codec", None)+ video_output_codec = server_config.get("video_output_codec", None)++ media_url = "https://github.com/pq-yang/MatAnyone/releases/download/media/"++ click_brush_js = """+ () => {+ setTimeout(() => {+ const brushButton = document.querySelector('button[aria-label="Brush"]');+ if (brushButton) {+ brushButton.click();+ console.log('Brush button clicked');+ } else {+ console.log('Brush button not found');+ }+ }, 1000);+ } """++ # download assets++ gr.Markdown("<B>Mast Edition is provided by MatAnyone, VRAM optimizations & Extended Masks by DeepBeepMeep</B>")gr.Markdown("If you have some trouble creating the perfect mask, be aware of these tips:")gr.Markdown("- Using the Matanyone Settings you can also define Negative Point Prompts to remove parts of the current selection.")gr.Markdown("- Sometime it is very hard to fit everything you want in a single mask, it may be much easier to combine multiple independent sub Masks before producing the Matting : each sub Mask is created by selecting an area of an image and by clicking the Add Mask button. Sub masks can then be enabled / disabled in the Matanyone settings.")gr.Markdown("The Mask Generation time and the VRAM consumed are proportional to the number of frames and the resolution. So if relevant, you may reduce the number of frames in the Matanyone Settings. You will need for the moment to resize yourself the video if needed.")- with gr.Column(visible=True) as main_column:+ with gr.Column( visible=True):with gr.Row():- with gr.Accordion("Video Tutorial (click to expand)", open=False, elem_classes="custom-bg") as video_tutorial_accordion:+ with gr.Accordion("Video Tutorial (click to expand)", open=False, elem_classes="custom-bg"):with gr.Row():with gr.Column():gr.Markdown("### Case 1: Single Target")gr.Video(value="preprocessing/matanyone/tutorial_single_target.mp4", elem_classes="video")+with gr.Column():gr.Markdown("### Case 2: Multiple Targets")gr.Video(value="preprocessing/matanyone/tutorial_multi_targets.mp4", elem_classes="video")+with gr.Row():new_dim= gr.Dropdown(choices=[@@ -939,6 +958,7 @@ def create_ui_components():("480p - Outer Frame", "480p - Outer Frame"),], label = "Resize Input / Output", value = "")+mask_type= gr.Dropdown(choices=[("Grey with Alpha (used by WanGP)", "wangp"),@@ -946,186 +966,401 @@ def create_ui_components():("RGB With Alpha Channel (local Zip file)", "alpha")], label = "Mask Type", value = "wangp")+matting_type = gr.Radio(choices=["Foreground", "Background"],value="Foreground",label="Type of Video Matting to Generate",scale=1)++with gr.Row(visible=False):dummy = gr.Text()- with gr.Tabs() as main_media_tabs:++ with gr.Tabs():with gr.TabItem("Video"):- click_state_video = gr.State([[],[]])- interactive_state_video = gr.State({- "inference_times": 0, "negative_click_times" : 0, "positive_click_times": 0, "mask_save": arg_mask_save,- "multi_mask": { "mask_names": [], "masks": [] }, "track_end_number": None,- })- video_state = gr.State({- "user_name": "", "video_name": "", "origin_images": None, "painted_images": None, "masks": None, "inpaint_masks": None,- "logits": None, "select_frame_number": 0, "fps": 16, "audio": "",- })- with gr.Column(visible=True) as video_column:++ click_state = gr.State([[],[]])++ interactive_state = gr.State({+ "inference_times": 0,+ "negative_click_times" : 0,+ "positive_click_times": 0,+ "mask_save": arg_mask_save,+ "multi_mask": {+ "mask_names": [],+ "masks": []+ },+ "track_end_number": None,+ }+ )++ video_state = gr.State(+ {+ "user_name": "",+ "video_name": "",+ "origin_images": None,+ "painted_images": None,+ "masks": None,+ "inpaint_masks": None,+ "logits": None,+ "select_frame_number": 0,+ "fps": 16,+ "audio": "",+ }+ )++ with gr.Column( visible=True):with gr.Row():- with gr.Accordion('MatAnyone Settings (click to expand)', open=False) as video_settings_accordion:+ with gr.Accordion('MatAnyone Settings (click to expand)', open=False):with gr.Row():- erode_kernel_size_video = gr.Slider(label='Erode Kernel Size', minimum=0, maximum=30, step=1, value=10, info="Erosion on the added mask", interactive=True)- dilate_kernel_size_video = gr.Slider(label='Dilate Kernel Size', minimum=0, maximum=30, step=1, value=10, info="Dilation on the added mask", interactive=True)+ erode_kernel_size = gr.Slider(label='Erode Kernel Size',+ minimum=0,+ maximum=30,+ step=1,+ value=10,+ info="Erosion on the added mask",+ interactive=True)+ dilate_kernel_size = gr.Slider(label='Dilate Kernel Size',+ minimum=0,+ maximum=30,+ step=1,+ value=10,+ info="Dilation on the added mask",+ interactive=True)+with gr.Row():- image_selection_slider_video = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Start Frame", info="Choose the start frame for target assignment and video matting", visible=False)- end_selection_slider_video = gr.Slider(minimum=1, maximum=300, step=1, value=81, label="Last Frame to Process", info="Last Frame to Process", visible=False)- track_pause_number_slider_video = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="End frame", visible=False)+ image_selection_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Start Frame", info="Choose the start frame for target assignment and video matting", visible=False)+ end_selection_slider = gr.Slider(minimum=1, maximum=300, step=1, value=81, label="Last Frame to Process", info="Last Frame to Process", visible=False)++ track_pause_number_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="End frame", visible=False)with gr.Row():- point_prompt_video = gr.Radio(choices=["Positive", "Negative"], value="Positive", label="Point Prompt", info="Click to add positive or negative point for target mask", interactive=True, visible=False, min_width=100, scale=1)- mask_dropdown_video = gr.Dropdown(multiselect=True, value=[], label="Mask Selection", info="Choose 1~all mask(s) added in Step 2", visible=False, scale=2, allow_custom_value=True)+ point_prompt = gr.Radio(+ choices=["Positive", "Negative"],+ value="Positive",+ label="Point Prompt",+ info="Click to add positive or negative point for target mask",+ interactive=True,+ visible=False,+ min_width=100,+ scale=1)+ mask_dropdown = gr.Dropdown(multiselect=True, value=[], label="Mask Selection", info="Choose 1~all mask(s) added in Step 2", visible=False, scale=2, allow_custom_value=True)++ # input videowith gr.Row(equal_height=True):with gr.Column(scale=2):gr.Markdown("## Step1: Upload video")with gr.Column(scale=2):- step2_title_video = gr.Markdown("## Step2: Add masks <small>(Several clicks then **`Add Mask`** <u>one by one</u>)</small>", visible=False)+ step2_title = gr.Markdown("## Step2: Add masks <small>(Several clicks then **`Add Mask`** <u>one by one</u>)</small>", visible=False)with gr.Row(equal_height=True):with gr.Column(scale=2):video_input = gr.Video(label="Input Video", elem_classes="video")- extract_frames_button_video = gr.Button(value="Load Video", interactive=True, elem_classes="new_button")+ extract_frames_button = gr.Button(value="Load Video", interactive=True, elem_classes="new_button")with gr.Column(scale=2):video_info = gr.Textbox(label="Video Info", visible=False)- template_frame_video = gr.Image(label="Start Frame", type="pil",interactive=True, elem_id="template_frame_video", visible=False, elem_classes="image")+ template_frame = gr.Image(label="Start Frame", type="pil",interactive=True, elem_id="template_frame", visible=False, elem_classes="image")with gr.Row():- clear_button_click_video = gr.Button(value="Clear Clicks", interactive=True, visible=False, min_width=100)- add_mask_button_video = gr.Button(value="Add Mask", interactive=True, visible=False, min_width=100)- remove_mask_button_video = gr.Button(value="Remove Mask", interactive=True, visible=False, min_width=100)- matting_button_video = gr.Button(value="Generate Video Matting", interactive=True, visible=False, min_width=100)- with gr.Row(): gr.Markdown("")- with gr.Column() as output_row_video:+ clear_button_click = gr.Button(value="Clear Clicks", interactive=True, visible=False, min_width=100)+ add_mask_button = gr.Button(value="Add Mask", interactive=True, visible=False, min_width=100)+ remove_mask_button = gr.Button(value="Remove Mask", interactive=True, visible=False, min_width=100) # no use+ matting_button = gr.Button(value="Generate Video Matting", interactive=True, visible=False, min_width=100)+ with gr.Row():+ gr.Markdown("")++ # output video+ with gr.Column() as output_row: #equal_height=Truewith gr.Row():with gr.Column(scale=2):foreground_video_output = gr.Video(label="Original Video Input", visible=False, elem_classes="video")+ foreground_output_button = gr.Button(value="Black & White Video Output", visible=False, elem_classes="new_button")with gr.Column(scale=2):alpha_video_output = gr.Video(label="Mask Video Output", visible=False, elem_classes="video")+ export_image_mask_btn = gr.Button(value="Alpha Mask Output", visible=False, elem_classes="new_button")with gr.Row():- export_to_current_video_engine_btn = gr.Button("Export to Control Video Input and Video Mask Input", visible=False)+ with gr.Row(visible= False):+ export_to_vace_video_14B_btn = gr.Button("Export to current Video Input Video For Inpainting", visible= False)+ with gr.Row(visible= True):+ export_to_current_video_engine_btn = gr.Button("Export to Control Video Input and Video Mask Input", visible= False)++ export_to_current_video_engine_btn.click( fn=export_to_current_video_engine, inputs= [state, foreground_video_output, alpha_video_output], outputs= [refresh_form_trigger]).then( #video_prompt_video_guide_trigger,+ fn=teleport_to_video_tab, inputs= [tab_state, state], outputs= [tabs])+++ # first step: get the video information+ extract_frames_button.click(+ fn=get_frames_from_video,+ inputs=[+ state, video_input, video_state, new_dim+ ],+ outputs=[video_state, extract_frames_button, video_info, template_frame,+ image_selection_slider, end_selection_slider, track_pause_number_slider, point_prompt, dummy, clear_button_click, add_mask_button, matting_button, template_frame,+ foreground_video_output, alpha_video_output, foreground_output_button, export_image_mask_btn, mask_dropdown, step2_title]+ )++ # second step: select images from slider+ image_selection_slider.release(fn=select_video_template,+ inputs=[image_selection_slider, video_state, interactive_state],+ outputs=[template_frame, video_state, interactive_state], api_name="select_image")+ track_pause_number_slider.release(fn=get_end_number,+ inputs=[track_pause_number_slider, video_state, interactive_state],+ outputs=[template_frame, interactive_state], api_name="end_image")++ # click select image to get mask using sam+ template_frame.select(+ fn=sam_refine,+ inputs=[state, video_state, point_prompt, click_state, interactive_state],+ outputs=[template_frame, video_state, interactive_state]+ )++ # add different mask+ add_mask_button.click(+ fn=add_multi_mask,+ inputs=[video_state, interactive_state, mask_dropdown],+ outputs=[interactive_state, mask_dropdown, template_frame, click_state]+ )++ remove_mask_button.click(+ fn=remove_multi_mask,+ inputs=[interactive_state, mask_dropdown],+ outputs=[interactive_state, mask_dropdown]+ )++ # video matting+ matting_button.click(+ fn=show_outputs,+ inputs=[],+ outputs=[foreground_video_output, alpha_video_output]).then(+ fn=video_matting,+ inputs=[state, video_state, mask_type, video_input, end_selection_slider, matting_type, new_dim, interactive_state, mask_dropdown, erode_kernel_size, dilate_kernel_size],+ outputs=[foreground_video_output, alpha_video_output,foreground_video_output, alpha_video_output, export_to_vace_video_14B_btn, export_to_current_video_engine_btn]+ )++ # click to get mask+ mask_dropdown.change(+ fn=show_mask,+ inputs=[video_state, interactive_state, mask_dropdown],+ outputs=[template_frame]+ )++ # clear input+ video_input.change(+ fn=restart,+ inputs=[],+ outputs=[+ video_state,+ interactive_state,+ click_state,+ extract_frames_button, dummy,+ foreground_video_output, dummy, alpha_video_output,+ template_frame,+ image_selection_slider, end_selection_slider, track_pause_number_slider,point_prompt, export_to_vace_video_14B_btn, export_to_current_video_engine_btn, dummy, clear_button_click,+ add_mask_button, matting_button, template_frame, foreground_video_output, alpha_video_output, remove_mask_button, foreground_output_button, export_image_mask_btn, mask_dropdown, video_info, step2_title+ ],+ queue=False,+ show_progress=False)++ video_input.clear(+ fn=restart,+ inputs=[],+ outputs=[+ video_state,+ interactive_state,+ click_state,+ extract_frames_button, dummy,+ foreground_video_output, dummy, alpha_video_output,+ template_frame,+ image_selection_slider , end_selection_slider, track_pause_number_slider,point_prompt, export_to_vace_video_14B_btn, export_to_current_video_engine_btn, dummy, clear_button_click,+ add_mask_button, matting_button, template_frame, foreground_video_output, alpha_video_output, remove_mask_button, foreground_output_button, export_image_mask_btn, mask_dropdown, video_info, step2_title+ ],+ queue=False,+ show_progress=False)++ # points clear+ clear_button_click.click(+ fn = clear_click,+ inputs = [video_state, click_state,],+ outputs = [template_frame,click_state],+ )++with gr.TabItem("Image"):- click_state_image = gr.State([[],[]])- interactive_state_image = gr.State({- "inference_times": 0, "negative_click_times" : 0, "positive_click_times": 0, "mask_save": arg_mask_save,- "multi_mask": { "mask_names": [], "masks": [] }, "track_end_number": None,- })- image_state = gr.State({- "user_name": "", "image_name": "", "origin_images": None, "painted_images": None, "masks": None, "inpaint_masks": None,- "logits": None, "select_frame_number": 0, "fps": 30- })- with gr.Group(elem_classes="gr-monochrome-group", visible=True) as image_settings_group:+ click_state = gr.State([[],[]])++ interactive_state = gr.State({+ "inference_times": 0,+ "negative_click_times" : 0,+ "positive_click_times": 0,+ "mask_save": False,+ "multi_mask": {+ "mask_names": [],+ "masks": []+ },+ "track_end_number": None,+ }+ )++ image_state = gr.State(+ {+ "user_name": "",+ "image_name": "",+ "origin_images": None,+ "painted_images": None,+ "masks": None,+ "inpaint_masks": None,+ "logits": None,+ "select_frame_number": 0,+ "fps": 30+ }+ )++ with gr.Group(elem_classes="gr-monochrome-group", visible=True):with gr.Row():- with gr.Accordion('MatAnyone Settings (click to expand)', open=False) as image_settings_accordion:+ with gr.Accordion('MatAnyone Settings (click to expand)', open=False):with gr.Row():- erode_kernel_size_image = gr.Slider(label='Erode Kernel Size', minimum=0, maximum=30, step=1, value=10, info="Erosion on the added mask", interactive=True)- dilate_kernel_size_image = gr.Slider(label='Dilate Kernel Size', minimum=0, maximum=30, step=1, value=10, info="Dilation on the added mask", interactive=True)+ erode_kernel_size = gr.Slider(label='Erode Kernel Size',+ minimum=0,+ maximum=30,+ step=1,+ value=10,+ info="Erosion on the added mask",+ interactive=True)+ dilate_kernel_size = gr.Slider(label='Dilate Kernel Size',+ minimum=0,+ maximum=30,+ step=1,+ value=10,+ info="Dilation on the added mask",+ interactive=True)+with gr.Row():- image_selection_slider_image = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Num of Refinement Iterations", info="More iterations → More details & More time", visible=False)- track_pause_number_slider_image = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Track end frame", visible=False)+ image_selection_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Num of Refinement Iterations", info="More iterations → More details & More time", visible=False)+ track_pause_number_slider = gr.Slider(minimum=1, maximum=100, step=1, value=1, label="Track end frame", visible=False)with gr.Row():- point_prompt_image = gr.Radio(choices=["Positive", "Negative"], value="Positive", label="Point Prompt", info="Click to add positive or negative point for target mask", interactive=True, visible=False, min_width=100, scale=1)- mask_dropdown_image = gr.Dropdown(multiselect=True, value=[], label="Mask Selection", info="Choose 1~all mask(s) added in Step 2", visible=False)- with gr.Column() as image_column:+ point_prompt = gr.Radio(+ choices=["Positive", "Negative"],+ value="Positive",+ label="Point Prompt",+ info="Click to add positive or negative point for target mask",+ interactive=True,+ visible=False,+ min_width=100,+ scale=1)+ mask_dropdown = gr.Dropdown(multiselect=True, value=[], label="Mask Selection", info="Choose 1~all mask(s) added in Step 2", visible=False)+++ with gr.Column():+ # input imagewith gr.Row(equal_height=True):with gr.Column(scale=2):gr.Markdown("## Step1: Upload image")with gr.Column(scale=2):- step2_title_image = gr.Markdown("## Step2: Add masks <small>(Several clicks then **`Add Mask`** <u>one by one</u>)</small>", visible=False)+ step2_title = gr.Markdown("## Step2: Add masks <small>(Several clicks then **`Add Mask`** <u>one by one</u>)</small>", visible=False)with gr.Row(equal_height=True):with gr.Column(scale=2):image_input = gr.Image(label="Input Image", elem_classes="image")- extract_frames_button_image = gr.Button(value="Load Image", interactive=True, elem_classes="new_button")+ extract_frames_button = gr.Button(value="Load Image", interactive=True, elem_classes="new_button")with gr.Column(scale=2):image_info = gr.Textbox(label="Image Info", visible=False)- template_frame_image = gr.Image(type="pil", label="Start Frame", interactive=True, elem_id="template_frame_image", visible=False, elem_classes="image")+ template_frame = gr.Image(type="pil", label="Start Frame", interactive=True, elem_id="template_frame", visible=False, elem_classes="image")with gr.Row(equal_height=True, elem_classes="mask_button_group"):- clear_button_click_image = gr.Button(value="Clear Clicks", interactive=True, visible=False, elem_classes="new_button", min_width=100)- add_mask_button_image = gr.Button(value="Add Mask", interactive=True, visible=False, elem_classes="new_button", min_width=100)- remove_mask_button_image = gr.Button(value="Remove Mask", interactive=True, visible=False, elem_classes="new_button", min_width=100)- matting_button_image = gr.Button(value="Image Matting", interactive=True, visible=False, elem_classes="green_button", min_width=100)- with gr.Tabs(visible=False) as image_tabs:- with gr.TabItem("Control Image & Mask", visible=False) as image_first_tab:+ clear_button_click = gr.Button(value="Clear Clicks", interactive=True, visible=False, elem_classes="new_button", min_width=100)+ add_mask_button = gr.Button(value="Add Mask", interactive=True, visible=False, elem_classes="new_button", min_width=100)+ remove_mask_button = gr.Button(value="Remove Mask", interactive=True, visible=False, elem_classes="new_button", min_width=100)+ matting_button = gr.Button(value="Image Matting", interactive=True, visible=False, elem_classes="green_button", min_width=100)++ # output image+ with gr.Tabs(visible = False) as image_tabs:+ with gr.TabItem("Control Image & Mask", visible = False) as image_first_tab:with gr.Row(equal_height=True):control_image_output = gr.Image(type="pil", label="Control Image", visible=False, elem_classes="image")alpha_image_output = gr.Image(type="pil", label="Mask", visible=False, elem_classes="image")with gr.Row():export_image_mask_btn = gr.Button(value="Set to Control Image & Mask", visible=False, elem_classes="new_button")- with gr.TabItem("Reference Image", visible=False) as image_second_tab:+ with gr.TabItem("Reference Image", visible = False) as image_second_tab:with gr.Row():foreground_image_output = gr.Image(type="pil", label="Foreground Output", visible=False, elem_classes="image")with gr.Row():export_image_btn = gr.Button(value="Add to current Reference Images", visible=False, elem_classes="new_button")+with gr.Row(equal_height=True):bbox_info = gr.Text(label ="Mask BBox Info (Left:Top:Right:Bottom)", visible = False, interactive= False)-- return locals()--def bind_events(components, tabs, tab_state, state, refresh_form_trigger, server_config, get_current_model_settings_fn):- """Binds all event listeners for the UI components."""- global get_current_model_settings, video_output_codec, image_output_codec- get_current_model_settings = get_current_model_settings_fn- video_output_codec = server_config.get("video_output_codec", "libx264_8")- image_output_codec = server_config.get("image_output_codec", "jpeg_95")- globals().update(components)-- click_brush_js = """- () => {- setTimeout(() => {- const brushButton = document.querySelector('button[aria-label="Brush"]');- if (brushButton) {- brushButton.click();- }- }, 1000);- }"""-- # --- Video Tab Events ---- extract_frames_button_video.click(- fn=get_frames_from_video,- inputs=[state, video_input, video_state, new_dim],- outputs=[video_state, extract_frames_button_video, video_info, template_frame_video,- image_selection_slider_video, end_selection_slider_video, track_pause_number_slider_video,- point_prompt_video, dummy, clear_button_click_video, add_mask_button_video, matting_button_video, template_frame_video,- foreground_video_output, alpha_video_output, gr.Button(visible=False), gr.Button(visible=False), mask_dropdown_video, step2_title_video]- )- image_selection_slider_video.release(fn=select_video_template, inputs=[image_selection_slider_video, video_state, interactive_state_video], outputs=[template_frame_video, video_state, interactive_state_video], api_name="select_video")- track_pause_number_slider_video.release(fn=get_end_number, inputs=[track_pause_number_slider_video, video_state, interactive_state_video], outputs=[template_frame_video, interactive_state_video])- template_frame_video.select(fn=sam_refine, inputs=[state, video_state, point_prompt_video, click_state_video, interactive_state_video], outputs=[template_frame_video, video_state, interactive_state_video])- add_mask_button_video.click(fn=add_multi_mask, inputs=[video_state, interactive_state_video, mask_dropdown_video], outputs=[interactive_state_video, mask_dropdown_video, template_frame_video, click_state_video])- remove_mask_button_video.click(fn=remove_multi_mask, inputs=[interactive_state_video, mask_dropdown_video], outputs=[interactive_state_video, mask_dropdown_video])- matting_button_video.click(- fn=show_outputs, inputs=[], outputs=[foreground_video_output, alpha_video_output]- ).then(- fn=video_matting,- inputs=[state, video_state, mask_type, video_input, end_selection_slider_video, matting_type, new_dim, interactive_state_video, mask_dropdown_video, erode_kernel_size_video, dilate_kernel_size_video],- outputs=[foreground_video_output, alpha_video_output, foreground_video_output, alpha_video_output, gr.Button(visible=False), export_to_current_video_engine_btn]- )- mask_dropdown_video.change(fn=show_mask, inputs=[video_state, interactive_state_video, mask_dropdown_video], outputs=[template_frame_video])- video_input.change(fn=restart, inputs=[], outputs=[video_state, interactive_state_video, click_state_video, extract_frames_button_video, dummy, foreground_video_output, dummy, alpha_video_output, template_frame_video, image_selection_slider_video, end_selection_slider_video, track_pause_number_slider_video, point_prompt_video, gr.Button(visible=False), export_to_current_video_engine_btn, dummy, clear_button_click_video, add_mask_button_video, matting_button_video, template_frame_video, foreground_video_output, alpha_video_output, remove_mask_button_video, gr.Button(visible=False), gr.Button(visible=False), mask_dropdown_video, video_info, step2_title_video], queue=False, show_progress=False)- video_input.clear(fn=restart, inputs=[], outputs=[video_state, interactive_state_video, click_state_video, extract_frames_button_video, dummy, foreground_video_output, dummy, alpha_video_output, template_frame_video, image_selection_slider_video, end_selection_slider_video, track_pause_number_slider_video, point_prompt_video, gr.Button(visible=False), export_to_current_video_engine_btn, dummy, clear_button_click_video, add_mask_button_video, matting_button_video, template_frame_video, foreground_video_output, alpha_video_output, remove_mask_button_video, gr.Button(visible=False), gr.Button(visible=False), mask_dropdown_video, video_info, step2_title_video], queue=False, show_progress=False)- clear_button_click_video.click(fn=clear_click, inputs=[video_state, click_state_video], outputs=[template_frame_video, click_state_video])- export_to_current_video_engine_btn.click(fn=export_to_current_video_engine, inputs=[state, foreground_video_output, alpha_video_output], outputs=[refresh_form_trigger]).then(fn=teleport_to_video_tab, inputs=[gr.State({}), state], outputs=[tabs])-- # --- Image Tab Events ---- extract_frames_button_image.click(- fn=get_frames_from_image,- inputs=[state, image_input, image_state, new_dim],- outputs=[image_state, extract_frames_button_image, image_info, template_frame_image,- image_selection_slider_image, track_pause_number_slider_image, point_prompt_image, clear_button_click_image, add_mask_button_image, matting_button_image, template_frame_image,- foreground_image_output, alpha_image_output, control_image_output, image_tabs, bbox_info, export_image_btn, export_image_mask_btn, mask_dropdown_image, step2_title_image]- )- clear_button_click_image.click(fn=clear_click, inputs=[image_state, click_state_image], outputs=[template_frame_image, click_state_image])- image_selection_slider_image.release(fn=select_image_template, inputs=[image_selection_slider_image, image_state, interactive_state_image], outputs=[template_frame_image, image_state, interactive_state_image], api_name="select_image")- template_frame_image.select(fn=sam_refine, inputs=[state, image_state, point_prompt_image, click_state_image, interactive_state_image], outputs=[template_frame_image, image_state, interactive_state_image])- add_mask_button_image.click(fn=add_multi_mask, inputs=[image_state, interactive_state_image, mask_dropdown_image], outputs=[interactive_state_image, mask_dropdown_image, template_frame_image, click_state_image])- remove_mask_button_image.click(fn=remove_multi_mask, inputs=[interactive_state_image, mask_dropdown_image], outputs=[interactive_state_image, mask_dropdown_image])- matting_button_image.click(- fn=image_matting,- inputs=[state, image_state, interactive_state_image, mask_type, matting_type, new_dim, mask_dropdown_image, erode_kernel_size_image, dilate_kernel_size_image, image_selection_slider_image],- outputs=[image_tabs, image_first_tab, image_second_tab, foreground_image_output, control_image_output, alpha_image_output, foreground_image_output, control_image_output, alpha_image_output, bbox_info, export_image_btn, export_image_mask_btn]- )- nada = gr.State({})- image_input.clear(fn=restart, inputs=[], outputs=[image_state, interactive_state_image, click_state_image, extract_frames_button_image, image_tabs, foreground_image_output, control_image_output, alpha_image_output, template_frame_image, image_selection_slider_image, image_selection_slider_image, track_pause_number_slider_image, point_prompt_image, export_image_btn, export_image_mask_btn, bbox_info, clear_button_click_image, add_mask_button_image, matting_button_image, template_frame_image, foreground_image_output, alpha_image_output, remove_mask_button_image, export_image_btn, export_image_mask_btn, mask_dropdown_image, nada, step2_title_image], queue=False, show_progress=False)- export_image_btn.click(fn=export_image, inputs=[state, foreground_image_output], outputs=[refresh_form_trigger]).then(fn=teleport_to_video_tab, inputs=[gr.State({}), state], outputs=[tabs])- export_image_mask_btn.click(fn=export_image_mask, inputs=[state, control_image_output, alpha_image_output], outputs=[refresh_form_trigger]).then(fn=teleport_to_video_tab, inputs=[gr.State({}), state], outputs=[tabs]).then(fn=None, inputs=None, outputs=None, js=click_brush_js)\ No newline at end of file+ export_image_btn.click( fn=export_image, inputs= [state, foreground_image_output], outputs= [refresh_form_trigger]).then( #video_prompt_video_guide_trigger,+ fn=teleport_to_video_tab, inputs= [tab_state, state], outputs= [tabs])+ export_image_mask_btn.click( fn=export_image_mask, inputs= [state, control_image_output, alpha_image_output], outputs= [refresh_form_trigger]).then( #video_prompt_video_guide_trigger,+ fn=teleport_to_video_tab, inputs= [tab_state, state], outputs= [tabs]).then(fn=None, inputs=None, outputs=None, js=click_brush_js)++ # first step: get the image information+ extract_frames_button.click(+ fn=get_frames_from_image,+ inputs=[+ state, image_input, image_state, new_dim+ ],+ outputs=[image_state, extract_frames_button, image_info, template_frame,+ image_selection_slider, track_pause_number_slider,point_prompt, clear_button_click, add_mask_button, matting_button, template_frame,+ foreground_image_output, alpha_image_output, control_image_output, image_tabs, bbox_info, export_image_btn, export_image_mask_btn, mask_dropdown, step2_title]+ )++ # points clear+ clear_button_click.click(+ fn = clear_click,+ inputs = [image_state, click_state,],+ outputs = [template_frame,click_state],+ )+++ # second step: select images from slider+ image_selection_slider.release(fn=select_image_template,+ inputs=[image_selection_slider, image_state, interactive_state],+ outputs=[template_frame, image_state, interactive_state], api_name="select_image")+ track_pause_number_slider.release(fn=get_end_number,+ inputs=[track_pause_number_slider, image_state, interactive_state],+ outputs=[template_frame, interactive_state], api_name="end_image")++ # click select image to get mask using sam+ template_frame.select(+ fn=sam_refine,+ inputs=[state, image_state, point_prompt, click_state, interactive_state],+ outputs=[template_frame, image_state, interactive_state]+ )++ # add different mask+ add_mask_button.click(+ fn=add_multi_mask,+ inputs=[image_state, interactive_state, mask_dropdown],+ outputs=[interactive_state, mask_dropdown, template_frame, click_state]+ )++ remove_mask_button.click(+ fn=remove_multi_mask,+ inputs=[interactive_state, mask_dropdown],+ outputs=[interactive_state, mask_dropdown]+ )++ # image matting+ matting_button.click(+ fn=image_matting,+ inputs=[state, image_state, interactive_state, mask_type, matting_type, new_dim, mask_dropdown, erode_kernel_size, dilate_kernel_size, image_selection_slider],+ outputs=[image_tabs, image_first_tab, image_second_tab, foreground_image_output, control_image_output, alpha_image_output, foreground_image_output, control_image_output, alpha_image_output, bbox_info, export_image_btn, export_image_mask_btn]+ )++ nada = gr.State({})+ # clear input+ gr.on(+ triggers=[image_input.clear], #image_input.change,+ fn=restart,+ inputs=[],+ outputs=[+ image_state,+ interactive_state,+ click_state,+ extract_frames_button, image_tabs,+ foreground_image_output, control_image_output, alpha_image_output,+ template_frame,+ image_selection_slider, image_selection_slider, track_pause_number_slider,point_prompt, export_image_btn, export_image_mask_btn, bbox_info, clear_button_click,+ add_mask_button, matting_button, template_frame, foreground_image_output, alpha_image_output, remove_mask_button, export_image_btn, export_image_mask_btn, mask_dropdown, nada, step2_title+ ],+ queue=False,+ show_progress=False)+diff --git a/shared/utils/plugins.py b/shared/utils/plugins.pyindex a8efece..ecb7a14 100644--- a/shared/utils/plugins.py+++ b/shared/utils/plugins.py@@ -46,7 +46,6 @@ class WAN2GPPlugin:self._setup_complete = Falseself._data_hooks: Dict[str, List[callable]] = {}self.tab_ids: List[str] = []- self.target_tabs: Optional[List[str]] = Nonedef setup_ui(self) -> None:pass@@ -262,12 +261,7 @@ class PluginManager:if plugin_dir_name not in plugins_to_load:continuetry:- # Reload the module to pick up code changes without restarting the whole app- module_name = f"{plugin_dir_name}.plugin"- if module_name in sys.modules:- importlib.reload(sys.modules[module_name])-- module = importlib.import_module(module_name)+ module = importlib.import_module(f"{plugin_dir_name}.plugin")for name, obj in inspect.getmembers(module, inspect.isclass):if issubclass(obj, WAN2GPPlugin) and obj != WAN2GPPlugin:@@ -328,88 +322,69 @@ class PluginManager:print(f"[PluginManager] Error running hook '{hook_name}' from {callback.__module__}: {e}")traceback.print_exc()return data++ def run_component_insertion_and_setup(self, all_components: Dict[str, Any]):+ all_insert_requests: List[InsertAfterRequest] = []- def run_post_ui_setup(self, all_tab_components: List[Dict[str, Any]]) -> None:- for tab_components in all_tab_components:- tab_id = tab_components.get('__tab_id__')- if not tab_id:- print("[PluginManager] WARNING: A tab component dictionary is missing '__tab_id__'. Skipping.")- continue-- tab_insert_requests: List[InsertAfterRequest] = []-- for plugin_id, plugin in self.plugins.items():- target_tabs = getattr(plugin, 'target_tabs', None)- if target_tabs is not None and tab_id not in target_tabs:- continue-- if not all(comp_id in tab_components for comp_id in plugin.component_requests):- continue+ for plugin_id, plugin in self.plugins.items():+ try:+ for comp_id in plugin.component_requests:+ if comp_id in all_components:+ setattr(plugin, comp_id, all_components[comp_id])++ requested_components = {+ comp_id: all_components[comp_id]+ for comp_id in plugin.component_requests+ if comp_id in all_components+ }++ plugin.post_ui_setup(requested_components)- original_attrs = {}+ insert_requests = getattr(plugin, '_insert_after_requests', [])+ if insert_requests:+ all_insert_requests.extend(insert_requests)+ plugin._insert_after_requests.clear()++ except Exception as e:+ print(f"[PluginManager] ERROR in post_ui_setup for {plugin_id}: {str(e)}")+ traceback.print_exc()++ if all_insert_requests:+ for request in all_insert_requests:try:- # Temporarily set attributes for the current tab's context- for comp_id in plugin.component_requests:- if hasattr(plugin, comp_id):- original_attrs[comp_id] = getattr(plugin, comp_id)- setattr(plugin, comp_id, tab_components[comp_id])-- requested_components = { comp_id: tab_components[comp_id] for comp_id in plugin.component_requests }- requested_components['__tab_id__'] = tab_id-- plugin._insert_after_requests = []- plugin.post_ui_setup(requested_components)- tab_insert_requests.extend(getattr(plugin, '_insert_after_requests', []))+ target = all_components.get(request.target_component_id)+ parent = getattr(target, 'parent', None)+ if not target or not parent or not hasattr(parent, 'children'):+ print(f"[PluginManager] ERROR: Target '{request.target_component_id}' for insertion not found or invalid.")+ continue++ target_index = parent.children.index(target)+ with parent:+ new_component = request.new_component_constructor()+ newly_added = parent.children.pop(-1)+ parent.children.insert(target_index + 1, newly_added)+except Exception as e:- print(f"[PluginManager] Error in post_ui_setup for {plugin_id} on tab '{tab_id}': {str(e)}")+ print(f"[PluginManager] ERROR processing insert_after for {request.target_component_id}: {str(e)}")traceback.print_exc()- finally:- # Clean up attributes to prevent state leakage- for comp_id in plugin.component_requests:- if hasattr(plugin, comp_id):- delattr(plugin, comp_id)- # Restore any original attributes that were overwritten- for comp_id, value in original_attrs.items():- setattr(plugin, comp_id, value)-- if tab_insert_requests:- for request in tab_insert_requests:- try:- target = tab_components.get(request.target_component_id)- parent = getattr(target, 'parent', None)- if not target or not parent or not hasattr(parent, 'children'):- print(f"[PluginManager] ERROR on tab '{tab_id}': Target '{request.target_component_id}' for insertion not found or invalid.")- continue-- target_index = parent.children.index(target)- with parent:- new_component = request.new_component_constructor()-- newly_added = parent.children.pop(-1)- parent.children.insert(target_index + 1, newly_added)- print(f"[PluginManager] Successfully inserted component after '{request.target_component_id}' on tab '{tab_id}'")-- except Exception as e:- print(f"[PluginManager] Error processing insert_after for {request.target_component_id} on tab '{tab_id}': {str(e)}")-class WAN2GPApplication:def __init__(self):self.plugin_manager = PluginManager()self.tab_to_plugin_map: Dict[str, WAN2GPPlugin] = {}+ self.all_rendered_tabs: List[gr.Tab] = []- def _create_plugin_tabs(self, main_module_globals: Dict[str, Any]):+ def run_component_insertion(self, components_dict: Dict[str, Any]):+ if self.plugin_manager:+ self.plugin_manager.run_component_insertion_and_setup(components_dict)++ def _create_plugin_tabs(self, enabled_plugins):if not self.plugin_manager:return- server_config = main_module_globals.get('server_config', {})- enabled_user_plugins = server_config.get("enabled_plugins", [])- self.plugin_manager.load_plugins_from_directory(enabled_user_plugins)- self.plugin_manager.inject_globals(main_module_globals)-loaded_plugins = self.plugin_manager.get_all_plugins()-+system_tabs = []user_tabs = []@@ -428,8 +403,9 @@ class WAN2GPApplication:user_tabs.append((plugin_id, tab_info))system_tabs.sort(key=lambda t: (t.get('position', -1), t['label']))+sorted_user_tabs = []- for plugin_id in enabled_user_plugins:+ for plugin_id in enabled_plugins:for pid, tab_info in user_tabs:if pid == plugin_id:sorted_user_tabs.append(tab_info)@@ -440,12 +416,13 @@ class WAN2GPApplication:all_tabs_to_render = pre_user_tabs + sorted_user_tabs + post_user_tabsfor tab_info in all_tabs_to_render:- with gr.Tab(tab_info['label'], id=f"plugin_{tab_info['id']}"):+ with gr.Tab(tab_info['label'], id=f"plugin_{tab_info['id']}") as new_tab:+ self.all_rendered_tabs.append(new_tab)tab_info['component_constructor']()def _handle_tab_selection(self, state: dict, evt: gr.SelectData):if not hasattr(self, 'previous_tab_id'):- self.previous_tab_id = None+ self.previous_tab_id = "video_gen"new_tab_id = evt.value@@ -468,20 +445,4 @@ class WAN2GPApplication:print(f"[PluginManager] Error in on_tab_select for plugin {plugin_to_select.name}: {e}")traceback.print_exc()- self.previous_tab_id = new_tab_id-- def finalize_ui_setup(self, main_module_globals: Dict[str, Any], all_tab_components: List[Dict[str, Any]]):- self._create_plugin_tabs(main_module_globals)-- main_tabs = main_module_globals.get('main_tabs')- state = main_module_globals.get('state')- if main_tabs and state:- main_tabs.select(- self._handle_tab_selection,- inputs=[state],- outputs=None,- show_progress="hidden"- )-- if self.plugin_manager:- self.plugin_manager.run_post_ui_setup(all_tab_components)\ No newline at end of file+ self.previous_tab_id = new_tab_id\ No newline at end of filediff --git a/wgp.py b/wgp.pyindex b74f266..31f2a25 100644--- a/wgp.py+++ b/wgp.py@@ -9382,8 +9382,17 @@ def generate_video_tab(update_form = False, state_dict = None, ui_defaults = Noninputs=None,outputs=[current_gen_column, queue_accordion])- locals()['__tab_id__'] = tab_id- return locals()+ locals_dict = locals()+ if not update_form and hasattr(app, 'plugin_manager'):+ app.run_component_insertion(locals_dict)++ if update_form:+ locals_dict = locals()+ gen_inputs = [state_dict if k=="state" else locals_dict[k] for k in inputs_names] + [state_dict, plugin_data] + extra_inputs+ return gen_inputs+ else:+ return locals()+def compact_name(family_name, model_name):if model_name.startswith(family_name):@@ -10181,6 +10190,10 @@ def create_ui():js += """}"""+ if hasattr(app, 'plugin_manager'):+ enabled_plugins = server_config.get("enabled_plugins", [])+ app.plugin_manager.load_plugins_from_directory(enabled_plugins)+ app.plugin_manager.inject_globals(globals())if server_config.get("display_stats", 0) == 1:from shared.utils.stats import SystemStatsAppstats_app = SystemStatsApp()@@ -10307,12 +10320,15 @@ def create_ui():outputs=[generator_tab_components['queue_html'], main_tabs, edit_tab],show_progress="hidden")- gl = globals()- gl['main_tabs'] = main_tabs- gl['refresh_form_trigger'] = refresh_form_trigger- gl['save_form_trigger'] = save_form_trigger- gl['state'] = state- app.finalize_ui_setup(gl, [generator_tab_components, edit_tab_components])+ if hasattr(app, 'plugin_manager'):+ app._create_plugin_tabs(enabled_plugins)+ if main_tabs and state:+ main_tabs.select(+ fn=app._handle_tab_selection,+ inputs=[state],+ outputs=None,+ show_progress="hidden",+ )if stats_app is not None:stats_app.setup_events(main, state)return main