alibaba-cloud-ops-mcp-server 0.9.1__tar.gz → 0.9.3__tar.gz

alibaba_cloud_ops_mcp_server-0.9.3/Dockerfile

@@ -0,0 +1,23 @@
+# Use official Python 3.10 image as base image
+FROM python:3.10-slim
+
+# Set working directory
+WORKDIR /app
+
+# Update package manager and install system dependencies
+RUN apt-get update && apt-get install -y \
+    curl \
+    gcc \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd --create-home --shell /bin/bash app && chown -R app:app /app
+USER app
+
+COPY . /app
+RUN pip install --no-cache-dir .
+
+# Expose port
+EXPOSE 8000
+
+# Set default startup command
+ENTRYPOINT ["python", "-m", "alibaba_cloud_ops_mcp_server"]

{alibaba_cloud_ops_mcp_server-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.1
+Version: 0.9.3
 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: fastmcp>=2.8.0
+Requires-Dist: fastmcp==2.8.0
 Description-Content-Type: text/markdown
 
 # Alibaba Cloud Ops MCP Server

{alibaba_cloud_ops_mcp_server-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.1"
+version = "0.9.3"
 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",
-    "fastmcp>=2.8.0"
+    "fastmcp==2.8.0"
 ]
 
 [build-system]

alibaba_cloud_ops_mcp_server-0.9.3/src/alibaba_cloud_ops_mcp_server/__main__.py

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

{alibaba_cloud_ops_mcp_server-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/src/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-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/src/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__)
 
@@ -47,14 +48,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-0.9.3/src/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-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/src/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,18 +30,17 @@ 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_ENDPOINTS_SERVICE = ['cbn', 'ros']
 
 
 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]
+            service in DOUBLE_ENDPOINT_SERVICE and region_id not in DOUBLE_ENDPOINT_SERVICE[service]
     )
 
     if use_region_endpoint:
@@ -78,6 +78,7 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
     
     # 处理特殊参数格式
     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 +98,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-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/src/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.1 → alibaba_cloud_ops_mcp_server-0.9.3}/tests/test_server.py

@@ -11,10 +11,11 @@ def test_main_run(mock_create_api_tools, mock_FastMCP):
         mcp = MagicMock()
         mock_FastMCP.return_value = mcp
         # 调用main函数
-        server.main.callback(transport='stdio', port=12345, host='127.0.0.1', services='ecs')
+        server.main.callback(transport='stdio', port=12345, host='127.0.0.1', services='ecs',
+                             headers_credential_only=None)
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
-            port=12345, host='127.0.0.1')
+            port=12345, host='127.0.0.1', stateless_http=True)
         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')
@@ -31,10 +32,11 @@ def test_main_run_without_services(mock_create_api_tools, mock_FastMCP):
         mcp = MagicMock()
         mock_FastMCP.return_value = mcp
         # 调用main函数，不指定services
-        server.main.callback(transport='stdio', port=8000, host='127.0.0.1', services=None)
+        server.main.callback(transport='stdio', port=8000, host='127.0.0.1', services=None,
+                             headers_credential_only=None)
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
-            port=8000, host='127.0.0.1')
+            port=8000, host='127.0.0.1', stateless_http=True)
         # 不指定services时，应该只有oss/oos/cms的工具被添加，没有common_api_tools
         assert mcp.tool.call_count == 3  # oss/oos/cms 各1
         mock_create_api_tools.assert_called_once()
@@ -75,10 +77,11 @@ def test_main_run_multiple_services(mock_create_api_tools, mock_FastMCP):
         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')
+        server.main.callback(transport='sse', port=9000, host='0.0.0.0', services='ecs,vpc,rds',
+                             headers_credential_only=None)
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
-            port=9000, host='0.0.0.0')
+            port=9000, host='0.0.0.0', stateless_http=True)
         # common_api_tools 2 + oss/oos/cms 各1 = 5
         assert mcp.tool.call_count == 5
         mock_create_api_tools.assert_called_once()
@@ -97,6 +100,7 @@ def test_main_run_with_logging(mock_logger, mock_create_api_tools, mock_FastMCP)
         mcp = MagicMock()
         mock_FastMCP.return_value = mcp
         # 调用main函数
-        server.main.callback(transport='streamable-http', port=8080, host='localhost', services=None)
+        server.main.callback(transport='streamable-http', port=8080, host='localhost', services=None,
+                             headers_credential_only=None)
         # 验证日志被调用
         mock_logger.debug.assert_called_once_with('mcp server is running on streamable-http mode.')

{alibaba_cloud_ops_mcp_server-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/tests/tools/test_api_tools.py

@@ -232,7 +232,6 @@ def test_tools_api_call_ecs_list_parameters_non_list():
         # 验证传入query方法的参数
         query_args = mock_OpenApiUtilClient.query.call_args[0][0]
         assert query_args['InstanceIds'] == 'i-123'
-        assert query_args['SecurityGroupIds'] is None
 
 def test_create_tool_function_with_signature_bind_and_apply_defaults():
     """测试func_code函数中的signature.bind和apply_defaults调用"""
@@ -382,7 +381,7 @@ def test_get_service_endpoint_all_branches():
     # REGION_ENDPOINT_SERVICE 分支
     assert _get_service_endpoint('ecs', 'cn-hangzhou') == 'ecs.cn-hangzhou.aliyuncs.com'
     # DOUBLE_ENDPOINT_SERVICE 且 region 匹配
-    assert _get_service_endpoint('rds', 'cn-hangzhou') == 'rds.cn-hangzhou.aliyuncs.com'
+    assert _get_service_endpoint('rds', 'cn-hangzhou') == 'rds.aliyuncs.com'
     # CENTRAL_ENDPOINTS_SERVICE 分支
     assert _get_service_endpoint('cbn', 'cn-hangzhou') == 'cbn.aliyuncs.com'
     # 其它分支

{alibaba_cloud_ops_mcp_server-0.9.1 → alibaba_cloud_ops_mcp_server-0.9.3}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.0"
+version = "0.9.3"
 source = { editable = "." }
 dependencies = [
     { name = "alibabacloud-cms20190101" },
@@ -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 = "fastmcp", specifier = ">=2.8.0" },
+    { name = "fastmcp", specifier = "==2.8.0" },
 ]
 
 [package.metadata.requires-dev]
@@ -666,7 +666,7 @@ wheels = [
 
 [[package]]
 name = "fastmcp"
-version = "2.8.1"
+version = "2.8.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "authlib" },
@@ -678,9 +678,9 @@ dependencies = [
     { name = "rich" },
     { name = "typer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/04/76/d9b352dd632dbac9eea3255df7bba6d83b2def769b388ec332368d7b4638/fastmcp-2.8.1.tar.gz", hash = "sha256:c89d8ce8bf53a166eda444cfdcb2c638170e62445487229fbaf340aed31beeaf", size = 2559427 }
+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/0a/f9/ecb902857d634e81287f205954ef1c69637f27b487b109bf3b4b62d3dbe7/fastmcp-2.8.1-py3-none-any.whl", hash = "sha256:3b56a7bbab6bbac64d2a251a98b3dec5bb822ab1e4e9f20bb259add028b10d44", size = 138191 },
+    { url = "https://files.pythonhosted.org/packages/2c/05/b9b0ee091578ff37da8ef0bee8fff80bed95daff61834982a6064e3e327f/fastmcp-2.8.0-py3-none-any.whl", hash = "sha256:772468e98dacd55ab3381f49dd2583341c41b0e5ef0d9c7620fd43833d949c0c", size = 137492 },
 ]
 
 [[package]]