@qingflow-tech/qingflow-cli 1.1.39 → 1.1.41

package/src/qingflow_mcp/tools/portal_tools.py

@@ -5,7 +5,7 @@ from mcp.server.fastmcp import FastMCP
 from ..config import DEFAULT_PROFILE
 from ..errors import QingflowApiError, backend_code_int, is_auth_like_error, raise_tool_error
 from ..json_types import JSONObject
-from .base import ToolBase, tool_cn_name
+from .base import ToolBase
 
 
 class PortalTools(ToolBase):
@@ -52,16 +52,14 @@ class PortalTools(ToolBase):
         def portal_publish(profile: str = DEFAULT_PROFILE, dash_key: str = "") -> JSONObject:
             return self.portal_publish(profile=profile, dash_key=dash_key)
 
-    @tool_cn_name("门户列表")
     def portal_list(self, *, profile: str) -> JSONObject:
         """执行门户相关逻辑。"""
         def runner(session_profile, context):
             result = self.backend.request("GET", context, "/dash")
             return {"profile": profile, "ws_id": session_profile.selected_ws_id, "items": result}
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='门户列表')
 
-    @tool_cn_name("门户详情")
     def portal_get(self, *, profile: str, dash_key: str, being_draft: bool = False) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -70,9 +68,8 @@ class PortalTools(ToolBase):
             result = self.backend.request("GET", context, f"/dash/{dash_key}", params={"beingDraft": being_draft})
             return {"profile": profile, "ws_id": session_profile.selected_ws_id, "dash_key": dash_key, "result": result}
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='门户详情')
 
-    @tool_cn_name("创建门户")
     def portal_create(self, *, profile: str, payload: JSONObject) -> JSONObject:
         """执行门户相关逻辑。"""
         body = self._require_dict(payload)
@@ -81,9 +78,8 @@ class PortalTools(ToolBase):
             result = self.backend.request("POST", context, "/dash", json_body=body)
             return {"profile": profile, "ws_id": session_profile.selected_ws_id, "result": result}
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='创建门户')
 
-    @tool_cn_name("门户基础信息")
     def portal_get_base_info(self, *, profile: str, dash_key: str) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -121,9 +117,8 @@ class PortalTools(ToolBase):
                 "verification": verification,
             }
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='门户基础信息')
 
-    @tool_cn_name("更新门户基础信息")
     def portal_update_base_info(self, *, profile: str, dash_key: str, payload: JSONObject) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -137,9 +132,8 @@ class PortalTools(ToolBase):
                 target="portal base settings",
             )
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='更新门户基础信息')
 
-    @tool_cn_name("更新门户配置")
     def portal_update(self, *, profile: str, dash_key: str, payload: JSONObject) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -153,9 +147,8 @@ class PortalTools(ToolBase):
                 target="portal configuration",
             )
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='更新门户配置')
 
-    @tool_cn_name("删除门户")
     def portal_delete(self, *, profile: str, dash_key: str) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -168,9 +161,8 @@ class PortalTools(ToolBase):
                 target="portal configuration",
             )
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='删除门户')
 
-    @tool_cn_name("发布门户")
     def portal_publish(self, *, profile: str, dash_key: str) -> JSONObject:
         """执行门户相关逻辑。"""
         self._require_dash_key(dash_key)
@@ -179,7 +171,7 @@ class PortalTools(ToolBase):
             result = self.backend.request("POST", context, f"/dash/{dash_key}/publish")
             return {"profile": profile, "ws_id": session_profile.selected_ws_id, "dash_key": dash_key, "result": result}
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name='发布门户')
 
     def _require_dash_key(self, dash_key: str) -> None:
         """执行内部辅助逻辑。"""

package/src/qingflow_mcp/tools/qingbi_report_tools.py

@@ -9,7 +9,7 @@ from ..backend_client import BackendRequestContext
 from ..config import DEFAULT_PROFILE, normalize_base_url
 from ..errors import QingflowApiError, backend_code_int, is_auth_like_error, raise_tool_error
 from ..json_types import JSONObject, JSONValue
-from .base import ToolBase, tool_cn_name
+from .base import ToolBase
 
 
 def _qingbi_base_url(base_url: str) -> str:
@@ -147,13 +147,11 @@ class QingbiReportTools(ToolBase):
         ) -> JSONObject:
             return self.qingbi_report_list_field_options(profile=profile, field_id=field_id, chart_id=chart_id)
 
-    @tool_cn_name("报表列表")
     def qingbi_report_list(self, *, profile: str, app_key: str) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_app_key(app_key)
-        return self._request(profile, "GET", f"/qingbi/charts/data/bichart/{app_key}", app_key=app_key, items_key="items")
+        return self._request(profile, "GET", f"/qingbi/charts/data/bichart/{app_key}", app_key=app_key, items_key="items", tool_name="报表列表")
 
-    @tool_cn_name("报表排序列表")
     def qingbi_report_list_sorted(
         self,
         *,
@@ -179,28 +177,27 @@ class QingbiReportTools(ToolBase):
             items_key="items",
             result_transform=_extract_sorted_chart_items,
             json_body=body,
+            tool_name="报表排序列表",
         )
 
-    @tool_cn_name("创建报表")
     def qingbi_report_create(self, *, profile: str, payload: JSONObject) -> JSONObject:
         """执行工具方法逻辑。"""
         body = self._require_dict(payload)
-        return self._request(profile, "POST", "/qingbi/charts", json_body=body)
+        return self._request(profile, "POST", "/qingbi/charts", json_body=body, tool_name="创建报表")
 
-    @tool_cn_name("报表基础信息")
     def qingbi_report_get_base(self, *, profile: str, chart_id: str) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_chart_id(chart_id)
         source_error: QingflowApiError | None = None
         try:
-            return self._request(profile, "GET", f"/qingbi/charts/qflow/baseinfo/{chart_id}", chart_id=chart_id)
+            return self._request(profile, "GET", f"/qingbi/charts/qflow/baseinfo/{chart_id}", chart_id=chart_id, tool_name="报表基础信息")
         except (QingflowApiError, RuntimeError) as raw_error:
             error = _coerce_tool_error(raw_error)
             if error is None or not _should_retry_qflow_base(error):
                 raise
             source_error = error
         try:
-            fallback = self._request(profile, "GET", f"/qingbi/charts/baseinfo/{chart_id}", chart_id=chart_id)
+            fallback = self._request(profile, "GET", f"/qingbi/charts/baseinfo/{chart_id}", chart_id=chart_id, tool_name="报表基础信息")
         except (QingflowApiError, RuntimeError):
             raise
         if not _has_chart_base_identity(fallback.get("result"), chart_id=chart_id):
@@ -223,20 +220,18 @@ class QingbiReportTools(ToolBase):
         )
         return fallback
 
-    @tool_cn_name("更新报表基础信息")
     def qingbi_report_update_base(self, *, profile: str, chart_id: str, payload: JSONObject) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_chart_id(chart_id)
         body = self._require_dict(payload)
-        return self._request(profile, "PUT", f"/qingbi/charts/baseinfo/{chart_id}", chart_id=chart_id, json_body=body, risk_operation="update", risk_target="report base settings")
+        return self._request(profile, "PUT", f"/qingbi/charts/baseinfo/{chart_id}", chart_id=chart_id, json_body=body, risk_operation="update", risk_target="report base settings", tool_name="更新报表基础信息")
 
-    @tool_cn_name("报表配置")
     def qingbi_report_get_config(self, *, profile: str, chart_id: str) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_chart_id(chart_id)
         original_error: QingflowApiError | RuntimeError | None = None
         try:
-            return self._request(profile, "GET", f"/qingbi/charts/{chart_id}/configs", chart_id=chart_id)
+            return self._request(profile, "GET", f"/qingbi/charts/{chart_id}/configs", chart_id=chart_id, tool_name="报表配置")
         except (QingflowApiError, RuntimeError) as raw_error:
             original_error = raw_error
             error = _coerce_tool_error(raw_error)
@@ -274,14 +269,12 @@ class QingbiReportTools(ToolBase):
             raise original_error
         raise_tool_error(QingflowApiError.config_error("chart config fallback did not return config"))
 
-    @tool_cn_name("更新报表配置")
     def qingbi_report_update_config(self, *, profile: str, chart_id: str, payload: JSONObject) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_chart_id(chart_id)
         body = self._require_dict(payload)
