alibaba-cloud-ops-mcp-server 0.9.0__tar.gz → 0.9.2__tar.gz

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.0
+Version: 0.9.2
 Summary: A MCP server for Alibaba Cloud
 Author-email: Zheng Dayu <dayu.zdy@alibaba-inc.com>
 License-File: LICENSE
@@ -11,7 +11,7 @@ Requires-Dist: alibabacloud-ecs20140526>=6.1.0
 Requires-Dist: alibabacloud-oos20190601>=3.4.1
 Requires-Dist: alibabacloud-oss-v2>=1.1.0
 Requires-Dist: click>=8.1.8
-Requires-Dist: mcp[cli]>=1.9.0
+Requires-Dist: fastmcp==2.8.0
 Description-Content-Type: text/markdown
 
 # Alibaba Cloud Ops MCP Server

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.0"
+version = "0.9.2"
 description = "A MCP server for Alibaba Cloud"
 readme = "README.md"
 authors = [
@@ -14,7 +14,7 @@ dependencies = [
     "alibabacloud_oss_v2>=1.1.0",
     "alibabacloud-credentials>=1.0.0",
     "click>=8.1.8",
-    "mcp[cli]>=1.9.0",
+    "fastmcp==2.8.0"
 ]
 
 [build-system]

alibaba_cloud_ops_mcp_server-0.9.2/src/alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -0,0 +1,46 @@
+import logging
+
+from alibabacloud_credentials.client import Client as CredClient
+from alibabacloud_tea_openapi.models import Config
+from fastmcp.server.dependencies import get_http_request
+
+logger = logging.getLogger(__name__)
+
+
+def get_credentials_from_header():
+    credentials = None
+    try:
+        request = get_http_request()
+        headers = request.headers
+        access_key_id = headers.get('x-acs-accesskey-id', None)
+        access_key_secret = headers.get('x-acs-accesskey-secret', None)
+        token = headers.get('x-acs-security-token', None)
+
+        if access_key_id:
+            credentials = {
+                'AccessKeyId': access_key_id,
+                'AccessKeySecret': access_key_secret,
+                'SecurityToken': token
+            }
+
+    except Exception as e:
+        logger.info(f'get_credentials_from_header error: {e}')
+    return credentials
+
+
+def create_config():
+    credentials = get_credentials_from_header()
+    if credentials:
+        access_key_id = credentials.get('AccessKeyId', None)
+        access_key_secret = credentials.get('AccessKeySecret', None)
+        token = credentials.get('SecurityToken', None)
+        config = Config(
+            access_key_id=access_key_id,
+            access_key_secret=access_key_secret,
+            security_token=token
+        )
+    else:
+        credentialsClient = CredClient()
+        config = Config(credential=credentialsClient)
+    config.user_agent = 'alibaba-cloud-ops-mcp-server'
+    return config

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/config.py

@@ -21,7 +21,7 @@ config = {
     ],
     'rds': [
         'DescribeDBInstances'
-    ],
+    ]
 }
 
 

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/server.py

@@ -1,4 +1,4 @@
-from mcp.server.fastmcp import FastMCP
+from fastmcp import FastMCP
 import click
 import logging
 
@@ -60,13 +60,13 @@ def main(transport: str, port: int, host: str, services: str):
         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.add_tool(tool)
+            mcp.tool(tool)
     for tool in oos_tools.tools:
-        mcp.add_tool(tool)
+        mcp.tool(tool)
     for tool in cms_tools.tools:
-        mcp.add_tool(tool)
+        mcp.tool(tool)
     for tool in oss_tools.tools:
-        mcp.add_tool(tool)
+        mcp.tool(tool)
     api_tools.create_api_tools(mcp, config)
 
     # Initialize and run the server

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/tools/api_tools.py

@@ -110,24 +110,37 @@ def _create_function_schemas(service, api, api_meta):
     schemas = {}
     schemas[api] = {}
     parameters = api_meta.get('parameters', [])
+
+    required_params = []
+    optional_params = []
+
     for parameter in parameters:
         name = parameter.get('name')
         # TODO 目前忽略了带'.'的参数
         if '.' in name:
             continue
         schema = parameter.get('schema', '')
+        required = schema.get('required', False)
+
+        if required:
+            required_params.append(parameter)
+        else:
+            optional_params.append(parameter)
+
+    def process_parameter(parameter):
+        name = parameter.get('name')
+        schema = parameter.get('schema', '')
         description = schema.get('description', '')
         example = schema.get('example', '')
         type_ = schema.get('type', '')
         description = f'{description} 参数类型: {type_},参数示例：{example}'
         required = schema.get('required', False)
