htmlgen-mcp 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

htmlgen_mcp/progress_tracker.py

@@ -0,0 +1,378 @@
+"""进度跟踪模块 - 支持集群环境下的任务进度查询"""
+import json
+import time
+import os
+from pathlib import Path
+from typing import Dict, List, Optional, Any
+from datetime import datetime
+import hashlib
+
+
+class ProgressTracker:
+    """任务进度跟踪器 - 支持分布式环境"""
+    
+    def __init__(self, nas_base_path: str = "/app/mcp-servers/mcp-servers/html_agent"):
+        """
+        初始化进度跟踪器
+        
+        Args:
+            nas_base_path: NAS 基础路径
+        """
+        self.nas_base = Path(nas_base_path)
+        self.progress_dir = self.nas_base / "mcp_data" / "make_web" / "progress"
+        self.progress_dir.mkdir(parents=True, exist_ok=True)
+        
+    def create_task(self, task_type: str, description: str) -> str:
+        """
+        创建新任务并返回任务 ID
+        
+        Args:
+            task_type: 任务类型 (plan_site, execute_plan, etc.)
+            description: 任务描述
+            
+        Returns:
+            任务 ID
+        """
+        # 生成唯一任务 ID
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
+        node_id = os.environ.get("NODE_ID", "node0")
+        random_suffix = hashlib.md5(f"{timestamp}{description}".encode()).hexdigest()[:8]
+        task_id = f"{task_type}_{node_id}_{timestamp}_{random_suffix}"
+        
+        # 创建任务记录
+        task_info = {
+            "task_id": task_id,
+            "task_type": task_type,
+            "description": description,
+            "status": "pending",
+            "progress": 0,
+            "created_at": datetime.now().isoformat(),
+            "node_id": node_id,
+            "events": [],
+            "current_step": None,
+            "total_steps": None
+        }
+        
+        self._save_task_info(task_id, task_info)
+        return task_id
+    
+    def update_progress(
+        self, 
+        task_id: str, 
+        progress: int, 
+        status: str = "running",
+        message: str = None,
+        current_step: int = None,
+        total_steps: int = None,
+        data: Dict[str, Any] = None
+    ) -> None:
+        """
+        更新任务进度
+        
+        Args:
+            task_id: 任务 ID
+            progress: 进度百分比 (0-100)
+            status: 任务状态 (pending/running/completed/failed)
+            message: 进度消息
+            current_step: 当前步骤
+            total_steps: 总步骤数
+            data: 附加数据
+        """
+        task_info = self._load_task_info(task_id)
+        if not task_info:
+            task_info = {"task_id": task_id, "events": []}
+        
+        # 更新基本信息
+        task_info["progress"] = progress
+        task_info["status"] = status
+        task_info["updated_at"] = datetime.now().isoformat()
+        
+        if current_step is not None:
+            task_info["current_step"] = current_step
+        if total_steps is not None:
+            task_info["total_steps"] = total_steps
+            
+        # 添加事件记录
+        event = {
+            "timestamp": datetime.now().isoformat(),
+            "progress": progress,
+            "status": status,
+            "message": message
+        }
+        if data:
+            event["data"] = data
+            
+        task_info["events"].append(event)
+        
+        # 保存更新
+        self._save_task_info(task_id, task_info)
+        
+        # 同时写入流式日志（用于实时查询）
+        self._append_progress_log(task_id, event)
+    
+    def get_task_progress(self, task_id: str) -> Optional[Dict[str, Any]]:
+        """
+        获取任务进度
+        
+        Args:
+            task_id: 任务 ID
+            
+        Returns:
+            任务进度信息
+        """
+        return self._load_task_info(task_id)
+    
+    def get_task_events(
+        self, 
+        task_id: str, 
+        since_timestamp: Optional[str] = None
+    ) -> List[Dict[str, Any]]:
+        """
+        获取任务事件（支持增量查询）
+        
+        Args:
+            task_id: 任务 ID
+            since_timestamp: 从此时间戳之后的事件
+            
+        Returns:
+            事件列表
+        """
+        task_info = self._load_task_info(task_id)
+        if not task_info:
+            return []
+        
+        events = task_info.get("events", [])
+        
+        if since_timestamp:
+            # 过滤出指定时间后的事件
+            events = [
+                e for e in events 
+                if e.get("timestamp", "") > since_timestamp
+            ]
+        
+        return events
+    
+    def list_tasks(
+        self, 
+        task_type: Optional[str] = None,
+        status: Optional[str] = None,
+        limit: int = 20
+    ) -> List[Dict[str, Any]]:
+        """
+        列出任务列表
+        
+        Args:
+            task_type: 筛选任务类型
+            status: 筛选任务状态
+            limit: 返回数量限制
+            
+        Returns:
+            任务列表
+        """
+        tasks = []
+        
+        # 扫描所有任务文件
+        for task_file in self.progress_dir.glob("*.json"):
+            if task_file.name.endswith("_log.json"):
+                continue  # 跳过日志文件
+                
+            try:
+                with open(task_file, 'r', encoding='utf-8') as f:
+                    task_info = json.load(f)
+                    
+                # 应用过滤条件
+                if task_type and task_info.get("task_type") != task_type:
+                    continue
+                if status and task_info.get("status") != status:
+                    continue
+                    
+                # 精简信息，不包含完整事件列表
+                summary = {
+                    "task_id": task_info.get("task_id"),
+                    "task_type": task_info.get("task_type"),
+                    "description": task_info.get("description"),
+                    "status": task_info.get("status"),
+                    "progress": task_info.get("progress"),
+                    "created_at": task_info.get("created_at"),
+                    "updated_at": task_info.get("updated_at"),
+                    "current_step": task_info.get("current_step"),
+                    "total_steps": task_info.get("total_steps")
+                }
+                tasks.append(summary)
+                
+            except Exception:
+                continue
+        
+        # 按创建时间倒序排序
+        tasks.sort(key=lambda x: x.get("created_at", ""), reverse=True)
+        
+        return tasks[:limit]
+    
+    def get_realtime_progress(self, task_id: str) -> Dict[str, Any]:
+        """
+        获取实时进度（用于 SSE 流式传输）
+        
+        Args:
+            task_id: 任务 ID
+            
+        Returns:
+            实时进度信息
+        """
+        task_info = self._load_task_info(task_id)
+        if not task_info:
+            return {
+                "task_id": task_id,
+                "status": "not_found",
+                "progress": 0
+            }
+        
+        # 计算详细进度
+        progress_detail = {
+            "task_id": task_id,
+            "status": task_info.get("status", "unknown"),
+            "progress": task_info.get("progress", 0),
+            "current_step": task_info.get("current_step"),
+            "total_steps": task_info.get("total_steps"),
+            "message": None
+        }
+        
+        # 获取最新消息
+        events = task_info.get("events", [])
+        if events:
+            latest_event = events[-1]
+            progress_detail["message"] = latest_event.get("message")
+            progress_detail["last_update"] = latest_event.get("timestamp")
+        
+        # 如果有步骤信息，计算步骤进度
+        if progress_detail["current_step"] and progress_detail["total_steps"]:
+            step_progress = (progress_detail["current_step"] / progress_detail["total_steps"]) * 100
+            progress_detail["step_progress"] = round(step_progress, 1)
+        
+        return progress_detail
+    
+    def _save_task_info(self, task_id: str, task_info: Dict[str, Any]) -> None:
+        """保存任务信息到 NAS"""
+        task_file = self.progress_dir / f"{task_id}.json"
+        
+        # 原子性写入（先写临时文件，再重命名）
+        temp_file = task_file.with_suffix('.tmp')
+        with open(temp_file, 'w', encoding='utf-8') as f:
+            json.dump(task_info, f, ensure_ascii=False, indent=2)
+        
+        # 重命名（原子操作）
+        temp_file.replace(task_file)
+    
+    def _load_task_info(self, task_id: str) -> Optional[Dict[str, Any]]:
+        """从 NAS 加载任务信息"""
+        task_file = self.progress_dir / f"{task_id}.json"
+        
+        if not task_file.exists():
+            return None
+            
+        try:
+            with open(task_file, 'r', encoding='utf-8') as f:
+                return json.load(f)
+        except Exception:
+            return None
+    
+    def _append_progress_log(self, task_id: str, event: Dict[str, Any]) -> None:
+        """追加进度日志（用于流式查询）"""
+        log_file = self.progress_dir / f"{task_id}_log.jsonl"
+        
+        try:
+            with open(log_file, 'a', encoding='utf-8') as f:
+                f.write(json.dumps(event, ensure_ascii=False))
+                f.write('\n')
+        except Exception:
+            pass
+    
+    def cleanup_old_tasks(self, days_to_keep: int = 7) -> int:
+        """
+        清理旧任务
+        
+        Args:
+            days_to_keep: 保留天数
+            
+        Returns:
+            清理的任务数量
+        """
+        cleaned = 0
+        cutoff_time = time.time() - (days_to_keep * 24 * 3600)
+        
+        for task_file in self.progress_dir.glob("*.json"):
+            try:
+                # 检查文件修改时间
+                if task_file.stat().st_mtime < cutoff_time:
+                    task_file.unlink()
+                    
+                    # 同时删除对应的日志文件
+                    log_file = task_file.with_suffix('.jsonl')
+                    if log_file.exists():
+                        log_file.unlink()
+                    
+                    cleaned += 1
+            except Exception:
+                continue
+        
+        return cleaned
+
+
+# 全局进度跟踪器实例
+_progress_tracker: Optional[ProgressTracker] = None
+
+
+def get_progress_tracker() -> ProgressTracker:
+    """获取进度跟踪器实例（单例）"""
+    global _progress_tracker
+    if _progress_tracker is None:
+        nas_path = os.environ.get(
+            "NAS_STORAGE_PATH",
+            "/app/mcp-servers/mcp-servers/html_agent"
+        )
+        _progress_tracker = ProgressTracker(nas_path)
+    return _progress_tracker
+
+
+# 便捷函数
+def track_task(task_type: str, description: str):
+    """
+    任务跟踪装饰器
+    
+    使用方式：
+    @track_task("plan_site", "生成网站计划")
+    async def plan_site(description: str):
+        ...
+    """
+    def decorator(func):
+        async def wrapper(*args, **kwargs):
+            tracker = get_progress_tracker()
+            task_id = tracker.create_task(task_type, description)
+            
+            try:
+                # 标记任务开始
+                tracker.update_progress(task_id, 0, "running", "任务开始执行")
+                
+                # 执行任务
+                result = await func(*args, **kwargs)
+                
+                # 标记任务完成
+                tracker.update_progress(task_id, 100, "completed", "任务执行成功")
+                
+                # 在结果中添加任务 ID
+                if isinstance(result, dict):
+                    result["task_id"] = task_id
+                
+                return result
+                
+            except Exception as e:
+                # 标记任务失败
+                tracker.update_progress(
+                    task_id, 
+                    tracker.get_task_progress(task_id).get("progress", 0),
+                    "failed", 
+                    f"任务执行失败: {str(e)}"
+                )
+                raise
+        
+        return wrapper
+    return decorator

