feat(vefaas): add GetDependencyInstallTaskLogDownloadURI support (#203)

* feat(vefaas): skip dependency install if node_modules exists

* feat(vefaas): add GetDependencyInstallTaskLogDownloadURI support

* fix(vefaas): standardize tool output to return JSON strings for validation compatibility

* fix(vefaas): add region support for request

Author: Tryking

server/mcp_server_vefaas_function/src/mcp_server_vefaas_function/sign.py

@@ -79,7 +79,7 @@ def hash_sha256(content: str):
 
 
 # 第二步：签名请求函数
-def request(method, date, query, header, ak, sk, token, action, body):
+def request(method, date, query, header, ak, sk, token, action, body, region = None):
     # 第三步：创建身份证明。其中的 Service 和 Region 字段是固定的。ak 和 sk 分别代表
     # AccessKeyID 和 SecretAccessKey。同时需要初始化签名结构体。一些签名计算时需要的属性也在这里处理。
     # 初始化身份证明结构体
@@ -88,13 +88,14 @@ def request(method, date, query, header, ak, sk, token, action, body):
         "access_key_id": ak,
         "secret_access_key": sk,
         "service": Service,
-        "region": Region,
+        "region": region or Region,
     }
 
     if token is not None:
         credential["session_token"] = token
 
-    if action in ['CodeUploadCallback', 'CreateDependencyInstallTask', 'GetDependencyInstallTaskStatus']:
+    if action in ['CodeUploadCallback', 'CreateDependencyInstallTask', 'GetDependencyInstallTaskStatus',
+                  'GetDependencyInstallTaskLogDownloadURI']:
         credential["service"] = "vefaas"
 
     content_type = ContentType

server/mcp_server_vefaas_function/src/mcp_server_vefaas_function/vefaas_server.py

@@ -371,7 +371,7 @@ def create_api_gateway_trigger(function_id: str, api_gateway_id: str, service_id
             "VeFaas": {"FunctionId":function_id}}}
 
     try:
-        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateUpstream", json.dumps(body))
+        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateUpstream", json.dumps(body), region)
         # Print the full response for debugging
         print(f"Response: {json.dumps(response_body)}")
         # Check if response contains an error
@@ -407,7 +407,7 @@ def create_api_gateway_trigger(function_id: str, api_gateway_id: str, service_id
                 }
     }
     try:
-        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateRoute", json.dumps(body))
+        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateRoute", json.dumps(body), region)
     except Exception as e:
         error_message = f"Error creating route: {str(e)}"
         raise ValueError(error_message)
@@ -424,7 +424,7 @@ def list_api_gateways(region: str = None):
     except ValueError as e:
         raise ValueError(f"Authorization failed: {str(e)}")
 
-    response_body = request("GET", now, {"Limit": "10"}, {}, ak, sk, token, "ListGateways", None)
+    response_body = request("GET", now, {"Limit": "10"}, {}, ak, sk, token, "ListGateways", None, region)
     return response_body
 
 
@@ -476,7 +476,7 @@ def create_api_gateway(name: str = None, region: str = "cn-beijing") -> str:
         raise ValueError(f"Authorization failed: {str(e)}")
 
     try:
-        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateGateway", json.dumps(body))
+        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateGateway", json.dumps(body), region)
         return response_body
     except Exception as e:
         return f"Failed to create VeApig gateway with name {gateway_name}: {str(e)}"
@@ -520,8 +520,8 @@ def create_gateway_service(
         raise ValueError(f"Authorization failed: {str(e)}")
 
     try:
-        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateGatewayService", json.dumps(body))
-        return response_body
+        response_body = request("POST", now, {}, {}, ak, sk, token, "CreateGatewayService", json.dumps(body), region)
+        return json.dumps(response_body, ensure_ascii=False, indent=2)
     except Exception as e:
         return f"Failed to create VeApig gateway service with name {service_name}: {str(e)}"
 
@@ -542,7 +542,7 @@ def list_api_gateway_services(gateway_id: str, region: str = None):
         "Offset": 0,
     }
 