-        
-        # 只有在service为ecs时，才对特定参数进行特殊处理
+
         if service.lower() == 'ecs' and name in ECS_LIST_PARAMETERS and type_ == 'string':
             python_type = list
         else:
             python_type = type_map.get(type_, str)
-            
+
         field_info = (
             python_type,
             field(
@@ -135,7 +148,16 @@ def _create_function_schemas(service, api, api_meta):
                 metadata={'description': description, 'required': required}
             )
         )
+        return name, field_info
+
+    for parameter in required_params:
+        name, field_info = process_parameter(parameter)
         schemas[api][name] = field_info
+
+    for parameter in optional_params:
+        name, field_info = process_parameter(parameter)
+        schemas[api][name] = field_info
+
     if 'RegionId' not in schemas[api]:
         schemas[api]['RegionId'] = (
             str,

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/tools/cms_tools.py

@@ -37,8 +37,8 @@ def _get_cms_metric_data(region_id: str, instance_ids: List[str], metric_name: s
 
 @tools.append
 def CMS_GetCpuUsageData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取ECS实例的CPU使用率数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'cpu_total')
@@ -46,8 +46,8 @@ def CMS_GetCpuUsageData(
 
 @tools.append
 def CMS_GetCpuLoadavgData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取CPU一分钟平均负载指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'load_1m')
@@ -55,8 +55,8 @@ def CMS_GetCpuLoadavgData(
 
 @tools.append
 def CMS_GetCpuloadavg5mData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取CPU五分钟平均负载指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'load_5m')
@@ -64,16 +64,16 @@ def CMS_GetCpuloadavg5mData(
 
 @tools.append
 def CMS_GetCpuloadavg15mData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取CPU十五分钟平均负载指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'load_15m')
 
 @tools.append
 def CMS_GetMemUsedData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取内存使用量指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'memory_usedspace')
@@ -81,8 +81,8 @@ def CMS_GetMemUsedData(
 
 @tools.append
 def CMS_GetMemUsageData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取内存利用率指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'memory_usedutilization')
@@ -90,8 +90,8 @@ def CMS_GetMemUsageData(
 
 @tools.append
 def CMS_GetDiskUsageData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取磁盘利用率指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'diskusage_utilization')
@@ -99,8 +99,8 @@ def CMS_GetDiskUsageData(
 
 @tools.append
 def CMS_GetDiskTotalData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取磁盘分区总容量指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'diskusage_total')
