Merge branch feat/env_database into master

Title: to #65849001 message format

to #65849001 message format
Link: https://code.alibaba-inc.com/idb/alibabacloud-dms-mcp-server/codereview/21876006

Author: tianzhen.wtz

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

@@ -55,6 +55,7 @@ jobs:
     name: >-
       Sign the Python 🐍 distribution 📦 with Sigstore
       and upload them to GitHub Release
+    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
     needs:
     - publish-to-pypi
     runs-on: ubuntu-latest

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alibabacloud-dms-mcp-server"
-version = "0.1.6"
+version = "0.1.7"
 description = "MCP Server for AlibabaCloud DMS"
 readme = "README.md"
 authors = [

src/alibabacloud_dms_mcp_server/server.py

@@ -103,6 +103,8 @@ class ResultSet(MyBaseModel):
     Rows: List[Dict[str, Any]] = Field(description="List of rows, where each row is a dictionary of column_name: value")
     MarkdownTable: Optional[str] = Field(default=None, description="Data formatted as a Markdown table string")
     Success: bool = Field(description="Whether this result set was successfully retrieved")
+    Message: str = Field(description="Additional message returned")
+
 
 class ExecuteScriptResult(MyBaseModel):
     RequestId: str = Field(description="Unique request identifier")
@@ -115,7 +117,7 @@ def __str__(self) -> str:
             if first_result.Success and first_result.MarkdownTable:
                 return first_result.MarkdownTable
             elif not first_result.Success:
-                return "The first result set was not successful."
+                return first_result.Message
             else:
                 return "Result data is not available in Markdown format."
         elif not self.Success:
@@ -266,7 +268,7 @@ async def get_meta_table_detail_info(
         raise
 
 def _format_as_markdown_table(column_names: List[str], rows: List[Dict[str, Any]]) -> str:
-    if not column_names or not rows: return ""
+    if not column_names: return ""
     header = "| " + " | ".join(column_names) + " |"
     separator = "| " + " | ".join(["---"] * len(column_names)) + " |"
     table_rows_str = [header, separator]
@@ -296,15 +298,16 @@ async def execute_script(
                     markdown_table = _format_as_markdown_table(column_names, rows_data)
                     processed_results.append(
                         ResultSet(ColumnNames=column_names, RowCount=res_item.get('RowCount', 0), Rows=rows_data,
-                                  MarkdownTable=markdown_table, Success=True))
+                                  MarkdownTable=markdown_table, Success=True, Message=''))
                 else:
                     processed_results.append(
-                        ResultSet(ColumnNames=[], RowCount=0, Rows=[], MarkdownTable=None, Success=False))
+                        ResultSet(ColumnNames=[], RowCount=0, Rows=[], MarkdownTable=None, Success=False, Message=res_item.get('Message')))
         return ExecuteScriptResult(RequestId=data.get('RequestId', ""), Results=processed_results,
                                    Success=data.get('Success', False))
     except Exception as e:
         logger.error(f"Error in execute_script: {e}")
-        raise
+        if "The instance is not in secure hosting mode" in str(e):
+            return "当前实例尚未开启安全托管功能。您可以通过DMS控制台免费开启「安全托管模式」。请注意，该操作需要管理员或DBA身份权限。"
 
 async def nl2sql(
         database_id: str = Field(description="DMS databaseId"),