alibaba-cloud-ops-mcp-server 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

alibaba_cloud_ops_mcp_server/__main__.py

@@ -0,0 +1,4 @@
+from .server import main
+
+if __name__ == "__main__":
+    main()

alibaba_cloud_ops_mcp_server/alibabacloud/static/PROMPT_UNDERSTANDING.md

@@ -39,6 +39,7 @@ When a user submits a request, analyze their needs and check if matching tools e
    - cbn: Cloud Enterprise Network (CBN)
    - dds: MongoDB Database Service (DDS)
    - r-kvstore: Cloud database Tair (compatible with Redis) (R-KVStore)
+   - bssopenapi: Billing and Cost Management (BssOpenAPI)
 
 2. **API Process**
    - Use `ListAPIs` for available APIs

alibaba_cloud_ops_mcp_server/alibabacloud/utils.py

@@ -3,6 +3,7 @@ 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
+from alibaba_cloud_ops_mcp_server.settings import settings
 
 logger = logging.getLogger(__name__)
 
@@ -30,17 +31,21 @@ def get_credentials_from_header():
 
 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)
+        access_key_id = credentials.get('AccessKeyId')
+        access_key_secret = credentials.get('AccessKeySecret')
+        token = credentials.get('SecurityToken')
         config = Config(
             access_key_id=access_key_id,
             access_key_secret=access_key_secret,
             security_token=token
         )
+    elif settings.headers_credential_only:
+        config = Config()
     else:
-        credentialsClient = CredClient()
-        config = Config(credential=credentialsClient)
+        credentials_client = CredClient()
+        config = Config(credential=credentials_client)
+
     config.user_agent = 'alibaba-cloud-ops-mcp-server'
     return config

alibaba_cloud_ops_mcp_server/server.py

@@ -5,6 +5,7 @@ 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, common_api_tools
+from alibaba_cloud_ops_mcp_server.settings import settings
 
 logger = logging.getLogger(__name__)
 
@@ -18,7 +19,8 @@ SUPPORTED_SERVICES_MAP = {
     "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)"
+    "r-kvstore": "Cloud database Tair (compatible with Redis) (R-KVStore)",
+    "bssopenapi": "Billing and Cost Management (BssOpenAPI)"
 }
 
 
@@ -47,14 +49,22 @@ SUPPORTED_SERVICES_MAP = {
     default=None,
     help="Comma-separated list of supported services, e.g., 'ecs,vpc,rds'",
 )
-def main(transport: str, port: int, host: str, services: str):
+@click.option(
+    "--headers-credential-only",
+    type=bool,
+    default=False,
+    help="Whether to use credentials only from headers",
+)
+def main(transport: str, port: int, host: str, services: str, headers_credential_only: bool):
     # Create an MCP server
     mcp = FastMCP(
         name="alibaba-cloud-ops-mcp-server",
         port=port,
-        host=host
+        host=host,
+        stateless_http=True
     )
-
+    if headers_credential_only:
+        settings.headers_credential_only = headers_credential_only
     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]

alibaba_cloud_ops_mcp_server/settings.py

@@ -0,0 +1,8 @@
+from pydantic_settings import BaseSettings
+
+
+class Settings(BaseSettings):
+    headers_credential_only: bool = False
+
+
+settings = Settings()

alibaba_cloud_ops_mcp_server/tools/api_tools.py

@@ -14,6 +14,7 @@ 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.utils import create_config
 
