mindroot 8.1.0__py3-none-any.whl → 8.2.0__py3-none-any.whl

mindroot/coreplugins/admin/plugin_manager.py

@@ -1,5 +1,6 @@
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter, HTTPException, Request
 from pydantic import BaseModel
+from sse_starlette.sse import EventSourceResponse
 import traceback
 import os
 import json
@@ -8,6 +9,10 @@ from lib.plugins import (
     load_plugin_manifest, update_plugin_manifest, plugin_install,
     save_plugin_manifest, plugin_update, toggle_plugin_state, get_plugin_path
 )
+from lib.plugins.installation import download_github_files
+from lib.streamcmd import stream_command_as_events
+import asyncio
+
 
 router = APIRouter()
 
@@ -30,12 +35,122 @@ class InstallFromIndexRequest(BaseModel):
     plugin: str
     index_name: str
 
+class StreamInstallRequest(BaseModel):
+    plugin: str
+    source: str
+    source_path: str = None
+
 class PluginMetadata(BaseModel):
     description: Optional[str] = None
     commands: Optional[List[str]] = None
     services: Optional[List[str]] = None
     dependencies: Optional[List[str]] = None
 
+import sys, os, shlex
+
+@router.post("/stream-install-plugin", response_class=EventSourceResponse)
+async def stream_install_plugin(request: StreamInstallRequest):
+    """Stream the installation process of a plugin using SSE (POST method)."""
+    # Prepare the command based on the source
+    if request.source == 'github_direct':
+        cmd = [sys.executable, '-m', 'pip', 'install', '-e', request.source_path, '-v', '--no-cache-dir']
+    elif request.source == 'local':
+        cmd = [sys.executable, '-m', 'pip', 'install', '-e', request.source_path, '-v', '--no-cache-dir']
+    elif request.source == 'pypi':
+        cmd = [sys.executable, '-m', 'pip', 'install', request.plugin, '-v', '--no-cache-dir']
+    else:
+        return {"success": False, "message": "Invalid source"}
+
+    # For GitHub installations, use the plugin_install function which handles the download and extraction
+    if request.source == 'github':
+        try:
+            # Use the streaming approach for GitHub installations
+            parts = request.source_path.split(':')
+            repo_path = parts[0]
+            tag = parts[1] if len(parts) > 1 else None
+            
+            async def stream_github_install():
+                yield {"event": "message", "data": f"Downloading GitHub repository {repo_path}..."}
+                
+                try:
+                    plugin_dir, _, plugin_info = download_github_files(repo_path, tag)
+                    
+                    cmd = [sys.executable, '-m', 'pip', 'install', '-e', plugin_dir, '-v', '--no-cache-dir']
+                    async for event in stream_command_as_events(cmd):
+                        yield event
+                        
+                    update_plugin_manifest(
+                        plugin_info['name'], 'github', os.path.abspath(plugin_dir),
+                        remote_source=repo_path, version=plugin_info.get('version', '0.0.1'),
+                        metadata=plugin_info
+                    )
+                except Exception as e:
+                    yield {"event": "error", "data": f"Error installing from GitHub: {str(e)}"}
+            
+            return EventSourceResponse(stream_github_install())
+        except Exception as e:
+            return {"success": False, "message": f"Error setting up GitHub installation: {str(e)}"}
+    
+    # For other sources, use our streamcmd module to stream the command output
+    return EventSourceResponse(stream_command_as_events(cmd))
+@router.get("/stream-install-plugin", response_class=EventSourceResponse)
+async def stream_install_plugin_get(request: Request):
+    """Stream the installation process of a plugin using SSE (GET method)."""
+    # Extract parameters from query string
+    plugin = request.query_params.get("plugin", "")
+    source = request.query_params.get("source", "")
+    source_path = request.query_params.get("source_path", "")
+    
+    # Use the new simpler approach
+    if source == 'github':
+        cmd = [sys.executable, '-m', 'pip', 'install', '-e', source_path, '-v', '--no-cache-dir']
+        message = f"Installing {plugin} from GitHub repository {source_path}..."
+    elif source == 'local':
+        cmd = [sys.executable, '-m', 'pip', 'install', '-e', source_path, '-v', '--no-cache-dir']
+        message = f"Installing from local path: {source_path}"
+    elif source == 'pypi':
+        cmd = [sys.executable, '-m', 'pip', 'install', plugin, '-v', '--no-cache-dir']
+        message = f"Installing from PyPI: {plugin}"
+    else:  
+        return {"success": False, "message": "Invalid source"}
+
+    # For GitHub installations, use the plugin_install function which handles the download and extraction
+    if source == 'github':
+        try:
+            # Use the streaming approach for GitHub installations
+            parts = source_path.split(':')
+            repo_path = parts[0]
+            tag = parts[1] if len(parts) > 1 else None
+            
+            # First yield a message about downloading
+            async def stream_github_install():
+                yield {"event": "message", "data": f"Downloading GitHub repository {repo_path}..."}
+                
+                # Download and extract the GitHub repository
+                try:
+                    plugin_dir, _, plugin_info = download_github_files(repo_path, tag)
+                    
+                    # Now stream the installation from the local directory
+                    cmd = [sys.executable, '-m', 'pip', 'install', '-e', plugin_dir, '-v', '--no-cache-dir']
+                    async for event in stream_command_as_events(cmd):
+                        yield event
+                        
+                    # Update the plugin manifest
+                    update_plugin_manifest(
+                        plugin_info['name'], 'github', os.path.abspath(plugin_dir),
+                        remote_source=repo_path, version=plugin_info.get('version', '0.0.1'),
+                        metadata=plugin_info
+                    )
+                except Exception as e:
+                    yield {"event": "error", "data": f"Error installing from GitHub: {str(e)}"}
+            
+            return EventSourceResponse(stream_github_install())
+        except Exception as e:
+            return {"success": False, "message": f"Error installing from GitHub: {str(e)}"}
+    
+    # Use our new streamcmd module
+    return EventSourceResponse(stream_command_as_events(cmd))
+
 @router.get("/get-all-plugins")
 async def get_all_plugins():
     try:
@@ -87,7 +202,7 @@ async def scan_directory(request: DirectoryRequest):
         # Update installed plugins from discovered ones
         for plugin_name, plugin_info in discovered_plugins.items():
             plugin_info['source'] = 'local'
-            plugin_info['metadata'] = {
+            plugin_info['metadata'] = plugin_info.get('metadata', {}) or {
                 "description": plugin_info.get('description', ''),
                 "install_date": plugin_info.get('install_date', ''),
                 "commands": plugin_info.get('commands', []),
@@ -96,8 +211,16 @@ async def scan_directory(request: DirectoryRequest):
             print(plugin_info)
             manifest['plugins']['installed'][plugin_name] = plugin_info
 
+        # Prepare plugin list for response
+        plugins_list = [{
+            "name": name,
+            "description": info.get('metadata', {}).get('description', info.get('description', ''))
+        } for name, info in discovered_plugins.items()]
+        
         save_plugin_manifest(manifest)
-        return {"success": True, "message": f"Scanned {len(discovered_plugins)} plugins in {directory}"}
+        return {"success": True, 
+                "message": f"Scanned {len(discovered_plugins)} plugins in {directory}",
+                "plugins": plugins_list}
     except Exception as e:
         trace = traceback.format_exc()
         return {"success": False, "message": f"Error during scan: {str(e)}\n\n{trace}"}