alibaba-cloud-ops-mcp-server 0.8.9__py3-none-any.whl → 0.9.1__py3-none-any.whl

alibaba_cloud_ops_mcp_server/alibabacloud/api_meta_client.py

@@ -47,9 +47,16 @@ class ApiMetaClient:
     @classmethod
     def get_service_version(cls, service):
         data = cls.get_response_from_pop_api(cls.GET_PRODUCT_LIST)
-        version = next((item.get(DEFAULT_VERSION) for item in data if item.get(CODE).lower() == service), None)
+        version = next((item.get(DEFAULT_VERSION) for item in data if item.get(CODE).lower() == service.lower()), None)
         return version
 
+    @classmethod
+    def get_all_service_info(cls):
+        data = cls.get_response_from_pop_api(cls.GET_PRODUCT_LIST)
+        filtered_data = [{"code": item["code"], "name": item["name"]} for item in data]
+
+        return filtered_data
+
     @classmethod
     def get_service_style(cls, service):
         data = cls.get_response_from_pop_api(cls.GET_PRODUCT_LIST)
@@ -147,7 +154,8 @@ class ApiMetaClient:
         return combined_params
 
     @classmethod
-    def get_apis_in_service(cls, service, version):
+    def get_apis_in_service(cls, service):
+        version = cls.get_service_version(service)
         data = cls.get_response_from_pop_api(cls.GET_API_OVERVIEW, service=service, version=version)
         apis = list(data[APIS].keys())
         return apis

alibaba_cloud_ops_mcp_server/alibabacloud/static/PROMPT_UNDERSTANDING.md

@@ -0,0 +1,134 @@
+## Optimized Prompt
+
+When a user submits a request, analyze their needs and check if matching tools exist. If yes, use them directly. If not, proceed to the retrieval phase.
+
+---
+
+## Request Flow
+
+1. **Analysis & Selection**
+   - Analyze user intent
+   - Choose between specific tools or common API flow
+   - Verify service support
+
+2. **API Flow** (if no specific tool)
+   - Identify service
+   - Select API via `ListAPIs`
+   - Get params via `GetAPIInfo`
+   - Execute via `CommonAPICaller`
+
+3. **Error Handling**
+   - Service not supported: "Unfortunately, we currently do not support this service"
+   - API failures: Check error code, params, permissions
+   - Param validation: Verify types and formats
+
+---
+
+### Retrieval Phase
+
+1. **Service Selection**
+
+   Supported Services:
+   - ecs: Elastic Compute Service (ECS)
+   - oos: Operations Orchestration Service (OOS)
+   - rds: Relational Database Service (RDS)
+   - vpc: Virtual Private Cloud (VPC)
+   - slb: Server Load Balancer (SLB)
+   - ess: Elastic Scaling (ESS)
+   - ros: Resource Orchestration Service (ROS)
+   - cbn: Cloud Enterprise Network (CBN)
+   - dds: MongoDB Database Service (DDS)
+   - r-kvstore: Cloud database Tair (compatible with Redis) (R-KVStore)
+
+2. **API Process**
+   - Use `ListAPIs` for available APIs
+   - Use `GetAPIInfo` for API details
+   - Use `CommonAPICaller` to execute
+
+---
+
+### Notes
+- Filter for most appropriate result
+- Choose based on user context and common usage
+- Validate parameters before calls
+- Handle errors gracefully
+
+---
+
+### Common Scenarios
+
+1. **Instance Management**
+   ```
+   User: "Start ECS instance i-1234567890abcdef0"
+   Action: Use OOS_StartInstances
+   ```
+
+2. **Monitoring**
+   ```
+   User: "Check ECS CPU usage"
+   Action: Use CMS_GetCpuUsageData
+   ```
+
+3. **Custom API**
+   ```
+   User: "Create VPC in cn-hangzhou"
+   Action: ListAPIs → GetAPIInfo → CommonAPICaller
+   ```
+
+---
+
+## Available Tools
+
+### ECS (OOS/API)
+- RunCommand: Execute commands on instances
+- StartInstances: Start ECS instances
+- StopInstances: Stop ECS instances
+- RebootInstances: Reboot ECS instances
+- DescribeInstances: List instance details
+- DescribeRegions: List available regions
+- DescribeZones: List available zones
+- DescribeAvailableResource: Check resource inventory
+- DescribeImages: List available images
+- DescribeSecurityGroups: List security groups
+- RunInstances: Create new instances
+- DeleteInstances: Delete instances
+- ResetPassword: Change instance password
+- ReplaceSystemDisk: Change instance OS
+
+### VPC (API)
+- DescribeVpcs: List VPCs
+- DescribeVSwitches: List VSwitches
+
+### RDS (OOS/API)
+- DescribeDBInstances: List database instances
+- StartDBInstances: Start RDS instances
+- StopDBInstances: Stop RDS instances
+- RestartDBInstances: Restart RDS instances
+
+### OSS (API)
+- ListBuckets: List OSS buckets
+- PutBucket: Create bucket
+- DeleteBucket: Delete bucket
+- ListObjects: List bucket contents
+
+### CloudMonitor (API)
+- GetCpuUsageData: Get instance CPU usage
+- GetCpuLoadavgData: Get 1m CPU load
+- GetCpuloadavg5mData: Get 5m CPU load
+- GetCpuloadavg15mData: Get 15m CPU load
+- GetMemUsedData: Get memory usage
+- GetMemUsageData: Get memory utilization
+- GetDiskUsageData: Get disk utilization
+- GetDiskTotalData: Get total disk space
+- GetDiskUsedData: Get used disk space
+
+Note: (OOS) = Operations Orchestration Service, (API) = Direct API call
+
+---
+
+### Best Practices
+- Use pre-defined tools when possible
+- Follow API rate limits
+- Implement proper error handling
+- Validate all parameters
+- Use appropriate endpoints

