mindroot 9.3.0__py3-none-any.whl → 9.6.0__py3-none-any.whl

mindroot/coreplugins/admin/router.py

@@ -1,47 +1,148 @@
 import nanoid
+import os
+import json
+from pathlib import Path
 from fastapi import APIRouter, HTTPException, Request
-from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse, Response
 from lib.plugins import list_enabled
 from lib.templates import render
 from .plugin_manager import router as plugin_manager_router
 from lib.route_decorators import requires_role
+from .mod import get_git_version_info
 
-# Create admin router with role requirement for all routes under it
-router = APIRouter(
-    dependencies=[requires_role('admin')]
-)
+# Create separate routers for public and admin routes
+public_router = APIRouter()  # No dependencies - for OAuth callbacks etc.
+admin_router = APIRouter(dependencies=[requires_role('admin')])  # Admin only
 
-router.include_router(plugin_manager_router, prefix="/plugin-manager", tags=["plugin-manager"])
+# === PUBLIC ROUTES (no authentication required) ===
+# Import and include the OAuth callback router in public router
+from .oauth_callback_router import router as oauth_callback_router
+public_router.include_router(oauth_callback_router)
 
-@router.get("/admin", response_class=HTMLResponse)
+# === ADMIN ROUTES (authentication required) ===
+admin_router.include_router(plugin_manager_router, prefix="/plugin-manager", tags=["plugin-manager"])
+
+@admin_router.get("/admin", response_class=HTMLResponse)
 async def get_admin_html():
     log_id = nanoid.generate()
     plugins = list_enabled()
     html = await render('admin', {"log_id": log_id})
     return html
 
+@admin_router.post("/admin/get-version-info")
+async def get_version_info():
+    """Get version information, trying git first, then falling back to cached file."""
+    try:
+        # Get the path to this file to determine where to store version.txt
+        current_file = Path(__file__)
+        version_file = current_file.parent / "version.txt"
+        
+        # Try to get fresh git info using the command
+        try:
+            if get_git_version_info:
+                git_info = await get_git_version_info()
+                if git_info:
+                    # Write to version.txt
+                    with open(version_file, 'w') as f:
+                        json.dump(git_info, f, indent=2)
+                    return JSONResponse(git_info)
+        except Exception as e:
+            print(f"Failed to get git info: {e}")
+        
+        # Fall back to reading from version.txt
+        if version_file.exists():
+            with open(version_file, 'r') as f:
+                cached_info = json.load(f)
+                # Add note that this is cached
+                cached_info['note'] = 'Cached version (git not available)'
+                return JSONResponse(cached_info)
+        
+        # No version info available
+        return JSONResponse({
+            'commit_hash': 'Unknown',
+            'commit_date': 'Unknown',
+            'retrieved_at': 'Unknown',
+            'note': 'Version information not available'
+        })
+        
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Error getting version info: {str(e)}")
 
 from lib.logging.log_router import router as log_router
-router.include_router(log_router)
+admin_router.include_router(log_router)
 
 from .command_router import router as command_router
-router.include_router(command_router)
+admin_router.include_router(command_router)
 
 from .settings_router import router as settings_router
-router.include_router(settings_router)
+admin_router.include_router(settings_router)
+
+# Use the fixed plugin router instead of the old one
+from .plugin_router_fixed import router as plugin_router_fixed
+admin_router.include_router(plugin_router_fixed, prefix="/admin", tags=["plugins", "mcp"])
 
+# Keep the old plugin router for backward compatibility if needed
 from .plugin_router import router as plugin_router
-router.include_router(plugin_router)
+admin_router.include_router(plugin_router, prefix="/admin/legacy", tags=["legacy-plugins"])
 
 from .persona_router import router as persona_router
-router.include_router(persona_router)
+admin_router.include_router(persona_router)
 
 from .agent_router import router as agent_router
-router.include_router(agent_router)
+admin_router.include_router(agent_router)
 
 from .server_router import router as server_router
-router.include_router(server_router, prefix="/admin/server", tags=["server"])
+admin_router.include_router(server_router, prefix="/admin/server", tags=["server"])
 
 # Import and include the env_manager router
 from coreplugins.env_manager.router import router as env_manager_router
