EnxDev commented on code in PR #43232: URL: https://github.com/apache/superset/pull/43232#discussion_r4142910660
########## superset/commands/annotation_layer/importers/v1/utils.py: ########## @@ -0,0 +1,71 @@ +# 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 typing import Any + +from marshmallow import fields + +from superset import db, security_manager +from superset.commands.exceptions import ImportFailedError +from superset.models.annotations import AnnotationLayer +from superset.utils import json + +DATETIME_FIELD = fields.DateTime(allow_none=True) + + +def import_annotation_layer( + config: dict[str, Any], + overwrite: bool = False, + ignore_permissions: bool = False, +) -> AnnotationLayer: + """Upsert annotation layer config and return persisted layer. + + If an existing layer is found and overwrite is False, return it unchanged. + """ + can_write = ignore_permissions or security_manager.can_access( + "can_write", "Annotation" + ) + if not can_write: + raise ImportFailedError( + "Annotation layer import requires can_write permission on Annotation" + ) + + existing = db.session.query(AnnotationLayer).filter_by(uuid=config["uuid"]).first() + if existing: + if not overwrite: + return existing + config["id"] = existing.id Review Comment: Applied the suggestion in 87e98f9. `test_import_annotation_layer_command_gamma_existing_layer_unchanged` checks that Gamma gets the existing layer back untouched, even with `overwrite=True`. -- 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]