alibaba_cloud_ops_mcp_server/alibabacloud/static/__init__.py

@@ -0,0 +1,8 @@
+from importlib import resources
+
+with (
+    resources.files('alibaba_cloud_ops_mcp_server.alibabacloud.static')
+    .joinpath('PROMPT_UNDERSTANDING.md')
+    .open('r', encoding='utf-8') as f
+):
+    PROMPT_UNDERSTANDING = f.read()

alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -1,9 +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():
-    credentialsClient = CredClient()
-    config = Config(credential=credentialsClient)
+    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/config.py

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

alibaba_cloud_ops_mcp_server/server.py

@@ -1,12 +1,26 @@
-from mcp.server.fastmcp import FastMCP
+from fastmcp import FastMCP
 import click
 import logging
 
+from alibaba_cloud_ops_mcp_server.tools.common_api_tools import set_custom_service_list
 from alibaba_cloud_ops_mcp_server.config import config
-from alibaba_cloud_ops_mcp_server.tools import cms_tools, oos_tools, oss_tools, api_tools
+from alibaba_cloud_ops_mcp_server.tools import cms_tools, oos_tools, oss_tools, api_tools, common_api_tools
 
 logger = logging.getLogger(__name__)
 
+SUPPORTED_SERVICES_MAP = {
+    "ecs": "Elastic Compute Service (ECS)",
+    "oos": "Operations Orchestration Service (OOS)",
+    "rds": "Relational Database Service (RDS)",
+    "vpc": "Virtual Private Cloud (VPC)",
+    "slb": "Server Load Balancer (SLB)",
+    "ess": "Elastic Scaling (ESS)",
+    "ros": "Resource Orchestration Service (ROS)",
+    "cbn": "Cloud Enterprise Network (CBN)",
+    "dds": "MongoDB Database Service (DDS)",
+    "r-kvstore": "Cloud database Tair (compatible with Redis) (R-KVStore)"
+}
+
 
 @click.command()
 @click.option(
@@ -27,19 +41,32 @@ logger = logging.getLogger(__name__)
     default="127.0.0.1",
     help="Host",
 )