-        return self._request(profile, "PUT", f"/qingbi/charts/{chart_id}/configs", chart_id=chart_id, json_body=body, risk_operation="update", risk_target="report chart config")
+        return self._request(profile, "PUT", f"/qingbi/charts/{chart_id}/configs", chart_id=chart_id, json_body=body, risk_operation="update", risk_target="report chart config", tool_name="更新报表配置")
 
-    @tool_cn_name("报表数据")
     def qingbi_report_get_data(
         self,
         *,
@@ -315,6 +308,7 @@ class QingbiReportTools(ToolBase):
                     chart_id=chart_id,
                     params=params,
                     json_body=payload,
+                    tool_name="报表数据",
                 )
             return self._request(
                 profile,
@@ -322,6 +316,7 @@ class QingbiReportTools(ToolBase):
                 f"/qingbi/charts/data/qflow/{chart_id}",
                 chart_id=chart_id,
                 params=params,
+                tool_name="报表数据",
             )
         except (QingflowApiError, RuntimeError) as raw_error:
             error = _coerce_tool_error(raw_error)
@@ -349,15 +344,14 @@ class QingbiReportTools(ToolBase):
                 "qflow_data_route_loaded": False,
                 "asos_data_route_loaded": True,
             },
+            tool_name="报表数据",
         )
 
-    @tool_cn_name("删除报表")
     def qingbi_report_delete(self, *, profile: str, chart_id: str) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_chart_id(chart_id)
-        return self._request(profile, "DELETE", f"/qingbi/charts/{chart_id}", chart_id=chart_id, risk_operation="delete", risk_target="report chart")
+        return self._request(profile, "DELETE", f"/qingbi/charts/{chart_id}", chart_id=chart_id, risk_operation="delete", risk_target="report chart", tool_name="删除报表")
 
-    @tool_cn_name("报表排序")
     def qingbi_report_reorder(self, *, profile: str, app_key: str, chart_ids: list[str]) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_app_key(app_key)
@@ -372,9 +366,9 @@ class QingbiReportTools(ToolBase):
             app_key=app_key,
             chart_ids=chart_ids,
             json_body={"appKey": app_key, "sortChartIdList": chart_ids},
+            tool_name="报表排序",
         )
 
-    @tool_cn_name("报表字段列表")
     def qingbi_report_list_fields(self, *, profile: str, app_key: str) -> JSONObject:
         """执行工具方法逻辑。"""
         self._require_app_key(app_key)
@@ -386,9 +380,9 @@ class QingbiReportTools(ToolBase):
             params={"dataSourceId": app_key, "dataSourceType": "qingflow"},
             items_key="items",
             result_transform=_extract_dataset_fields,
+            tool_name="报表字段列表",
         )
 
-    @tool_cn_name("报表字段选项")
     def qingbi_report_list_field_options(self, *, profile: str, field_id: str, chart_id: str) -> JSONObject:
         """执行工具方法逻辑。"""
         if not field_id:
@@ -397,7 +391,7 @@ class QingbiReportTools(ToolBase):
         params = {"fieldId": field_id}
         if chart_id:
             self._require_chart_id(chart_id)
-        return self._request(profile, "GET", path, chart_id=chart_id or None, field_id=field_id, params=params, items_key="items")
+        return self._request(profile, "GET", path, chart_id=chart_id or None, field_id=field_id, params=params, items_key="items", tool_name="报表字段选项")
 
     def _request(
         self,
@@ -411,6 +405,7 @@ class QingbiReportTools(ToolBase):
         result_transform: object | None = None,
         risk_operation: str | None = None,
         risk_target: str | None = None,
+        tool_name: str,
         **extra: JSONValue,
     ) -> JSONObject:
         """执行内部辅助逻辑。"""
@@ -436,7 +431,7 @@ class QingbiReportTools(ToolBase):
                 return self._attach_human_review_notice(payload, operation=risk_operation, target=risk_target)
             return payload
 
-        return self._run(profile, runner)
+        return self._run(profile, runner, tool_name=tool_name)
 
     def _require_app_key(self, app_key: str) -> None:
         """执行内部辅助逻辑。"""