Python
add ability to insertAfter a gradio component
Chris Malone0683d7feabbd
diff --git a/plugin_system.py b/plugin_system.pyindex 5c42121..353fcc5 100644--- a/plugin_system.py+++ b/plugin_system.py@@ -6,6 +6,11 @@ from typing import Dict, Any, Optional, List, Unionfrom dataclasses import dataclassimport gradio as gr+@dataclass+class InsertAfterRequest:+ target_component_id: str+ new_component_constructor: callable+@dataclassclass PluginTab:id: str@@ -19,6 +24,7 @@ class WAN2GPPlugin:self.name = self.__class__.__name__self.version = "1.0.0"self._component_requests: List[str] = []+ self._insert_after_requests: List[InsertAfterRequest] = []self._setup_complete = Falsedef setup_ui(self) -> None:@@ -35,6 +41,16 @@ class WAN2GPPlugin:def component_requests(self) -> List[str]:return self._component_requests.copy()+ def insert_after(self, target_component_id: str, new_component_constructor: callable) -> None:+ if not hasattr(self, '_insert_after_requests'):+ self._insert_after_requests = []+ self._insert_after_requests.append(+ InsertAfterRequest(+ target_component_id=target_component_id,+ new_component_constructor=new_component_constructor+ )+ )+def post_ui_setup(self, components: Dict[str, gr.components.Component]) -> Dict[gr.components.Component, Union[gr.update, Any]]:return {}@@ -66,8 +82,6 @@ class PluginManager:self.plugins[module_name] = pluginprint(f"Loaded plugin: {plugin.name}")return True-- print(f"No plugin class found in {plugin_path}")return Falseexcept Exception as e:@@ -109,30 +123,72 @@ class PluginManager:return {'tabs': tabs}- def run_post_ui_setup(self, all_components: Dict[str, gr.components.Component]) -> Dict[gr.components.Component, Union[gr.update, Any]]:- all_updates: Dict[gr.components.Component, Union[gr.update, Any]] = {}+ def run_post_ui_setup(self, all_components: Dict[str, gr.components.Component]) -> None:+ all_insert_requests: List[InsertAfterRequest] = []+for plugin_id, plugin in self.plugins.items():try:- for comp_id in plugin._component_requests:+ 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+ for comp_id in plugin.component_requestsif comp_id in all_components}- if not requested_components and plugin._component_requests:- print(f"Warning: Plugin '{plugin.name}' requested components that were not found: "- f"{[c for c in plugin._component_requests if c not in all_components]}")-updates = plugin.post_ui_setup(requested_components)if updates:- all_updates.update(updates)+ for component, update_instruction in updates.items():+ new_value = None+ if isinstance(update_instruction, dict) and update_instruction.get("__type__") == "update":+ if 'value' in update_instruction:+ new_value = update_instruction['value']+ elif isinstance(update_instruction, gr.components.Component):+ if hasattr(update_instruction, 'value'):+ print(f"Warning: Plugin '{plugin.name}' is returning a new component instance for a value update. Please use gr.update(value=...) instead.")+ new_value = getattr(update_instruction, 'value')+ else:+ new_value = update_instruction++ if new_value is not None:+ component.value = new_value+ print(f"[PluginManager] Set initial value for component {type(component).__name__}")++ all_insert_requests.extend(getattr(plugin, '_insert_after_requests', []))+ getattr(plugin, '_insert_after_requests', []).clear()+except Exception as e:- print(f"Error in post_ui_setup for plugin {plugin_id}: {str(e)}")- import traceback- traceback.print_exc()+ print(f"[PluginManager] Error in post_ui_setup for {plugin_id}: {str(e)}")++ if all_insert_requests:+ for request in all_insert_requests:+ target_id = request.target_component_id+ constructor = request.new_component_constructor++ try:+ if target_id not in all_components:+ print(f"[PluginManager] ERROR: Target '{target_id}' for insertion not found.")+ continue++ target = all_components[target_id]+ parent = getattr(target, 'parent', None)+ if parent is None or not hasattr(parent, 'children'):+ continue++ children = list(parent.children)+ target_index = children.index(target)++ with parent:+ new_component = constructor()++ newly_added_component = parent.children.pop(-1)+ parent.children.insert(target_index + 1, newly_added_component)++ print(f"[PluginManager] Successfully inserted {type(new_component).__name__} after {target_id}")- return all_updates\ No newline at end of file+ except Exception as e:+ print(f"[PluginManager] Error processing insert_after for {target_id}: {str(e)}")+ import traceback+ traceback.print_exc()\ No newline at end of filediff --git a/plugins/lora_setter_plugin.py b/plugins/lora_setter_plugin.pyindex d7a57d4..a634292 100644--- a/plugins/lora_setter_plugin.py+++ b/plugins/lora_setter_plugin.py@@ -9,9 +9,22 @@ class LoraSetterPlugin(WAN2GPPlugin):self.request_component("loras_multipliers")def post_ui_setup(self, components: dict) -> dict:- if hasattr(self, 'loras_multipliers'):- return {- self.loras_multipliers: gr.Textbox(value="test")- }-- return {}\ No newline at end of file+ target_component = components.get("loras_multipliers")+ if target_component is None:+ return {}++ def create_test_component():+ return gr.HTML(+ value="<div style='padding: 10px; background: #f0f0f0; margin: 10px 0; border: 2px solid red;'>"+ "Test Component - Inserted by LoraSetterPlugin"+ "</div>"+ )++ self.insert_after(+ target_component_id="loras_multipliers",+ new_component_constructor=create_test_component+ )++ return {+ target_component: gr.update(value="test")+ }\ No newline at end of filediff --git a/wgp.py b/wgp.pyindex df8e8f4..afa20dc 100644--- a/wgp.py+++ b/wgp.py@@ -9933,13 +9933,7 @@ def create_ui():main_tabs.select(fn=select_tab, inputs= [tab_state], outputs= [main_tabs, save_form_trigger], trigger_mode="multiple")app.ui_components = generate_tab_components-- main.load(- fn=app.run_post_ui_setup,- inputs=None,- outputs=list(generate_tab_components.values()),- show_progress="hidden"- )+ app.run_post_ui_setup()return mainclass WAN2GPApplication:@@ -9954,7 +9948,6 @@ class WAN2GPApplication:plugins_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plugins")os.makedirs(plugins_dir, exist_ok=True)self.plugin_manager.load_plugins_from_directory(plugins_dir)- print(f"Initialized {len(self.plugin_manager.get_all_plugins())} plugins")except Exception as e:print(f"Error initializing plugin manager: {str(e)}")import traceback@@ -9962,12 +9955,7 @@ class WAN2GPApplication:def run_post_ui_setup(self):if hasattr(self, 'ui_components') and self.plugin_manager:- updates_dict = self.plugin_manager.run_post_ui_setup(self.ui_components)- final_updates = []- for component in self.ui_components.values():- final_updates.append(updates_dict.get(component, gr.update()))- return final_updates- return [gr.update() for _ in self.ui_components]+ self.plugin_manager.run_post_ui_setup(self.ui_components)app = WAN2GPApplication()if __name__ == "__main__":