-def main(transport: str, port: int, host: str):
+@click.option(
+    "--services",
+    type=str,
+    default=None,
+    help="Comma-separated list of supported services, e.g., 'ecs,vpc,rds'",
+)
+def main(transport: str, port: int, host: str, services: str):
     # Create an MCP server
     mcp = FastMCP(
         name="alibaba-cloud-ops-mcp-server",
         port=port,
         host=host
     )
+
+    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.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/tools/api_tools.py

@@ -24,12 +24,38 @@ type_map = {
     'number': float
 }
 
+REGION_ENDPOINT_SERVICE = ['ecs', 'oos', 'vpc', 'slb']
+
+DOUBLE_ENDPOINT_SERVICE = {
+    'rds': ['cn-qingdao', 'cn-beijing', 'cn-hangzhou', 'cn-shanghai', 'cn-shenzhen', 'cn-heyuan', 'cn-guangzhou', 'cn-hongkong'],
+    'ess': ['cn-qingdao', 'cn-beijing', 'cn-hangzhou', 'cn-shanghai', 'cn-nanjing', 'cn-shenzhen'],
+    'ros': ['cn-qingdao'],
+    'dds': ['cn-qingdao', 'cn-beijing', 'cn-wulanchabu', 'cn-hangzhou', 'cn-shanghai', 'cn-shenzhen', 'cn-heyuan', 'cn-guangzhou'],
+    'r-kvstore': ['cn-qingdao', 'cn-beijing', 'cn-wulanchabu', 'cn-hangzhou', 'cn-shanghai', 'cn-shenzhen', 'cn-heyuan']
+}
+
+CENTRAL_ENDPOINTS_SERVICE = ['cbn']
+
+
+def _get_service_endpoint(service: str, region_id: str):
+    region_id = region_id.lower()
+    use_region_endpoint = service in REGION_ENDPOINT_SERVICE or (
+            service in DOUBLE_ENDPOINT_SERVICE and region_id in DOUBLE_ENDPOINT_SERVICE[service]
+    )
+
+    if use_region_endpoint:
+        return f'{service}.{region_id}.aliyuncs.com'
+    elif service in CENTRAL_ENDPOINTS_SERVICE or service in DOUBLE_ENDPOINT_SERVICE:
+        return f'{service}.aliyuncs.com'
+    else:
+        return f'{service}.{region_id}.aliyuncs.com'
+
 
 def create_client(service: str, region_id: str) -> OpenApiClient:
     config = create_config()
     if isinstance(service, str):
         service = service.lower()
-    config.endpoint = f'{service}.{region_id}.aliyuncs.com'
+    config.endpoint = _get_service_endpoint(service, region_id.lower())
     return OpenApiClient(config)
 
 