-router.include_router(env_manager_router)
+admin_router.include_router(env_manager_router)
+
+@admin_router.post("/admin/update-mindroot")
+async def update_mindroot():
+    """Update MindRoot using pip install --upgrade mindroot"""
+    import subprocess
+    import sys
+    
+    try:
+        # Run pip install --upgrade mindroot in the current environment
+        result = subprocess.run(
+            [sys.executable, "-m", "pip", "install", "--upgrade", "mindroot"],
+            capture_output=True,
+            text=True,
+            timeout=300  # 5 minute timeout
+        )
+        
+        if result.returncode == 0:
+            return JSONResponse({
+                "success": True,
+                "message": "MindRoot updated successfully",
+                "output": result.stdout,
+                "note": "Restart the application to use the updated version"
+            })
+        else:
+            return JSONResponse({
+                "success": False,
+                "message": "Failed to update MindRoot",
+                "error": result.stderr,
+                "output": result.stdout
+            })
+            
+    except subprocess.TimeoutExpired:
+        return JSONResponse({
+            "success": False,
+            "message": "Update timed out after 5 minutes",
+            "error": "Process timed out"
+        })
+    except Exception as e:
+        return JSONResponse({
+            "success": False,
+            "message": "Error during update",
+            "error": str(e)
+        })
+
+# === MAIN ROUTER COMBINING PUBLIC AND ADMIN ===
+# Create main router that combines both public and admin routes
+router = APIRouter()
+router.include_router(public_router)  # Public routes first (no auth)
+router.include_router(admin_router)   # Admin routes (with auth)

mindroot/coreplugins/admin/service_models.py

