EnxDev commented on code in PR #40443: URL: https://github.com/apache/superset/pull/40443#discussion_r3354227342
########## superset/extensions/models.py: ########## @@ -0,0 +1,37 @@ +# 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. + +"""SQLAlchemy models for extension settings persistence.""" + +from flask_appbuilder import Model +from sqlalchemy import Boolean, Column, Integer, String + + +class ExtensionSettings(Model): # pylint: disable=too-few-public-methods + """Global admin settings for extensions (singleton row, id=1).""" + + __tablename__ = "extension_settings" + id = Column(Integer, primary_key=True) + active_chatbot_id = Column(String(250), nullable=True) + + +class ExtensionEnabled(Model): # pylint: disable=too-few-public-methods + """Per-extension enable/disable flag.""" + + __tablename__ = "extension_enabled" + extension_id = Column(String(250), primary_key=True) + enabled = Column(Boolean, nullable=False, default=True) Review Comment: Fixed in eae5bb8 — added a side-effect import in `superset/models/__init__.py` (same mechanism as `core`/`sql_lab`), so the tables register in `Model.metadata`. ########## superset/migrations/versions/2026-05-25_00-00_b2c3d4e5f6a7_add_extension_settings.py: ########## @@ -0,0 +1,47 @@ +# 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. +"""Add extension_settings and extension_enabled tables. + +Revision ID: b2c3d4e5f6a7 +Revises: a1b2c3d4e5f6 +Create Date: 2026-05-25 00:00:00.000000 + +""" + +import sqlalchemy as sa +from alembic import op + +revision = "b2c3d4e5f6a7" +down_revision = "a1b2c3d4e5f6" Review Comment: Fixed in 82a6234 — re-pointed `down_revision` onto `33d7e0e21daa`, the current single head on master, so `db upgrade` no longer forks. ########## superset/extensions/api.py: ########## @@ -167,6 +172,53 @@ def get(self, publisher: str, name: str, **kwargs: Any) -> Response: extension_data = build_extension_data(extension) return self.response(200, result=extension_data) + @protect() + @safe + @expose("/settings", methods=("GET",)) + def get_settings(self, **kwargs: Any) -> Response: + """Get global extension admin settings. + --- + get: + summary: Get extension admin settings (active chatbot, enabled flags). + responses: + 200: + description: Extension settings + """ + return self.response(200, result=get_extension_settings()) Review Comment: Done in c60f353 — reintroduced the Command→DAO layer: `ExtensionSettingsDAO`/`ExtensionEnabledDAO` (`BaseDAO` subclasses) plus `Get`/`UpdateExtensionSettingsCommand`. The API now constructs and runs the commands, and `UpdateExtensionSettingsCommand.validate()` rejects bad input before any write. ########## superset/extensions/settings.py: ########## @@ -0,0 +1,127 @@ +# 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. + +"""Admin settings persistence for extensions (active chatbot, enable/disable).""" + +from typing import Any + +from sqlalchemy.dialects.postgresql import insert as pg_insert +from sqlalchemy.dialects.sqlite import insert as sqlite_insert + +from superset import db +from superset.extensions.models import ExtensionEnabled, ExtensionSettings +from superset.utils.decorators import transaction + +_SETTINGS_ROW_ID = 1 + + +def get_extension_settings() -> dict[str, Any]: + row = db.session.get(ExtensionSettings, _SETTINGS_ROW_ID) + enabled_rows = db.session.query(ExtensionEnabled).all() + return { + "active_chatbot_id": row.active_chatbot_id if row else None, + "enabled": {r.extension_id: r.enabled for r in enabled_rows}, + } + + +def _upsert_settings_row( + active_chatbot_id: str | None, +) -> None: + """Upsert the singleton settings row without a read-then-insert race.""" Review Comment: Fixed in c60f353 — `settings.py` was removed and replaced by the DAO. The per-dialect branch with the contradictory docstring is gone; the DAO uses a portable check-then-write upsert serialised by `@transaction`. ########## superset/extensions/utils.py: ########## @@ -232,12 +232,18 @@ def get_loaded_extension( def build_extension_data(extension: LoadedExtension) -> dict[str, Any]: manifest = extension.manifest + local_paths = { + str((Path(p) / "dist").resolve()) + for p in current_app.config.get("LOCAL_EXTENSIONS", []) + } extension_data: dict[str, Any] = { "id": manifest.id, + "publisher": manifest.publisher, "name": extension.name, "version": extension.version, "description": manifest.description or "", "dependencies": manifest.dependencies, + "deletable": extension.source_base_path not in local_paths, Review Comment: Reverted — `utils.py` now matches master; that change is no longer part of this PR. -- 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]