@@ -84,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(
@@ -109,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/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/tools/common_api_tools.py

@@ -0,0 +1,74 @@
+import logging
+import os
+from pydantic import Field
+from alibabacloud_tea_openapi import models as open_api_models
+from alibabacloud_tea_util import models as util_models
+from alibabacloud_tea_openapi.client import Client as OpenApiClient
+from alibabacloud_openapi_util.client import Client as OpenApiUtilClient
+from alibaba_cloud_ops_mcp_server.alibabacloud.api_meta_client import ApiMetaClient
+from alibaba_cloud_ops_mcp_server.alibabacloud.static import PROMPT_UNDERSTANDING
+from alibaba_cloud_ops_mcp_server.tools.api_tools import create_client, _tools_api_call
+
+END_STATUSES = ['Success', 'Failed', 'Cancelled']
+
+tools = []
+
+_CUSTOM_SERVICE_LIST = None
+
+logger = logging.getLogger(__name__)
+
+
+def set_custom_service_list(service_list):
+    global _CUSTOM_SERVICE_LIST
+    _CUSTOM_SERVICE_LIST = service_list
+
+
+@tools.append
+def PromptUnderstanding() -> str:
+    """
+    Always use this tool first to understand the user's query and convert it into suggestions from Alibaba Cloud experts.
+    """
+    global _CUSTOM_SERVICE_LIST
+
+    content = PROMPT_UNDERSTANDING
+    if _CUSTOM_SERVICE_LIST:
+        import re
+        pattern = r'Supported Services\s*:\s*\n(?:\s{3}- .+?\n)+'
+        replacement = f"Supported Services:\n   - " + "\n   - ".join([f"{k}: {v}" for k, v in _CUSTOM_SERVICE_LIST])
+        content = re.sub(pattern, replacement, content, flags=re.DOTALL)
+
+    return content
+
+
+@tools.append
+def ListAPIs(
+        service: str = Field(description='AlibabaCloud service code')
+):
+    """
+    Use PromptUnderstanding tool first to understand the user's query, Get the corresponding API list information through the service name to prepare for the subsequent selection of the appropriate API to call
+    """
+    return ApiMetaClient.get_apis_in_service(service)
+
+
+@tools.append
+def GetAPIInfo(
+        service: str = Field(description='AlibabaCloud service code'),
+        api: str = Field(description='AlibabaCloud api name'),
+):
+    """
+    Use PromptUnderstanding tool first to understand the user's query, After specifying the service name and API name, get the detailed API META of the corresponding API
+    """
+    data, version = ApiMetaClient.get_api_meta(service, api)
+    return data.get('parameters')
+
+
+@tools.append
+def CommonAPICaller(
+        service: str = Field(description='AlibabaCloud service code'),
+        api: str = Field(description='AlibabaCloud api name'),
+        parameters: dict = Field(description='AlibabaCloud ECS instance ID List', default={}),
+):
+    """
+    Use PromptUnderstanding tool first to understand the user's query, Perform the actual call by specifying the Service, API, and Parameters
+    """
+    return _tools_api_call(service, api, parameters, None)

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/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.8.9.dist-info → alibaba_cloud_ops_mcp_server-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.8.9
+Version: 0.9.1
 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
@@ -55,6 +55,8 @@ To use `alibaba-cloud-ops-mcp-server` MCP Server with any other MCP Client, you
 }
 ```
 
+[For detailed parameter description, see MCP startup parameter document](./README_mcp_args.md)
+
 ## MCP Maketplace Integration
 
 * [Cline](https://cline.bot/mcp-marketplace)

alibaba_cloud_ops_mcp_server-0.9.1.dist-info/RECORD

@@ -0,0 +1,20 @@
+alibaba_cloud_ops_mcp_server/__init__.py,sha256=BaluUNyRz8Qw-X7Y0ywDezwbkqiSvWlSYn2452XeGcA,213
+alibaba_cloud_ops_mcp_server/config.py,sha256=PizctjXsQUWoMWBY1dFjNffVlZr9K6hNvqA4DpayR_o,513
+alibaba_cloud_ops_mcp_server/server.py,sha256=1TRZMsgicsnaK_YFktL8JPglIc7Z-EQgDmSd0Ww_wdI,2219
+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=7PldufvFOb9GcXLHbUxKV6m9XqJpoNe4FVdQcg7Zeuk,1495
+alibaba_cloud_ops_mcp_server/alibabacloud/static/PROMPT_UNDERSTANDING.md,sha256=494HcCQQCc_iqDrRKhk7eWXB4I0dMtqCseT78KphDHg,3553
+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=T5Zat31yjEBEmILKbb2uDUkgDHSqOIlPAjpi47hsCz8,8220
+alibaba_cloud_ops_mcp_server/tools/cms_tools.py,sha256=_M13s87WxxiHp3Phu5AmXKkHOj0KDvUlodJ6z5Ndi7E,4182
+alibaba_cloud_ops_mcp_server/tools/common_api_tools.py,sha256=ccQAWqS1I9F-fdOdjLcXN-dIhNqSbZV8T5ODuGXlfXM,2711
+alibaba_cloud_ops_mcp_server/tools/oos_tools.py,sha256=8CLidg8Vrzpxv4lEOokPdScv31xlg_gX7glifiSqa8g,10063
+alibaba_cloud_ops_mcp_server/tools/oss_tools.py,sha256=MUAiYL4VlsYQPoR_JtHOLcF1i4VYK9KE6ff9BTqJr9E,5014
+alibaba_cloud_ops_mcp_server-0.9.1.dist-info/METADATA,sha256=fhRqAb0Wk1fzC76dFuW45ETIHgIMTIyARtiPu5EjZ34,5965
+alibaba_cloud_ops_mcp_server-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+alibaba_cloud_ops_mcp_server-0.9.1.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
+alibaba_cloud_ops_mcp_server-0.9.1.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
+alibaba_cloud_ops_mcp_server-0.9.1.dist-info/RECORD,,

alibaba_cloud_ops_mcp_server-0.8.9.dist-info/RECORD

@@ -1,17 +0,0 @@
-alibaba_cloud_ops_mcp_server/__init__.py,sha256=BaluUNyRz8Qw-X7Y0ywDezwbkqiSvWlSYn2452XeGcA,213
-alibaba_cloud_ops_mcp_server/config.py,sha256=Nq6AT8bqSVa6zu9xjInaSjFcxA-GC7MLlCsV1q53yO0,514
-alibaba_cloud_ops_mcp_server/server.py,sha256=NrUFnF4bVBYzrZs186iq77R9C08Vcy1jCAftm4vpGEA,1168
-alibaba_cloud_ops_mcp_server/alibabacloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alibaba_cloud_ops_mcp_server/alibabacloud/api_meta_client.py,sha256=VOyOLuo_WC8uaJSlh5pLxaMb2z90HWHVtCMhb2hddRE,7685
-alibaba_cloud_ops_mcp_server/alibabacloud/exception.py,sha256=7PdhgqgXEGrTPL1cj98h9EH-RrM6-2TT89PDtcmlpmU,1230
-alibaba_cloud_ops_mcp_server/alibabacloud/utils.py,sha256=jWQtP59P4ejh7N6xiYSDq1WgCd3Les0aSZr2pLGzkls,299
-alibaba_cloud_ops_mcp_server/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alibaba_cloud_ops_mcp_server/tools/api_tools.py,sha256=gXIZnQrCeS8SHWxFl4DlaKfHAaQAcA8K4s_G2YmOgQM,6523
-alibaba_cloud_ops_mcp_server/tools/cms_tools.py,sha256=GFSBDTddvQ7M9fDGm69jvH6Yt4nui5uOVjwD61CZKT4,4191
-alibaba_cloud_ops_mcp_server/tools/oos_tools.py,sha256=l228yl_SGg_rNdrBSDeqWYI8ZE1XUAHhsPLArvfE4A8,10116
-alibaba_cloud_ops_mcp_server/tools/oss_tools.py,sha256=c7D1fAjFBqHl0oMy0O6i7onoXeAN9cpdBdLtXKrxVQE,4615
-alibaba_cloud_ops_mcp_server-0.8.9.dist-info/METADATA,sha256=Pu2lZ17UiEzw4xGtYzgAFY0nJSHjgYlUMrwtFW0n-cs,5870
-alibaba_cloud_ops_mcp_server-0.8.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-alibaba_cloud_ops_mcp_server-0.8.9.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
-alibaba_cloud_ops_mcp_server-0.8.9.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
-alibaba_cloud_ops_mcp_server-0.8.9.dist-info/RECORD,,