@@ -71,7 +71,7 @@ async def get_service_models_from_providers(timeout: float = 500.0, context=None
     print(f"Querying {len(providers)} providers for service models...")
     provider_tasks = [query_provider(provider) for provider in providers]
     provider_results = await asyncio.gather(*provider_tasks)
-    print(provider_results)
+    #print(provider_results)
     # Organize results by service, then by provider
     service_models: Dict[str, Dict[str, List[str]]] = {}
     

mindroot/coreplugins/admin/settings_router.py

@@ -110,6 +110,7 @@ async def get_providers():
 @router.get('/commands', response_model=Dict)
 async def get_commands():
     print("retrieving commands")
+    print(f"settings_router: command_manager instance ID: {id(command_manager)}")
     #funcs = command_manager.get_functions()
     funcs = command_manager.get_detailed_functions()
     print("funcs is")

mindroot/coreplugins/admin/static/css/admin-custom.css

@@ -138,7 +138,7 @@ details summary .material-icons {
 
 .commands-grid {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
     gap: 0.5rem;
     margin-top: 0.25rem;
 }
@@ -147,7 +147,7 @@ details summary .material-icons {
     display: flex;
     align-items: center;
     gap: 0.5rem;
-    padding: 0.35rem 0.5rem;
+    padding: 0.5rem 0.75rem;
     background: rgba(255, 255, 255, 0.05);
     border-radius: 4px;
     cursor: pointer;
@@ -167,6 +167,9 @@ details summary .material-icons {
 
 .command-name {
     white-space: nowrap;
+    flex: 1;
+    margin-right: 1rem;
+    min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
     font-size: 0.9rem;
@@ -312,3 +315,355 @@ h2, h3, h4 {
 .admin-link, .admin-link:visited {
   color: #ddd;
 }
+
+/* Category Section Styles */
+.category-section {
+    margin-bottom: 2rem;
+    background: rgba(5, 5, 15, 0.6);
+    border-radius: 12px;
+    padding: 1.5rem;
+    border: 1px solid rgba(255, 255, 255, 0.08);
+}
+
+.category-title {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    font-size: 1.3rem;
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.95);
+    margin: 0 0 1.5rem 0;
+    padding: 0.75rem 1rem;
+    background: rgba(255, 255, 255, 0.08);
+    border-radius: 8px;
+    border: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+.category-title .material-icons {
+    font-size: 1.4rem;
+    opacity: 0.9;
+}
+
+/* Adjust details within categories */
+.category-section details {
+    margin-bottom: 1rem;
+    background: rgba(15, 15, 30, 0.7);
+    border: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+.category-section details:last-child {
+    margin-bottom: 0;
+}
+
+.category-section details summary {
+    background: rgba(255, 255, 255, 0.06);
+    padding: 1rem 1.25rem;
+    font-size: 1.05rem;
+}
+
+.category-section details summary:hover {
+    background: rgba(255, 255, 255, 0.12);
+}
+
+.category-section .details-content {
+    padding: 1.25rem;
+    background: rgba(10, 10, 25, 0.5);
+}
+
+/* Category-specific styling */
+.category-section:nth-child(1) .category-title {
+    background: linear-gradient(135deg, rgba(74, 158, 255, 0.15), rgba(74, 158, 255, 0.08));
+    border-color: rgba(74, 158, 255, 0.2);
+}
+
+.category-section:nth-child(2) .category-title {
+    background: linear-gradient(135deg, rgba(76, 175, 80, 0.15), rgba(76, 175, 80, 0.08));
+    border-color: rgba(76, 175, 80, 0.2);
+}
+
+.category-section:nth-child(3) .category-title {
+    background: linear-gradient(135deg, rgba(255, 152, 0, 0.15), rgba(255, 152, 0, 0.08));
+    border-color: rgba(255, 152, 0, 0.2);
+}
+
+/* Responsive adjustments for categories */
+@media (max-width: 768px) {
+    .category-section {
+        padding: 1rem;
+        margin-bottom: 1.5rem;
+    }
+    
+    .category-title {
+        font-size: 1.2rem;
+        padding: 0.6rem 0.8rem;
+    }
+    
+    .category-section details summary {
+        padding: 0.8rem 1rem;
+        font-size: 1rem;
+    }
+    
+    .category-section .details-content {
+        padding: 1rem;
+    }
+}
+
+/* Navigation Category Styles */
+.nav-category {
+    margin-bottom: 0.5rem;
+}
+
+.nav-category-header {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.75rem 1rem;
+    background: rgba(255, 255, 255, 0.08);
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    border-radius: 6px;
+    cursor: pointer;
+    font-weight: 600;
+    font-size: 0.95rem;
+    color: rgba(255, 255, 255, 0.9);
+    margin-bottom: 0.5rem;
+    transition: background 0.2s ease;
+}
+
+.nav-category-header:hover {
+    background: rgba(255, 255, 255, 0.12);
+}
+
+.nav-category-header .material-icons {
+    font-size: 1.1rem;
+    opacity: 0.8;
+}
+
+.nav-category-content {
+    padding-left: 1rem;
+    border-left: 2px solid rgba(255, 255, 255, 0.1);
+    margin-left: 1rem;
+}
+
+.nav-category-content .tab-button {
+    width: 100%;
+    margin-bottom: 0.25rem;
+    justify-content: flex-start;
+    padding: 0.6rem 0.75rem;
+    font-size: 0.9rem;
+}
+
+/* Category-specific colors for headers */
+.nav-category:nth-child(1) .nav-category-header {
+    background: linear-gradient(135deg, rgba(74, 158, 255, 0.15), rgba(74, 158, 255, 0.08));
+    border-color: rgba(74, 158, 255, 0.2);
+}
+
+.nav-category:nth-child(1) .nav-category-content {
+    border-left-color: rgba(74, 158, 255, 0.3);
+}
+
+.nav-category:nth-child(2) .nav-category-header {
+    background: linear-gradient(135deg, rgba(76, 175, 80, 0.15), rgba(76, 175, 80, 0.08));
+    border-color: rgba(76, 175, 80, 0.2);
+}
+
+.nav-category:nth-child(2) .nav-category-content {
+    border-left-color: rgba(76, 175, 80, 0.3);
+}
+
+.nav-category:nth-child(3) .nav-category-header {
+    background: linear-gradient(135deg, rgba(255, 152, 0, 0.15), rgba(255, 152, 0, 0.08));
+    border-color: rgba(255, 152, 0, 0.2);
+}
+
+.nav-category:nth-child(3) .nav-category-content {
+    border-left-color: rgba(255, 152, 0, 0.3);
+}
+
+/* Responsive adjustments for navigation categories */
+@media (max-width: 768px) {
+    .nav-category-header {
+        padding: 0.6rem 0.8rem;
+        font-size: 0.9rem;
+    }
+    
+    .nav-category-content {
+        padding-left: 0.75rem;
+        margin-left: 0.75rem;
+    }
+    
+    .nav-category-content .tab-button {
+        padding: 0.5rem 0.6rem;
+        font-size: 0.85rem;
+    }
+}
+
+/* Enhanced Navigation Category Styles with Expand Indicators */
+.nav-category-header {
+    position: relative;
+}
+
+.nav-category-header::after {
+    content: '▼';
+    position: absolute;
+    right: 1rem;
+    top: 50%;
+    transform: translateY(-50%);
+    font-size: 0.8rem;
+    opacity: 0.7;
+    transition: transform 0.2s ease, opacity 0.2s ease;
+}
+
+.nav-category:not([open]) .nav-category-header::after {
+    transform: translateY(-50%) rotate(-90deg);
+}
+
+.nav-category-header:hover::after {
+    opacity: 1;
+}
+
+/* Enhanced hover effects */
+.nav-category-header:hover {
+    background: rgba(255, 255, 255, 0.15);
+    transform: translateY(-1px);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+}
+
+/* Category-specific hover enhancements */
+.nav-category:nth-child(1) .nav-category-header:hover {
+    background: linear-gradient(135deg, rgba(74, 158, 255, 0.25), rgba(74, 158, 255, 0.15));
+    border-color: rgba(74, 158, 255, 0.3);
+}
+
+.nav-category:nth-child(2) .nav-category-header:hover {
+    background: linear-gradient(135deg, rgba(76, 175, 80, 0.25), rgba(76, 175, 80, 0.15));
+    border-color: rgba(76, 175, 80, 0.3);
+}
+
+.nav-category:nth-child(3) .nav-category-header:hover {
+    background: linear-gradient(135deg, rgba(255, 152, 0, 0.25), rgba(255, 152, 0, 0.15));
+    border-color: rgba(255, 152, 0, 0.3);
+}
+
+/* Smooth transitions for all category interactions */
+.nav-category-header {
+    transition: all 0.2s ease;
+}
+
+.nav-category-content {
+    transition: all 0.2s ease;
+}
+
+/* Enhanced tab button hover within categories */
+.nav-category-content .tab-button:hover {
+    background: rgba(255, 255, 255, 0.15);
+    transform: translateX(2px);
+    border-left: 2px solid rgba(255, 255, 255, 0.3);
+}
+
+/* Active state enhancements */
+.nav-category-content .tab-button.active {
+    background: rgba(255, 255, 255, 0.2);
+    border-left: 3px solid #4a9eff;
+    font-weight: 500;
+}
+
+.nav-category-content .tab-button.active:hover {
+    background: rgba(255, 255, 255, 0.25);
+}
+
+
+.publish-details summary {
+  list-style: none;
+}
+
+/* Remove webkit default arrow */
+.publish-details summary::-webkit-details-marker {
+  display: none;
+}
+
+/* Add custom arrow using ::before pseudo-element */
+.publish-details summary::before {
+  content: '▶';
+  margin-right: 8px;
+  transition: transform 0.2s ease;
+  display: inline-block;
+}
+
+/* Rotate arrow when expanded */
+.publish-details details[open] summary::before {
+  transform: rotate(90deg);
+}
+
+
+
+/* Override all radio buttons globally */
+input[type="radio"] {
+  /* Remove default appearance */
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  
+  /* Size and positioning */
+  width: 20px;
+  height: 20px;
+  margin-right: 8px;
+  
+  /* Dark theme styling */
+  background-color: #2a2a2a;
+  border: 2px solid #4a4a4a;
+  border-radius: 50%;
+  
+  /* Smooth transitions */
+  transition: all 0.2s ease;
+  cursor: pointer;
+  
+  /* Positioning for the inner dot */
+  position: relative;
+  vertical-align: middle;
+}
+
+/* Hover state */
+input[type="radio"]:hover {
+  border-color: #6366f1;
+  box-shadow: 0 0 0 4px rgba(99, 102, 241, 0.1);
+}
+
+/* Checked state */
+input[type="radio"]:checked {
+  background-color: #6366f1;
+  border-color: #6366f1;
+}
+
+/* Inner dot when checked */
+input[type="radio"]:checked::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 8px;
+  height: 8px;
+  background-color: white;
+  border-radius: 50%;
+}
+
+/* Focus state for accessibility */
+input[type="radio"]:focus {
+  outline: none;
+  box-shadow: 0 0 0 3px rgba(99, 102, 241, 0.3);
+}
+
+/* Disabled state */
+input[type="radio"]:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+input[type="radio"]:disabled:hover {
+  border-color: #4a4a4a;
+  box-shadow: none;
+}
+
+
+

mindroot/coreplugins/admin/static/css/dark.css

@@ -3,6 +3,7 @@ html, body {
   color: #f0f0f0;
   padding: 5px 5px;
   font-family: ui-sans-serif, -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif, Helvetica, "Apple Color Emoji", Arial, "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 16px;
   display: flex;
   flex-direction: column;
   height: 100%;

mindroot/coreplugins/admin/static/css/default.css

@@ -10,6 +10,10 @@ html, body {
   margin: 2px;
 }
 
+html, body, * {
+  font-size: 16px;
+}
+
 input, textarea {
   background-color: rgba(10, 10, 25, 0.95);
   color: #f0f0f0;