htmlgen-mcp 0.4.1__py3-none-any.whl → 0.4.8__py3-none-any.whl

htmlgen_mcp/sse_optimizations.py

@@ -154,7 +154,8 @@ async def get_progress_optimized(
                     "job_id", "status", "plan_id", "progress_log",
                     "started_at", "updated_at", "completed_at",
                     "project_directory", "model", "upload_status",
-                    "website_url", "upload_completed_at"
+                    "upload_url", "web_url", "deployment_env",
+                    "upload_completed_at", "uploaded_directory"
                 ]
                 job_snapshot = {
                     k: job_info.get(k) for k in snapshot_keys 
@@ -192,4 +193,4 @@ async def get_progress_optimized(
         return {
             "status": "error",
             "message": str(exc)
-        }
+        }

htmlgen_mcp/web_agent_server.py

@@ -44,8 +44,9 @@ DEFAULT_PROJECT_ROOT = os.path.abspath(
 )
 # 是否自动生成项目子目录（可通过环境变量控制）
 AUTO_CREATE_PROJECT_DIR = os.environ.get("AUTO_CREATE_PROJECT_DIR", "true").lower() == "true"
-# 默认的文件上传URL（可通过环境变量 UPLOAD_URL 覆盖）
-DEFAULT_UPLOAD_URL = os.environ.get("UPLOAD_URL", "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile")
+DEFAULT_UPLOAD_URL = os.environ.get(
+    "UPLOAD_URL", "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile"
+)
 DEFAULT_MODEL = os.environ.get("WEB_AGENT_MODEL", "qwen3-coder-plus-2025-09-23")
 DEFAULT_BASE_URL = os.environ.get(
     "OPENAI_BASE_URL", "https://dashscope.aliyuncs.com/compatible-mode/v1"
@@ -85,6 +86,38 @@ _CONTEXT_CACHE_BY_ID: dict[str, Dict[str, Any]] = {}
 _CONTEXT_ID_BY_PLAN: dict[str, str] = {}
 
 
+def _resolve_edgeone_deploy_env() -> str:
+    """解析 EdgeOne 自动部署环境，默认 Production。"""
+    env_value = (
+        os.environ.get("EDGEONE_AUTO_DEPLOY_ENV")
+        or os.environ.get("EDGEONE_PAGES_DEPLOY_ENV")
+        or "Production"
+    )
+    return env_value if env_value in {"Production", "Preview"} else "Production"
+
+
+def _should_upload_zip_to_oss() -> bool:
+    """是否在 EdgeOne 部署前上传 ZIP 到 OSS。"""
+    flag = os.environ.get("KEEP_OSS_UPLOAD", "true").strip().lower()
+    return flag not in {"0", "false", "no", "off"}
+
+
+def _extract_zip_url(upload_result: Dict[str, Any]) -> Optional[str]:
+    """从上传结果中提取包含 .zip 的下载地址。"""
+    try:
+        candidates = [
+            upload_result.get("oss_url"),
+            upload_result.get("upload_url"),
+            (upload_result.get("oss_response") or {}).get("url"),
+            upload_result.get("url"),
+        ]
+        for candidate in candidates:
+            if candidate and ".zip" in str(candidate).lower():
+                return candidate
+    except Exception:
+        pass
+    return None
+
 def _job_state_path(job_id: str) -> Path:
     return JOB_STATE_DIR / f"{job_id}.json"
 
@@ -471,7 +504,7 @@ async def execute_plan(
 
     参数详细说明：
     - plan_id: 计划的唯一标识符
-        由 plan_site 工具返回的计划ID，用于从缓存或文件系统中查找对应的执行计划。
+        由 create_simple_site 工具返回的计划ID，用于从缓存或文件系统中查找对应的执行计划。
         例如："a1b2c3d4e5f6..." 这样的32位十六进制字符串。
 
     - project_root: 网站文件生成的目标目录路径（可选）
@@ -485,13 +518,11 @@ async def execute_plan(
         如果未指定：自动在 ~/.mcp/make_web/progress_logs 目录创建时间戳命名的日志文件（可通过环境变量覆盖）
         路径可以是绝对路径或相对于 project_root 的相对路径
 
-        注意：进度日志始终会被创建，以便使用 get_progress 工具查询任务进度。
-
     执行流程：
-    - 任务始终在后台异步执行，立即返回 job_id 和 progress_log 路径
-    - 使用 get_progress(job_id=..., limit=...) 可以实时查询执行状态和进度
+    - 任务在后台异步执行，立即返回 job_id 和 progress_log 路径
+    - 任务完成后，系统会自动推送通知给用户，包含执行报告、生成文件列表和上传结果
     - 系统会自动记录详细的执行步骤和结果到进度日志文件
-    - 执行完成后可以获取完整的执行报告、生成文件列表，以及自动上传结果
+    - 如需实时了解任务进展或调试，可使用 get_progress(job_id=...) 工具手动查询状态
     """
     try:
         # 如果没有提供project_root，尝试从缓存中获取
@@ -514,19 +545,21 @@ async def execute_plan(
                                 break
                         except Exception:
                             pass
-                
+
                 if not project_root:
                     # 使用默认根目录，但不添加子目录
                     project_root = None
-        
+
         # 从计划中获取项目名称（如果有）
         project_name = None
         if plan_id:
             cached_plan = _PLAN_CACHE_BY_ID.get(plan_id)
             if cached_plan:
                 # 尝试从缓存中获取项目名称
-                project_name = cached_plan.get("site_title") or cached_plan.get("project_name")
-        
+                project_name = cached_plan.get("site_title") or cached_plan.get(
+                    "project_name"
+                )
+
         project_dir = _resolve_project_directory(project_root, project_name)
 
         # 进度日志始终启用
@@ -625,6 +658,7 @@ async def execute_plan(
             "project_directory": project_dir,
             "model": agent.model,
             "progress_log": progress_log_path,
+            "deployment_env": _resolve_edgeone_deploy_env(),
             "started_at": time.time(),
             "updated_at": time.time(),
         }
@@ -656,7 +690,9 @@ async def execute_plan(
             "job_id": job_id,
             "plan_id": plan_id,
             "progress_log": progress_log_path,
-            "upload_url": DEFAULT_UPLOAD_URL,
+            "upload_url": None,
+            "web_url": None,
+            "deployment_env": job_info["deployment_env"],
             "message": message,
         }
     except Exception as exc:
@@ -713,6 +749,32 @@ async def _handle_auto_upload(
     if not project_dir:
         return
 
+    upload_target = project_dir
+
+    created_files = (job_info.get("result") or {}).get("created_files") or []
+    for file_path in created_files:
+        if not file_path:
+            continue
+        try:
+            candidate_path = file_path
+            if not os.path.isabs(candidate_path):
+                candidate_path = os.path.join(project_dir, candidate_path)
+            if not os.path.exists(candidate_path):
+                continue
+            candidate_dir = (
+                candidate_path if os.path.isdir(candidate_path) else os.path.dirname(candidate_path)
+            )
+            rel_path = os.path.relpath(candidate_dir, project_dir)
+            if rel_path == "." or rel_path.startswith(".."):
+                continue
+            top_level = rel_path.split(os.sep, 1)[0]
+            top_level_dir = os.path.join(project_dir, top_level)
+            if os.path.isdir(top_level_dir):
+                upload_target = top_level_dir
+                break
+        except Exception:
+            continue
+
     job_info["upload_status"] = "uploading"
     _persist_job_state(job_id)
 
@@ -721,22 +783,37 @@ async def _handle_auto_upload(
         if not callable(upload_func):
             raise RuntimeError("upload_project_to_mcp_server 缺少可调用实现")
 
-        upload_result = await upload_func(folder_path=project_dir)
+        upload_result = await upload_func(folder_path=upload_target)
 
         job_info["upload_result"] = upload_result
         job_info["upload_status"] = upload_result.get("status")
+        if upload_result.get("deployment_env"):
+            job_info["deployment_env"] = upload_result["deployment_env"]
 
         if upload_result.get("status") == "success":
-            job_info["website_url"] = upload_result.get("url")
+            zip_url = _extract_zip_url(upload_result)
+            web_url = (
+                upload_result.get("web_url")
+                or (upload_result.get("result") or {}).get("url")
+            )
+            if zip_url:
+                job_info["upload_url"] = zip_url
+            if web_url:
+                job_info["web_url"] = web_url
             job_info["upload_completed_at"] = time.time()
+            job_info["uploaded_directory"] = upload_target
 
             if progress_log_path:
                 upload_event = {
                     "timestamp": time.time(),
                     "type": "upload_completed",
                     "status": "success",
-                    "website_url": upload_result.get("url"),
+                    "web_url": web_url,
+                    "upload_url": zip_url,
+                    "oss_url": zip_url,
+                    "deployment_env": job_info.get("deployment_env"),
                     "message": upload_result.get("message"),
+                    "uploaded_directory": upload_target,
                 }
                 try:
                     with open(progress_log_path, "a", encoding="utf-8") as log_file:
@@ -780,7 +857,7 @@ async def create_simple_site(
     使用流程：
     1. 调用此工具生成计划，获得 plan_id
     2. 使用 plan_id 调用 execute_plan 执行构建
-    3. 使用 plan_id 调用 get_progress 查询进度
+    3. 构建完成后会自动推送通知给用户，包含项目文件和访问链接
 
     💡 使用提示：
     如果你有地图查询结果、API数据等，请将完整信息传递给 context_content 参数，
@@ -1096,8 +1173,11 @@ async def get_progress(
                 "project_directory",
                 "model",
                 "upload_status",
-                "website_url",
+                "upload_url",
+                "web_url",
+                "deployment_env",
                 "upload_completed_at",
+                "uploaded_directory",
             ]
             job_snapshot = {
                 k: job_info.get(k) for k in snapshot_keys if job_info.get(k) is not None
@@ -1132,15 +1212,17 @@ async def get_progress(
 async def upload_project_to_mcp_server(
     folder_path: str,
 ) -> Dict[str, Any]:
-    """将项目文件夹打包成ZIP并上传到MCP服务器。
+    """将项目文件夹打包成ZIP并上传到 EdgeOne Pages（自动部署流程）。
 
     参数说明：
     - folder_path: 项目文件夹的绝对路径
 
     返回值：
     - status: 上传状态 ("success" 或 "error")
-    - url: 上传成功后返回的文件访问URL
-    - zip_path: 临时ZIP文件路径（用于调试）
+    - web_url: 部署成功后返回的 EdgeOne 访问地址
+    - deployment_env: 部署环境（Production/Preview）
+    - deployment_result: EdgeOne 原始部署结果
+    - deployment_logs: 部署日志
     - message: 状态信息
     """
     try:
@@ -1151,6 +1233,12 @@ async def upload_project_to_mcp_server(
         if not os.path.isdir(folder_path):
             return {"status": "error", "message": f"路径不是文件夹: {folder_path}"}
 
+        if not os.getenv("EDGEONE_PAGES_API_TOKEN"):
+            return {
+                "status": "error",
+                "message": "缺少 EDGEONE_PAGES_API_TOKEN 环境变量，无法执行 EdgeOne 部署",
+            }
+
         # 创建临时ZIP文件
         project_name = os.path.basename(folder_path.rstrip("/"))
         temp_dir = tempfile.gettempdir()
@@ -1175,52 +1263,85 @@ async def upload_project_to_mcp_server(
                 "message": f"ZIP文件过大: {zip_size / 1024 / 1024:.1f}MB，超过50MB限制",
             }
 
-        # 上传文件
-        async with aiohttp.ClientSession() as session:
-            with open(zip_path, "rb") as f:
-                data = aiohttp.FormData()
-                data.add_field(
-                    "file", f, filename=zip_filename, content_type="application/zip"
-                )
+        oss_url: Optional[str] = None
+        oss_response: Optional[Dict[str, Any]] = None
+        if _should_upload_zip_to_oss():
+            async with aiohttp.ClientSession() as session:
+                with open(zip_path, "rb") as f:
+                    data = aiohttp.FormData()
+                    data.add_field(
+                        "file", f, filename=zip_filename, content_type="application/zip"
+                    )
+
+                    async with session.post(DEFAULT_UPLOAD_URL, data=data) as response:
+                        response_text = await response.text()
 
-                async with session.post(DEFAULT_UPLOAD_URL, data=data) as response:
-                    response_text = await response.text()
-
-                    if response.status != 200:
-                        return {
-                            "status": "error",
-                            "message": f"上传失败，HTTP {response.status}: {response_text}",
-                        }
-
-                    # 解析响应JSON
-                    try:
-                        result = json.loads(response_text)
-                        if result.get("code") == 0 and result.get("data", {}).get(
-                            "url"
-                        ):
-                            # 清理临时文件
-                            try:
-                                os.remove(zip_path)
-                            except:
-                                pass
+                        if response.status != 200:
+                            return {
+                                "status": "error",
+                                "message": f"OSS 上传失败，HTTP {response.status}: {response_text}",
+                            }
 
+                        try:
+                            result = json.loads(response_text)
+                        except json.JSONDecodeError:
                             return {
-                                "status": "success",
-                                "url": result["data"]["url"],
-                                "message": f"项目 '{project_name}' 上传成功",
-                                "zip_size": f"{zip_size / 1024:.1f}KB",
+                                "status": "error",
+                                "message": f"OSS 上传响应解析失败: {response_text}",
                             }
+
+                        upload_data = result.get("data") or {}
+                        oss_response = upload_data
+                        if result.get("code") == 0 and upload_data.get("url"):
+                            oss_url = upload_data["url"]
                         else:
                             return {
                                 "status": "error",
-                                "message": f"上传失败: {result.get('msg', '未知错误')}",
+                                "message": f"OSS 上传失败: {result.get('msg', '未知错误')}",
                                 "response": response_text,
                             }
-                    except json.JSONDecodeError:
-                        return {
-                            "status": "error",
-                            "message": f"响应解析失败: {response_text}",
-                        }
+
+        # 导入 EdgeOne 部署工具
+        from htmlgen_mcp.agents.web_tools.edgeone_deploy import (
+            deploy_folder_or_zip_to_edgeone,
+        )
+
+        deployment_env = _resolve_edgeone_deploy_env()
+
+        # 将 ZIP 包部署到 EdgeOne（使用线程避免阻塞事件循环）
+        result_json = await asyncio.to_thread(
+            deploy_folder_or_zip_to_edgeone, zip_path, deployment_env
+        )
+
+        try:
+            deploy_result = json.loads(result_json)
+        except json.JSONDecodeError:
+            return {
+                "status": "error",
+                "message": f"EdgeOne 返回数据解析失败: {result_json}",
+            }
+
+        edgeone_result = deploy_result.get("result") or {}
+        web_url = edgeone_result.get("url")
+
+        response: Dict[str, Any] = {
+            "status": "success",
+            "web_url": web_url,
+            "oss_url": oss_url,
+            "oss_response": oss_response,
+            "deployment_env": deployment_env,
+            "deployment_result": edgeone_result,
+            "deployment_logs": deploy_result.get("deployment_logs"),
+            "zip_size": f"{zip_size / 1024:.1f}KB",
+            "message": f"项目 '{project_name}' 已部署到 EdgeOne ({deployment_env})",
+        }
+        if oss_url:
+            response["upload_url"] = oss_url
+
+        if not web_url:
+            response["message"] += "，但未获取到访问链接"
+
+        return response
 
     except Exception as exc:
         # 清理临时文件
@@ -1230,11 +1351,42 @@ async def upload_project_to_mcp_server(
             except:
                 pass
 
-        return {
+        error_message = str(exc)
+        try:
+            # EdgeOne 部署错误通常是 JSON 字符串
+            if error_message.startswith("{"):
+                error_data = json.loads(error_message)
+                error_response = {
+                    "status": "error",
+                    "message": error_data.get("error", error_message),
+                    "deployment_logs": error_data.get("deployment_logs", ""),
+                    "traceback": traceback.format_exc(),
+                }
+                if "oss_url" in locals() and oss_url:
+                    error_response["upload_url"] = oss_url
+                if "oss_response" in locals() and oss_response:
+                    error_response["oss_response"] = oss_response
+                return error_response
+        except Exception:
+            pass
+
+        error_response = {
             "status": "error",
-            "message": str(exc),
+            "message": error_message,
             "traceback": traceback.format_exc(),
         }
+        if "oss_url" in locals() and oss_url:
+            error_response["upload_url"] = oss_url
+        if "oss_response" in locals() and oss_response:
+            error_response["oss_response"] = oss_response
+        return error_response
+    finally:
+        # 确保清理临时ZIP文件
+        if "zip_path" in locals() and os.path.exists(zip_path):
+            try:
+                os.remove(zip_path)
+            except:
+                pass
 
 
 @mcp.tool()

{htmlgen_mcp-0.4.1.dist-info → htmlgen_mcp-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgen-mcp
-Version: 0.4.1
+Version: 0.4.8
 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
@@ -97,7 +97,10 @@ print(f"状态: {progress['job']['status']}")
 
 # 如果启用了自动上传
 if progress['job'].get('upload_status') == 'success':
-    print(f"网站地址: {progress['job']['website_url']}")
+    if progress['job'].get('upload_url'):
+        print(f"部署包下载: {progress['job']['upload_url']}")
+    if progress['job'].get('web_url'):
+        print(f"网站地址: {progress['job']['web_url']}")
 ```
 
 ## 🛠️ MCP 工具
@@ -105,7 +108,7 @@ if progress['job'].get('upload_status') == 'success':
 - `create_simple_site()` - 生成网站计划
 - `execute_plan()` - 执行网站构建
 - `get_progress()` - 查询构建进度
-- `upload_project_to_mcp_server()` - 手动上传项目
+- `upload_project_to_mcp_server()` - 打包上传至 OSS 并部署到 EdgeOne Pages
 - `deploy_folder_or_zip()` - 部署到EdgeOne Pages
 
 ## 🔧 环境配置
@@ -124,11 +127,13 @@ WEB_AGENT_PROJECT_ROOT=/path/to/projects
 # EdgeOne Pages 部署（可选）
 EDGEONE_PAGES_API_TOKEN=your_token
 EDGEONE_PAGES_PROJECT_NAME=your_project
+EDGEONE_AUTO_DEPLOY_ENV=Production  # 支持 Production / Preview
+KEEP_OSS_UPLOAD=true               # 保留 OSS 压缩包上传（false 则跳过）
 ```
 
 ## 🎯 自动上传功能
 
-构建完成时自动上传到云端，无需手动操作：
+构建完成时自动部署到 EdgeOne Pages，同时保留 OSS 压缩包链接：
 
 ```python
 # 启动带自动上传的构建
@@ -146,7 +151,10 @@ while True:
     if status == 'completed':
         upload_status = progress['job'].get('upload_status')
         if upload_status == 'success':
-            print(f"🎉 网站已上线: {progress['job']['website_url']}")
+            if progress['job'].get('upload_url'):
+                print(f"📦 部署包下载: {progress['job']['upload_url']}")
+            if progress['job'].get('web_url'):
+                print(f"🎉 网站已上线: {progress['job']['web_url']}")
             break
         elif upload_status == 'failed':
             print("❌ 上传失败")
@@ -159,7 +167,7 @@ while True:
 
 - **构建阶段**: `running` → `completed`
 - **上传阶段**: `uploading` → `success`/`failed`
-- **最终结果**: `website_url` (成功时)
+- **最终结果**: `upload_url` (OSS 压缩包下载地址，可选)、`web_url` (EdgeOne 访问地址)
 
 ## 🤝 贡献
 

{htmlgen_mcp-0.4.1.dist-info → htmlgen_mcp-0.4.8.dist-info}/RECORD

@@ -7,8 +7,8 @@ htmlgen_mcp/nas_storage.py,sha256=HpgROy53vrYiBiXsUJO56GCoYZdyYR15iVvOBqyp7Yc,11
 htmlgen_mcp/progress_tools.py,sha256=SOScPSr3hEv4rvGzqvwUcomEFiPhhNxJ7CbWURlFpBs,5067
 htmlgen_mcp/progress_tracker.py,sha256=2TVduWNJJH08EQ7Vf9EpiwPjtp61JX7muSCdbGHZAfM,12210
 htmlgen_mcp/prompt_enhancer.py,sha256=8UIxt45vSNarS5uqfxC5thOfnGY7luDs2YjHZRx1GAM,7976
-htmlgen_mcp/sse_optimizations.py,sha256=_UTpgLtxgNAiiEkO5lPihOi1-eEQk6R4ejNParufrrc,6932
-htmlgen_mcp/web_agent_server.py,sha256=ZlQNuuMk6WI5QFBcMR-UISOlcnBhw6oMqrseQIiRZX0,50900
+htmlgen_mcp/sse_optimizations.py,sha256=lkAizXEwJxDuhf0ZiaHg_N-RYsfVd1USnd1p9UTLT38,7003
+htmlgen_mcp/web_agent_server.py,sha256=Jna9yYMxz2IdZPMV9gyYRq9UxZbGgAA6FmIccWaDeWQ,56671
 htmlgen_mcp/agents/__init__.py,sha256=Xydfjzw9s9O6I5Ixx6EmsTdXu26136NDPUAqt9B1hzE,121
 htmlgen_mcp/agents/ai_content_generator.py,sha256=tWGC9cY6Wp7MB1P9J7uCv8LUdiS02rgS6vxaNHD7KQk,10311
 htmlgen_mcp/agents/quick_generator.py,sha256=2wV4PCRugV0suTedLDV91_etHy_2Fiw4J0MraT7MQjw,34201
@@ -31,8 +31,8 @@ htmlgen_mcp/agents/web_tools/simple_css.py,sha256=kj9X3sHHhj1wGwBVL20j6w2qIHXRdx
 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.4.1.dist-info/METADATA,sha256=G6MovnmQ1Bv1I8tvD74N6007PYtSJxQmt3Nd_jibWWM,5161
-htmlgen_mcp-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-htmlgen_mcp-0.4.1.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
-htmlgen_mcp-0.4.1.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
-htmlgen_mcp-0.4.1.dist-info/RECORD,,
+htmlgen_mcp-0.4.8.dist-info/METADATA,sha256=fN2M_vuYxEquzylz0yjZBRloJuwSNfLNgIJC98BI3KY,5746
+htmlgen_mcp-0.4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+htmlgen_mcp-0.4.8.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
+htmlgen_mcp-0.4.8.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
+htmlgen_mcp-0.4.8.dist-info/RECORD,,