bito-code-review[bot] commented on code in PR #40350: URL: https://github.com/apache/superset/pull/40350#discussion_r3328088781
########## superset/commands/css/update.py: ########## @@ -0,0 +1,53 @@ +# 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 functools import partial +from typing import Any + +from superset.commands.base import BaseCommand +from superset.commands.css.exceptions import ( + CssTemplateInvalidError, + CssTemplateNotFoundError, + CssTemplateUpdateFailedError, +) +from superset.daos.css import CssTemplateDAO +from superset.models.core import CssTemplate +from superset.utils.decorators import on_error, transaction + +logger = logging.getLogger(__name__) + + +class UpdateCssTemplateCommand(BaseCommand): + def __init__(self, model_id: int, properties: dict[str, Any]): + self._model_id = model_id + self._properties = properties + self._model: CssTemplate | None = None + + @transaction(on_error=partial(on_error, reraise=CssTemplateUpdateFailedError)) + def run(self) -> CssTemplate: + self.validate() + assert self._model + return CssTemplateDAO.update(self._model, attributes=self._properties) + + def validate(self) -> None: + self._model = CssTemplateDAO.find_by_id(self._model_id) + if not self._model: + raise CssTemplateNotFoundError() + template_name = self._properties.get("template_name") + if template_name is not None and not template_name.strip(): + raise CssTemplateInvalidError() Review Comment: <!-- Bito Reply --> The suggestion to require the 'css' property in the `UpdateCssTemplateCommand` is not appropriate in this case. The command is designed to allow partial updates, such as renaming a template without changing its CSS or updating the CSS without renaming it. The existing validation ensures that at least one field is provided before the command is invoked, which covers valid use cases like rename-only operations. Requiring the 'css' property on every update would break these valid scenarios. **superset/commands/css/update.py** ``` template_name = self._properties.get("template_name") if template_name is not None and not template_name.strip(): raise CssTemplateInvalidError() if "css" not in self._properties: raise CssTemplateInvalidError() ``` ########## superset/mcp_service/css_template/schemas.py: ########## @@ -0,0 +1,108 @@ +# 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. + +"""Pydantic schemas for CSS template MCP tools.""" + +from pydantic import BaseModel, ConfigDict, Field, field_validator + + +class CreateCssTemplateRequest(BaseModel): + model_config = ConfigDict(populate_by_name=True) + + template_name: str = Field( + ..., + min_length=1, + max_length=250, + description="Name for the CSS template.", + ) + css: str = Field( + ..., + description="CSS content for the template.", + ) + + @field_validator("template_name") + @classmethod + def template_name_must_not_be_empty(cls, v: str) -> str: + if not v.strip(): + raise ValueError("template_name must not be empty") + return v.strip() + + +class CreateCssTemplateResponse(BaseModel): + """Response schema for create_css_template.""" + + id: int | None = Field( + None, + description="ID of the created CSS template. None if creation failed.", + ) + template_name: str | None = Field( + None, + description="Name of the created CSS template.", + ) + css: str | None = Field( + None, + description="CSS content of the created template.", + ) + error: str | None = Field( + None, + description="Error message if creation failed, otherwise null.", + ) + + +class UpdateCssTemplateRequest(BaseModel): + model_config = ConfigDict(populate_by_name=True) + + id: int = Field(..., description="ID of the CSS template to update.") + template_name: str | None = Field( + None, + max_length=250, + description="New name for the CSS template.", + ) + css: str | None = Field( + None, + description="New CSS content for the template.", + ) + + @field_validator("template_name") + @classmethod + def template_name_must_not_be_empty(cls, v: str | None) -> str | None: + if v is not None: + if not v.strip(): + raise ValueError("template_name must not be empty") + return v.strip() + return v + + +class UpdateCssTemplateResponse(BaseModel): + """Response schema for update_css_template.""" + + id: int | None = Field( + None, + description="ID of the updated CSS template. None if update failed.", + ) + template_name: str | None = Field( + None, + description="Name of the updated CSS template.", + ) + css: str | None = Field( + None, + description="CSS content of the updated template.", + ) + error: str | None = Field( + None, + description="Error message if update failed, otherwise null.", + ) Review Comment: <!-- Bito Reply --> The suggestion has been implemented by adding the `sanitize_error_for_llm_context` validator to the `UpdateCssTemplateResponse.error` field in the `schemas.py` file. This ensures that error messages are sanitized to prevent potential prompt injection vulnerabilities when included in LLM context. **superset/mcp_service/css_template/schemas.py** ``` error: str | None = Field( None, description="Error message if update failed, otherwise null.", ) ``` -- 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]
