alibaba-cloud-ops-mcp-server 0.9.14__tar.gz → 0.9.16__tar.gz

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.14
+Version: 0.9.16
 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
@@ -9,7 +9,7 @@ Requires-Dist: alibabacloud-cms20190101>=3.1.4
 Requires-Dist: alibabacloud-credentials>=1.0.3
 Requires-Dist: alibabacloud-ecs20140526>=6.1.0
 Requires-Dist: alibabacloud-oos20190601>=3.5.0
-Requires-Dist: alibabacloud-oss-v2>=1.1.0
+Requires-Dist: alibabacloud-oss-v2>=1.2.0
 Requires-Dist: click>=8.1.8
 Requires-Dist: fastmcp==2.8.0
 Requires-Dist: pydantic==2.11.3

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.14"
+version = "0.9.16"
 description = "A MCP server for Alibaba Cloud"
 readme = "README.md"
 authors = [
@@ -12,7 +12,7 @@ dependencies = [
     "alibabacloud-cms20190101>=3.1.4",
     "alibabacloud-ecs20140526>=6.1.0",
     "alibabacloud-oos20190601>=3.5.0",
-    "alibabacloud_oss_v2>=1.1.0",
+    "alibabacloud_oss_v2>=1.2.0",
     "alibabacloud-credentials>=1.0.3",
     "click>=8.1.8",
     "fastmcp==2.8.0",

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/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.14 → alibaba_cloud_ops_mcp_server-0.9.16}/src/alibaba_cloud_ops_mcp_server/server.py

@@ -190,7 +190,9 @@ def main(transport: str, port: int, host: str, services: str, headers_credential
         for tool in oos_tools.tools:
             mcp.tool(tool)
         for tool in application_management_tools.tools:
-            mcp.tool(tool)
+            # Skip ECS_DescribeInstances in normal mode
+            if tool.__name__ != 'ECS_DescribeInstances':
+                mcp.tool(tool)
         for tool in cms_tools.tools:
             mcp.tool(tool)
         for tool in oss_tools.tools:

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/src/alibaba_cloud_ops_mcp_server/tools/api_tools.py

@@ -150,19 +150,16 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
         except UnretryableException as e:
             last_exception = e
             error_msg = str(e)
-            # 检查错误消息是否包含 [Errno 9] Bad file descriptor
             has_bad_fd = '[Errno 9] Bad file descriptor' in error_msg
             
             if has_bad_fd and attempt < max_retries - 1:
-                wait_time = (attempt + 1) * 1  # 递增等待时间：1秒、2秒
+                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:
-                # 如果不是可重试的错误，或者已经重试了3次，直接抛出异常
                 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

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/src/alibaba_cloud_ops_mcp_server/tools/application_management_tools.py

@@ -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), '
@@ -93,13 +89,11 @@ def OOS_CodeDeploy(
     - 记录文件路径，留待后续CodeDeploy使用
 
     步骤 3：调用此工具进行部署
-    - 此工具会依次调用：CreateApplication（如果不存在）、CreateApplicationGroup（如果不存在）、
-      TagResources（可选，如果是已有资源需要打 tag 导入应用分组）、DeployApplicationGroup
 
     重要提示：
     1. 启动脚本（application_start）必须与上传的产物对应。如果产物是压缩包（tar、tar.gz、zip等），
        需要先解压并进入对应目录后再执行启动命令。
-    2. 示例：如果上传的是 app.tar.gz，启动脚本应该类似，一般压缩包就在当前目录下，直接解压即可：
+    2. 示例：如果上传的是 app.tar.gz，启动脚本应该类似，一般压缩包就在当前目录下，直接解压即可，不要盲目cd，使用前务必确认对应文件和路径存在：
        "tar -xzf app.tar.gz && ./start.sh"
        或者如果解压后是Java应用：
        "tar -xzf app.tar.gz && java -jar app.jar"
@@ -157,7 +151,7 @@ def OOS_CodeDeploy(
             logger.info(f"[code_deploy] Using file directory as project path: {file_path_resolved.parent}")
     
     # Check ECS instance ID
-    if not instance_ids or len(instance_ids) == 0:
+    if not instance_ids:
         ecs_purchase_link = f'https://ecs-buy.aliyun.com/ecs#/custom/prepay/{deploy_region_id}?orderSource=buyWizard-console-list'
         security_group_link = f'https://ecs.console.aliyun.com/securityGroup?regionId={deploy_region_id}'
         port_info = f'port {port}' if port else 'application port'
@@ -242,7 +236,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 +245,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(
@@ -314,6 +309,8 @@ def OOS_CodeDeploy(
         'security_group_link': security_group_link,
         'port': port,
         'deploy_region_id': deploy_region_id,
+        'bucket_name': bucket_name,
+        'oss_bucket_link': f'https://oss.console.aliyun.com/bucket/oss-cn-hangzhou/{bucket_name}/object',
         'security_group_instructions': f'''
             ## Deployment Successful!
             
@@ -551,7 +548,7 @@ def _check_ecs_instances_exist(deploy_region_id: str, instance_ids: list) -> Tup
     response = _describe_instances_with_retry(deploy_region_id, describe_instances_request)
     
     existing_instance_ids = set()
-    if response.body and response.body.instances:
+    if response.body and response.body.instances and response.body.instances.instance:
         for instance in response.body.instances.instance:
             if instance.instance_id:
                 existing_instance_ids.add(instance.instance_id)
@@ -582,7 +579,7 @@ def _check_instance_has_tag(deploy_region_id: str, instance_id: str, tag_key: st
         response = _describe_instances_with_retry(deploy_region_id, describe_instances_request)
         if response.body and response.body.instances and response.body.instances.instance:
             instance = response.body.instances.instance[0]
-            if instance.tags and instance.tags.tag:
+            if instance.tags and instance.tags.tag is not None:
                 for tag in instance.tags.tag:
                     if tag.tag_key == tag_key and tag.tag_value == tag_value:
                         logger.info(f"[_check_instance_has_tag] Instance {instance_id} already has tag {tag_key}={tag_value}")
@@ -634,7 +631,7 @@ def _ensure_instances_tagged(deploy_region_id: str, name: str, application_group
 
 def _tag_multiple_instances(deploy_region_id, name, application_group_name, instance_ids):
     """
-    为多个实例打 tag（已废弃，使用 _ensure_instances_tagged 代替）
+    为多个实例打 tag
     """
     remaining_instance_ids = instance_ids[1:]
     if remaining_instance_ids:

{alibaba_cloud_ops_mcp_server-0.9.14 → alibaba_cloud_ops_mcp_server-0.9.16}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.13"
+version = "0.9.15"
 source = { editable = "." }
 dependencies = [
     { name = "alibabacloud-cms20190101" },