gkneighb commented on code in PR #41472:
URL: https://github.com/apache/superset/pull/41472#discussion_r3555941413
##########
superset/mcp_service/dashboard/schemas.py:
##########
@@ -1528,3 +1528,30 @@ def dashboard_layout_serializer(dashboard: "Dashboard")
-> DashboardLayout:
has_layout=bool(position_json_str),
)
)
+
+
+class DeleteDashboardRequest(BaseModel):
+ """Request schema for delete_dashboard."""
+
+ identifier: int | str = Field(
+ ...,
+ description="Dashboard identifier - numeric ID, UUID string, or slug.",
+ )
+
+
+class DeleteDashboardResponse(BaseModel):
+ """Result of a delete_dashboard operation."""
+
+ success: bool = Field(description="Whether the dashboard was deleted")
+ deleted_id: int | None = Field(None, description="ID of the deleted
dashboard")
Review Comment:
Declining: numeric IDs are the primary handle across the whole MCP surface
(list_charts/list_dashboards return them; get/update/delete accept them), so a
UUID-only contract here would orphan this tool from the rest of the toolset.
UUIDs are accepted as identifiers already; the UUID-first guidance is being
adopted surface-wide, not per-tool.
##########
superset/mcp_service/chart/schemas.py:
##########
@@ -2550,3 +2550,32 @@ class ChartFiltersInfo(BaseModel):
# Rebuild ChartInfo so Pydantic can resolve the ChartFiltersInfo forward
reference.
ChartInfo.model_rebuild()
+
+
+class DeleteChartRequest(BaseModel):
+ """Request schema for delete_chart."""
+
+ identifier: int | str = Field(
+ ...,
+ description=(
+ "Chart identifier - numeric ID or UUID string (charts have no
slug)."
+ ),
+ )
Review Comment:
Declining: numeric IDs are the primary handle across the whole MCP surface
(list_charts/list_dashboards return them; get/update/delete accept them), so a
UUID-only contract here would orphan this tool from the rest of the toolset.
UUIDs are accepted as identifiers already; the UUID-first guidance is being
adopted surface-wide, not per-tool.
##########
superset/mcp_service/chart/schemas.py:
##########
@@ -2550,3 +2550,32 @@ class ChartFiltersInfo(BaseModel):
# Rebuild ChartInfo so Pydantic can resolve the ChartFiltersInfo forward
reference.
ChartInfo.model_rebuild()
+
+
+class DeleteChartRequest(BaseModel):
+ """Request schema for delete_chart."""
+
+ identifier: int | str = Field(
+ ...,
+ description=(
+ "Chart identifier - numeric ID or UUID string (charts have no
slug)."
+ ),
+ )
+
+
+class DeleteChartResponse(BaseModel):
+ """Result of a delete_chart operation."""
+
+ success: bool = Field(description="Whether the chart was deleted")
+ deleted_id: int | None = Field(None, description="ID of the deleted chart")
Review Comment:
Declining: numeric IDs are the primary handle across the whole MCP surface
(list_charts/list_dashboards return them; get/update/delete accept them), so a
UUID-only contract here would orphan this tool from the rest of the toolset.
UUIDs are accepted as identifiers already; the UUID-first guidance is being
adopted surface-wide, not per-tool.
##########
superset/mcp_service/chart/schemas.py:
##########
@@ -2695,3 +2695,32 @@ class ChartFiltersInfo(BaseModel):
# Rebuild ChartInfo so Pydantic can resolve the ChartFiltersInfo forward
reference.
ChartInfo.model_rebuild()
+
+
+class DeleteChartRequest(BaseModel):
+ """Request schema for delete_chart."""
+
+ identifier: int | str = Field(
+ ...,
+ description=(
+ "Chart identifier - numeric ID or UUID string (charts have no
slug)."
+ ),
+ )
Review Comment:
Declining: numeric IDs are the primary handle across the whole MCP surface
(list_charts/list_dashboards return them; get/update/delete accept them), so a
UUID-only contract here would orphan this tool from the rest of the toolset.
UUIDs are accepted as identifiers already; the UUID-first guidance is being
adopted surface-wide, not per-tool.
##########
superset/mcp_service/chart/schemas.py:
##########
@@ -2695,3 +2695,32 @@ class ChartFiltersInfo(BaseModel):
# Rebuild ChartInfo so Pydantic can resolve the ChartFiltersInfo forward
reference.
ChartInfo.model_rebuild()
+
+
+class DeleteChartRequest(BaseModel):
+ """Request schema for delete_chart."""
+
+ identifier: int | str = Field(
+ ...,
+ description=(
+ "Chart identifier - numeric ID or UUID string (charts have no
slug)."
+ ),
+ )
+
+
+class DeleteChartResponse(BaseModel):
+ """Result of a delete_chart operation."""
+
+ success: bool = Field(description="Whether the chart was deleted")
+ deleted_id: int | None = Field(None, description="ID of the deleted chart")
Review Comment:
Declining: numeric IDs are the primary handle across the whole MCP surface
(list_charts/list_dashboards return them; get/update/delete accept them), so a
UUID-only contract here would orphan this tool from the rest of the toolset.
UUIDs are accepted as identifiers already; the UUID-first guidance is being
adopted surface-wide, not per-tool.
##########
tests/unit_tests/mcp_service/chart/tool/test_delete_chart.py:
##########
@@ -0,0 +1,131 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Unit tests for the delete_chart MCP tool.
+
+Run through the async MCP Client (not direct calls); auth is mocked via the
+autouse mock_auth fixture, matching the other chart tool test files.
+"""
+
+from unittest.mock import Mock, patch
+
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+
+
[email protected]
+def mcp_server() -> object:
+ return mcp
Review Comment:
Docstrings/annotations added in 0439d6b2b2 / 3fb2247d16.
##########
tests/unit_tests/mcp_service/chart/tool/test_delete_chart.py:
##########
@@ -0,0 +1,131 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Unit tests for the delete_chart MCP tool.
+
+Run through the async MCP Client (not direct calls); auth is mocked via the
+autouse mock_auth fixture, matching the other chart tool test files.
+"""
+
+from unittest.mock import Mock, patch
+
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+
+
[email protected]
+def mcp_server() -> object:
+ return mcp
+
+
[email protected](autouse=True)
+def mock_auth():
+ with patch("superset.mcp_service.auth.get_user_from_request") as
mock_get_user:
+ mock_user = Mock()
+ mock_user.id = 1
+ mock_user.username = "admin"
+ mock_get_user.return_value = mock_user
+ yield mock_get_user
Review Comment:
Docstrings/annotations added in 0439d6b2b2 / 3fb2247d16.
##########
tests/unit_tests/mcp_service/chart/tool/test_delete_chart.py:
##########
@@ -0,0 +1,131 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Unit tests for the delete_chart MCP tool.
+
+Run through the async MCP Client (not direct calls); auth is mocked via the
+autouse mock_auth fixture, matching the other chart tool test files.
+"""
+
+from unittest.mock import Mock, patch
+
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+
+
[email protected]
+def mcp_server() -> object:
+ return mcp
+
+
[email protected](autouse=True)
+def mock_auth():
+ with patch("superset.mcp_service.auth.get_user_from_request") as
mock_get_user:
+ mock_user = Mock()
+ mock_user.id = 1
+ mock_user.username = "admin"
+ mock_get_user.return_value = mock_user
+ yield mock_get_user
+
+
+def _mock_chart(chart_id: int = 10, slice_name: str = "Test Chart") -> Mock:
+ chart = Mock()
+ chart.id = chart_id
+ chart.slice_name = slice_name
+ return chart
Review Comment:
Docstrings/annotations added in 0439d6b2b2 / 3fb2247d16.
##########
tests/unit_tests/mcp_service/chart/tool/test_delete_chart.py:
##########
@@ -0,0 +1,131 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Unit tests for the delete_chart MCP tool.
+
+Run through the async MCP Client (not direct calls); auth is mocked via the
+autouse mock_auth fixture, matching the other chart tool test files.
+"""
+
+from unittest.mock import Mock, patch
+
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+
+
[email protected]
+def mcp_server() -> object:
+ return mcp
+
+
[email protected](autouse=True)
+def mock_auth():
+ with patch("superset.mcp_service.auth.get_user_from_request") as
mock_get_user:
+ mock_user = Mock()
+ mock_user.id = 1
+ mock_user.username = "admin"
+ mock_get_user.return_value = mock_user
+ yield mock_get_user
+
+
+def _mock_chart(chart_id: int = 10, slice_name: str = "Test Chart") -> Mock:
+ chart = Mock()
+ chart.id = chart_id
+ chart.slice_name = slice_name
+ return chart
+
+
+@patch("superset.mcp_service.chart.tool.delete_chart.find_chart_by_identifier")
[email protected]
+async def test_delete_chart_not_found(mock_find: Mock, mcp_server: object) ->
None:
+ mock_find.return_value = None
+
+ async with Client(mcp_server) as client:
+ result = await client.call_tool(
+ "delete_chart", {"request": {"identifier": 999}}
+ )
+
+ content = result.structured_content
+ assert content["success"] is False
+ assert content["error_type"] == "NotFound"
+ assert "999" in (content["error"] or "")
Review Comment:
Docstrings/annotations added in 0439d6b2b2 / 3fb2247d16.
##########
superset/mcp_service/chart/tool/delete_chart.py:
##########
@@ -0,0 +1,140 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+MCP tool: delete_chart
+"""
+
+import logging
+
+from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+from superset.commands.chart.exceptions import (
+ ChartDeleteFailedReportsExistError,
+ ChartForbiddenError,
+ ChartNotFoundError,
+)
+from superset.commands.exceptions import CommandException
+from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import find_chart_by_identifier
+from superset.mcp_service.chart.schemas import (
+ DeleteChartRequest,
+ DeleteChartResponse,
+)
+from superset.mcp_service.utils import escape_llm_context_delimiters
+
+logger = logging.getLogger(__name__)
+
+
+def _rollback() -> None:
+ from superset import db
+
+ try:
+ db.session.rollback() # pylint: disable=consider-using-transaction
+ except SQLAlchemyError:
+ logger.warning("Database rollback failed during delete_chart error
handling")
Review Comment:
Docstrings/annotations added in 0439d6b2b2 / 3fb2247d16.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
