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

mindroot/migrate.py

@@ -1,30 +1,49 @@
 import os
-import shutil
-from pathlib import Path
+import logging
+from .lib.plugins.manifest import create_default_plugin_manifest, _get_absolute_paths, _validate_manifest
+
+# Setup logging
+logger = logging.getLogger(__name__)
 
 def migrate_plugin_manifest():
-    """Migrate plugin_manifest.json from root to data/ directory if needed."""
-    root_manifest = 'plugin_manifest.json'
-    data_manifest = 'data/plugin_manifest.json'
+    """Migrate plugin_manifest.json from root to data/ directory if needed.
+    
+    This function now delegates to the consolidated manifest handling logic.
+    """
+    manifest_abs_path, root_manifest_abs_path, _ = _get_absolute_paths()
     
-    # If the new location already exists, no migration needed
-    if os.path.exists(data_manifest):
-        print(f"Plugin manifest already exists at {data_manifest}")
+    logger.info("Checking plugin manifest migration...")
+    logger.debug(f"Target manifest path: {manifest_abs_path}")
+    logger.debug(f"Source manifest path: {root_manifest_abs_path}")
+    
+    # Check if target manifest already exists and is valid
+    is_valid, _ = _validate_manifest(manifest_abs_path)
+    if is_valid:
+        logger.info(f"Valid plugin manifest already exists at {manifest_abs_path}")
         return
     
-    # If old location exists, move it to new location
-    if os.path.exists(root_manifest):
-        print(f"Migrating plugin manifest from {root_manifest} to {data_manifest}")
-        # Ensure data directory exists
-        os.makedirs('data', exist_ok=True)
-        # Move the file
-        shutil.move(root_manifest, data_manifest)
-        print(f"Plugin manifest migration complete")
+    # Check if source manifest exists
+    source_exists = os.path.exists(root_manifest_abs_path)
+    if source_exists:
+        logger.info(f"Found manifest to migrate from {root_manifest_abs_path}")
     else:
-        print("No existing plugin manifest found to migrate")
+        logger.info("No existing plugin manifest found to migrate")
+    
+    # Use the consolidated manifest creation logic which handles migration
+    try:
+        create_default_plugin_manifest()
+        logger.info("Plugin manifest migration/creation completed successfully")
+    except Exception as e:
+        logger.error(f"Plugin manifest migration failed: {e}")
+        raise
 
 def run_migrations():
     """Run all necessary migrations."""
-    print("Running MindRoot migrations...")
-    migrate_plugin_manifest()
-    print("Migrations complete")
+    logger.info("Running MindRoot migrations...")
+    try:
+        migrate_plugin_manifest()
+        logger.info("Migrations completed successfully")
+    except Exception as e:
+        logger.error(f"Migration failed: {e}")
+        # Don't raise here - let the system continue with default manifest
+        logger.warning("Continuing with default manifest due to migration failure")

mindroot/registry/data_access.py

@@ -6,7 +6,7 @@ class DataAccess:
         self.data_dir = 'data'
         self.models_file = os.path.join(self.data_dir, 'models.json')
         self.providers_file = os.path.join(self.data_dir, 'providers.json')
-        self.plugins_file = 'plugin_manifest.json'
+        self.plugins_file = 'data/plugin_manifest.json'
         self.equivalent_flags_file = os.path.join(self.data_dir, 'equivalent_flags.json')
         self.preferred_models_file = os.path.join(self.data_dir, 'preferred_models.json')
 

mindroot/server.py

@@ -8,25 +8,44 @@ from .lib.chatcontext import ChatContext
 from .lib.providers.hooks import hook_manager
 from .lib.utils.debug import debug_box
 import asyncio
+import sys
 import uvicorn
 from termcolor import colored
 import socket
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.middleware.base import BaseHTTPMiddleware
+from .lib.cli.plugins import install_plugins_from_cli
 from dotenv import load_dotenv
 from .migrate import run_migrations
 
+# import for file copy
+from shutil import copyfile
+
 # Load environment variables from .env file at the start
 # Set override=True to make .env variables override existing environment variables
 load_dotenv(override=True)
 
 def parse_args():
     import argparse
