alibaba-cloud-ops-mcp-server 0.9.15__py3-none-any.whl → 0.9.17__py3-none-any.whl

alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -185,10 +185,15 @@ def put_bucket_tagging(client: oss.Client, bucket_name: str, tags: dict):
 def find_bucket_by_tag(client: oss.Client, tag_key: str, tag_value: str) -> Optional[str]:
     paginator = client.list_buckets_paginator(tag_key=tag_key, tag_value=tag_value)
     buckets = []
-    for page in paginator.iter_page(oss.ListBucketsRequest(tag_key=tag_key, tag_value=tag_value)):
-        for bucket in page.buckets:
-            buckets.append(bucket.name)
-    logger.info(f'[code_deploy] Trying to find bucket with tag {tag_key}:{tag_value}, buckets: {buckets}')
+    try:
+        for page in paginator.iter_page(oss.ListBucketsRequest(tag_key=tag_key, tag_value=tag_value)):
+            if not page.buckets:
+                continue
+            for bucket in page.buckets:
+                buckets.append(bucket.name)
+        logger.info(f'[code_deploy] Trying to find bucket with tag {tag_key}:{tag_value}, buckets: {buckets}')
+    except Exception as e:
+        logger.error(f'[code_deploy] Failed to list buckets: {e}')
     return buckets[0] if buckets else None
 
 

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/tools/application_management_tools.py

@@ -89,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"
@@ -153,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'
@@ -311,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!
             
@@ -548,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)
@@ -579,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}")
@@ -631,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.15.dist-info → alibaba_cloud_ops_mcp_server-0.9.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.15
+Version: 0.9.17
 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.15.dist-info → alibaba_cloud_ops_mcp_server-0.9.17.dist-info}/RECORD

@@ -1,24 +1,24 @@
 alibaba_cloud_ops_mcp_server/__init__.py,sha256=BaluUNyRz8Qw-X7Y0ywDezwbkqiSvWlSYn2452XeGcA,213
 alibaba_cloud_ops_mcp_server/__main__.py,sha256=Q40p2HtWGvxj1JLvS7dn95NLzDhJNQ6JAgLLyCb4Y50,63
 alibaba_cloud_ops_mcp_server/config.py,sha256=PizctjXsQUWoMWBY1dFjNffVlZr9K6hNvqA4DpayR_o,513
-alibaba_cloud_ops_mcp_server/server.py,sha256=l-a53wmZPSilVq6TL9UHLw4LboYSSFJhNtEfDW2y-e4,9138
+alibaba_cloud_ops_mcp_server/server.py,sha256=nXZVhNnvPk5_VqGfTEmlFjv6lG3VYAxnTfzeF7zisog,9255
 alibaba_cloud_ops_mcp_server/settings.py,sha256=R1jvMtgErWn_1MZ2Gq3xzBZeMtkGpSHvVutInh0Ix4s,167
 alibaba_cloud_ops_mcp_server/alibabacloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alibaba_cloud_ops_mcp_server/alibabacloud/api_meta_client.py,sha256=t2TSc0Gzcy_uEcaCgiHHuLoMiEGu3-NCtYmwYjyPWsY,7973
 alibaba_cloud_ops_mcp_server/alibabacloud/exception.py,sha256=7PdhgqgXEGrTPL1cj98h9EH-RrM6-2TT89PDtcmlpmU,1230
-alibaba_cloud_ops_mcp_server/alibabacloud/utils.py,sha256=lGjwsq-Igptz52_3AALSRJLtVsP815b4nSQCfxhIiUo,8068
+alibaba_cloud_ops_mcp_server/alibabacloud/utils.py,sha256=F_nuYlN9EiDp8iWby6MYjSZg8Gm9t1aEAoylA7AHunU,8245
 alibaba_cloud_ops_mcp_server/alibabacloud/static/PROMPT_UNDERSTANDING.md,sha256=QPubudP1bwDbWu0Js6MYb4cJd1B2zM_JGp53twYv5yc,3611
 alibaba_cloud_ops_mcp_server/alibabacloud/static/__init__.py,sha256=wJrYamaIb7e_kA4ILZpdP1f1TUUTXMGqEhA4IbSZ2Ts,230
 alibaba_cloud_ops_mcp_server/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alibaba_cloud_ops_mcp_server/tools/api_tools.py,sha256=n7FLDAlnTSIk38iQqT1ABwAskIyswO_tBGTm34SPMpg,10632
-alibaba_cloud_ops_mcp_server/tools/application_management_tools.py,sha256=B3Otl46o9T2StEbe1yaKnerqjctZgEHuLMu4dHeQseE,35060
+alibaba_cloud_ops_mcp_server/tools/application_management_tools.py,sha256=mmjZTFAV_8bj5EK5d0yXv4827IhRF2XW2PNcLI5evos,35004
 alibaba_cloud_ops_mcp_server/tools/cms_tools.py,sha256=BmPTiP8wu9DsEHBQsvR7JH9nFkcKMTBuNuafFqSfVxU,4308
 alibaba_cloud_ops_mcp_server/tools/common_api_tools.py,sha256=ccQAWqS1I9F-fdOdjLcXN-dIhNqSbZV8T5ODuGXlfXM,2711
 alibaba_cloud_ops_mcp_server/tools/local_tools.py,sha256=Sl7Vl2mVQMLyMIZQDLoE-xVF0vNz_haMEspyYPDe6Sg,13133
 alibaba_cloud_ops_mcp_server/tools/oos_tools.py,sha256=cPEl05Y0rlNvCeO2SF46Y7Ewky4LXZ8__sD0_JCi8ek,13569
 alibaba_cloud_ops_mcp_server/tools/oss_tools.py,sha256=6yKo1FqQN3n9I-eDUW8MrnIZTHthy-worKc8XIsn-Nw,7427
-alibaba_cloud_ops_mcp_server-0.9.15.dist-info/METADATA,sha256=uB0lXqAEtEFLRaz79bhXwQF2r7gbEhBjxXn7CGpBhrI,8794
-alibaba_cloud_ops_mcp_server-0.9.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-alibaba_cloud_ops_mcp_server-0.9.15.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
-alibaba_cloud_ops_mcp_server-0.9.15.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
-alibaba_cloud_ops_mcp_server-0.9.15.dist-info/RECORD,,
+alibaba_cloud_ops_mcp_server-0.9.17.dist-info/METADATA,sha256=REI5_coalxMm7cmvOhDdGgVqmtlFKaNU08lg7IRZD3c,8794
+alibaba_cloud_ops_mcp_server-0.9.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+alibaba_cloud_ops_mcp_server-0.9.17.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
+alibaba_cloud_ops_mcp_server-0.9.17.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
+alibaba_cloud_ops_mcp_server-0.9.17.dist-info/RECORD,,