alibaba-cloud-ops-mcp-server 0.9.4__tar.gz → 0.9.6__tar.gz

{alibaba_cloud_ops_mcp_server-0.9.4 → alibaba_cloud_ops_mcp_server-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibaba-cloud-ops-mcp-server
-Version: 0.9.4
+Version: 0.9.6
 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.4 → alibaba_cloud_ops_mcp_server-0.9.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.4"
+version = "0.9.6"
 description = "A MCP server for Alibaba Cloud"
 readme = "README.md"
 authors = [

{alibaba_cloud_ops_mcp_server-0.9.4 → alibaba_cloud_ops_mcp_server-0.9.6}/src/alibaba_cloud_ops_mcp_server/server.py

@@ -55,7 +55,13 @@ SUPPORTED_SERVICES_MAP = {
     default=False,
     help="Whether to use credentials only from headers",
 )
-def main(transport: str, port: int, host: str, services: str, headers_credential_only: bool):
+@click.option(
+    "--env",
+    type=click.Choice(["domestic", "international"]),
+    default="domestic",
+    help="Environment type: 'domestic' for domestic, 'international' for overseas (default: domestic)",
+)
+def main(transport: str, port: int, host: str, services: str, headers_credential_only: bool, env: str):
     # Create an MCP server
     mcp = FastMCP(
         name="alibaba-cloud-ops-mcp-server",
@@ -65,6 +71,8 @@ def main(transport: str, port: int, host: str, services: str, headers_credential
     )
     if headers_credential_only:
         settings.headers_credential_only = headers_credential_only
+    if env:
+        settings.env = env
     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.4 → alibaba_cloud_ops_mcp_server-0.9.6}/src/alibaba_cloud_ops_mcp_server/settings.py

@@ -3,6 +3,7 @@ from pydantic_settings import BaseSettings
 
 class Settings(BaseSettings):
     headers_credential_only: bool = False
+    env: str = "domestic"
 
 
 settings = Settings()

{alibaba_cloud_ops_mcp_server-0.9.4 → alibaba_cloud_ops_mcp_server-0.9.6}/src/alibaba_cloud_ops_mcp_server/tools/api_tools.py

@@ -13,6 +13,7 @@ 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.utils import create_config
+from alibaba_cloud_ops_mcp_server.settings import settings
 
 logger = logging.getLogger(__name__)
 
@@ -52,7 +53,9 @@ def _get_service_endpoint(service: str, region_id: str):
     # Prioritizing central service endpoints
     central = CENTRAL_SERVICE_ENDPOINTS.get(service)
     if central:
-        if region_id in central.get('DomesticRegion', []):
+        if settings.env == 'international':
+            return central['InternationalEndpoint']
+        elif region_id in central.get('DomesticRegion', []) or settings.env == 'domestic':
             return central['DomesticEndpoint']
         else:
             return central['InternationalEndpoint']
@@ -129,7 +132,7 @@ def _tools_api_call(service: str, api: str, parameters: dict, ctx: Context):
     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)
+    return resp
 
 
 def _create_parameter_schema(fields: dict):

{alibaba_cloud_ops_mcp_server-0.9.4 → alibaba_cloud_ops_mcp_server-0.9.6}/tests/test_server.py

@@ -12,7 +12,7 @@ def test_main_run(mock_create_api_tools, mock_FastMCP):
         mock_FastMCP.return_value = mcp
         # 调用main函数
         server.main.callback(transport='stdio', port=12345, host='127.0.0.1', services='ecs',
-                             headers_credential_only=None)
+                             headers_credential_only=None, env='domestic')
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
             port=12345, host='127.0.0.1', stateless_http=True)
@@ -33,7 +33,7 @@ def test_main_run_without_services(mock_create_api_tools, mock_FastMCP):
         mock_FastMCP.return_value = mcp
         # 调用main函数，不指定services
         server.main.callback(transport='stdio', port=8000, host='127.0.0.1', services=None,
-                             headers_credential_only=None)
+                             headers_credential_only=None, env='domestic')
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
             port=8000, host='127.0.0.1', stateless_http=True)
@@ -78,7 +78,7 @@ def test_main_run_multiple_services(mock_create_api_tools, mock_FastMCP):
         mock_FastMCP.return_value = mcp
         # 调用main函数，指定多个services
         server.main.callback(transport='sse', port=9000, host='0.0.0.0', services='ecs,vpc,rds',
-                             headers_credential_only=None)
+                             headers_credential_only=None, env='domestic')
         mock_FastMCP.assert_called_once_with(
             name='alibaba-cloud-ops-mcp-server',
             port=9000, host='0.0.0.0', stateless_http=True)
@@ -101,6 +101,6 @@ def test_main_run_with_logging(mock_logger, mock_create_api_tools, mock_FastMCP)
         mock_FastMCP.return_value = mcp
         # 调用main函数
         server.main.callback(transport='streamable-http', port=8080, host='localhost', services=None,
-                             headers_credential_only=None)
+                             headers_credential_only=None, env='domestic')
         # 验证日志被调用
         mock_logger.debug.assert_called_once_with('mcp server is running on streamable-http mode.')

{alibaba_cloud_ops_mcp_server-0.9.4 → alibaba_cloud_ops_mcp_server-0.9.6}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "alibaba-cloud-ops-mcp-server"
-version = "0.9.4"
+version = "0.9.6"
 source = { editable = "." }
 dependencies = [
     { name = "alibabacloud-cms20190101" },