mindroot 9.0.0__tar.gz → 9.2.0__tar.gz

{mindroot-9.0.0 → mindroot-9.2.0}/MANIFEST.in

@@ -33,3 +33,5 @@ recursive-include src/mindroot/coreplugins/env_manager *
 recursive-include src/mindroot/lib/plugins *.json
 
 recursive-include src/mindroot/coreplugins/google_auth *
+
+recursive-include src/mindroot/coreplugins/user_service *

{mindroot-9.0.0/src/mindroot.egg-info → mindroot-9.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 9.0.0
+Version: 9.2.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE

{mindroot-9.0.0 → mindroot-9.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mindroot"
-version = "9.0.0"
+version = "9.2.0"
 description = "MindRoot AI Agent Framework"
 requires-python = ">=3.9"
 dependencies = [

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/coreplugins/chat/router.py

@@ -258,8 +258,9 @@ async def delete_chat_session(request: Request, log_id: str, user=Depends(requir
     try:
         # Try to determine the agent name from the context file first
         agent_name = "unknown"
-        context_file_path = f"data/context/{user.username}/context_{log_id}.json"
-        
+        context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+        context_file_path = f"{context_dir}/{user.username}/context_{log_id}.json"
+
         if os.path.exists(context_file_path):
             try:
                 with open(context_file_path, 'r') as f:

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/coreplugins/env_manager/mod.py

@@ -4,7 +4,9 @@ import json
 import subprocess
 from pathlib import Path
 from lib.providers.services import service
+import lib
 from lib.plugins import list_enabled, get_plugin_path
+import mindroot.coreplugins
 
 
 def should_skip_directory(directory):
@@ -64,7 +66,7 @@ def scan_directory_for_env_vars(directory):
         # Use grep to find os.environ references - much faster than parsing each file
         cmd = [
             'grep', '-r', 
-            '-E', "(os\.environ\[\"|'|os\.environ\.get\(\"|')", 
+            '-E', r"os\.environ(\.get\(|\[)", 
             '--include=*.py', 
             '--exclude-dir=venv', 
             '--exclude-dir=env',
@@ -132,6 +134,30 @@ async def scan_env_vars(params=None, context=None):
                 }
                 all_env_vars.update(env_vars)
     
+    # Also scan the core directories (lib and coreplugins)
+    core_env_vars = set()
+    lib_path = os.path.dirname(lib.__file__)
+    mindroot_path = os.path.dirname(lib_path)
+    
+    # Scan lib directory
+    if os.path.isdir(lib_path):
+        lib_vars = scan_directory_for_env_vars(lib_path)
+        core_env_vars.update(lib_vars)
+
+    # Scan coreplugins directory
+    coreplugins_path = os.path.join(mindroot_path, 'coreplugins')
+    if os.path.isdir(coreplugins_path):
+        coreplugins_vars = scan_directory_for_env_vars(coreplugins_path)
+        core_env_vars.update(coreplugins_vars)
+
+    if core_env_vars:
+        results['core'] = {
+            'plugin_name': 'core',
+            'category': 'core',
+            'env_vars': sorted(list(core_env_vars))
+        }
+        all_env_vars.update(core_env_vars)
+
     # Get current environment variables
     current_env = {}
     for var_name in all_env_vars:

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/coreplugins/home/router.py

@@ -22,9 +22,11 @@ async def home(request: Request):
     
     # Try to sort agents by last access time
     agent_access_times = []
+    chatlog_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
     for agent in agent_dirs:
         # Look for the most recent log file for this agent
-        log_pattern = f"data/chatlogs/{agent}_*.json"
+        # Search across all user directories for this agent's logs
+        log_pattern = f"{chatlog_dir}/*/{agent}/chatlog_*.json"
         log_files = glob.glob(log_pattern)
         
         if log_files:

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/coreplugins/startup/mod.py

@@ -10,7 +10,9 @@ print("--- AH Startup ---")
 async def on_load(app):
     print(termcolor.colored("startup plugin calling startup() hook...", 'yellow', 'on_green'))
 
-    for dirs in ['data/context', 'data/chat']:
+    context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+    chatlog_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
+    for dirs in [context_dir, chatlog_dir]:
         os.makedirs(dirs, exist_ok=True)
 
     context = ChatContext(user='startup')

mindroot-9.2.0/src/mindroot/coreplugins/user_service/__init__.py

@@ -0,0 +1,10 @@
+#
+from .mod import *
+
+from .admin_init import *
+
+
+from .password_reset_service import *
+from .router import router
+from .file_trigger_service import *
+from .hooks import *

mindroot-9.2.0/src/mindroot/coreplugins/user_service/file_trigger_service.py

@@ -0,0 +1,72 @@
+import asyncio
+import json
+import os
+import logging
+from datetime import datetime
+from lib.providers.services import service, ServiceProvider
+
+logger = logging.getLogger(__name__)
+
+# Use paths relative to the process working directory
+REQUEST_DIR = "data/password_resets/requests"
+GENERATED_DIR = "data/password_resets/generated"
+CHECK_INTERVAL_SECONDS = 30
+
+@service()
+async def process_password_reset_requests(context=None):
+    """Processes password reset request files from a directory."""
+    # Ensure directories exist
+    os.makedirs(REQUEST_DIR, exist_ok=True)
+    os.makedirs(GENERATED_DIR, exist_ok=True)
+
+    sp = ServiceProvider()
+    initiate_reset = sp.get('user_service.initiate_password_reset')
+    
+    if not (initiate_reset and callable(initiate_reset)):
+        logger.error("Could not get 'user_service.initiate_password_reset' service.")
+        return
+
+    for filename in os.listdir(REQUEST_DIR):
+        request_file_path = os.path.join(REQUEST_DIR, filename)
+        if not os.path.isfile(request_file_path):
+            continue
+
+        try:
+            with open(request_file_path, 'r') as f:
+                data = json.load(f)
+            
+            username = data.get("username")
+            is_admin_reset = data.get("is_admin_reset", False)
+
+            if not username:
+                raise ValueError("Username is missing from request file.")
+
+            logger.info(f"Processing password reset request for user: {username}")
+            token = await initiate_reset(username=username, is_admin_reset=is_admin_reset)
+            
+            reset_link = f"/user_service/reset-password/{token}"
+            generated_file_path = os.path.join(GENERATED_DIR, f"{username}_{datetime.utcnow().strftime('%Y%m%d%H%M%S')}.json")
+            with open(generated_file_path, 'w') as f:
+                json.dump({"username": username, "reset_link": reset_link, "token": token}, f, indent=2)
+            
+            logger.info(f"Successfully generated password reset link for {username}.")
+            os.remove(request_file_path)
+
+        except Exception as e:
+            logger.error(f"Failed to process reset request file {filename}: {e}")
+            error_file_path = os.path.join(REQUEST_DIR, f"{filename}.error")
+            os.rename(request_file_path, error_file_path)
+
+@service()
+async def start_file_watcher_service(context=None):
+    """Starts a background task to watch for password reset request files."""
+    logger.info("Starting password reset file watcher service.")
+    async def watcher_loop():
+        while True:
+            try:
+                await process_password_reset_requests()
+            except Exception as e:
+                logger.error(f"Error in password reset watcher loop: {e}")
+            await asyncio.sleep(CHECK_INTERVAL_SECONDS)
+    
+    asyncio.create_task(watcher_loop())

mindroot-9.2.0/src/mindroot/coreplugins/user_service/hooks.py

@@ -0,0 +1,23 @@
+import asyncio
+import logging
+from lib.providers.hooks import hook
+from lib.providers.services import ServiceProvider
+
+logger = logging.getLogger(__name__)
+
+@hook('startup')
+async def on_user_service_startup(app, context=None):
+    """
+    Startup hook for the user_service plugin.
+    """
+    logger.info("User service startup hook triggered.")
+    try:
+        sp = ServiceProvider()
+        start_watcher = sp.get('user_service.start_file_watcher_service')
+        if start_watcher and callable(start_watcher):
+            logger.info("Starting the password reset file watcher service via startup hook.")
+            asyncio.create_task(start_watcher())
+        else:
+            logger.error("Could not find 'user_service.start_file_watcher_service' during startup.")
+    except Exception as e:
+        logger.error(f"Error starting file watcher service from hook: {e}")

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/coreplugins/user_service/models.py

@@ -26,3 +26,10 @@ class UserCreate(BaseModel):
 class UserInRequest(UserBase):
     """User data as attached to request.state.user"""
     token_data: dict
+
+
+class PasswordResetToken(BaseModel):
+    """Data for password reset tokens"""
+    token: str
+    expires_at: str
+    is_admin_reset: bool = False

mindroot-9.2.0/src/mindroot/coreplugins/user_service/password_reset_service.py

@@ -0,0 +1,79 @@
+from lib.providers.services import service
+from .models import UserAuth, PasswordResetToken
+import bcrypt
+import json
+import os
+import secrets
+from datetime import datetime, timedelta
+
+USER_DATA_ROOT = "data/users"
+RESET_TOKEN_VALIDITY_HOURS = 1
+
+@service()
+async def initiate_password_reset(username: str, is_admin_reset: bool = False, context=None) -> str:
+    """Initiates a password reset, generates a token, and stores it."""
+    user_dir = os.path.join(USER_DATA_ROOT, username)
+    if not os.path.exists(user_dir):
+        raise ValueError("User not found")
+
+    token = secrets.token_urlsafe(32)
+    expires_at = datetime.utcnow() + timedelta(hours=RESET_TOKEN_VALIDITY_HOURS)
+
+    reset_data = PasswordResetToken(
+        token=token,
+        expires_at=expires_at.isoformat(),
+        is_admin_reset=is_admin_reset
+    )
+
+    reset_file_path = os.path.join(user_dir, "password_reset.json")
+    with open(reset_file_path, 'w') as f:
+        json.dump(reset_data.dict(), f, indent=2)
+
+    # In a real application, you would email this token to the user.
+    # For this implementation, we return it directly.
+    return token
+
+@service()
+async def reset_password_with_token(token: str, new_password: str, context=None) -> bool:
+    """Resets a user's password using a valid reset token."""
+    for username in os.listdir(USER_DATA_ROOT):
+        user_dir = os.path.join(USER_DATA_ROOT, username)
+        reset_file_path = os.path.join(user_dir, "password_reset.json")
+
+        if not os.path.exists(reset_file_path):
+            continue
+
+        with open(reset_file_path, 'r') as f:
+            try:
+                reset_data = PasswordResetToken(**json.load(f))
+            except (json.JSONDecodeError, TypeError):
+                continue
+
+        if reset_data.token == token:
+            if datetime.fromisoformat(reset_data.expires_at) < datetime.utcnow():
+                os.remove(reset_file_path) # Expired token
+                raise ValueError("Password reset token has expired.")
+
+            auth_file_path = os.path.join(user_dir, "auth.json")
+            if not os.path.exists(auth_file_path):
+                os.remove(reset_file_path)
+                raise FileNotFoundError("User auth file not found.")
+
+            with open(auth_file_path, 'r+') as auth_file:
+                auth_data_dict = json.load(auth_file)
+                auth_data = UserAuth(**auth_data_dict)
+
+                new_password_hash = bcrypt.hashpw(new_password.encode(), bcrypt.gensalt()).decode()
+                auth_data.password_hash = new_password_hash
+
+                if reset_data.is_admin_reset and 'admin' not in auth_data.roles:
+                    auth_data.roles.append('admin')
+
+                auth_file.seek(0)
+                json.dump(auth_data.dict(), auth_file, indent=2, default=str)
+                auth_file.truncate()
+
+            os.remove(reset_file_path) # Invalidate token after use
+            return True
+
+    raise ValueError("Invalid password reset token.")

mindroot-9.2.0/src/mindroot/coreplugins/user_service/router.py

@@ -0,0 +1,36 @@
+from fastapi import APIRouter, Request, Form, Depends
+from fastapi.responses import HTMLResponse, RedirectResponse
+from lib.templates import render
+from .password_reset_service import reset_password_with_token, initiate_password_reset
+from lib.providers.services import service_manager
+from lib.providers import ProviderManager
+
+router = APIRouter()
+
+@router.get("/reset-password/{token}")
+async def get_reset_password_form(request: Request, token: str):
+    return await render('reset_password', {"request": request, "token": token, "error": None, "success": False})
+
+@router.post("/reset-password/{token}")
+async def handle_reset_password(request: Request, token: str, password: str = Form(...), confirm_password: str = Form(...), services: ProviderManager = Depends(lambda: service_manager)):
+    if password != confirm_password:
+        return await render('reset_password', {"request": request, "token": token, "error": "Passwords do not match.", "success": False})
+
+    try:
+        success = await services.get('user_service.reset_password_with_token')(token=token, new_password=password)
+        if success:
+            return await render('reset_password', {"request": request, "token": token, "error": None, "success": True})
+        else:
+            return await render('reset_password', {"request": request, "token": token, "error": "Invalid or expired token.", "success": False})
+    except ValueError as e:
+        return await render('reset_password', {"request": request, "token": token, "error": str(e), "success": False})
+
+# This is an admin-only function to generate a reset link.
+# In a real app, this would be more protected.
+@router.get("/admin/initiate-reset/{username}")
+async def admin_initiate_reset(username: str, services: ProviderManager = Depends(lambda: service_manager)):
+    try:
+        token = await services.get('user_service.initiate_password_reset')(username=username)
+        return HTMLResponse(f'<h1>Password Reset Link</h1><p>Share this link with the user: <a href="/user_service/reset-password/{token}">/user_service/reset-password/{token}</a></p>')
+    except ValueError as e:
+        return HTMLResponse(f'<h1>Error</h1><p>{str(e)}</p>', status_code=404)

mindroot-9.2.0/src/mindroot/coreplugins/user_service/templates/reset_password.jinja2

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Reset Password</title>
+    <style>
+        body { font-family: sans-serif; background-color: #1a1a1a; color: #f0f0f0; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; }
+        .container { background-color: #2a2a2a; padding: 2rem; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.3); width: 100%; max-width: 400px; }
+        h1 { text-align: center; color: #fff; }
+        form { display: flex; flex-direction: column; gap: 1rem; }
+        label { font-weight: bold; }
+        input[type="password"] { padding: 0.75rem; border-radius: 4px; border: 1px solid #444; background-color: #333; color: #f0f0f0; }
+        button { padding: 0.75rem; border: none; border-radius: 4px; background-color: #007bff; color: white; font-size: 1rem; cursor: pointer; }
+        button:hover { background-color: #0056b3; }
+        .error { color: #ff4d4d; background-color: #402a2a; padding: 1rem; border-radius: 4px; text-align: center; }
+        .success { color: #4dff4d; background-color: #2a402a; padding: 1rem; border-radius: 4px; text-align: center; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Reset Your Password</h1>
+        {% if success %}
+            <div class="success">Your password has been reset successfully. You can now log in with your new password.</div>
+        {% else %}
+            <form method="post">
+                <label for="password">New Password</label>
+                <input type="password" id="password" name="password" required minlength="8">
+                <label for="confirm_password">Confirm New Password</label>
+                <input type="password" id="confirm_password" name="confirm_password" required minlength="8">
+                <button type="submit">Reset Password</button>
+            </form>
+            {% if error %}
+                <p class="error">{{ error }}</p>
+            {% endif %}
+        {% endif %}
+    </div>
+</body>
+</html>

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/lib/chatcontext.py

@@ -93,7 +93,8 @@ class ChatContext:
             raise ValueError('log_id is not set for the context.')
         else:
             pass
-        context_file = f'data/context/{self.username}/context_{self.log_id}.json'
+        context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+        context_file = f'{context_dir}/{self.username}/context_{self.log_id}.json'
         await aiofiles.os.makedirs(os.path.dirname(context_file), exist_ok=True)
         try:
             async with aiofiles.open(context_file, 'r') as f:
@@ -112,7 +113,8 @@ class ChatContext:
             raise ValueError('log_id is not set for the context.')
         else:
             pass
-        context_file = f'data/context/{self.username}/context_{self.log_id}.json'
+        context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+        context_file = f'{context_dir}/{self.username}/context_{self.log_id}.json'
         await aiofiles.os.makedirs(os.path.dirname(context_file), exist_ok=True)
         self.data['log_id'] = self.log_id
         context_data = {'data': self.data, 'chat_log': self.chat_log._get_log_data()}
@@ -133,7 +135,8 @@ class ChatContext:
 
     async def load_context(self, log_id):
         self.log_id = log_id
-        context_file = f'data/context/{self.username}/context_{log_id}.json'
+        context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+        context_file = f'{context_dir}/{self.username}/context_{log_id}.json'
         if await aiofiles.os.path.exists(context_file):
             async with aiofiles.open(context_file, 'r') as f:
                 content = await f.read()
@@ -238,7 +241,8 @@ class ChatContext:
             print(f"Chatlog file not found for deletion: {chatlog_file_to_delete}")
 
         # ChatContext File (Agent is not part of the context file path structure)
-        context_file_to_delete = os.path.join('data/context', user, f'context_{log_id}.json')
+        context_dir = os.environ.get('CHATCONTEXT_DIR', 'data/context')
+        context_file_to_delete = os.path.join(context_dir, user, f'context_{log_id}.json')
         if await aiofiles.os.path.exists(context_file_to_delete):
             try:
                 await aiofiles.os.remove(context_file_to_delete)

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot/server.py

@@ -36,7 +36,6 @@ def create_directories():
     root = get_project_root()
     directories = [
         "imgs",
-        "data/chat",
         "models",
         "models/face",
         "models/llm",
@@ -46,6 +45,9 @@ def create_directories():
         "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)
 

{mindroot-9.0.0 → mindroot-9.2.0/src/mindroot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 9.0.0
+Version: 9.2.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE

{mindroot-9.0.0 → mindroot-9.2.0}/src/mindroot.egg-info/SOURCES.txt

@@ -1772,11 +1772,16 @@ src/mindroot/coreplugins/usage/templates/usage.jinja2
 src/mindroot/coreplugins/user_service/__init__.py
 src/mindroot/coreplugins/user_service/admin_init.py
 src/mindroot/coreplugins/user_service/email_service.py
+src/mindroot/coreplugins/user_service/file_trigger_service.py
+src/mindroot/coreplugins/user_service/hooks.py
 src/mindroot/coreplugins/user_service/mod.py
 src/mindroot/coreplugins/user_service/models.py
+src/mindroot/coreplugins/user_service/password_reset_service.py
 src/mindroot/coreplugins/user_service/role_service.py
+src/mindroot/coreplugins/user_service/router.py
 src/mindroot/coreplugins/user_service/backup/admin_service.py
 src/mindroot/coreplugins/user_service/backup/admin_setup.py
+src/mindroot/coreplugins/user_service/templates/reset_password.jinja2
 src/mindroot/lib/__init__.py
 src/mindroot/lib/buchatlog.py
 src/mindroot/lib/buchatlog2.py

mindroot-9.0.0/src/mindroot/coreplugins/user_service/__init__.py

@@ -1,5 +0,0 @@
-#
-from .mod import *
-
-from .admin_init import *
-