aminghadersohi commented on code in PR #40351: URL: https://github.com/apache/superset/pull/40351#discussion_r3336211703
########## superset/mcp_service/annotation_layer/tool/update_layer_annotation.py: ########## @@ -0,0 +1,153 @@ +# 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. + +import logging +from typing import Any + +from fastmcp import Context +from superset_core.mcp.decorators import tool, ToolAnnotations + +from superset.extensions import event_logger +from superset.mcp_service.annotation_layer.schemas import ( + UpdateLayerAnnotationRequest, + UpdateLayerAnnotationResponse, +) + +logger = logging.getLogger(__name__) + + +def _build_update_properties(request: UpdateLayerAnnotationRequest) -> dict[str, Any]: + """Build the properties dict for UpdateAnnotationCommand from the request.""" + properties: dict[str, Any] = {"layer": request.layer_id} + if request.short_descr is not None: + properties["short_descr"] = request.short_descr + if request.start_dttm is not None: + properties["start_dttm"] = request.start_dttm + if request.end_dttm is not None: + properties["end_dttm"] = request.end_dttm + if request.long_descr is not None: + properties["long_descr"] = request.long_descr + if request.json_metadata is not None: + properties["json_metadata"] = request.json_metadata Review Comment: Fixed. `json_metadata` now also uses `model_fields_set`: it is forwarded to the command only when explicitly present in the request, so passing `null` clears it and omitting it leaves the existing value untouched. Verified by `test_update_layer_annotation_clear_nullable_fields` (commit e5e4a8bc). ########## tests/unit_tests/mcp_service/annotation_layer/tool/test_create_layer_annotation.py: ########## @@ -0,0 +1,467 @@ +# 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. + +from datetime import datetime, timezone +from unittest.mock import MagicMock, patch + +import pytest +from fastmcp import Client + +from superset.mcp_service.annotation_layer.schemas import ( + CreateLayerAnnotationRequest, +) +from superset.mcp_service.app import mcp +from superset.utils import json + + [email protected] +def mcp_server(): + return mcp + + [email protected](autouse=True) +def mock_auth(): + """Mock authentication for all tests.""" + from unittest.mock import Mock + + 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 _make_request(**kwargs) -> CreateLayerAnnotationRequest: + defaults = { + "layer_id": 1, + "short_descr": "Deploy v2.0", + "start_dttm": datetime(2024, 1, 15, 8, 0, tzinfo=timezone.utc), + "end_dttm": datetime(2024, 1, 15, 9, 0, tzinfo=timezone.utc), + } + defaults.update(kwargs) + return CreateLayerAnnotationRequest(**defaults) + + +def _make_mock_annotation( + id: int = 42, + short_descr: str = "Deploy v2.0", + long_descr: str | None = None, +) -> MagicMock: + annotation = MagicMock() + annotation.id = id + annotation.short_descr = short_descr + annotation.long_descr = long_descr + annotation.start_dttm = datetime(2024, 1, 15, 8, 0, tzinfo=timezone.utc) + annotation.end_dttm = datetime(2024, 1, 15, 9, 0, tzinfo=timezone.utc) + return annotation + + +# --- Schema tests --- + + +def test_request_valid() -> None: + req = _make_request() + assert req.layer_id == 1 + assert req.short_descr == "Deploy v2.0" + assert req.long_descr is None + assert req.json_metadata is None + + +def test_request_short_descr_too_long() -> None: + from pydantic import ValidationError + + with pytest.raises(ValidationError): + _make_request(short_descr="x" * 501) + + +def test_request_end_before_start_is_allowed_at_schema_level() -> None: + # Date ordering is enforced by the command, not the Pydantic schema + req = _make_request( + start_dttm=datetime(2024, 1, 15, 10, 0), + end_dttm=datetime(2024, 1, 15, 8, 0), Review Comment: Fixed. Added `tzinfo=timezone.utc` to both `datetime()` calls in `test_request_end_before_start_is_allowed_at_schema_level` (commit e5e4a8bc). -- 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]