-    parser = argparse.ArgumentParser(description="Run the server")
+    parser = argparse.ArgumentParser(description="Run the MindRoot server or manage plugins.", allow_abbrev=False)
+
+    # Server arguments are top-level
     parser.add_argument("-p", "--port", type=int, help="Port to run the server on")
-    # need to include optional admin-user and admin-password
     parser.add_argument("-u", "--admin-user", type=str, help="Admin username")
     parser.add_argument("-pw", "--admin-password", type=str, help="Admin password")
+
+    subparsers = parser.add_subparsers(dest='command', help='sub-command help')
+
+    # Explicit 'server' command for clarity in help, but it's the default action
+    server_parser = subparsers.add_parser('server', help='Run the web server (default action)')
+
+    # Plugin command group
+    plugin_parser = subparsers.add_parser('plugin', help='Manage plugins')
+    plugin_subparsers = plugin_parser.add_subparsers(dest='plugin_command', required=True)
+    install_parser = plugin_subparsers.add_parser('install', help='Install or update one or more plugins')
+    install_parser.add_argument('plugins', nargs='+', help='List of plugins to install (e.g., runvnc/plugin-name)')
+    install_parser.add_argument('--reinstall', action='store_true', help='Force reinstall of the plugin if it already exists.')
+
     return parser.parse_args()
 
 def get_project_root():
@@ -68,10 +87,13 @@ async def setup_app_internal(app_):
     app = app_
     
     root = get_project_root()
+    source_root = Path(__file__).parent
     await plugins.load(app=app)
     app.mount("/static", StaticFiles(directory=str(root / "static"), follow_symlink=True), name="static")
     app.mount("/imgs", StaticFiles(directory=str(root / "imgs"), follow_symlink=True), name="imgs")
-
+    if not os.path.exists(root / "imgs/logo.png"):
+        print(colored("No logo found, copying default logo from coreplugins", "yellow"))
+        copyfile(str(source_root / "coreplugins/home/static/imgs/logo.png"), str(root / "imgs/logo.png"))
     return app
 
 def is_port_in_use(port):
@@ -97,7 +119,11 @@ class HeaderMiddleware(BaseHTTPMiddleware):
         
         # Add security headers
         response.headers["X-Content-Type-Options"] = "nosniff"
-        response.headers["X-Frame-Options"] = "SAMEORIGIN"
+
+        #chat widgets don't work if we do this
+        if os.environ.get('MR_X_FRAME_SAMEORIGIN', 'false').lower() == 'true':
+            response.headers["X-Frame-Options"] = "SAMEORIGIN"
+
         response.headers["X-XSS-Protection"] = "1; mode=block"
         
         return response
@@ -108,20 +134,23 @@ def main():
     # Run migrations first, before anything else
     run_migrations()
 
-    cmd_args = parse_args()
-    # save ALL parsed args in app state
+    args = parse_args()
+
+    # If the command is 'plugin', handle it and exit.
+    if args.command == 'plugin':
+        if args.plugin_command == 'install':
+            asyncio.run(install_plugins_from_cli(args.plugins, reinstall=args.reinstall))
+        sys.exit(0)
+
+    # Default action: run the server. The server arguments are on the main 'args' object.
+    cmd_args = args
     port = 8010
     if cmd_args.port:
         port = cmd_args.port
     else:
-        cmd_args.port = port 
-  
-    app = FastAPI()
+        cmd_args.port = port
 
-    #app.add_middleware(
-    #    CORSMiddleware,
-    #    allow_origins=["*"]  # This one line is all you need to allow all origins
-    #)
+    app = FastAPI()
 
     app.state.cmd_args = cmd_args
 

mindroot/server_missing_normal_args.py

