Removes database model

superset/dashboards/filter_state/api.py

@@ -26,7 +26,6 @@
 from superset.dashboards.filter_state.commands.update import UpdateFilterStateCommand
 from superset.extensions import event_logger
 from superset.key_value.api import KeyValueRestApi
-from superset.views.base_api import statsd_metrics
 
 logger = logging.getLogger(__name__)
 
@@ -51,7 +50,6 @@ def get_delete_command(self) -> Type[DeleteFilterStateCommand]:
     @expose("/<int:pk>/filter_state", methods=["POST"])
     @protect()
     @safe
-    @statsd_metrics
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.post",
         log_to_statsd=False,
@@ -99,7 +97,6 @@ def post(self, pk: int) -> Response:
     @expose("/<int:pk>/filter_state/<string:key>/", methods=["PUT"])
     @protect()
     @safe
-    @statsd_metrics
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.put",
         log_to_statsd=False,
@@ -153,7 +150,6 @@ def put(self, pk: int, key: str) -> Response:
     @expose("/<int:pk>/filter_state/<string:key>/", methods=["GET"])
     @protect()
     @safe
-    @statsd_metrics
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get",
         log_to_statsd=False,
@@ -200,7 +196,6 @@ def get(self, pk: int, key: str) -> Response:
     @expose("/<int:pk>/filter_state/<string:key>/", methods=["DELETE"])
     @protect()
     @safe
-    @statsd_metrics
     @event_logger.log_this_with_context(
         action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,

superset/key_value/api.py

@@ -19,23 +19,17 @@
 from typing import Any
 
 from flask import g, request, Response
+from flask_appbuilder.api import BaseApi
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 
 from superset.constants import MODEL_API_RW_METHOD_PERMISSION_MAP, RouteMethod
 from superset.exceptions import InvalidPayloadFormatError
-from superset.key_value.commands.create import CreateKeyValueCommand
-from superset.key_value.commands.delete import DeleteKeyValueCommand
-from superset.key_value.commands.get import GetKeyValueCommand
-from superset.key_value.commands.update import UpdateKeyValueCommand
 from superset.key_value.schemas import KeyValuePostSchema, KeyValuePutSchema
-from superset.models.key_value import KeyValueEntry
-from superset.views.base_api import BaseSupersetModelRestApi
 
 logger = logging.getLogger(__name__)
 
 
-class KeyValueRestApi(BaseSupersetModelRestApi, ABC):
-    datamodel = SQLAInterface(KeyValueEntry)
+class KeyValueRestApi(BaseApi, ABC):
     add_model_schema = KeyValuePostSchema()
     edit_model_schema = KeyValuePutSchema()
     method_permission_name = MODEL_API_RW_METHOD_PERMISSION_MAP

superset/key_value/commands/create.py

@@ -45,7 +45,7 @@ def run(self) -> Model:
                 self.create(self._resource_id, key, value)
                 return key
         except SQLAlchemyError as ex:
-            logger.exception(ex.exception)
+            logger.exception("Error running create command")
             raise KeyValueCreateFailedError() from ex
         return False
 

superset/key_value/commands/delete.py

@@ -38,7 +38,7 @@ def run(self) -> Model:
         try:
             return self.delete(self._resource_id, self._key)
         except SQLAlchemyError as ex:
-            logger.exception(ex.exception)
+            logger.exception("Error running delete command")
             raise KeyValueDeleteFailedError() from ex
 
     def validate(self) -> None:

superset/key_value/commands/get.py

@@ -41,7 +41,7 @@ def run(self) -> Model:
             refreshTimeout = config.get("REFRESH_TIMEOUT_ON_RETRIEVAL")
             return self.get(self._resource_id, self._key, refreshTimeout)
         except SQLAlchemyError as ex:
-            logger.exception(ex.exception)
+            logger.exception("Error running get command")
             raise KeyValueGetFailedError() from ex
 
     def validate(self) -> None:

superset/key_value/commands/update.py

@@ -43,7 +43,7 @@ def run(self) -> Model:
             if value:
                 return self.update(self._resource_id, self._key, value)
         except SQLAlchemyError as ex:
-            logger.exception(ex.exception)
+            logger.exception("Error running update command")
             raise KeyValueUpdateFailedError() from ex
         return False