aminghadersohi commented on code in PR #41472: URL: https://github.com/apache/superset/pull/41472#discussion_r3537144173
########## tests/unit_tests/mcp_service/chart/tool/test_delete_chart.py: ########## @@ -0,0 +1,171 @@ +# 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 "") + + +@patch("superset.commands.chart.delete.DeleteChartCommand.run") +@patch("superset.mcp_service.chart.tool.delete_chart.find_chart_by_identifier") [email protected] +async def test_delete_chart_success( + mock_find: Mock, mock_run: Mock, mcp_server: object +) -> None: + mock_find.return_value = _mock_chart(chart_id=10, slice_name="Sales") + mock_run.return_value = None + + async with Client(mcp_server) as client: + result = await client.call_tool("delete_chart", {"request": {"identifier": 10}}) + + content = result.structured_content + assert content["success"] is True + assert content["deleted_id"] == 10 + assert content["deleted_name"] == "Sales" + assert content["permission_denied"] is False + mock_run.assert_called_once() + + +@patch("superset.mcp_service.chart.tool.delete_chart.is_feature_enabled") +@patch("superset.commands.chart.delete.DeleteChartCommand.run") +@patch("superset.mcp_service.chart.tool.delete_chart.find_chart_by_identifier") [email protected] +async def test_delete_chart_soft_delete_reports_restorable( + mock_find: Mock, mock_run: Mock, mock_flag: Mock, mcp_server: object +) -> None: + mock_find.return_value = _mock_chart(chart_id=10, slice_name="Sales") + mock_run.return_value = None + mock_flag.side_effect = lambda flag: flag == "SOFT_DELETE" + + async with Client(mcp_server) as client: + result = await client.call_tool("delete_chart", {"request": {"identifier": 10}}) + + content = result.structured_content + assert content["success"] is True + assert content["soft_deleted"] is True Review Comment: **MEDIUM — Soft-delete assertion always fails in OSS** `_routes_to_soft_delete()` checks `issubclass(Slice, SoftDeleteMixin)` which is `False` in OSS — patching only `is_feature_enabled` is not enough. `content["soft_deleted"]` will always be `False`, so this assertion fails on every OSS test run. Fix: mock `_routes_to_soft_delete` directly instead of its internal inputs: ```python @patch("superset.mcp_service.chart.tool.delete_chart._routes_to_soft_delete", return_value=True) ``` Same issue in `test_delete_dashboard.py`'s restorable test. ########## superset/mcp_service/chart/tool/delete_chart.py: ########## @@ -0,0 +1,161 @@ +# 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 import is_feature_enabled +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") + + +def _routes_to_soft_delete() -> bool: + """Mirror the ``BaseDAO.delete`` routing predicate so the response can + report whether the row was trashed (restorable) or permanently removed.""" + from superset.models.helpers import SoftDeleteMixin + from superset.models.slice import Slice + + return issubclass(Slice, SoftDeleteMixin) and is_feature_enabled("SOFT_DELETE") Review Comment: **MEDIUM — `_routes_to_soft_delete()` always returns `False` in OSS** `Slice` inherits `CoreChart, AuditMixinNullable, ImportExportMixin` — not `SoftDeleteMixin`. So `issubclass(Slice, SoftDeleteMixin)` is always `False`, making `soft_deleted` in every success response always `False` regardless of the `SOFT_DELETE` feature flag. Same root cause in `delete_dashboard.py:81` (`Dashboard(CoreDashboard, AuditMixinNullable, ImportExportMixin)` also does not inherit `SoftDeleteMixin`). The `soft_deleted` response field is non-functional in OSS as submitted. -- 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]
