Update server_manager.py

server_manager.py

@@ -1,5 +1,6 @@
 """
 Server management utilities for Universal MCP Client
+Version 2.0 - Enhanced with server enabling/disabling support
 """
 import asyncio
 import re
@@ -13,7 +14,7 @@ from mcp_client import UniversalMCPClient
 logger = logging.getLogger(__name__)
 
 class ServerManager:
-    """Manages MCP server connections and status"""
+    """Manages MCP server connections and status with enhanced server management"""
     
     def __init__(self, mcp_client: UniversalMCPClient):
         self.mcp_client = mcp_client
@@ -99,6 +100,7 @@ class ServerManager:
                         <p><strong>Space:</strong> {space_name}</p>
                         <p><strong>Base URL:</strong> {mcp_url}</p>
                         <p><strong>Status:</strong> Connected successfully!</p>
+                        <p><strong>Enabled:</strong> Yes (new servers are enabled by default)</p>
                         <div style="margin-top: 10px;">
                             {tools_info.replace('**', '<strong>').replace('**', '</strong>').replace(chr(10), '<br>')}
                         </div>
@@ -126,20 +128,24 @@ class ServerManager:
     def get_server_status(self) -> Tuple[str, str]:
         """Get status of all servers in accordion format"""
         try:
-            status = self.mcp_client.get_server_status()
-            server_count = f"**Total MCP Servers**: {len(status)}"
+            logger.info(f"🔍 Getting server status, found {len(self.mcp_client.servers)} servers")
             
-            if not status:
-                return server_count, "<p><em>No MCP servers configured yet.</em></p>"
+            # Get server status from mcp_client
+            server_count = len(self.mcp_client.servers)
+            server_status_text = f"**Total MCP Servers**: {server_count}"
+            
+            if not self.mcp_client.servers:
+                logger.info("📊 No servers found")
+                return server_status_text, "<p><em>No MCP servers configured yet.</em></p>"
             
             accordion_html = ""
             
-            for name, state in status.items():
-                server_config = self.mcp_client.servers[name]
-                base_url = server_config.url.replace("/gradio_api/mcp/sse", "")
+            for name, config in self.mcp_client.servers.items():
+                logger.info(f"📊 Processing server: {name}")
+                base_url = config.url.replace("/gradio_api/mcp/sse", "")
                 
-                # Determine health status
-                health = "🟢 Healthy" if "✅ Connected" in state else "🔴 Unhealthy"
+                # Determine health status (assume healthy if it's in the servers dict)
+                health = "🟢 Healthy"
                 
                 accordion_html += f"""
                 <details style="margin-bottom: 10px;">
@@ -149,11 +155,46 @@ class ServerManager:
                         <p><strong>Status:</strong> Connected (MCP Protocol)</p>
                         <p><strong>Health:</strong> {health}</p>
                         <p><strong>Base URL:</strong> {base_url}</p>
+                        <p><strong>Description:</strong> {config.description}</p>
+                        {f'<p><strong>Space ID:</strong> {config.space_id}</p>' if config.space_id else ''}
                     </div>
                 </details>
                 """
             
-            return server_count, accordion_html
+            logger.info(f"📊 Generated accordion HTML for {server_count} servers")
+            return server_status_text, accordion_html
             
         except Exception as e:
-            return "**Total MCP Servers**: 0", f"<p style='color: red;'>❌ Error getting status: {str(e)}</p>"
+            error_msg = f"Error getting server status: {str(e)}"
+            logger.error(f"❌ {error_msg}")
+            logger.error(traceback.format_exc())
+            return "**Total MCP Servers**: Error", f"<p style='color: red;'>❌ {error_msg}</p>"
+    
+    def remove_server(self, server_name: str) -> Tuple[str, str]:
+        """Remove a specific server"""
+        success = self.mcp_client.remove_server(server_name)
+        if success:
+            return f"✅ Removed server: {server_name}", ""
+        else:
+            return f"❌ Server not found: {server_name}", ""
+    
+    def remove_all_servers(self) -> Tuple[str, str]:
+        """Remove all servers"""
+        count = self.mcp_client.remove_all_servers()
+        if count > 0:
+            return f"✅ Removed all {count} MCP servers", ""
+        else:
+            return "ℹ️ No servers to remove", ""
+    
+    def enable_server(self, server_name: str, enabled: bool = True) -> Tuple[str, str]:
+        """Enable or disable a server"""
+        if server_name in self.mcp_client.servers:
+            self.mcp_client.enable_server(server_name, enabled)
+            status = "enabled" if enabled else "disabled"
+            return f"✅ Server {server_name} {status}", ""
+        else:
+            return f"❌ Server not found: {server_name}", ""
+    
+    def get_server_list_with_status(self) -> list:
+        """Get server list with enable/disable status for UI components"""
+        return self.mcp_client.get_server_list_with_status()