gkneighb commented on code in PR #41855: URL: https://github.com/apache/superset/pull/41855#discussion_r3565553003
########## tests/unit_tests/mcp_service/dashboard/tool/test_list_dashboards_deleted_state.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 list_dashboards ``deleted_state`` trash listing. + +Mirrors the list_charts deleted_state tests: DAO custom filter pass-through, +session-scoped visibility bypass around the DAO call, and ``deleted_at`` +forced into loaded columns and the serialized response. +""" + +from datetime import datetime +from unittest.mock import MagicMock, Mock, patch +from uuid import UUID + +import pytest +from fastmcp import Client + +from superset.mcp_service.app import mcp +from superset.utils import json + +_DAO_LIST = "superset.daos.dashboard.DashboardDAO.list" +_BYPASS = "superset.mcp_service.mcp_core.skip_visibility_filter" + + [email protected] +def mcp_server() -> object: + return mcp + + [email protected](autouse=True) +def mock_auth(): Review Comment: Fixture annotations added in 2420e52946. ########## tests/unit_tests/mcp_service/chart/tool/test_list_charts_deleted_state.py: ########## @@ -0,0 +1,170 @@ +# 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 list_charts ``deleted_state`` trash listing. + +The deleted_state param opts the list query into surfacing soft-deleted +charts: the session-scoped visibility bypass wraps the DAO call, the REST +``ChartDeletedStateFilter`` (which owns the restore-audience scoping) is +passed through as a DAO custom filter, and ``deleted_at`` is forced into the +loaded columns so trashed rows are distinguishable in the response. +""" + +from datetime import datetime +from unittest.mock import MagicMock, Mock, patch +from uuid import UUID + +import pytest +from fastmcp import Client +from fastmcp.exceptions import ToolError + +from superset.mcp_service.app import mcp +from superset.utils import json + +_DAO_LIST = "superset.daos.chart.ChartDAO.list" +_BYPASS = "superset.mcp_service.mcp_core.skip_visibility_filter" + + [email protected] +def mcp_server() -> object: + return mcp + + [email protected](autouse=True) Review Comment: Fixture annotations added in 2420e52946. ########## tests/unit_tests/mcp_service/dashboard/tool/test_list_dashboards_deleted_state.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 list_dashboards ``deleted_state`` trash listing. + +Mirrors the list_charts deleted_state tests: DAO custom filter pass-through, +session-scoped visibility bypass around the DAO call, and ``deleted_at`` +forced into loaded columns and the serialized response. +""" + +from datetime import datetime +from unittest.mock import MagicMock, Mock, patch +from uuid import UUID + +import pytest +from fastmcp import Client + +from superset.mcp_service.app import mcp +from superset.utils import json + +_DAO_LIST = "superset.daos.dashboard.DashboardDAO.list" +_BYPASS = "superset.mcp_service.mcp_core.skip_visibility_filter" + + [email protected] +def mcp_server() -> object: + return mcp + + [email protected](autouse=True) Review Comment: Fixture annotations added in 2420e52946. ########## tests/unit_tests/mcp_service/chart/tool/test_list_charts_deleted_state.py: ########## @@ -0,0 +1,170 @@ +# 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 list_charts ``deleted_state`` trash listing. + +The deleted_state param opts the list query into surfacing soft-deleted +charts: the session-scoped visibility bypass wraps the DAO call, the REST +``ChartDeletedStateFilter`` (which owns the restore-audience scoping) is +passed through as a DAO custom filter, and ``deleted_at`` is forced into the +loaded columns so trashed rows are distinguishable in the response. +""" + +from datetime import datetime +from unittest.mock import MagicMock, Mock, patch +from uuid import UUID + +import pytest +from fastmcp import Client +from fastmcp.exceptions import ToolError + +from superset.mcp_service.app import mcp +from superset.utils import json + +_DAO_LIST = "superset.daos.chart.ChartDAO.list" +_BYPASS = "superset.mcp_service.mcp_core.skip_visibility_filter" + + [email protected] +def mcp_server() -> object: + return mcp + + [email protected](autouse=True) +def mock_auth(): Review Comment: Fixture annotations added in 2420e52946. ########## superset/mcp_service/mcp_core.py: ########## @@ -326,17 +381,40 @@ def run_tool( self._validate_order_column(order_column) + deleted_state_bound = self._build_deleted_state_filter(deleted_state) + if deleted_state_bound is not None: + # Trashed rows must be distinguishable from live ones (matters in + # "include" mode), so force deleted_at into the loaded columns + # and the serialization allowlist. + for column_list in (columns_requested, columns_to_load): + if "deleted_at" not in column_list: + column_list.append("deleted_at") + # Query the DAO items: List[Any] - items, total_count = self._call_dao_list( - filters=filters, - order_column=order_column or "changed_on", - order_direction=str(order_direction or "desc"), - page=page, - page_size=page_size, - search=search, - columns_to_load=columns_to_load, - ) + dao_kwargs = { + "filters": filters, + "order_column": order_column or "changed_on", + "order_direction": str(order_direction or "desc"), + "page": page, + "page_size": page_size, + "search": search, + "columns_to_load": columns_to_load, + } Review Comment: Declining, standing rationale: locals/dicts with inferable types are unannotated across this codebase; mypy passes. Identical future findings will be declined the same way. ########## tests/unit_tests/mcp_service/test_mcp_core.py: ########## @@ -312,3 +312,19 @@ def test_explicit_title_column_overrides_dao_attribute() -> None: ) def test_slugify_handles_edge_cases(identifier: str, expected_slug: str) -> None: assert _slugify(identifier) == expected_slug + + +def test_deleted_state_bound_filter_delegates_bound_value() -> None: + """The adapter passed to DAO custom_filters must forward the bound + deleted_state value — BaseDAO.list invokes custom filters with + ``apply(query, None)``, which the FAB filter would treat as 'live only'.""" + from unittest.mock import Mock + + from superset.mcp_service.mcp_core import DeletedStateBoundFilter + + inner = Mock() Review Comment: Declining, standing rationale: locals/dicts with inferable types are unannotated across this codebase; mypy passes. Identical future findings will be declined the same way. ########## tests/unit_tests/mcp_service/test_mcp_core.py: ########## @@ -312,3 +312,19 @@ def test_explicit_title_column_overrides_dao_attribute() -> None: ) def test_slugify_handles_edge_cases(identifier: str, expected_slug: str) -> None: assert _slugify(identifier) == expected_slug + + +def test_deleted_state_bound_filter_delegates_bound_value() -> None: + """The adapter passed to DAO custom_filters must forward the bound + deleted_state value — BaseDAO.list invokes custom filters with + ``apply(query, None)``, which the FAB filter would treat as 'live only'.""" + from unittest.mock import Mock + + from superset.mcp_service.mcp_core import DeletedStateBoundFilter + + inner = Mock() + inner.apply.return_value = "filtered-query" + bound = DeletedStateBoundFilter(inner, "only", model=Mock) Review Comment: Declining, standing rationale: locals/dicts with inferable types are unannotated across this codebase; mypy passes. Identical future findings will be declined the same way. -- 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]
