htmlgen-mcp 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

htmlgen_mcp/web_agent_server.py

@@ -38,9 +38,14 @@ from datetime import datetime
 
 # 使用 NAS 作为默认存储路径
 NAS_PATH = os.environ.get("NAS_STORAGE_PATH", "/app/mcp-servers/mcp-servers/html_agent")
+# 项目根目录：优先使用 WEB_AGENT_PROJECT_ROOT 环境变量，否则使用 NAS_PATH/projects
 DEFAULT_PROJECT_ROOT = os.path.abspath(
     os.environ.get("WEB_AGENT_PROJECT_ROOT", f"{NAS_PATH}/projects")
 )
+# 是否自动生成项目子目录（可通过环境变量控制）
+AUTO_CREATE_PROJECT_DIR = os.environ.get("AUTO_CREATE_PROJECT_DIR", "true").lower() == "true"
+# 默认的文件上传URL（固定值）
+DEFAULT_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"
@@ -173,9 +178,47 @@ def _resolve_cached_context(context_id: Optional[str]) -> Optional[Dict[str, Any
     return None
 
 
-def _resolve_project_directory(project_root: Optional[str]) -> str:
-    base = project_root or DEFAULT_PROJECT_ROOT
-    abs_path = os.path.abspath(base)
+def _resolve_project_directory(project_root: Optional[str], project_name: Optional[str] = None) -> str:
+    """
+    解析项目目录路径
+    
+    Args:
+        project_root: 项目根目录或完整路径
+        project_name: 项目名称（可选）
+    
+    Returns:
+        完整的项目目录路径
+    """
+    if project_root:
+        # 如果提供了 project_root
+        if os.path.isabs(project_root):
+            # 绝对路径：直接使用
+            abs_path = project_root
+        else:
+            # 相对路径：相对于默认根目录
+            # 如果 project_root 看起来像项目名（不含/），则作为子目录
+            if '/' not in project_root and '\\' not in project_root:
+                abs_path = os.path.join(DEFAULT_PROJECT_ROOT, project_root)
+            else:
+                # 包含路径分隔符，作为相对路径处理
+                abs_path = os.path.abspath(os.path.join(DEFAULT_PROJECT_ROOT, project_root))
+    else:
+        # 没有提供 project_root，使用默认根目录
+        base = DEFAULT_PROJECT_ROOT
+        
+        # 如果提供了 project_name 且启用了自动创建子目录
+        if project_name and AUTO_CREATE_PROJECT_DIR:
+            # 清理项目名称，去除特殊字符
+            safe_name = "".join(c for c in project_name if c.isalnum() or c in (' ', '-', '_', '.'))
+            safe_name = safe_name.strip().replace(' ', '_')
+            if safe_name:
+                abs_path = os.path.join(base, safe_name)
+            else:
+                abs_path = base
+        else:
+            abs_path = base
+    
+    # 创建目录
     os.makedirs(abs_path, exist_ok=True)
     return abs_path
 
@@ -403,8 +446,7 @@ def _execute_plan(
 @mcp.tool()
 async def execute_plan(
     plan_id: str,
-    *,
-    project_root: str,
+    project_root: Optional[str] = None,
     # auto_plan: bool = False,  # 已禁用，没有实际作用
     # confirm_each_step: bool = False,  # 后台执行模式下用户无法交互确认
     # show_code: bool = False,  # 后台执行时用户看不到输出
@@ -412,7 +454,7 @@ async def execute_plan(
     save_output: bool = False,
     progress_log: Optional[str] = None,
     auto_upload: bool = False,
-    upload_url: str = "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile",
+    upload_url: Optional[str] = None,
 ) -> Dict[str, Any]:
     """执行网页构建计划，始终以后台模式运行。
 
@@ -442,9 +484,9 @@ async def execute_plan(
         False: 仅构建，不上传
         默认为 False
 
-    - upload_url: 文件上传API地址
+    - upload_url: 文件上传API地址（可选）
         默认为 "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile"
-        只在 auto_upload=True 时生效
+        只在 auto_upload=True 时生效，一般不需要修改
 
     执行流程：
     - 任务始终在后台异步执行，立即返回 job_id 和 progress_log 路径
@@ -454,7 +496,40 @@ async def execute_plan(
     - 🎯 新增：auto_upload=True时，构建完成(100%)后自动上传并返回访问URL
     """
     try:
-        project_dir = _resolve_project_directory(project_root)
+        # 如果没有提供project_root，尝试从缓存中获取
+        if not project_root:
+            cached_by_id = _PLAN_CACHE_BY_ID.get(plan_id)
+            if cached_by_id and cached_by_id.get("project_directory"):
+                project_root = cached_by_id["project_directory"]
+            else:
+                # 尝试从文件中读取
+                possible_paths = [
+                    PLAN_CACHE_DIR / f"{plan_id}.json",
+                    PLAN_CACHE_DIR / f"simple_site_plan_{plan_id}.json",
+                ]
+                for path in possible_paths:
+                    if path.exists():
+                        try:
+                            plan_data = json.loads(path.read_text(encoding="utf-8"))
+                            project_root = plan_data.get("project_directory")
+                            if project_root:
+                                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_dir = _resolve_project_directory(project_root, project_name)
 
         # 移除 auto_plan 检查，因为参数已被移除
 
@@ -563,6 +638,9 @@ async def execute_plan(
 
         _persist_job_state(job_id)
 
+        # 使用默认URL如果没有提供
+        effective_upload_url = upload_url or DEFAULT_UPLOAD_URL
+        
         asyncio.create_task(
             _run_execution_job(
                 job_id,
@@ -570,7 +648,7 @@ async def execute_plan(
                 plan_dict,
                 progress_log_path=progress_log_path,
                 auto_upload=auto_upload,
-                upload_url=upload_url,
+                upload_url=effective_upload_url,
             )
         )
 
@@ -609,7 +687,7 @@ async def _run_execution_job(
     *,
     progress_log_path: Optional[str],
     auto_upload: bool = False,
-    upload_url: str = "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile",
+    upload_url: str = None,
 ) -> None:
     job_info = _JOB_REGISTRY.get(job_id)
     if not job_info:
@@ -634,9 +712,12 @@ async def _run_execution_job(
                 job_info["upload_status"] = "uploading"
                 _persist_job_state(job_id)
 
-                upload_result = await upload_project_to_mcp_server(
-                    folder_path=job_info["project_directory"], upload_url=upload_url
-                )
+                # 只在不是默认值时传递upload_url
+                upload_params = {"folder_path": job_info["project_directory"]}
+                if upload_url and upload_url != DEFAULT_UPLOAD_URL:
+                    upload_params["upload_url"] = upload_url
+                
+                upload_result = await upload_project_to_mcp_server(**upload_params)
 
                 # 记录上传结果
                 job_info["upload_result"] = upload_result
@@ -735,18 +816,9 @@ async def create_simple_site(
         # 使用指定模型或默认模型
         used_model = model or DEFAULT_MODEL
 
-        # 确定项目目录
-        if project_root:
-            if not os.path.isabs(project_root):
-                project_directory = os.path.join(DEFAULT_PROJECT_ROOT, project_root)
-            else:
-                project_directory = project_root
-        else:
-            # 使用站点标题作为目录名
-            safe_title = "".join(
-                c if c.isalnum() or c in "._-" else "_" for c in site_title
-            )
-            project_directory = os.path.join(DEFAULT_PROJECT_ROOT, safe_title)
+        # 使用新的路径解析逻辑
+        # 如果没有提供 project_root，使用 site_title 作为项目名
+        project_directory = _resolve_project_directory(project_root, site_title)
 
         # 处理上下文
         context_data = ""
@@ -1075,13 +1147,15 @@ async def get_progress(
 @mcp.tool()
 async def upload_project_to_mcp_server(
     folder_path: str,
-    upload_url: str = "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile",
+    upload_url: Optional[str] = None,
 ) -> Dict[str, Any]:
     """将项目文件夹打包成ZIP并上传到MCP服务器。
 
     参数说明：
     - folder_path: 项目文件夹的绝对路径
-    - upload_url: 上传API地址，默认为MCP服务器地址
+    - upload_url: 上传API地址（可选）
+        默认为 "https://www.mcpcn.cc/api/fileUploadAndDownload/uploadMcpFile"
+        一般不需要修改
 
     返回值：
     - status: 上传状态 ("success" 或 "error")
@@ -1090,6 +1164,9 @@ async def upload_project_to_mcp_server(
     - message: 状态信息
     """
     try:
+        # 使用默认URL如果没有提供
+        effective_upload_url = upload_url or DEFAULT_UPLOAD_URL
+        
         # 验证文件夹路径
         if not os.path.exists(folder_path):
             return {"status": "error", "message": f"项目文件夹不存在: {folder_path}"}
@@ -1129,7 +1206,7 @@ async def upload_project_to_mcp_server(
                     "file", f, filename=zip_filename, content_type="application/zip"
                 )
 
-                async with session.post(upload_url, data=data) as response:
+                async with session.post(effective_upload_url, data=data) as response:
                     response_text = await response.text()
 
                     if response.status != 200:

{htmlgen_mcp-0.3.6.dist-info → htmlgen_mcp-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgen-mcp
-Version: 0.3.6
+Version: 0.3.7
 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.6.dist-info → htmlgen_mcp-0.3.7.dist-info}/RECORD

@@ -8,7 +8,7 @@ htmlgen_mcp/progress_tools.py,sha256=SOScPSr3hEv4rvGzqvwUcomEFiPhhNxJ7CbWURlFpBs
 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=JQPBM2uupyGHZWpSJ-QFQa9U7O4knJr12V4l5GlDBSI,49130
+htmlgen_mcp/web_agent_server.py,sha256=Uqz4xBhTaBqjAdouNbf4mCHpeluqyM8PAZZ2WA2LsPA,52617
 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.3.6.dist-info/METADATA,sha256=9LHsHXEXmqM77kT9AjOyJk8bJisLaJMWTTDwoqXXmSM,5161
-htmlgen_mcp-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-htmlgen_mcp-0.3.6.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
-htmlgen_mcp-0.3.6.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
-htmlgen_mcp-0.3.6.dist-info/RECORD,,
+htmlgen_mcp-0.3.7.dist-info/METADATA,sha256=XVni-ah0fkx0HvGkRo5tiHM0xAdOvQMpZGfmQGBKbkw,5161
+htmlgen_mcp-0.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+htmlgen_mcp-0.3.7.dist-info/entry_points.txt,sha256=w7ufTQJobIxT3FYI24yKsCEwEQvBOWhNjckUd9Amu_k,66
+htmlgen_mcp-0.3.7.dist-info/top_level.txt,sha256=KnglzX4ekV8SQkHTsJg2_nTBXz2TxaYLdvoMMovHLNk,12
+htmlgen_mcp-0.3.7.dist-info/RECORD,,