@@ -108,8 +108,8 @@ def CMS_GetDiskTotalData(
 
 @tools.append
 def CMS_GetDiskUsedData(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """获取磁盘分区使用量指标数据"""
     return _get_cms_metric_data(RegionId, InstanceIds, 'diskusage_used')

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/tools/oos_tools.py

@@ -47,10 +47,10 @@ def _start_execution_sync(region_id: str, template_name: str, parameters: dict):
         time.sleep(1)
 @tools.append
 def OOS_RunCommand(
-     RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
-     CommandType: str = Field(description='The type of command executed on the ECS instance, optional value：RunShellScript，RunPythonScript，RunPerlScript，RunBatScript，RunPowerShellScript', default='RunShellScript'),
-     Command: str = Field(description='Content of the command executed on the ECS instance'),
+    Command: str = Field(description='Content of the command executed on the ECS instance'),
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
+    CommandType: str = Field(description='The type of command executed on the ECS instance, optional value：RunShellScript，RunPythonScript，RunPerlScript，RunBatScript，RunPowerShellScript', default='RunShellScript')
 ):
     """批量在多台ECS实例上运行云助手命令，适用于需要同时管理多台ECS实例的场景，如应用程序管理和资源标记操作等。"""
     
@@ -74,8 +74,8 @@ def OOS_RunCommand(
 
 @tools.append
 def OOS_StartInstances(
-     RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
 ):
     """批量启动ECS实例，适用于需要同时管理和启动多台ECS实例的场景，例如应用部署和高可用性场景。"""
     
@@ -93,9 +93,9 @@ def OOS_StartInstances(
 
 @tools.append
 def OOS_StopInstances(
-     RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
-     ForeceStop: bool = Field(description='Is forced shutdown required', default=False),
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
+    ForeceStop: bool = Field(description='Is forced shutdown required', default=False)
 ):
     """批量停止ECS实例，适用于需要同时管理和停止多台ECS实例的场景。"""
     
@@ -114,9 +114,9 @@ def OOS_StopInstances(
 
 @tools.append
 def OOS_RebootInstances(
-     RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
-     ForeceStop: bool = Field(description='Is forced shutdown required', default=False),
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
+    ForeceStop: bool = Field(description='Is forced shutdown required', default=False)
 ):
     """批量重启ECS实例，适用于需要同时管理和重启多台ECS实例的场景。"""
     
@@ -135,13 +135,13 @@ def OOS_RebootInstances(
 
 @tools.append
 def OOS_RunInstances(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     ImageId: str = Field(description='Image ID'),
     InstanceType: str = Field(description='Instance Type'),
     SecurityGroupId: str = Field(description='SecurityGroup ID'),
     VSwitchId: str = Field(description='VSwitch ID'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     Amount: int = Field(description='Number of ECS instances', default=1),
-    InstanceName: str = Field(description='Instance Name', default=''),
+    InstanceName: str = Field(description='Instance Name', default='')
 ):
     """批量创建ECS实例，适用于需要同时创建多台ECS实例的场景，例如应用部署和高可用性场景。"""
 
@@ -158,9 +158,9 @@ def OOS_RunInstances(
 
 @tools.append
 def OOS_ResetPassword(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
     Password: str = Field(description='The password of the ECS instance must be 8-30 characters and must contain only the following characters: lowercase letters, uppercase letters, numbers, and special characters only.（）~！@#$%^&*-_+=（40：<>，？/'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
 ):
     """批量修改ECS实例的密码，请注意，本操作将会重启ECS实例"""
     parameters = {
@@ -177,9 +177,9 @@ def OOS_ResetPassword(
 
 @tools.append
 def OOS_ReplaceSystemDisk(
-        RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-        InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
-        ImageId: str = Field(description='Image ID')
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    ImageId: str = Field(description='Image ID'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """批量替换ECS实例的系统盘，更换操作系统"""
     parameters = {
@@ -197,8 +197,8 @@ def OOS_ReplaceSystemDisk(
 
 @tools.append
 def OOS_StartRDSInstances(
-        RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-        InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    InstanceIds: List[str] = Field(description='AlibabaCloud ECS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """批量启动RDS实例，适用于需要同时管理和启动多台RDS实例的场景，例如应用部署和高可用性场景。"""
 
@@ -216,8 +216,8 @@ def OOS_StartRDSInstances(
 
 @tools.append
 def OOS_StopRDSInstances(
-        RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-        InstanceIds: List[str] = Field(description='AlibabaCloud RDS instance ID List')
+    InstanceIds: List[str] = Field(description='AlibabaCloud RDS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """批量停止RDS实例，适用于需要同时管理和停止多台RDS实例的场景。"""
 
@@ -235,8 +235,8 @@ def OOS_StopRDSInstances(
 
 @tools.append
 def OOS_RebootRDSInstances(
-        RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-        InstanceIds: List[str] = Field(description='AlibabaCloud RDS instance ID List')
+    InstanceIds: List[str] = Field(description='AlibabaCloud RDS instance ID List'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """批量重启RDS实例，适用于需要同时管理和重启多台RDS实例的场景。"""
 

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/src/alibaba_cloud_ops_mcp_server/tools/oss_tools.py

@@ -1,6 +1,7 @@
 # oss_tools.py
 import os
 import alibabacloud_oss_v2 as oss
+from alibaba_cloud_ops_mcp_server.alibabacloud.utils import get_credentials_from_header
 
 from pydantic import Field
 from alibabacloud_oss_v2 import Credentials
@@ -13,10 +14,16 @@ tools = []
 
 class CredentialsProvider(EnvironmentVariableCredentialsProvider):
     def __init__(self) -> None:
-        credentialsClient = CredClient()
-        access_key_id = credentialsClient.get_credential().access_key_id
-        access_key_secret = credentialsClient.get_credential().access_key_secret
-        session_token = credentialsClient.get_credential().security_token
+        credentials = get_credentials_from_header()
+        if credentials:
+            access_key_id = credentials.get('AccessKeyId', None)
+            access_key_secret = credentials.get('AccessKeySecret', None)
+            session_token = credentials.get('SecurityToken', None)
+        else:
+            credentialsClient = CredClient()
+            access_key_id = credentialsClient.get_credential().access_key_id
+            access_key_secret = credentialsClient.get_credential().access_key_secret
+            session_token = credentialsClient.get_credential().security_token
 
         self._credentials = Credentials(
             access_key_id, access_key_secret, session_token)
@@ -51,8 +58,8 @@ def OSS_ListBuckets(
 
 @tools.append
 def OSS_ListObjects(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     BucketName: str = Field(description='AlibabaCloud OSS Bucket Name'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     Prefix: str = Field(description='AlibabaCloud OSS Bucket Name prefix', default=None)
 ):
     """获取指定OSS存储空间中的所有文件信息。"""
@@ -72,8 +79,8 @@ def OSS_ListObjects(
 
 @tools.append
 def OSS_PutBucket(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     BucketName: str = Field(description='AlibabaCloud OSS Bucket Name'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
     StorageClass: str = Field(description='The Storage Type of AlibabaCloud OSS Bucket, The value range is as follows: '
                                           'Standard (default): standard storage, '
                                           'IA: infrequent access, Archive: archive storage, '
@@ -100,8 +107,8 @@ def OSS_PutBucket(
 
 @tools.append
 def OSS_DeleteBucket(
-    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou'),
-    BucketName: str = Field(description='AlibabaCloud OSS Bucket Name')
+    BucketName: str = Field(description='AlibabaCloud OSS Bucket Name'),
+    RegionId: str = Field(description='AlibabaCloud region ID', default='cn-hangzhou')
 ):
     """删除指定的OSS存储空间。"""
     client = create_client(region_id=RegionId)

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/tests/alibabacloud/test_api_meta_client.py

@@ -301,9 +301,9 @@ def test_get_ref_api_meta_valid_path(mock_pop_api, mock_std):
     }
     assert result == expected
 
-@patch('alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client.ApiMetaClient.get_response_from_pop_api')
+@patch('alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client.requests.get')
 def test_get_all_service_info(mock_get):
-    mock_get.return_value = [
+    mock_get.return_value.json.return_value = [
         {"code": "ecs", "name": "Elastic Compute Service"},
         {"code": "rds", "name": "Relational Database Service"}
     ]
@@ -312,3 +312,44 @@ def test_get_all_service_info(mock_get):
         {"code": "ecs", "name": "Elastic Compute Service"},
         {"code": "rds", "name": "Relational Database Service"}
     ]
+
+
+
+@patch('alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client.ApiMetaClient.get_service_version', return_value='2014-05-26')
+@patch('alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client.ApiMetaClient.get_standard_service_and_api', return_value=('ecs', 'DescribeInstances'))
+@patch('alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client.ApiMetaClient.get_response_from_pop_api')
+def test_get_api_meta_success(mock_pop_api, mock_get_std, mock_get_ver):
+    """测试get_api_meta方法的正常成功路径，覆盖第90-91行"""
+    # 模拟get_response_from_pop_api返回的API元数据
+    mock_api_data = {
+        'parameters': [
+            {'name': 'InstanceIds', 'in': 'query', 'schema': {'type': 'string'}}
+        ],
+        'responses': {
+            '200': {
+                'schema': {
+                    'properties': {
+                        'Instances': {'type': 'array'}
+                    }
+                }
+            }
+        }
+    }
+    mock_pop_api.return_value = mock_api_data
+    
+    # 调用get_api_meta
+    data, version = api_meta_client.ApiMetaClient.get_api_meta('ecs', 'DescribeInstances')
+    
+    # 验证返回值
+    assert data == mock_api_data
+    assert version == '2014-05-26'
+    
+    # 验证调用了正确的方法
+    mock_get_ver.assert_called_once_with('ecs')
+    mock_get_std.assert_called_once_with('ecs', 'DescribeInstances', '2014-05-26')
+    mock_pop_api.assert_called_once_with(
+        api_meta_client.ApiMetaClient.GET_API_INFO, 
+        'ecs', 
+        'DescribeInstances', 
+        '2014-05-26'
+    )

alibaba_cloud_ops_mcp_server-0.9.2/tests/alibabacloud/test_utils.py

@@ -0,0 +1,75 @@
+from unittest.mock import patch, MagicMock
+from alibaba_cloud_ops_mcp_server.alibabacloud import utils
+
+def test_create_config():
+    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.CredClient') as mock_cred, \
+         patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.Config') as mock_cfg:
+        cred = MagicMock()
+        mock_cred.return_value = cred
+        cfg = MagicMock()
+        mock_cfg.return_value = cfg
+        result = utils.create_config()
+        assert result is cfg
+        assert cfg.user_agent == 'alibaba-cloud-ops-mcp-server'
+        mock_cred.assert_called_once()
+        mock_cfg.assert_called_once_with(credential=cred)
+
+def test_get_credentials_from_header_success():
+    """测试从header成功获取凭证的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.get_http_request') as mock_get_request:
+        mock_request = MagicMock()
+        mock_request.headers = {
+            'x-acs-accesskey-id': 'test_id',
+            'x-acs-accesskey-secret': 'test_secret',
+            'x-acs-security-token': 'test_token'
+        }
+        mock_get_request.return_value = mock_request
+        
+        result = utils.get_credentials_from_header()
+        expected = {
+            'AccessKeyId': 'test_id',
+            'AccessKeySecret': 'test_secret',
+            'SecurityToken': 'test_token'
+        }
+        assert result == expected
+
+def test_get_credentials_from_header_no_access_key():
+    """测试header中没有access_key_id的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.get_http_request') as mock_get_request:
+        mock_request = MagicMock()
+        mock_request.headers = {}
+        mock_get_request.return_value = mock_request
+        
+        result = utils.get_credentials_from_header()
+        assert result is None
+
+def test_get_credentials_from_header_exception():
+    """测试get_http_request抛出异常的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.get_http_request') as mock_get_request, \
+         patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.logger') as mock_logger:
+        mock_get_request.side_effect = Exception('test error')
+        
+        result = utils.get_credentials_from_header()
+        assert result is None
+        mock_logger.info.assert_called_once_with('get_credentials_from_header error: test error')
+
+def test_create_config_with_credentials():
+    """测试使用header中的凭证创建config的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.get_credentials_from_header') as mock_get_creds, \
+         patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.Config') as mock_cfg:
+        mock_get_creds.return_value = {
+            'AccessKeyId': 'test_id',
+            'AccessKeySecret': 'test_secret',
+            'SecurityToken': 'test_token'
+        }
+        cfg = MagicMock()
+        mock_cfg.return_value = cfg
+        
+        result = utils.create_config()
+        assert result is cfg
+        assert cfg.user_agent == 'alibaba-cloud-ops-mcp-server'
+        mock_cfg.assert_called_once_with(
+            access_key_id='test_id',
+            access_key_secret='test_secret',
+            security_token='test_token'
+        ) 

alibaba_cloud_ops_mcp_server-0.9.2/tests/test_server.py

@@ -0,0 +1,102 @@
+import pytest
+from unittest.mock import patch, MagicMock
+
+@patch('alibaba_cloud_ops_mcp_server.server.FastMCP')
+@patch('alibaba_cloud_ops_mcp_server.server.api_tools.create_api_tools')
+def test_main_run(mock_create_api_tools, mock_FastMCP):
+    with patch('alibaba_cloud_ops_mcp_server.server.oss_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.oos_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.cms_tools.tools', [lambda: None]):
+        from alibaba_cloud_ops_mcp_server import server
+        mcp = MagicMock()
+        mock_FastMCP.return_value = mcp
+        # 调用main函数
+        server.main.callback(transport='stdio', port=12345, host='127.0.0.1', services='ecs')
+        mock_FastMCP.assert_called_once_with(
+            name='alibaba-cloud-ops-mcp-server',
+            port=12345, host='127.0.0.1')
+        assert mcp.tool.call_count == 7  # common_api_tools 4 + oss/oos/cms 各1
+        mock_create_api_tools.assert_called_once()
+        mcp.run.assert_called_once_with(transport='stdio')
+
+
+@patch('alibaba_cloud_ops_mcp_server.server.FastMCP')
+@patch('alibaba_cloud_ops_mcp_server.server.api_tools.create_api_tools')
+def test_main_run_without_services(mock_create_api_tools, mock_FastMCP):
+    """测试不指定services参数时的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.server.oss_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.oos_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.cms_tools.tools', [lambda: None]):
+        from alibaba_cloud_ops_mcp_server import server
+        mcp = MagicMock()
+        mock_FastMCP.return_value = mcp
+        # 调用main函数，不指定services
+        server.main.callback(transport='stdio', port=8000, host='127.0.0.1', services=None)
+        mock_FastMCP.assert_called_once_with(
+            name='alibaba-cloud-ops-mcp-server',
+            port=8000, host='127.0.0.1')
+        # 不指定services时，应该只有oss/oos/cms的工具被添加，没有common_api_tools
+        assert mcp.tool.call_count == 3  # oss/oos/cms 各1
+        mock_create_api_tools.assert_called_once()
+        mcp.run.assert_called_once_with(transport='stdio')
+
+
+def test_main_module_execution():
+    """测试模块直接执行时的入口点（第78-79行）"""
+    import subprocess
+    import sys
+    import os
+    
+    # 获取server.py的路径
+    server_path = os.path.join(os.path.dirname(__file__), '../src/alibaba_cloud_ops_mcp_server/server.py')
+    server_path = os.path.abspath(server_path)
+    
+    # 使用subprocess来模拟直接执行模块，但立即终止以避免实际运行服务器
+    try:
+        # 使用timeout来快速终止进程，只是为了测试入口点能否正常启动
+        result = subprocess.run([sys.executable, server_path, '--help'], 
+                              capture_output=True, text=True, timeout=5)
+        # 如果能显示帮助信息，说明main函数和入口点工作正常
+        assert 'Transport type' in result.stdout or result.returncode == 0
+    except subprocess.TimeoutExpired:
+        # 超时也是可以接受的，说明程序启动了
+        pass
+
+
+@patch('alibaba_cloud_ops_mcp_server.server.FastMCP')
+@patch('alibaba_cloud_ops_mcp_server.server.api_tools.create_api_tools')
+def test_main_run_multiple_services(mock_create_api_tools, mock_FastMCP):
+    """测试指定多个services的情况"""
+    with patch('alibaba_cloud_ops_mcp_server.server.oss_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.oos_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.cms_tools.tools', [lambda: None]), \
+         patch('alibaba_cloud_ops_mcp_server.server.common_api_tools.tools', [lambda: None, lambda: None]):
+        from alibaba_cloud_ops_mcp_server import server
+        mcp = MagicMock()
+        mock_FastMCP.return_value = mcp
+        # 调用main函数，指定多个services
+        server.main.callback(transport='sse', port=9000, host='0.0.0.0', services='ecs,vpc,rds')
+        mock_FastMCP.assert_called_once_with(
+            name='alibaba-cloud-ops-mcp-server',
+            port=9000, host='0.0.0.0')
+        # common_api_tools 2 + oss/oos/cms 各1 = 5
+        assert mcp.tool.call_count == 5
+        mock_create_api_tools.assert_called_once()
+        mcp.run.assert_called_once_with(transport='sse')
+
+
+@patch('alibaba_cloud_ops_mcp_server.server.FastMCP')
+@patch('alibaba_cloud_ops_mcp_server.server.api_tools.create_api_tools')
+@patch('alibaba_cloud_ops_mcp_server.server.logger')
+def test_main_run_with_logging(mock_logger, mock_create_api_tools, mock_FastMCP):
+    """测试日志输出（第77行）"""
+    with patch('alibaba_cloud_ops_mcp_server.server.oss_tools.tools', []), \
+         patch('alibaba_cloud_ops_mcp_server.server.oos_tools.tools', []), \
+         patch('alibaba_cloud_ops_mcp_server.server.cms_tools.tools', []):
+        from alibaba_cloud_ops_mcp_server import server
+        mcp = MagicMock()
+        mock_FastMCP.return_value = mcp
+        # 调用main函数
+        server.main.callback(transport='streamable-http', port=8080, host='localhost', services=None)
+        # 验证日志被调用
+        mock_logger.debug.assert_called_once_with('mcp server is running on streamable-http mode.')

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/tests/tools/test_oss_tools.py

@@ -68,6 +68,20 @@ def test_CredentialsProvider_and_get_credentials(mock_cred_client):
     assert credentials.access_key_secret == 'secret'
     assert credentials.security_token == 'token'
 
+@patch('alibaba_cloud_ops_mcp_server.tools.oss_tools.get_credentials_from_header')
+def test_CredentialsProvider_with_header_credentials(mock_get_creds):
+    """测试从header获取凭证的CredentialsProvider"""
+    mock_get_creds.return_value = {
+        'AccessKeyId': 'header_id',
+        'AccessKeySecret': 'header_secret',
+        'SecurityToken': 'header_token'
+    }
+    provider = oss_tools.CredentialsProvider()
+    credentials = provider.get_credentials()
+    assert credentials.access_key_id == 'header_id'
+    assert credentials.access_key_secret == 'header_secret'
+    assert credentials.security_token == 'header_token'
+
 @patch('alibaba_cloud_ops_mcp_server.tools.oss_tools.CredentialsProvider')
 @patch('alibaba_cloud_ops_mcp_server.tools.oss_tools.oss')
 def test_create_client(mock_oss, mock_provider):

{alibaba_cloud_ops_mcp_server-0.9.0 → alibaba_cloud_ops_mcp_server-0.9.2}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.0"
+version = "0.9.2"
 source = { editable = "." }
 dependencies = [
     { name = "alibabacloud-cms20190101" },
@@ -125,7 +125,7 @@ dependencies = [
     { name = "alibabacloud-oos20190601" },
     { name = "alibabacloud-oss-v2" },
     { name = "click" },
-    { name = "mcp", extra = ["cli"] },
+    { name = "fastmcp" },
 ]
 
 [package.dev-dependencies]
@@ -142,7 +142,7 @@ requires-dist = [
     { name = "alibabacloud-oos20190601", specifier = ">=3.4.1" },
     { name = "alibabacloud-oss-v2", specifier = ">=1.1.0" },
     { name = "click", specifier = ">=8.1.8" },
-    { name = "mcp", extras = ["cli"], specifier = ">=1.9.0" },
+    { name = "fastmcp", specifier = "==2.8.0" },
 ]
 
 [package.metadata.requires-dev]
@@ -348,6 +348,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/77/06/bb80f5f86020c4551da315d78b3ab75e8228f89f0162f2c3a819e407941a/attrs-25.3.0-py3-none-any.whl", hash = "sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3", size = 63815 },
 ]
 
+[[package]]
+name = "authlib"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cryptography" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a2/9d/b1e08d36899c12c8b894a44a5583ee157789f26fc4b176f8e4b6217b56e1/authlib-1.6.0.tar.gz", hash = "sha256:4367d32031b7af175ad3a323d571dc7257b7099d55978087ceae4a0d88cd3210", size = 158371 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/84/29/587c189bbab1ccc8c86a03a5d0e13873df916380ef1be461ebe6acebf48d/authlib-1.6.0-py2.py3-none-any.whl", hash = "sha256:91685589498f79e8655e8a8947431ad6288831d643f11c55c2143ffcc738048d", size = 239981 },
+]
+
 [[package]]
 name = "certifi"
 version = "2025.1.31"
@@ -652,6 +664,25 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453 },
 ]
 
+[[package]]
+name = "fastmcp"
+version = "2.8.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "authlib" },
+    { name = "exceptiongroup" },
+    { name = "httpx" },
+    { name = "mcp" },
+    { name = "openapi-pydantic" },
+    { name = "python-dotenv" },
+    { name = "rich" },
+    { name = "typer" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/8d/a3/d5b2c47b25d13cca8108e077bf4a72b255b113fb525f4c22ce9ca5af9b08/fastmcp-2.8.0.tar.gz", hash = "sha256:8a6427ece23d0a324d4be2043598c8b89a91b2b5688873d8ae1e7aeaa7960513", size = 2554559 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/05/b9b0ee091578ff37da8ef0bee8fff80bed95daff61834982a6064e3e327f/fastmcp-2.8.0-py3-none-any.whl", hash = "sha256:772468e98dacd55ab3381f49dd2583341c41b0e5ef0d9c7620fd43833d949c0c", size = 137492 },
+]
+
 [[package]]
 name = "frozenlist"
 version = "1.5.0"
@@ -799,7 +830,7 @@ wheels = [
 
 [[package]]
 name = "mcp"
-version = "1.9.1"
+version = "1.9.4"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -812,15 +843,9 @@ dependencies = [
     { name = "starlette" },
     { name = "uvicorn", marker = "sys_platform != 'emscripten'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e7/bc/54aec2c334698cc575ca3b3481eed627125fb66544152fa1af927b1a495c/mcp-1.9.1.tar.gz", hash = "sha256:19879cd6dde3d763297617242888c2f695a95dfa854386a6a68676a646ce75e4", size = 316247 }
+sdist = { url = "https://files.pythonhosted.org/packages/06/f2/dc2450e566eeccf92d89a00c3e813234ad58e2ba1e31d11467a09ac4f3b9/mcp-1.9.4.tar.gz", hash = "sha256:cfb0bcd1a9535b42edaef89947b9e18a8feb49362e1cc059d6e7fc636f2cb09f", size = 333294 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a6/c0/4ac795585a22a0a2d09cd2b1187b0252d2afcdebd01e10a68bbac4d34890/mcp-1.9.1-py3-none-any.whl", hash = "sha256:2900ded8ffafc3c8a7bfcfe8bc5204037e988e753ec398f371663e6a06ecd9a9", size = 130261 },
-]
-
-[package.optional-dependencies]
-cli = [
-    { name = "python-dotenv" },
-    { name = "typer" },
+    { url = "https://files.pythonhosted.org/packages/97/fc/80e655c955137393c443842ffcc4feccab5b12fa7cb8de9ced90f90e6998/mcp-1.9.4-py3-none-any.whl", hash = "sha256:7fcf36b62936adb8e63f89346bccca1268eeca9bf6dfb562ee10b1dfbda9dac0", size = 130232 },
 ]
 
 [[package]]
@@ -929,6 +954,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/96/10/7d526c8974f017f1e7ca584c71ee62a638e9334d8d33f27d7cdfc9ae79e4/multidict-6.4.3-py3-none-any.whl", hash = "sha256:59fe01ee8e2a1e8ceb3f6dbb216b09c8d9f4ef1c22c4fc825d045a147fa2ebc9", size = 10400 },
 ]
 
+[[package]]
+name = "openapi-pydantic"
+version = "0.5.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/02/2e/58d83848dd1a79cb92ed8e63f6ba901ca282c5f09d04af9423ec26c56fd7/openapi_pydantic-0.5.1.tar.gz", hash = "sha256:ff6835af6bde7a459fb93eb93bb92b8749b754fc6e51b2f1590a19dc3005ee0d", size = 60892 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/cf/03675d8bd8ecbf4445504d8071adab19f5f993676795708e36402ab38263/openapi_pydantic-0.5.1-py3-none-any.whl", hash = "sha256:a3a09ef4586f5bd760a8df7f43028b60cafb6d9f61de2acba9574766255ab146", size = 96381 },
+]
+
 [[package]]
 name = "packaging"
 version = "25.0"

alibaba_cloud_ops_mcp_server-0.9.0/src/alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -1,9 +0,0 @@
-from alibabacloud_credentials.client import Client as CredClient
-from alibabacloud_tea_openapi.models import Config
-
-
-def create_config():
-    credentialsClient = CredClient()
-    config = Config(credential=credentialsClient)
-    config.user_agent = 'alibaba-cloud-ops-mcp-server'
-    return config

alibaba_cloud_ops_mcp_server-0.9.0/tests/alibabacloud/test_utils.py

@@ -1,15 +0,0 @@
-from unittest.mock import patch, MagicMock
-from alibaba_cloud_ops_mcp_server.alibabacloud import utils
-
-def test_create_config():
-    with patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.CredClient') as mock_cred, \
-         patch('alibaba_cloud_ops_mcp_server.alibabacloud.utils.Config') as mock_cfg:
-        cred = MagicMock()
-        mock_cred.return_value = cred
-        cfg = MagicMock()
-        mock_cfg.return_value = cfg
-        result = utils.create_config()
-        assert result is cfg
-        assert cfg.user_agent == 'alibaba-cloud-ops-mcp-server'
-        mock_cred.assert_called_once()
-        mock_cfg.assert_called_once_with(credential=cred) 

alibaba_cloud_ops_mcp_server-0.9.0/tests/test_server.py

@@ -1,32 +0,0 @@
-import pytest
-from unittest.mock import patch, MagicMock
-
-@patch('alibaba_cloud_ops_mcp_server.server.FastMCP')
-@patch('alibaba_cloud_ops_mcp_server.server.api_tools.create_api_tools')
-def test_main_run(mock_create_api_tools, mock_FastMCP):
-    with patch('alibaba_cloud_ops_mcp_server.server.oss_tools.tools', [lambda: None]), \
-         patch('alibaba_cloud_ops_mcp_server.server.oos_tools.tools', [lambda: None]), \
-         patch('alibaba_cloud_ops_mcp_server.server.cms_tools.tools', [lambda: None]):
-        from alibaba_cloud_ops_mcp_server import server
-        mcp = MagicMock()
-        mock_FastMCP.return_value = mcp
-        # 调用main函数
-        server.main.callback(transport='stdio', port=12345, host='127.0.0.1', services='ecs')
-        mock_FastMCP.assert_called_once_with(
-            name='alibaba-cloud-ops-mcp-server',
-            port=12345, host='127.0.0.1')
-        assert mcp.add_tool.call_count == 7  # common_api_tools 4 + oss/oos/cms 各1
-        mock_create_api_tools.assert_called_once()
-        mcp.run.assert_called_once_with(transport='stdio')
-
-def test_run_as_main(monkeypatch):
-    import runpy, sys
-    from alibaba_cloud_ops_mcp_server import server
-    monkeypatch.setattr(server, 'main', lambda *a, **kw: None)
-    monkeypatch.setattr(sys, 'argv', ['server.py'])
-    import mcp.server.fastmcp
-    monkeypatch.setattr(mcp.server.fastmcp.FastMCP, 'run', lambda self, **kwargs: None)
-    import pytest
-    with pytest.raises(SystemExit) as e:
-        runpy.run_path('src/alibaba_cloud_ops_mcp_server/server.py', run_name='__main__')
-    assert e.value.code == 0