-    response_body = request("POST", now, {}, {}, ak, sk, token, "ListGatewayServices", json.dumps(body))
+    response_body = request("POST", now, {}, {}, ak, sk, token, "ListGatewayServices", json.dumps(body), region)
     return response_body
 
 @mcp.tool(description="""Lists all routes of an upstream.
@@ -559,7 +559,7 @@ def list_routes(upstream_id: str, region: str = None):
         "UpstreamId": upstream_id
     }
 
-    response_body = request("POST", now, {}, {}, ak, sk, token, "ListRoutes", json.dumps(body))
+    response_body = request("POST", now, {}, {}, ak, sk, token, "ListRoutes", json.dumps(body), region)
     return response_body
 
 def ensure_executable_permissions(folder_path: str):
@@ -690,7 +690,7 @@ def _get_upload_code_description() -> str:
     return base_desc + note + tail
 
 @mcp.tool(description=_get_upload_code_description())
-def upload_code(region: str, function_id: str, local_folder_path: Optional[str] = None, file_dict: Optional[dict[str, Union[str, bytes]]] = None) -> bytes:
+def upload_code(region: str, function_id: str, local_folder_path: Optional[str] = None, file_dict: Optional[dict[str, Union[str, bytes]]] = None) -> str:
     region = validate_and_set_region(region)
 
     api_instance = init_client(region, mcp.get_context())
@@ -714,13 +714,13 @@ def upload_code(region: str, function_id: str, local_folder_path: Optional[str]
     else:
         raise ValueError("Either local_folder_path or file_dict must be provided.")
     response_body = upload_code_zip_for_function(api_instance=api_instance, function_id=function_id, code_zip_size=size,
-                                                 zip_bytes=data, ak=ak, sk=sk, token=token)
+                                                 zip_bytes=data, ak=ak, sk=sk, token=token, region=region)
     handle_dependency(api_instance=api_instance, function_id=function_id, local_folder_path=local_folder_path,
-                      file_dict= file_dict, ak=ak, sk=sk, token=token)
-    return response_body
+                      file_dict= file_dict, ak=ak, sk=sk, token=token, region=region)
+    return json.dumps(response_body, ensure_ascii=False, indent=2)
 
 def handle_dependency(api_instance: VEFAASApi, function_id: str, local_folder_path, file_dict,
-                      ak: str, sk: str, token: str):
+                      ak: str, sk: str, token: str, region: str = None):
     req = volcenginesdkvefaas.GetFunctionRequest(
         id=function_id
     )
@@ -745,12 +745,20 @@ def handle_dependency(api_instance: VEFAASApi, function_id: str, local_folder_pa
             or (file_dict is not None and "package.json" in file_dict)
     )
 
+    has_node_modules = (
+            (local_folder_path is not None and os.path.exists(os.path.join(local_folder_path, "node_modules")))
+            or (file_dict is not None and "node_modules" in file_dict)
+    )
+
     if is_native_python and not has_requirements:
         print("Python runtime detected, but no requirements.txt found. Skipping dependency install.")
         return
     if is_native_nodejs and not has_package_json:
         print("Node.js runtime detected, but no package.json found. Skipping dependency install.")
         return
+    if is_native_nodejs and has_package_json and has_node_modules:
+        print("Node.js runtime detected, package.json found, but has node_modules. Skipping dependency install.")
+        return
     if not is_native_python and not is_native_nodejs:
         print("Runtime is not native-python or native-nodejs. Skipping dependency install.")
         return
@@ -760,22 +768,25 @@ def handle_dependency(api_instance: VEFAASApi, function_id: str, local_folder_pa
 
     try:
         response_body = request("POST", now, {}, {}, ak, sk, token,
-                                "CreateDependencyInstallTask", json.dumps(body))
+                                "CreateDependencyInstallTask", json.dumps(body), region)
         print(response_body)
 
         timeout_seconds = 300
         start_time = time.time()
         while True:
             status_resp = request("POST", now, {}, {}, ak, sk, token,
-                                  "GetDependencyInstallTaskStatus", json.dumps(body))
+                                  "GetDependencyInstallTaskStatus", json.dumps(body), region)
             print(status_resp)
 
             status = status_resp['Result']['Status']
             if status == 'Failed':
-                # log_download_resp = request("POST", now, {}, {}, ak, sk, token,
-                #                       "GetDependencyInstallTaskLogDownloadURI", json.dumps(body))
-                # url = log_download_resp['Result']['DownloadURL']
-                raise ValueError("Dependency installation failed.")
+                log_download_resp = request("POST", now, {}, {}, ak, sk, token,
+                                      "GetDependencyInstallTaskLogDownloadURI", json.dumps(body), region)
+                url = log_download_resp['Result']['DownloadURL']
+                url = url.replace("\\u0026", "&")
+                response = requests.get(url, timeout=30)
+                install_log = response.text
+                raise ValueError("Dependency installation failed. Install log \n" + install_log)
             elif status == 'Succeeded':
                 print("Dependency installation succeeded.")
                 break
@@ -787,7 +798,7 @@ def handle_dependency(api_instance: VEFAASApi, function_id: str, local_folder_pa
 
 
 def upload_code_zip_for_function(api_instance: VEFAASApi(object), function_id: str, code_zip_size: int, zip_bytes,
-                                 ak: str, sk: str, token: str,) -> bytes:
+                                 ak: str, sk: str, token: str, region: str,) -> bytes:
     req = volcenginesdkvefaas.GetCodeUploadAddressRequest(
         function_id=function_id,
         content_length=code_zip_size
@@ -817,7 +828,7 @@ def upload_code_zip_for_function(api_instance: VEFAASApi(object), function_id: s
     }
 
     try:
-        response_body = request("POST", now, {}, {}, ak, sk, token, "CodeUploadCallback", json.dumps(body))
+        response_body = request("POST", now, {}, {}, ak, sk, token, "CodeUploadCallback", json.dumps(body), region)
         return response_body
     except Exception as e:
         error_message = f"Error creating upstream: {str(e)}"