alibaba-cloud-ops-mcp-server 0.9.13__tar.gz → 0.9.15__tar.gz

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.13
+Version: 0.9.15
 Summary: A MCP server for Alibaba Cloud
 Author-email: Zheng Dayu <dayu.zdy@alibaba-inc.com>, Zhao Shuaibo <zhaoshuaibo.zsb@alibaba-inc.com>
 License-File: LICENSE

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.13"
+version = "0.9.15"
 description = "A MCP server for Alibaba Cloud"
 readme = "README.md"
 authors = [

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/src/alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -192,7 +192,7 @@ def find_bucket_by_tag(client: oss.Client, tag_key: str, tag_value: str) -> Opti
     return buckets[0] if buckets else None
 
 
-def get_or_create_bucket_for_code_deploy(application_name: str, region_id: str) -> str:
+def get_or_create_bucket_for_code_deploy(application_name: str) -> str:
     """
     Obtain or create an OSS bucket for code deployment
 
@@ -206,17 +206,14 @@ def get_or_create_bucket_for_code_deploy(application_name: str, region_id: str)
     """
     tag_key = 'app_management'
     tag_value = 'code_deploy'
-    client = create_oss_client(region_id=region_id)
+    client = create_oss_client(region_id='cn-hangzhou')
 
     found_bucket = find_bucket_by_tag(client, tag_key, tag_value)
     if found_bucket:
         logger.info(f"[code_deploy] Found existing bucket by tag: {found_bucket}")
         return found_bucket
 
-    safe_app_name = application_name.lower().replace('_', '-').replace(' ', '-')
-
-    safe_app_name = ''.join(c if c.isalnum() or c == '-' else '' for c in safe_app_name)
-    bucket_name = f'app-{safe_app_name}-code-deploy-{str(uuid.uuid4())[:8]}'
+    bucket_name = f'code-deploy-{str(uuid.uuid4())[:8]}'
 
     try:
         client.put_bucket(oss.PutBucketRequest(

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/src/alibaba_cloud_ops_mcp_server/server.py

@@ -80,7 +80,13 @@ SUPPORTED_SERVICES_MAP = {
     default="domestic",
     help="Environment type: 'domestic' for domestic, 'international' for overseas (default: domestic)",
 )
-def main(transport: str, port: int, host: str, services: str, headers_credential_only: bool, env: str):
+@click.option(
+    "--code-deploy",
+    is_flag=True,
+    default=False,
+    help="Enable code deploy mode, only load 6 specific tools: OOS_CodeDeploy, OOS_GetDeployStatus, OOS_GetLastDeploymentInfo, LOCAL_ListDirectory, LOCAL_RunShellScript, LOCAL_AnalyzeDeployStack",
+)
+def main(transport: str, port: int, host: str, services: str, headers_credential_only: bool, env: str, code_deploy: bool):
     _setup_logging()
     # Create an MCP server
     mcp = FastMCP(
@@ -152,23 +158,46 @@ def main(transport: str, port: int, host: str, services: str, headers_credential
         settings.headers_credential_only = headers_credential_only
     if env:
         settings.env = env
-    if services:
-        service_keys = [s.strip().lower() for s in services.split(",")]
-        service_list = [(key, SUPPORTED_SERVICES_MAP.get(key, key)) for key in service_keys]
-        set_custom_service_list(service_list)
-        for tool in common_api_tools.tools:
+    if code_deploy:
+        # Code deploy mode: only load 6 specific tools
+        code_deploy_tools = {
+            'OOS_CodeDeploy',
+            'OOS_GetDeployStatus',
+            'OOS_GetLastDeploymentInfo',
+            'ECS_DescribeInstances',
+            'LOCAL_ListDirectory',
+            'LOCAL_RunShellScript',
+            'LOCAL_AnalyzeDeployStack'
+        }
+        
+        # Load from application_management_tools
+        for tool in application_management_tools.tools:
+            if tool.__name__ in code_deploy_tools:
+                mcp.tool(tool)
+        
+        # Load from local_tools
+        for tool in local_tools.tools:
+            if tool.__name__ in code_deploy_tools:
+                mcp.tool(tool)
+    else:
+        # Normal mode: load all tools
+        if services:
+            service_keys = [s.strip().lower() for s in services.split(",")]
+            service_list = [(key, SUPPORTED_SERVICES_MAP.get(key, key)) for key in service_keys]
+            set_custom_service_list(service_list)
+            for tool in common_api_tools.tools:
+                mcp.tool(tool)
+        for tool in oos_tools.tools:
+            mcp.tool(tool)
+        for tool in application_management_tools.tools:
+            mcp.tool(tool)
+        for tool in cms_tools.tools:
+            mcp.tool(tool)
+        for tool in oss_tools.tools:
+            mcp.tool(tool)
+        api_tools.create_api_tools(mcp, config)
+        for tool in local_tools.tools:
             mcp.tool(tool)
-    for tool in oos_tools.tools:
-        mcp.tool(tool)
-    for tool in application_management_tools.tools:
-        mcp.tool(tool)
-    for tool in cms_tools.tools:
-        mcp.tool(tool)
-    for tool in oss_tools.tools:
-        mcp.tool(tool)
-    api_tools.create_api_tools(mcp, config)
-    for tool in local_tools.tools:
-        mcp.tool(tool)
 
     # Initialize and run the server
     logger.debug(f'mcp server is running on {transport} mode.')

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/src/alibaba_cloud_ops_mcp_server/tools/api_tools.py

@@ -1,4 +1,7 @@
 import os
+import time
+
+from Tea.exceptions import UnretryableException
 from mcp.server.fastmcp import FastMCP, Context
 from pydantic import Field
 import logging
@@ -90,9 +93,9 @@ def create_client(service: str, region_id: str) -> OpenApiClient:
 
 # JSON array parameter of type String
 ECS_LIST_PARAMETERS = {
-    'HpcClusterIds', 'DedicatedHostClusterIds', 'DedicatedHostIds', 
-    'InstanceIds', 'DeploymentSetIds', 'KeyPairNames', 'SecurityGroupIds', 
-    'diskIds', 'repeatWeekdays', 'timePoints', 'DiskIds', 'SnapshotLinkIds', 
+    'HpcClusterIds', 'DedicatedHostClusterIds', 'DedicatedHostIds',
+    'InstanceIds', 'DeploymentSetIds', 'KeyPairNames', 'SecurityGroupIds',
+    'diskIds', 'repeatWeekdays', 'timePoints', 'DiskIds', 'SnapshotLinkIds',
     'EipAddresses', 'PublicIpAddresses', 'PrivateIpAddresses'
 }
 
@@ -109,7 +112,7 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
     method = 'POST' if api_meta.get('methods', ['post'])[0] == 'post' else 'GET'
     path = api_meta.get('path', '/')
     style = ApiMetaClient.get_service_style(service)
-    
+
     # Handling special parameter formats
     processed_parameters = parameters.copy()
     processed_parameters = {k: v for k, v in processed_parameters.items() if v is not None}
@@ -117,7 +120,7 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
         for param_name, param_value in parameters.items():
             if param_name in ECS_LIST_PARAMETERS and isinstance(param_value, list):
                 processed_parameters[param_name] = json.dumps(param_value)
-    
+
     req = open_api_models.OpenApiRequest(
         query=OpenApiUtilClient.query(processed_parameters)
     )
@@ -135,9 +138,31 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
     logger.info(f'Call API Request: Service: {service} API: {api} Method: {method} Parameters: {processed_parameters}')
     client = create_client(service, processed_parameters.get('RegionId', 'cn-hangzhou'))
     runtime = util_models.RuntimeOptions()
-    resp = client.call_api(params, req, runtime)
-    logger.info(f'Call API Response: {resp}')
-    return resp
+    
+    max_retries = 3
+    last_exception = None
+    
+    for attempt in range(max_retries):
+        try:
+            resp = client.call_api(params, req, runtime)
+            logger.info(f'Call API Response: {resp}')
+            return resp
+        except UnretryableException as e:
+            last_exception = e
+            error_msg = str(e)
+            has_bad_fd = '[Errno 9] Bad file descriptor' in error_msg
+            
+            if has_bad_fd and attempt < max_retries - 1:
+                wait_time = (attempt + 1) * 0.5
+                logger.warning(f'[_tools_api_call] UnretryableException with [Errno 9] Bad file descriptor (attempt {attempt + 1}/{max_retries}), retrying after {wait_time}s: {e}')
+                time.sleep(wait_time)
+            else:
+                logger.error(f'Call API Error: {e}')
+                raise e
+
+    if last_exception:
+        logger.error(f'[_tools_api_call] All retries failed, raising last exception: {last_exception}')
+        raise last_exception
 
 
 def _create_parameter_schema(fields: dict):

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/src/alibaba_cloud_ops_mcp_server/tools/application_management_tools.py

@@ -5,7 +5,7 @@ from alibaba_cloud_ops_mcp_server.tools.api_tools import _tools_api_call
 from pathlib import Path
 
 from pydantic import Field
-from typing import Optional, Tuple
+from typing import Optional, Tuple, List
 import json
 import time
 from alibabacloud_oos20190601.client import Client as oos20190601Client
@@ -47,13 +47,9 @@ def OOS_CodeDeploy(
         name: str = Field(description='name of the application'),
         deploy_region_id: str = Field(description='Region ID for deployment'),
         application_group_name: str = Field(description='name of the application group'),
-        region_id_oss: str = Field(description='OSS region ID'),
         object_name: str = Field(description='OSS object name'),
         file_path: str = Field(description='Local file path to upload. If the file is not in '
                                            '.code_deploy/release directory, it will be copied there.'),
-        is_internal_oss: bool = Field(description='Whether to download OSS files through internal network. Note: '
-                                                  'If you choose internal network download, you must ensure that '
-                                                  'the ECS to be deployed and OSS are in the same region.'),
         application_start: str = Field(
             description='Application start command script. IMPORTANT: If the uploaded artifact '
                         'is a tar archive or compressed package (e.g., .tar, .tar.gz, .zip), '
@@ -78,7 +74,7 @@ def OOS_CodeDeploy(
 
 ):
     """
-    通过应用管理 API 部署应用到 ECS 实例。
+    部署应用到阿里云ECS实例。
 
     完整部署流程（在调用此工具之前）：
 
@@ -242,7 +238,8 @@ def OOS_CodeDeploy(
         file_path = str(release_path_resolved)
     else:
         logger.info(f"[code_deploy] File already in release directory: {file_path}")
-
+    region_id_oss = 'cn-hangzhou'
+    is_internal_oss = True if deploy_region_id.lower() == 'cn-hangzhou' else False
     # Log input parameters
     logger.info(f"[code_deploy] Input parameters: name={name}, deploy_region_id={deploy_region_id}, "
                 f"application_group_name={application_group_name}, instance_ids={instance_ids}, "
@@ -250,7 +247,7 @@ def OOS_CodeDeploy(
                 f"is_internal_oss={is_internal_oss}, port={port}")
 
     # Upload file to OSS
-    bucket_name = get_or_create_bucket_for_code_deploy(name, region_id_oss)
+    bucket_name = get_or_create_bucket_for_code_deploy(name)
     logger.info(f"[code_deploy] Auto selected/created bucket: {bucket_name}")
 
     put_object_resp = oss_tools.OSS_PutObject(
@@ -379,6 +376,30 @@ def OOS_GetDeployStatus(
     return response
 
 
+@_append_tool
+def ECS_DescribeInstances(
+        instance_ids: List[str] = Field(description='AlibabaCloud ECS instance ID List (required)'),
+        region_id: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
+):
+    """
+    查询指定ECS实例的详细信息。此工具要求必须提供实例ID列表，避免随意查询所有实例。
+    注意：此工具仅用于查询用户明确指定的实例信息，不允许用于扫描或枚举所有实例。
+    """
+    logger.info(f"[ECS_DescribeInstances] Input parameters: region_id={region_id}, instance_ids={instance_ids}")
+    
+    if not instance_ids:
+        raise ValueError("instance_ids is required and cannot be empty")
+    
+    describe_instances_request = ecs_20140526_models.DescribeInstancesRequest(
+        region_id=region_id,
+        instance_ids=json.dumps(instance_ids)
+    )
+    
+    response = _describe_instances_with_retry(region_id, describe_instances_request)
+    logger.info(f"[ECS_DescribeInstances] Response: {json.dumps(str(response), ensure_ascii=False)}")
+    return response
+
+
 def _handle_new_application_group(client, name, application_group_name, deploy_region_id,
                                   region_id_oss, bucket_name, object_name, version_id,
                                   is_internal_oss, port, instance_ids, application_start,

{alibaba_cloud_ops_mcp_server-0.9.13 → alibaba_cloud_ops_mcp_server-0.9.15}/uv.lock

@@ -116,12 +116,11 @@ wheels = [
 
 [[package]]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.12"
+version = "0.9.15"
 source = { editable = "." }
 dependencies = [
     { name = "alibabacloud-cms20190101" },
     { name = "alibabacloud-credentials" },
-    { name = "alibabacloud-credentials-api" },
     { name = "alibabacloud-ecs20140526" },
     { name = "alibabacloud-oos20190601" },
     { name = "alibabacloud-oss-v2" },
@@ -140,7 +139,6 @@ dev = [
 requires-dist = [
     { name = "alibabacloud-cms20190101", specifier = ">=3.1.4" },
     { name = "alibabacloud-credentials", specifier = ">=1.0.3" },
-    { name = "alibabacloud-credentials-api", specifier = "==1.0.1" },
     { name = "alibabacloud-ecs20140526", specifier = ">=6.1.0" },
     { name = "alibabacloud-oos20190601", specifier = ">=3.5.0" },
     { name = "alibabacloud-oss-v2", specifier = ">=1.1.0" },