htmlgen_mcp/web_agent_server.py

@@ -31,9 +31,13 @@ import uuid
 from pathlib import Path
 
 from htmlgen_mcp.agents.smart_web_agent import SmartWebAgent
+from htmlgen_mcp.nas_storage import get_nas_storage
+from datetime import datetime
 
+# 使用 NAS 作为默认存储路径
+NAS_PATH = os.environ.get("NAS_STORAGE_PATH", "/app/mcp-servers/mcp-servers/html_agent")
 DEFAULT_PROJECT_ROOT = os.path.abspath(
-    os.environ.get("WEB_AGENT_PROJECT_ROOT", os.path.join(PROJECT_ROOT, "projects"))
+    os.environ.get("WEB_AGENT_PROJECT_ROOT", f"{NAS_PATH}/projects")
 )
 DEFAULT_MODEL = os.environ.get("WEB_AGENT_MODEL", "qwen3-coder-plus-2025-09-23")
 DEFAULT_BASE_URL = os.environ.get(
@@ -42,45 +46,26 @@ DEFAULT_BASE_URL = os.environ.get(
 
 mcp = FastMCP("smart-web-agent")
 
-# MCP 服务持久化目录：优先使用项目根目录下的 .mcp_state，可通过环境变量覆盖
-DEFAULT_MCP_STORAGE = Path.home() / ".mcp"
+# MCP 服务持久化目录：使用 NAS 路径以便集群共享
 MCP_SERVICE_NAME = os.environ.get("MCP_SERVICE_NAME", "make_web")
-
-
-def _resolve_mcp_data_root() -> Path:
-    """解析 MCP 数据目录，优先使用共享项目目录"""
-    env_dir = os.environ.get("MCP_DATA_DIR")
-    if env_dir:
-        path = Path(env_dir)
-        path.mkdir(parents=True, exist_ok=True)
-        return path
-
-    shared_dir = Path(DEFAULT_PROJECT_ROOT) / ".mcp_state"
-    try:
-        shared_dir.mkdir(parents=True, exist_ok=True)
-        return shared_dir
-    except Exception:
-        fallback = DEFAULT_MCP_STORAGE / MCP_SERVICE_NAME
-        fallback.mkdir(parents=True, exist_ok=True)
-        print(
-            f"⚠️ 无法在 {shared_dir} 创建 MCP 数据目录，改用 {fallback}",
-            file=sys.stderr,
-        )
-        return fallback
-
-
-MCP_DATA_ROOT = _resolve_mcp_data_root()
+MCP_DATA_ROOT = Path(
+    os.environ.get("MCP_DATA_DIR", f"{NAS_PATH}/mcp_data/{MCP_SERVICE_NAME}")
+)
+MCP_DATA_ROOT.mkdir(parents=True, exist_ok=True)
 
 # 简单的缓存：记录最近一次生成的计划，避免“create_simple_site → execute_plan”时需手动传递
 PLAN_CACHE_DIR = MCP_DATA_ROOT / "plan_cache"
 PLAN_CACHE_DIR.mkdir(exist_ok=True)
 
+# 进度日志目录，存储每个任务的实时进度
 PROGRESS_LOG_DIR = MCP_DATA_ROOT / "progress_logs"
 PROGRESS_LOG_DIR.mkdir(exist_ok=True)
 
+# 任务状态目录，每个任务一个 JSON 文件
 JOB_STATE_DIR = MCP_DATA_ROOT / "jobs" / "state"
 JOB_STATE_DIR.mkdir(parents=True, exist_ok=True)
 
+# 上下文缓存目录
 CONTEXT_CACHE_DIR = MCP_DATA_ROOT / "context_cache"
 CONTEXT_CACHE_DIR.mkdir(exist_ok=True)
 
@@ -189,6 +174,7 @@ def _build_agent(
     show_code: bool = False,
     verbose: bool = False,
     save_output: bool = False,
+    force_single_page: bool = True,
 ) -> SmartWebAgent:
     return SmartWebAgent(
         project_directory=project_directory,
@@ -196,6 +182,7 @@ def _build_agent(
         show_code=show_code,
         verbose=verbose,
         save_output=save_output,
+        force_single_page=force_single_page,
     )
 
 
@@ -764,6 +751,7 @@ async def create_simple_site(
             model=used_model,
             show_code=False,
             verbose=False,
+            force_single_page=True,
         )
 
         # 构建针对简单网站的提示，包含上下文和图片要求

{htmlgen_mcp-0.3.2.dist-info → htmlgen_mcp-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgen-mcp
-Version: 0.3.2
+Version: 0.3.4
 Summary: AI-powered HTML website generator with auto-upload functionality via Model Context Protocol
 Author-email: HTML Generator Team <contact@htmlgen-mcp.com>
 License: MIT

{htmlgen_mcp-0.3.2.dist-info → htmlgen_mcp-0.3.4.dist-info}/RECORD

@@ -1,33 +1,34 @@
 htmlgen_mcp/__init__.py,sha256=8jambwGFxu8RNWes1BUEGDHErV-LcvDaABWqNja9GW0,114
-htmlgen_mcp/config.py,sha256=TXDAvNFmeCI4RIznrBhZhhvWLgXAw6MO6j83prJxFsE,11373
+htmlgen_mcp/config.py,sha256=Xd9naNKP1LfgOfOSXf2QbzKfrmByWvYsNP1OumDH25E,11249
+htmlgen_mcp/nas_storage.py,sha256=HpgROy53vrYiBiXsUJO56GCoYZdyYR15iVvOBqyp7Yc,11292
+htmlgen_mcp/progress_tools.py,sha256=SOScPSr3hEv4rvGzqvwUcomEFiPhhNxJ7CbWURlFpBs,5067
+htmlgen_mcp/progress_tracker.py,sha256=2TVduWNJJH08EQ7Vf9EpiwPjtp61JX7muSCdbGHZAfM,12210
 htmlgen_mcp/sse_optimizations.py,sha256=_UTpgLtxgNAiiEkO5lPihOi1-eEQk6R4ejNParufrrc,6932
-htmlgen_mcp/web_agent_server.py,sha256=UfjO3DtiHekr61nJ0z-Ne9cMXTqzjRLuIfIr85wBhIY,48091
+htmlgen_mcp/web_agent_server.py,sha256=_0t-HJBmqF2vGF5aVfsV1LQQGzmW0E95ocwBQn5jBNQ,47848
 htmlgen_mcp/agents/__init__.py,sha256=Xydfjzw9s9O6I5Ixx6EmsTdXu26136NDPUAqt9B1hzE,121
 htmlgen_mcp/agents/ai_content_generator.py,sha256=tWGC9cY6Wp7MB1P9J7uCv8LUdiS02rgS6vxaNHD7KQk,10311
-htmlgen_mcp/agents/cluster_state.py,sha256=eDAqVm_A94_x7YfmhKKQ6T1FFt_4XQOyUiHdiTPF7Qg,14615
-htmlgen_mcp/agents/cluster_storage.py,sha256=TJTl_uk4mBHf6nZ1Es0LzPzXfneUITVW-JXTP0gZSdE,11534
-htmlgen_mcp/agents/quick_generator.py,sha256=U16MOazMdBBz0MjtfsFuc-dTLFHpPbXzGG0Yuy5ljwE,9561
-htmlgen_mcp/agents/smart_web_agent.py,sha256=gIlHqE2Zvf8IwXQCBVSzteYN0u7C6e3n5D7jCDlbR-8,99054
-htmlgen_mcp/agents/web_tools/__init__.py,sha256=2Km6T6tMkjMFKoEWkrsSuLUyr_yfHq78_V_oreqQOMc,2472
+htmlgen_mcp/agents/quick_generator.py,sha256=2wV4PCRugV0suTedLDV91_etHy_2Fiw4J0MraT7MQjw,34201
+htmlgen_mcp/agents/smart_web_agent.py,sha256=i651WqD54BhM6WfabutTyBY3VwshkFaYPDJ4H-yapQI,126830
+htmlgen_mcp/agents/web_tools/__init__.py,sha256=oqH9p3C6UHn2yOzBgbHZK3D_rCoWQmQxM-jI4YLTseg,2649
 htmlgen_mcp/agents/web_tools/bootstrap.py,sha256=QOoR38GhrK2JHow2P86fHgV9r6UFGDikwT0w6Qq4yh0,1909
 htmlgen_mcp/agents/web_tools/browser.py,sha256=0Z84BtvBSXplpIDySw_ICH6RZPe9PtSYP8WGm4GJp0M,870
 htmlgen_mcp/agents/web_tools/colors.py,sha256=GyoDWJiJPMTXRrYiJ8c0-ur25jDOZuq5nNSPDA38yEI,5242
-htmlgen_mcp/agents/web_tools/css.py,sha256=GLEq3jy5CwpW-vrNOzU9EDPVLGdEDFwdpGQXDWuwM_4,37467
+htmlgen_mcp/agents/web_tools/css.py,sha256=_JlOjowjtqYm8LQ5dcl1A3f_DxBtLdQJMCk3oxM1BKI,41084
 htmlgen_mcp/agents/web_tools/edgeone_deploy.py,sha256=DAc0ISqu8swGG9MEU2o8ONc7PDGsQ2MOakcSi2phxfk,20113
 htmlgen_mcp/agents/web_tools/html_templates.py,sha256=kbs0slN5kIXstlMbqgLBQxMOVQtlap2lwLYg-3GBR4s,79659
 htmlgen_mcp/agents/web_tools/html_templates_improved.py,sha256=i9XWv4Cqm94Ud7lqkOHgYHazhZDacrSPpamI9F1fw8g,25221
 htmlgen_mcp/agents/web_tools/images.py,sha256=miFp8-77SLlvBDBBbR6LYDfYGVzO0GmcZz06CQC16Gc,27617
 htmlgen_mcp/agents/web_tools/images_fixed.py,sha256=2L1m4TKTx253Eigb_OSg89mOIjfzwBXfeyDJ7hsh3tw,7567
-htmlgen_mcp/agents/web_tools/js.py,sha256=NaeABI0WWX23sdtZ2CZHJVBbOyRDbsKPwNqVz76n2SU,9388
-htmlgen_mcp/agents/web_tools/navigation.py,sha256=F7CjllbLdHhBy7jKsF0n8TFfHz646GzWXYhIKEHdL1k,19826
-htmlgen_mcp/agents/web_tools/project.py,sha256=JUxPDdJSdjdAu8eoMCsxMUOayQ_Tdt33wUFjCL93b-c,910
+htmlgen_mcp/agents/web_tools/js.py,sha256=DFS5kj65qU6tEZcwS4Hxr2_JqVncLwNdtdPoMU8-oEU,9468
+htmlgen_mcp/agents/web_tools/navigation.py,sha256=7ABTqRHsQ2IOeT-RN1b9uVCxGm8IFkLZQA1CFuevPEE,19935
+htmlgen_mcp/agents/web_tools/project.py,sha256=9iw09yAIpWO5l9TCz5FPtr8k5TPbF32BfnYJW-P5w3w,841
 htmlgen_mcp/agents/web_tools/simple_builder.py,sha256=nfxrr0F_wlaq4k7_No3_33stnBlxhyjFFGQBxxPtGTM,10658
 htmlgen_mcp/agents/web_tools/simple_css.py,sha256=kj9X3sHHhj1wGwBVL20j6w2qIHXRdxfBXoldnabxKsk,8278
 htmlgen_mcp/agents/web_tools/simple_js.py,sha256=xMiuF-u-h_IIkUONZIa4Xf8vKB5mcXxwQf5b_BIcpoE,12174
 htmlgen_mcp/agents/web_tools/simple_templates.py,sha256=-Rs-SsWpGZT2hiwa3jZNVDHOMZOo1vV2pWbmBdR30os,6471
 htmlgen_mcp/agents/web_tools/validation.py,sha256=bNA6aWXrCSi7sPqQw5bBR3XF69gRf85D5jSMi996CtI,2069
-htmlgen_mcp-0.3.2.dist-info/METADATA,sha256=ZbrJ1I9ijuFaPO0LDrRrVZS1r8d82_qLZ6xM-EP_dN0,5161
-htmlgen_mcp-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-htmlgen_mcp-0.3.2.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
-htmlgen_mcp-0.3.2.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
-htmlgen_mcp-0.3.2.dist-info/RECORD,,
+htmlgen_mcp-0.3.4.dist-info/METADATA,sha256=UIbhoxesfWZpcwkrDDehZ5FlHmFN2Kv3gj3zkdF8SEs,5161
+htmlgen_mcp-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+htmlgen_mcp-0.3.4.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
+htmlgen_mcp-0.3.4.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
+htmlgen_mcp-0.3.4.dist-info/RECORD,,