+logger = logging.getLogger(__name__)
 
 type_map = {
     'string': str,
@@ -29,37 +30,62 @@ 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']
+CENTRAL_SERVICE = ['cbn', 'ros', 'ram']
+
+CENTRAL_SERVICE_ENDPOINTS = {
+    'bssopenapi': {
+        'DomesticEndpoint': 'business.aliyuncs.com',
+        'InternationalEndpoint': 'business.ap-southeast-1.aliyuncs.com',
+        'DomesticRegion': ['cn-qingdao', 'cn-beijing', 'cn-zhangjiakou', 'cn-huhehaote', 'cn-wulanchabu',
+                           'cn-hangzhou', 'cn-shanghai', 'cn-shenzhen', 'cn-chengdu', 'cn-hongkong']
+    }
+}
 
 
 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:
+    # Prioritizing central service endpoints
+    central = CENTRAL_SERVICE_ENDPOINTS.get(service)
+    if central:
+        if region_id in central.get('DomesticRegion', []):
+            return central['DomesticEndpoint']
+        else:
+            return central['InternationalEndpoint']
+
+    # Determine whether to use regional endpoints
+    if service in REGION_ENDPOINT_SERVICE:
         return f'{service}.{region_id}.aliyuncs.com'
-    elif service in CENTRAL_ENDPOINTS_SERVICE or service in DOUBLE_ENDPOINT_SERVICE:
+
+    if service in DOUBLE_ENDPOINT_SERVICE:
+        not_in_central = region_id not in DOUBLE_ENDPOINT_SERVICE[service]
+        if not_in_central:
+            return f'{service}.{region_id}.aliyuncs.com'
+        else:
+            return f'{service}.aliyuncs.com'
+
+    if service in CENTRAL_SERVICE:
         return f'{service}.aliyuncs.com'
-    else:
-        return f'{service}.{region_id}.aliyuncs.com'
+
+    # Default
+    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 = _get_service_endpoint(service, region_id.lower())
+    endpoint = _get_service_endpoint(service, region_id.lower())
+    config.endpoint = endpoint
+    logger.info(f'Service Endpoint: {endpoint}')
     return OpenApiClient(config)
 
 
-# 类型为String的JSON数组参数
+# JSON array parameter of type String
 ECS_LIST_PARAMETERS = {
     'HpcClusterIds', 'DedicatedHostClusterIds', 'DedicatedHostIds', 
     'InstanceIds', 'DeploymentSetIds', 'KeyPairNames', 'SecurityGroupIds', 
@@ -76,8 +102,9 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
     path = api_meta.get('path', '/')
     style = ApiMetaClient.get_service_style(service)
     
-    # 处理特殊参数格式
+    # Handling special parameter formats
     processed_parameters = parameters.copy()
+    processed_parameters = {k: v for k, v in processed_parameters.items() if v is not None}
     if service == 'ecs':
         for param_name, param_value in parameters.items():
             if param_name in ECS_LIST_PARAMETERS and isinstance(param_value, list):
@@ -97,8 +124,11 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
         req_body_type='formData',
         body_type='json'
     )
+    logger.info(f'Call API Request: Service: {service} API: {api} Method: {method} Parameters: {processed_parameters}')
     client = create_client(service, processed_parameters.get('RegionId', 'cn-hangzhou'))
     runtime = util_models.RuntimeOptions()
+    resp = client.call_api(params, req, runtime)
+    logger.info(f'Call API Response: {resp}')
     return client.call_api(params, req, runtime)
 
 

alibaba_cloud_ops_mcp_server/tools/cms_tools.py

@@ -1,3 +1,5 @@
+import logging
+
 from pydantic import Field
 from typing import List
 import os
@@ -10,6 +12,7 @@ from alibaba_cloud_ops_mcp_server.alibabacloud.utils import create_config
 
 END_STATUSES = ['Success', 'Failed', 'Cancelled']
 
+logger = logging.getLogger(__name__)
 
 tools = []
 
@@ -33,6 +36,7 @@ def _get_cms_metric_data(region_id: str, instance_ids: List[str], metric_name: s
         dimensions=json.dumps(dimesion),
     )
     describe_metric_last_resp = client.describe_metric_last(describe_metric_last_request)
+    logger.info(f'CMS Tools response: {describe_metric_last_resp.body}')
     return describe_metric_last_resp.body.datapoints
 
 @tools.append

{alibaba_cloud_ops_mcp_server-0.9.2.dist-info → alibaba_cloud_ops_mcp_server-0.9.4.dist-info}/METADATA

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

{alibaba_cloud_ops_mcp_server-0.9.2.dist-info → alibaba_cloud_ops_mcp_server-0.9.4.dist-info}/RECORD

@@ -1,20 +1,22 @@
 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=1TRZMsgicsnaK_YFktL8JPglIc7Z-EQgDmSd0Ww_wdI,2219
+alibaba_cloud_ops_mcp_server/server.py,sha256=zmEL-4X35CklntDuWFk6Mc8QrHq-jvsaF1XLEyhKFSc,2639
+alibaba_cloud_ops_mcp_server/settings.py,sha256=fqbTHaAw59nK7fJo6MyTCY_-M0K9YAD66WpybQalo9I,141
 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/utils.py,sha256=tZQAEqGKS6Rx6Te9zNYfPBJ75GnAA-wX7hs6uP_JN0M,1609
+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=T5Zat31yjEBEmILKbb2uDUkgDHSqOIlPAjpi47hsCz8,8220
-alibaba_cloud_ops_mcp_server/tools/cms_tools.py,sha256=_M13s87WxxiHp3Phu5AmXKkHOj0KDvUlodJ6z5Ndi7E,4182
+alibaba_cloud_ops_mcp_server/tools/api_tools.py,sha256=nkYLrrcZ1LVoc-4-sQoyHO4aO-G6Brz_xO5dz6NL9BI,9414
+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/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.2.dist-info/METADATA,sha256=j-SZxCA0-iHZGMWqaJ4z9-vXq3rYs1du4FQ9822zAFc,5965
-alibaba_cloud_ops_mcp_server-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-alibaba_cloud_ops_mcp_server-0.9.2.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
-alibaba_cloud_ops_mcp_server-0.9.2.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
-alibaba_cloud_ops_mcp_server-0.9.2.dist-info/RECORD,,
+alibaba_cloud_ops_mcp_server-0.9.4.dist-info/METADATA,sha256=asXs9bS4X4omeQvusc63uF75qvNqs0DW4_V0YGNZKp4,5965
+alibaba_cloud_ops_mcp_server-0.9.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+alibaba_cloud_ops_mcp_server-0.9.4.dist-info/entry_points.txt,sha256=ESGAWXKEp184forhs7VzTD4P1AUdZz6vCW6hRUKITGw,83
+alibaba_cloud_ops_mcp_server-0.9.4.dist-info/licenses/LICENSE,sha256=gQgVkp2ttRCjodiPpXZZR-d7JnrYIYNiHk1YDUYgpa4,11331
+alibaba_cloud_ops_mcp_server-0.9.4.dist-info/RECORD,,