Merge branch 'main' into feature/modify_security_ips

Author: fdwills

.github/workflows/publish-to-pypi.yml

@@ -5,6 +5,7 @@ on: push
 jobs:
   build:
     name: Build distribution 📦
+    if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
 
     steps:
@@ -93,27 +94,28 @@ jobs:
           gh release upload
           "$GITHUB_REF_NAME" dist/**
           --repo "$GITHUB_REPOSITORY"
-#
-#  publish-to-testpypi:
-#    name: Publish Python 🐍 distribution 📦 to TestPyPI
-#    needs:
-#      - build
-#    runs-on: ubuntu-latest
-#
-#    environment:
-#      name: testpypi
-#      url: https://test.pypi.org/p/alibabacloud-rds-openapi-mcp-server
-#
-#    permissions:
-#      id-token: write  # IMPORTANT: mandatory for trusted publishing
-#
-#    steps:
-#      - name: Download all the dists
-#        uses: actions/download-artifact@v4
-#        with:
-#          name: python-package-distributions
-#          path: dist/
-#      - name: Publish distribution 📦 to TestPyPI
-#        uses: pypa/gh-action-pypi-publish@release/v1
-#        with:
-#          repository-url: https://test.pypi.org/legacy/
+
+  publish-to-testpypi:
+    name: Publish Python 🐍 distribution 📦 to TestPyPI
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to TestPyPI on tag pushes
+    needs:
+      - build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/alibabacloud-rds-openapi-mcp-server
+
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish distribution 📦 to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

README.md

@@ -12,7 +12,7 @@ MCP server for RDS Services via OPENAPI
 ### Using [cherry-studio](https://github.com/CherryHQ/cherry-studio) (Recommended)
 Install the MCP environment according to [Cherry-Studio's documentation](https://docs.cherry-ai.com/advanced-basic/mcp/install), then configure and use RDS MCP.
 Add the following configuration to the MCP client configuration file:
-```json
+```json5
 "mcpServers": {
   "rds-openapi-mcp-server": {
     "command": "uvx",
@@ -21,7 +21,8 @@ Add the following configuration to the MCP client configuration file:
     ],
     "env": {
       "ALIBABA_CLOUD_ACCESS_KEY_ID": "access_id",
-      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key"
+      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key",
+      "ALIBABA_CLOUD_SECURITY_TOKEN": "sts_security_token" // optional, required when using STS Token 
     }
   }
 }
@@ -34,6 +35,7 @@ Set you env and run mcp server.
 export SERVER_TRANSPORT=sse;
 export ALIBABA_CLOUD_ACCESS_KEY_ID=$you_access_id;
 export ALIBABA_CLOUD_ACCESS_KEY_SECRET=$you_access_key;
+export ALIBABA_CLOUD_SECURITY_TOKEN=$you_sts_security_token; # optional, required when using STS Token 
 
 # run mcp server
 uvx alibabacloud-rds-openapi-mcp-server@latest
@@ -57,7 +59,7 @@ Download from Github
 git clone https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git
 ```
 Add the following configuration to the MCP client configuration file:
-```json
+```json5
 "mcpServers": {
   "rds-openapi-mcp-server": {
     "command": "uv",
@@ -69,32 +71,45 @@ Add the following configuration to the MCP client configuration file:
     ],
     "env": {
       "ALIBABA_CLOUD_ACCESS_KEY_ID": "access_id",
-      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key"
+      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key",
+      "ALIBABA_CLOUD_SECURITY_TOKEN": "sts_security_token"  // optional, required when using STS Token
     }
   }
 }
 ```
 
 ## Components
 ### Tools
+* `add_tags_to_db_instance`: Add tags to an RDS instance.
+* `allocate_instance_public_connection`: Allocate a public connection for an RDS instance.
+* `attach_whitelist_template_to_instance`: Attach a whitelist template to an RDS instance.
 * `create_db_instance`: Create an RDS instance.
-* `describe_db_instances`: Queries instances.
+* `create_db_instance_account`: Create an account for RDS instance.
+* `describe_all_whitelist_template`: Query the whitelist template list.
+* `describe_available_classes`: Query available instance classes and storage ranges.
+* `describe_available_zones`: Query available zones for RDS instances.
+* `describe_bills`: Query the consumption summary of all product instances or billing items for a user within a specific billing period.
+* `describe_db_instance_accounts`: Batch retrieves account information for multiple RDS instances.
 * `describe_db_instance_attribute`: Queries the details of an instance.
+* `describe_db_instance_databases`: Batch retrieves database information for multiple RDS instances.
+* `describe_db_instance_ip_allowlist`: Batch retrieves IP allowlist configurations for multiple RDS instances.
+* `describe_db_instance_net_info`: Batch retrieves network configuration details for multiple RDS instances.
+* `describe_db_instance_parameters`: Batch retrieves parameter information for multiple RDS instances.
 * `describe_db_instance_performance`: Queries the performance data of an instance.
+* `describe_db_instances`: Queries instances.
 * `describe_error_logs`: Queries the error log of an instance.
-* `describe_db_instance_net_info`: Batch retrieves network configuration details for multiple RDS instances.
-* `describe_db_instance_ip_allowlist`: Batch retrieves IP allowlist configurations for multiple RDS instances.
-* `describe_db_instance_databases`: Batch retrieves database information for multiple RDS instances.
-* `describe_db_instance_accounts`: Batch retrieves account information for multiple RDS instances.
-* `describe_available_classes`: Query available instance classes and storage ranges.
-* `describe_available_zones`: Query available zones for RDS instances.
+* `describe_instance_linked_whitelist_template`: Query the whitelist template list.
+* `describe_slow_log_records`: Query slow log records for an RDS instance.
 * `describe_vpcs`: Query VPC list.
 * `describe_vswitches`: Query VSwitch list.
 * `describe_slow_log_records`: Query slow log records for an RDS instance.
 * `modify_parameter`: Modify RDS instance parameters.
 * `modify_db_instance_spec`: Modify RDS instance specifications.
 * `modify_security_ips`: Modify security ips
 * `get_current_time`: Get the current time.
+* `modify_db_instance_description`: Modify RDS instance descriptions.
+* `modify_db_instance_spec`: Modify RDS instance specifications.
+* `modify_parameter`: Modify RDS instance parameters.
 
 ### Resources
 None at this time
@@ -108,7 +123,8 @@ You are a professional Alibaba Cloud RDS Copilot, specializing in providing cust
 
 ### Skill 1: Problem Decomposition and Analysis  
 - Deeply deconstruct user questions to identify core requirements and potential steps/commands involved.  
-- Provide clear task breakdowns to ensure each step contributes to the final solution.  
+- Provide clear task breakdowns to ensure each step contributes to the final solution.
+- Please organize your answers in a table format as much as possible.
 
 ### Skill 2: RDS MCP Tool Invocation  
 - Proficiently invoke the RDS MCP tool to retrieve database information or execute operations.  
@@ -137,3 +153,8 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## License
 This project is licensed under the Apache 2.0 License.
+
+## Contact Information
+For any questions or concerns, please contact us through the DingTalk group：106730017609
+
+<img src="./assets/dingding.png" alt="store" width="500"/>

README_CN.md

@@ -10,7 +10,7 @@ RDS OpenAPI MCP服务。
 ## 快速开始
 ### 使用[cherry-studio](https://github.com/CherryHQ/cherry-studio)（推荐）
 根据[Cherry-Studio文档](https://docs.cherry-ai.com/advanced-basic/mcp/install)安装MCP环境后配置使用RDS MCP。 MCP配置文件格式如下：
-```json
+```json5
 "mcpServers": {
   "rds-openapi-mcp-server": {
     "command": "uvx",
@@ -19,7 +19,8 @@ RDS OpenAPI MCP服务。
     ],
     "env": {
       "ALIBABA_CLOUD_ACCESS_KEY_ID": "access_id",
-      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key"
+      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key",
+      "ALIBABA_CLOUD_SECURITY_TOKEN": "sts_security_token" // 可选项，使用sts token鉴权时填写
     }
   }
 }
@@ -32,6 +33,7 @@ RDS OpenAPI MCP服务。
 export SERVER_TRANSPORT=sse;
 export ALIBABA_CLOUD_ACCESS_KEY_ID=$your_access_id;  # 替换为你的access_id
 export ALIBABA_CLOUD_ACCESS_KEY_SECRET=$your_access_key;  # 替换为你的access_key
+export ALIBABA_CLOUD_SECURITY_TOKEN=$your_sts_security_token; # 可选项，使用sts token鉴权时填写
 
 # 启动MCP服务
 uvx alibabacloud-rds-openapi-mcp-server@latest
@@ -54,7 +56,7 @@ remote_server = "http://127.0.0.1:8000/sse";
 git clone https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git
 ```
 在MCP客户端配置文件中添加：
-```json
+```json5
 "mcpServers": {
   "rds-openapi-mcp-server": {
     "command": "uv",
@@ -66,33 +68,46 @@ git clone https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git
     ],
     "env": {
       "ALIBABA_CLOUD_ACCESS_KEY_ID": "access_id",
-      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key"
-    }
+      "ALIBABA_CLOUD_ACCESS_KEY_SECRET": "access_key",
+      "ALIBABA_CLOUD_SECURITY_TOKEN": "sts_security_token" // 可选项，使用sts token鉴权时填写
+}
   }
 }
 ```
 
 ## 功能组件
 ### 工具集
+* `add_tags_to_db_instance`: 添加标签到RDS实例
+* `allocate_instance_public_connection`: 为RDS实例分配公网连接
+* `attach_whitelist_template_to_instance`: 将白名单模板绑定到RDS实例
 * `create_db_instance`: 创建RDS实例
-* `describe_db_instances`: 查询实例列表
-* `describe_db_instance_attribute`: 查询实例详情
-* `describe_db_instance_metrics`: 查询实例性能数据、错误日志和SQL报告
+* `create_db_instance_account`: 创建RDS实例账号
+* `describe_all_whitelist_template`: 查询白名单模板列表
+* `describe_available_classes`: 查询可用实例规格和存储范围
+* `describe_available_zones`: 查询RDS实例可用区域
+* `describe_bills`: 查询用户在特定计费周期内所有产品实例或计费项的消费汇总
+* `describe_db_instance_accounts`: 批量查询多个RDS实例的账户信息
+* `describe_db_instance_attribute`: 查询实例详细信息
+* `describe_db_instance_databases`: 批量查询多个RDS实例的数据库信息
+* `describe_db_instance_ip_allowlist`: 批量查询多个RDS实例的IP白名单配置
+* `describe_db_instance_net_info`: 批量查询多个RDS实例的网络配置详情
+* `describe_db_instance_parameters`: 批量查询多个RDS实例的参数信息
 * `describe_db_instance_performance`: 查询实例性能数据
+* `describe_db_instances`: 查询实例
 * `describe_error_logs`: 查询实例错误日志
-* `describe_db_instance_net_info`: 批量查询实例网络信息
-* `describe_db_instance_ip_allowlist`: 批量查询实例IP白名单配置
-* `describe_db_instance_databases`: 批量查询实例的DB信息
-* `describe_db_instance_accounts`: 批量查询实例的账号信息
-* `describe_available_classes`: 查询可用实例规格和存储范围
-* `describe_available_zones`: 查询RDS可用区
+* `describe_instance_linked_whitelist_template`: 查询绑定到实例的白名单模板列表
+* `describe_slow_log_records`: 查询RDS实例的慢日志记录
 * `describe_vpcs`: 查询VPC列表
 * `describe_vswitches`: 查询虚拟交换机列表
 * `describe_slow_log_records`: 查询RDS慢日志记录
 * `modify_parameter`: 修改RDS实例参数
 * `modify_db_instance_spec`: 调整RDS实例规格
 * `modify_security_ips`: 修改白名单
+* `describe_vswitches`: 查询VSwitch列表
 * `get_current_time`: 获取当前时间
+* `modify_db_instance_description`: 修改RDS实例描述
+* `modify_db_instance_spec`: 修改RDS实例规格
+* `modify_parameter`: 修改RDS实例参数
 
 ### 资源
 当前暂无资源
@@ -105,23 +120,24 @@ git clone https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git
 ## 技能  
 
 ### 技能一：问题拆解与分析  
-- 能够对用户提出的问题进行深入拆解，明确问题的核心需求及可能涉及的步骤或指令。  
-- 提供清晰的任务分解步骤，确保每一步都能指向最终解决方案。  
+- 能够对用户提出的问题进行深入拆解，明确问题的核心需求及可能涉及的步骤或指令。
+- 提供清晰的任务分解步骤，确保每一步都能指向最终解决方案。
+- 回答结果中尽量以表格的形式进行整理。
 
 ### 技能二：RDS MCP工具调用  
-- 熟练调用RDS MCP工具获取数据库相关信息或执行相关操作。  
-- 工具调用前必须先完成任务拆解，并确保调用逻辑清晰且符合客户需求。  
-- 根据用户的具体问题，选择合适的MCP功能模块进行操作，如监控数据查询、性能诊断、备份恢复等。  
+- 熟练调用RDS MCP工具获取数据库相关信息或执行相关操作。
+- 工具调用前必须先完成任务拆解，并确保调用逻辑清晰且符合客户需求。
+- 根据用户的具体问题，选择合适的MCP功能模块进行操作，如监控数据查询、性能诊断、备份恢复等。
 
 ### 技能三：时间理解与计算  
-- 能够准确解析用户提出的相对时间概念，例如“今天”、“昨天”、“最近一小时”等。  
-- 通过获取当前时间，将相对时间转换为具体的时间范围或时间点，以支持后续的数据查询或操作。  
+- 能够准确解析用户提出的相对时间概念，例如“今天”、“昨天”、“最近一小时”等。
+- 通过获取当前时间，将相对时间转换为具体的时间范围或时间点，以支持后续的数据查询或操作。
 
 ## 限制条件  
-- **任务拆解优先**：必须先给出详细的任务拆解步骤。  
-- **工具依赖明确**：所有需要调用RDS MCP工具的操作，都应基于清晰的任务需求和逻辑推理。  
-- **时间计算精确**：对于涉及时间的查询，必须准确计算出对应的具体时间范围。  
-- **专业性保障**：仅讨论与阿里云RDS相关的技术问题，避免偏离主题。  
+- **任务拆解优先**：必须先给出详细的任务拆解步骤。
+- **工具依赖明确**：所有需要调用RDS MCP工具的操作，都应基于清晰的任务需求和逻辑推理。
+- **时间计算精确**：对于涉及时间的查询，必须准确计算出对应的具体时间范围。
+- **专业性保障**：仅讨论与阿里云RDS相关的技术问题，避免偏离主题。
 - **安全性注意**：在执行任何操作时，需确保不会对客户的数据库造成负面影响。
 ```
 
@@ -136,3 +152,7 @@ git clone https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git
 ## 许可证
 本项目采用Apache 2.0许可证
 
+## 联系信息
+如有任何疑问或疑虑，请通过钉钉群联系我们：106730017609
+
+<img src="./assets/dingding.png" alt="store" width="500"/>

assets/alibabacloudrds.png

@@ -1,10 +1,11 @@
 [project]
 name = "alibabacloud-rds-openapi-mcp-server"
-version = "1.2.2"
+version = "1.7.5"
 description = "MCP server for RDS Services via OPENAPI."
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
+    "alibabacloud-bssopenapi20171214>=5.0.0",
     "alibabacloud-rds20140815>=11.0.0",
     "alibabacloud-vpc20160428>=6.11.4",
     "httpx>=0.28.1",
@@ -19,13 +20,13 @@ authors = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/aliyun/alibaba-cloud-ops-mcp-server"
-Documentation = "https://github.com/aliyun/alibaba-cloud-ops-mcp-server/"
-Source = "https://github.com/aliyun/alibaba-cloud-ops-mcp-server.git"
-"Bug Tracker" = "https://github.com/aliyun/alibaba-cloud-ops-mcp-server/issues"
+Homepage = "https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server"
+Documentation = "https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server/"
+Source = "https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server.git"
+"Bug Tracker" = "https://github.com/aliyun/alibabacloud-rds-openapi-mcp-server/issues"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/alibabacloud_rds_openapi_mcp_server"]
 
 [project.scripts]
-alibabacloud-rds-openapi-mcp-server = "alibabacloud_rds_openapi_mcp_server.server:main"
+alibabacloud-rds-openapi-mcp-server = "alibabacloud_rds_openapi_mcp_server.server:main"