Skip to content
Python

refactor

Chris Malone3472163ef3c5
diff --git a/plugin_system.py b/plugin_system.py
index e2771ce..f9ff384 100644
--- a/plugin_system.py
+++ b/plugin_system.py
@@ -222,8 +222,22 @@ class WAN2GPApplication:
self.plugin_manager.load_plugins_from_directory(plugins_dir)
except Exception as e:
print(f"Error initializing plugin manager: {str(e)}")
+ import traceback
traceback.print_exc()
+ def setup_plugins_ui(self, main_module_globals: Dict[str, Any]):
+ self.initialize_plugin_manager()
+ if self.plugin_manager:
+ self.plugin_manager.inject_globals(main_module_globals)
+ plugin_ui = self.plugin_manager.setup_ui()
+ plugin_tabs = plugin_ui.get('tabs', {})
+ sorted_plugin_tabs = sorted(
+ plugin_tabs.items(),
+ key=lambda x: x[1].get('position', -1)
+ )
+ return sorted_plugin_tabs
+ return []
+
def run_post_ui_setup(self):
if hasattr(self, 'ui_components') and self.plugin_manager:
self.plugin_manager.run_post_ui_setup(self.ui_components)
\ No newline at end of file
diff --git a/wgp.py b/wgp.py
index 9af5bf7..bd491df 100644
--- a/wgp.py
+++ b/wgp.py
@@ -9882,34 +9882,8 @@ def create_ui():
tab_state = gr.State({ "tab_no":0 })
- app.initialize_plugin_manager()
- if app.plugin_manager:
- global_references = {
- "server_config": server_config,
- "has_video_file_extension": has_video_file_extension,
- "has_image_file_extension": has_image_file_extension,
- "get_settings_from_file": get_settings_from_file,
- "get_video_info": get_video_info,
- "extract_audio_tracks": extract_audio_tracks,
- "get_file_creation_date": get_file_creation_date,
- "get_video_frame": get_video_frame,
- "are_model_types_compatible": are_model_types_compatible,
- "get_model_def": get_model_def,
- "get_default_settings": get_default_settings,
- "add_to_sequence": add_to_sequence,
- "set_model_settings": set_model_settings,
- "generate_dropdown_model_list": generate_dropdown_model_list,
- "get_unique_id": get_unique_id,
- "args": args
- }
- app.plugin_manager.inject_globals(global_references)
- plugin_ui = app.plugin_manager.setup_ui() if app.plugin_manager else {}
- plugin_tabs = plugin_ui.get('tabs', {})
+ sorted_plugin_tabs = app.setup_plugins_ui(globals())
- sorted_plugin_tabs = sorted(
- plugin_tabs.items(),
- key=lambda x: x[1].get('position', -1)
- )
with gr.Tabs(selected="video_gen", ) as main_tabs:
with gr.Tab("Video Generator", id="video_gen") as video_generator_tab:
with gr.Row():