@@ -0,0 +1,197 @@
+from fastapi import FastAPI, Response, Request
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+import os
+from pathlib import Path
+from .lib import plugins
+from .lib.chatcontext import ChatContext
+from .lib.providers.hooks import hook_manager
+from .lib.utils.debug import debug_box
+import asyncio
+import uvicorn
+import sys
+from termcolor import colored
+import socket
+from fastapi.middleware.cors import CORSMiddleware
+from starlette.middleware.base import BaseHTTPMiddleware
+from .lib.cli.plugins import install_plugins_from_cli
+from dotenv import load_dotenv
+from .migrate import run_migrations
+
+# import for file copy
+from shutil import copyfile
+
+# Load environment variables from .env file at the start
+# Set override=True to make .env variables override existing environment variables
+load_dotenv(override=True)
+
+def parse_args():
+    import argparse
+    parser = argparse.ArgumentParser(description="Run the server")
+    subparsers = parser.add_subparsers(dest='command', help='sub-command help')
+
+    # Server command (default)
+    server_parser = subparsers.add_parser('server', help='Run the web server (default)')
+    server_parser.add_argument("-p", "--port", type=int, help="Port to run the server on")
+    server_parser.add_argument("-u", "--admin-user", type=str, help="Admin username")
+    server_parser.add_argument("-pw", "--admin-password", type=str, help="Admin password")
+
+    # Plugin command
+    plugin_parser = subparsers.add_parser('plugin', help='Manage plugins')
+    plugin_subparsers = plugin_parser.add_subparsers(dest='plugin_command', required=True)
+    install_parser = plugin_subparsers.add_parser('install', help='Install one or more plugins')
+    install_parser.add_argument('plugins', nargs='+', help='List of plugins to install (e.g., runvnc/plugin-name or pypi-package-name)')
+
+    return parser.parse_args()
+
+def get_project_root():
+    return Path(os.getcwd())
+    #return Path(__file__).parent
+
+def create_directories():
+    root = get_project_root()
+    directories = [
+        "data",
+        "imgs",
+        "models",
+        "models/face",
+        "models/llm",
+        "static/personas",
+        "personas",
+        "personas/local",
+        "personas/shared",
+        "data/sessions"
+    ]
+    chatlog_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
+    directories.append(chatlog_dir)
+
+    for directory in directories:
+        (root / directory).mkdir(parents=True, exist_ok=True)
+
+create_directories()
+
+import mimetypes
+mimetypes.add_type('application/javascript', '.js')
+mimetypes.add_type('text/css', '.css')
+
+templates = None
+app = None
+failed_plugins = []
+
+async def setup_app_internal(app_):
+    global app, templates
+    app = app_
+    
+    root = get_project_root()
+    source_root = Path(__file__).parent
+    await plugins.load(app=app)
+    app.mount("/static", StaticFiles(directory=str(root / "static"), follow_symlink=True), name="static")
+    app.mount("/imgs", StaticFiles(directory=str(root / "imgs"), follow_symlink=True), name="imgs")
+    if not os.path.exists(root / "imgs/logo.png"):
+        print(colored("No logo found, copying default logo from coreplugins", "yellow"))
+        copyfile(str(source_root / "coreplugins/home/static/imgs/logo.png"), str(root / "imgs/logo.png"))
+    return app
+
+def is_port_in_use(port):
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        try:
+            s.bind(('0.0.0.0', port))
+            return False
+        except socket.error:
+            return True
+
+def find_available_port(start_port=8010, max_attempts=100):
+    port = start_port
+    while port < start_port + max_attempts:
+        if not is_port_in_use(port):
+            return port
+        port += 1
+    raise RuntimeError(f"Could not find an available port after {max_attempts} attempts")
+
+class HeaderMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        # First get the response from other middleware and routes
+        response = await call_next(request)
+        
+        # Add security headers
+        response.headers["X-Content-Type-Options"] = "nosniff"
+
+        #chat widgets don't work if we do this
+        if os.environ.get('MR_X_FRAME_SAMEORIGIN', 'false').lower() == 'true':
+            response.headers["X-Frame-Options"] = "SAMEORIGIN"
+
+        response.headers["X-XSS-Protection"] = "1; mode=block"
+        
+        return response
+
+def main():
+    global app
+    
+    # Run migrations first, before anything else
+    run_migrations()
+
+    args = parse_args()
+
+    # If no command is specified, default to 'server'
+    if args.command is None:
+        args.command = 'server'
+
+    if args.command == 'plugin' and args.plugin_command == 'install':
+        asyncio.run(install_plugins_from_cli(args.plugins))
+        sys.exit(0)
+
+    # Proceed with server startup
+    cmd_args = args
+    port = 8010
+    if cmd_args.port:
+        port = cmd_args.port
+    else:
+        # Add a default port to the args namespace if not provided
+        # to avoid AttributeError later.
+        setattr(cmd_args, 'port', port)
+
+    app = FastAPI()
+
+    #app.add_middleware(
+    #    CORSMiddleware,
+    #    allow_origins=["*"]  # This one line is all you need to allow all origins
+    #)
+
+    app.state.cmd_args = cmd_args
+
+    debug_box("pre_load")
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(plugins.pre_load(app)) # middleware
+
+    debug_box("finished with pre_load, now calling uvicorn.run")
+
+    @app.on_event("startup")
+    async def setup_app():
+        global app
+        await setup_app_internal(app)
+        print(colored("Plugin setup complete", "green"))
+
+    @app.on_event("shutdown")
+    async def shutdown_event():
+        print("Shutting down MindRoot")
+        hook_manager.eject()
+
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],  # Replace with your specific origins for production
+        allow_credentials=True,
+        allow_methods=["*"],  # Or specify: ["GET", "POST", "PUT", "DELETE", etc.]
+        allow_headers=["*"],  # Or specify required headers
+        expose_headers=["*"]  # Headers that browsers are allowed to access
+    )
+
+    app.add_middleware(HeaderMiddleware)
+
+    try:
+        print(colored(f"Starting server on port {port}", "green"))
+        uvicorn.run(app, host="0.0.0.0", port=port, lifespan="on", timeout_graceful_shutdown=2)
+    except Exception as e:
+        print(colored(f"Error starting server: {str(e)}", "red"))
+
+if __name__ == "__main__":
+    main()

mindroot/server_prev.py

@@ -0,0 +1,173 @@
+from fastapi import FastAPI, Response, Request
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+import os
+from pathlib import Path
+from .lib import plugins
+from .lib.chatcontext import ChatContext
+from .lib.providers.hooks import hook_manager
+from .lib.utils.debug import debug_box
+import asyncio
+import uvicorn
+from termcolor import colored
+import socket
+from fastapi.middleware.cors import CORSMiddleware
+from starlette.middleware.base import BaseHTTPMiddleware
+from dotenv import load_dotenv
+from .migrate import run_migrations
+
+# import for file copy
+from shutil import copyfile
+
+# Load environment variables from .env file at the start
+# Set override=True to make .env variables override existing environment variables
+load_dotenv(override=True)
+
+def parse_args():
+    import argparse
+    parser = argparse.ArgumentParser(description="Run the server")
+    parser.add_argument("-p", "--port", type=int, help="Port to run the server on")
+    # need to include optional admin-user and admin-password
+    parser.add_argument("-u", "--admin-user", type=str, help="Admin username")
+    parser.add_argument("-pw", "--admin-password", type=str, help="Admin password")
+    return parser.parse_args()
+
+def get_project_root():
+    return Path(os.getcwd())
+    #return Path(__file__).parent
+
+def create_directories():
+    root = get_project_root()
+    directories = [
+        "data",
+        "imgs",
+        "models",
+        "models/face",
+        "models/llm",
+        "static/personas",
+        "personas",
+        "personas/local",
+        "personas/shared",
+        "data/sessions"
+    ]
+    chatlog_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
+    directories.append(chatlog_dir)
+
+    for directory in directories:
+        (root / directory).mkdir(parents=True, exist_ok=True)
+
+create_directories()
+
+import mimetypes
+mimetypes.add_type('application/javascript', '.js')
+mimetypes.add_type('text/css', '.css')
+
+templates = None
+app = None
+failed_plugins = []
+
+async def setup_app_internal(app_):
+    global app, templates
+    app = app_
+    
+    root = get_project_root()
+    source_root = Path(__file__).parent
+    await plugins.load(app=app)
+    app.mount("/static", StaticFiles(directory=str(root / "static"), follow_symlink=True), name="static")
+    app.mount("/imgs", StaticFiles(directory=str(root / "imgs"), follow_symlink=True), name="imgs")
+    if not os.path.exists(root / "imgs/logo.png"):
+        print(colored("No logo found, copying default logo from coreplugins", "yellow"))
+        copyfile(str(source_root / "coreplugins/home/static/imgs/logo.png"), str(root / "imgs/logo.png"))
+    return app
+
+def is_port_in_use(port):
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        try:
+            s.bind(('0.0.0.0', port))
+            return False
+        except socket.error:
+            return True
+
+def find_available_port(start_port=8010, max_attempts=100):
+    port = start_port
+    while port < start_port + max_attempts:
+        if not is_port_in_use(port):
+            return port
+        port += 1
+    raise RuntimeError(f"Could not find an available port after {max_attempts} attempts")
+
+class HeaderMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        # First get the response from other middleware and routes
+        response = await call_next(request)
+        
+        # Add security headers
+        response.headers["X-Content-Type-Options"] = "nosniff"
+
+        #chat widgets don't work if we do this
+        if os.environ.get('MR_X_FRAME_SAMEORIGIN', 'false').lower() == 'true':
+            response.headers["X-Frame-Options"] = "SAMEORIGIN"
+
+        response.headers["X-XSS-Protection"] = "1; mode=block"
+        
+        return response
+
+def main():
+    global app
+    
+    # Run migrations first, before anything else
+    run_migrations()
+
+    cmd_args = parse_args()
+    # save ALL parsed args in app state
+    port = 8010
+    if cmd_args.port:
+        port = cmd_args.port
+    else:
+        cmd_args.port = port 
+  
+    app = FastAPI()
+
+    #app.add_middleware(
+    #    CORSMiddleware,
+    #    allow_origins=["*"]  # This one line is all you need to allow all origins
+    #)
+
+    app.state.cmd_args = cmd_args
+
+    debug_box("pre_load")
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(plugins.pre_load(app)) # middleware
+
+    debug_box("finished with pre_load, now calling uvicorn.run")
+
+    @app.on_event("startup")
+    async def setup_app():
+        global app
+        await setup_app_internal(app)
+        print(colored("Plugin setup complete", "green"))
+
+    @app.on_event("shutdown")
+    async def shutdown_event():
+        print("Shutting down MindRoot")
+        hook_manager.eject()
+
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],  # Replace with your specific origins for production
+        allow_credentials=True,
+        allow_methods=["*"],  # Or specify: ["GET", "POST", "PUT", "DELETE", etc.]
+        allow_headers=["*"],  # Or specify required headers
+        expose_headers=["*"]  # Headers that browsers are allowed to access
+    )
+
+    app.add_middleware(HeaderMiddleware)
+
+    try:
+        print(colored(f"Starting server on port {port}", "green"))
+        uvicorn.run(app, host="0.0.0.0", port=port, lifespan="on", timeout_graceful_shutdown=2)
+    except Exception as e:
+        print(colored(f"Error starting server: {str(e)}", "red"))
+
+if __name__ == "__main__":
+    main()

{mindroot-9.3.0.dist-info → mindroot-9.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 9.3.0
+Version: 9.6.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE
@@ -18,7 +18,6 @@ Requires-Dist: PyJWT
 Requires-Dist: pluggy
 Requires-Dist: sse_starlette
 Requires-Dist: partial-json-parser
-Requires-Dist: pydantic
 Requires-Dist: setuptools
 Requires-Dist: requests
 Requires-Dist: aiohttp
@@ -33,4 +32,10 @@ Requires-Dist: python-dotenv
 Requires-Dist: google-auth
 Requires-Dist: google-auth-oauthlib
 Requires-Dist: google-auth-httplib2
+Requires-Dist: chardet
+Requires-Dist: mcp>=1.12.3
+Requires-Dist: httpx>=0.24.0
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: aiofiles>=23.0.0
+Requires-Dist: uv>=0.7.0
 Dynamic: license-file