This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch just_raise in repository https://gitbox.apache.org/repos/asf/superset.git
commit aeaec1ab4a8f6619b945640f5b2699baffcc1120 Author: Maxime Beauchemin <[email protected]> AuthorDate: Mon Jun 10 17:01:31 2024 -0700 chore: enable ruff lint rule TRY201 When intercepting and re-raising an error in python, it's almost always better to simply `raise` over raising the exception alias ie: `raise ex`. The main reason is that the stack trace often (always?) gets truncated in the process, loosing track of where the error occurred. I found this while debugging and thought it be a good idea to fix and enforce using ruff's --- pyproject.toml | 2 +- superset/app.py | 4 +-- superset/charts/data/api.py | 5 ++-- superset/commands/chart/importers/dispatcher.py | 8 +++--- .../commands/dashboard/importers/dispatcher.py | 8 +++--- superset/commands/database/create.py | 4 +-- superset/commands/database/importers/dispatcher.py | 8 +++--- superset/commands/database/ssh_tunnel/create.py | 5 ++-- superset/commands/database/tables.py | 4 +-- superset/commands/database/test_connection.py | 4 +-- superset/commands/database/update.py | 4 +-- superset/commands/dataset/importers/dispatcher.py | 8 +++--- superset/commands/importers/v1/__init__.py | 4 +-- superset/commands/importers/v1/utils.py | 2 +- superset/commands/query/importers/dispatcher.py | 4 +-- superset/commands/report/execute.py | 8 +++--- superset/commands/security/create.py | 2 +- superset/commands/security/update.py | 2 +- superset/commands/sql_lab/execute.py | 8 +++--- superset/common/query_object.py | 2 +- superset/connectors/sqla/models.py | 4 +-- superset/db_engine_specs/base.py | 4 +-- superset/db_engine_specs/ocient.py | 4 +-- superset/db_engine_specs/snowflake.py | 2 +- superset/db_engine_specs/trino.py | 2 +- ...3a3a8ff221_migrate_filter_sets_to_new_format.py | 8 +++--- ...ed7ec95_migrate_native_filters_to_new_schema.py | 8 +++--- ...15da_migrate_pivot_table_v2_heatmaps_to_new_.py | 4 +-- ...5b9441_rename_big_viz_total_form_data_fields.py | 8 +++--- ...d1d2_move_pivot_table_v2_legacy_order_by_to_.py | 8 +++--- ...-41_4ea966691069_cross_filter_global_scoping.py | 8 +++--- superset/models/core.py | 4 +-- superset/models/helpers.py | 4 +-- superset/sql_lab.py | 4 +-- superset/sql_validators/presto_db.py | 2 +- superset/sqllab/sql_json_executer.py | 4 +-- superset/tasks/async_queries.py | 13 +++++---- superset/utils/decorators.py | 7 +++-- superset/utils/json.py | 6 ++-- superset/utils/webdriver.py | 24 ++++++++-------- superset/views/base_api.py | 2 +- .../dashboards/superset_factory_util.py | 32 +++++++++++----------- 42 files changed, 131 insertions(+), 127 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2e20fae77b..c1e225ad39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -435,7 +435,7 @@ target-version = "py310" # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default. # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or # McCabe complexity (`C901`) by default. -select = ["E4", "E7", "E9", "F"] +select = ["E4", "E7", "E9", "F", "TRY201"] ignore = [] extend-select = ["I"] diff --git a/superset/app.py b/superset/app.py index a2192b8966..a3d02648e1 100644 --- a/superset/app.py +++ b/superset/app.py @@ -42,9 +42,9 @@ def create_app(superset_config_module: Optional[str] = None) -> Flask: return app # Make sure that bootstrap errors ALWAYS get logged - except Exception as ex: + except Exception: logger.exception("Failed to create app") - raise ex + raise class SupersetApp(Flask): diff --git a/superset/charts/data/api.py b/superset/charts/data/api.py index 932a666738..963edc2b3c 100644 --- a/superset/charts/data/api.py +++ b/superset/charts/data/api.py @@ -446,5 +446,6 @@ class ChartDataRestApi(ChartRestApi): return ChartDataQueryContextSchema().load(form_data) except KeyError as ex: raise ValidationError("Request is incorrect") from ex - except ValidationError as error: - raise error + except ValidationError: # pylint: disable=try-except-raise + # Make sure to bubble this up + raise diff --git a/superset/commands/chart/importers/dispatcher.py b/superset/commands/chart/importers/dispatcher.py index 6d2d31ccf4..227dcaa81f 100644 --- a/superset/commands/chart/importers/dispatcher.py +++ b/superset/commands/chart/importers/dispatcher.py @@ -55,14 +55,14 @@ class ImportChartsCommand(BaseCommand): return except IncorrectVersionError: logger.debug("File not handled by command, skipping") - except (CommandInvalidError, ValidationError) as exc: + except (CommandInvalidError, ValidationError): # found right version, but file is invalid logger.info("Command failed validation") - raise exc - except Exception as exc: + raise + except Exception: # validation succeeded but something went wrong logger.exception("Error running import command") - raise exc + raise raise CommandInvalidError("Could not find a valid command to import file") diff --git a/superset/commands/dashboard/importers/dispatcher.py b/superset/commands/dashboard/importers/dispatcher.py index 061558cce9..250815295c 100644 --- a/superset/commands/dashboard/importers/dispatcher.py +++ b/superset/commands/dashboard/importers/dispatcher.py @@ -58,14 +58,14 @@ class ImportDashboardsCommand(BaseCommand): return except IncorrectVersionError: logger.debug("File not handled by command, skipping") - except (CommandInvalidError, ValidationError) as exc: + except (CommandInvalidError, ValidationError): # found right version, but file is invalid logger.info("Command failed validation") - raise exc - except Exception as exc: + raise + except Exception: # validation succeeded but something went wrong logger.exception("Error running import command") - raise exc + raise raise CommandInvalidError("Could not find a valid command to import file") diff --git a/superset/commands/database/create.py b/superset/commands/database/create.py index b45107ca85..811c2b205e 100644 --- a/superset/commands/database/create.py +++ b/superset/commands/database/create.py @@ -68,7 +68,7 @@ class CreateDatabaseCommand(BaseCommand): engine=self._properties.get("sqlalchemy_uri", "").split(":")[0], ) # So we can show the original message - raise ex + raise except Exception as ex: event_logger.log_with_context( action=f"db_creation_failed.{ex.__class__.__name__}", @@ -141,7 +141,7 @@ class CreateDatabaseCommand(BaseCommand): engine=self._properties.get("sqlalchemy_uri", "").split(":")[0], ) # So we can show the original message - raise ex + raise except ( DAOCreateFailedError, DatabaseInvalidError, diff --git a/superset/commands/database/importers/dispatcher.py b/superset/commands/database/importers/dispatcher.py index bdf487a758..beb24df2d1 100644 --- a/superset/commands/database/importers/dispatcher.py +++ b/superset/commands/database/importers/dispatcher.py @@ -53,14 +53,14 @@ class ImportDatabasesCommand(BaseCommand): return except IncorrectVersionError: logger.debug("File not handled by command, skipping") - except (CommandInvalidError, ValidationError) as exc: + except (CommandInvalidError, ValidationError): # found right version, but file is invalid logger.info("Command failed validation") - raise exc - except Exception as exc: + raise + except Exception: # validation succeeded but something went wrong logger.exception("Error running import command") - raise exc + raise raise CommandInvalidError("Could not find a valid command to import file") diff --git a/superset/commands/database/ssh_tunnel/create.py b/superset/commands/database/ssh_tunnel/create.py index 287accc5aa..ea38aa52bf 100644 --- a/superset/commands/database/ssh_tunnel/create.py +++ b/superset/commands/database/ssh_tunnel/create.py @@ -51,8 +51,9 @@ class CreateSSHTunnelCommand(BaseCommand): return ssh_tunnel except DAOCreateFailedError as ex: raise SSHTunnelCreateFailedError() from ex - except SSHTunnelInvalidError as ex: - raise ex + except SSHTunnelInvalidError: # pylint: disable=try-except-raise + # Make sure to bubble this up + raise def validate(self) -> None: # TODO(hughhh): check to make sure the server port is not localhost diff --git a/superset/commands/database/tables.py b/superset/commands/database/tables.py index b16fcfc504..80f1748898 100644 --- a/superset/commands/database/tables.py +++ b/superset/commands/database/tables.py @@ -127,8 +127,8 @@ class TablesDatabaseCommand(BaseCommand): payload = {"count": len(tables) + len(views), "result": options} return payload - except SupersetException as ex: - raise ex + except SupersetException: + raise except Exception as ex: raise DatabaseTablesUnexpectedError(ex) from ex diff --git a/superset/commands/database/test_connection.py b/superset/commands/database/test_connection.py index 6bf69bbb87..7c38ab68a3 100644 --- a/superset/commands/database/test_connection.py +++ b/superset/commands/database/test_connection.py @@ -212,7 +212,7 @@ class TestConnectionDatabaseCommand(BaseCommand): engine=database.db_engine_spec.__name__, ) # bubble up the exception to return a 408 - raise ex + raise except SSHTunnelingNotEnabledError as ex: event_logger.log_with_context( action=get_log_connection_action( @@ -221,7 +221,7 @@ class TestConnectionDatabaseCommand(BaseCommand): engine=database.db_engine_spec.__name__, ) # bubble up the exception to return a 400 - raise ex + raise except Exception as ex: event_logger.log_with_context( action=get_log_connection_action( diff --git a/superset/commands/database/update.py b/superset/commands/database/update.py index c59984238c..61b0d51ed8 100644 --- a/superset/commands/database/update.py +++ b/superset/commands/database/update.py @@ -85,9 +85,9 @@ class UpdateDatabaseCommand(BaseCommand): database.set_sqlalchemy_uri(database.sqlalchemy_uri) ssh_tunnel = self._handle_ssh_tunnel(database) self._refresh_catalogs(database, original_database_name, ssh_tunnel) - except SSHTunnelError as ex: + except SSHTunnelError: # pylint: disable=try-except-raise # allow exception to bubble for debugbing information - raise ex + raise except (DAOUpdateFailedError, DAOCreateFailedError) as ex: raise DatabaseUpdateFailedError() from ex diff --git a/superset/commands/dataset/importers/dispatcher.py b/superset/commands/dataset/importers/dispatcher.py index 9138d4f971..2d71150672 100644 --- a/superset/commands/dataset/importers/dispatcher.py +++ b/superset/commands/dataset/importers/dispatcher.py @@ -58,14 +58,14 @@ class ImportDatasetsCommand(BaseCommand): return except IncorrectVersionError: logger.debug("File not handled by command, skipping") - except (CommandInvalidError, ValidationError) as exc: + except (CommandInvalidError, ValidationError): # found right version, but file is invalid logger.info("Command failed validation") - raise exc - except Exception as exc: + raise + except Exception: # validation succeeded but something went wrong logger.exception("Error running import command") - raise exc + raise raise CommandInvalidError("Could not find a valid command to import file") diff --git a/superset/commands/importers/v1/__init__.py b/superset/commands/importers/v1/__init__.py index 6c86faabeb..25b8b8790f 100644 --- a/superset/commands/importers/v1/__init__.py +++ b/superset/commands/importers/v1/__init__.py @@ -74,9 +74,9 @@ class ImportModelsCommand(BaseCommand): try: self._import(self._configs, self.overwrite) db.session.commit() - except CommandException as ex: + except CommandException: db.session.rollback() - raise ex + raise except Exception as ex: db.session.rollback() raise self.import_error() from ex diff --git a/superset/commands/importers/v1/utils.py b/superset/commands/importers/v1/utils.py index 912a4d1be5..51ab99271c 100644 --- a/superset/commands/importers/v1/utils.py +++ b/superset/commands/importers/v1/utils.py @@ -75,7 +75,7 @@ def load_metadata(contents: dict[str, str]) -> dict[str, str]: # otherwise we raise the validation error ex.messages = {METADATA_FILE_NAME: ex.messages} - raise ex + raise return metadata diff --git a/superset/commands/query/importers/dispatcher.py b/superset/commands/query/importers/dispatcher.py index 438ea8351f..c89a6963b1 100644 --- a/superset/commands/query/importers/dispatcher.py +++ b/superset/commands/query/importers/dispatcher.py @@ -55,10 +55,10 @@ class ImportSavedQueriesCommand(BaseCommand): return except IncorrectVersionError: logger.debug("File not handled by command, skipping") - except (CommandInvalidError, ValidationError) as exc: + except (CommandInvalidError, ValidationError): # found right version, but file is invalid logger.exception("Error running import command") - raise exc + raise raise CommandInvalidError("Could not find a valid command to import file") diff --git a/superset/commands/report/execute.py b/superset/commands/report/execute.py index 1540fa70d8..637898a7a0 100644 --- a/superset/commands/report/execute.py +++ b/superset/commands/report/execute.py @@ -599,7 +599,7 @@ class ReportNotTriggeredErrorState(BaseReportState): self.update_report_schedule_and_log( ReportState.ERROR, error_message=second_error_message ) - raise first_ex + raise class ReportWorkingState(BaseReportState): @@ -662,7 +662,7 @@ class ReportSuccessState(BaseReportState): ReportState.ERROR, error_message=REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER, ) - raise ex + raise try: self.send() @@ -737,8 +737,8 @@ class AsyncExecuteReportScheduleCommand(BaseCommand): ReportScheduleStateMachine( self._execution_id, self._model, self._scheduled_dttm ).run() - except CommandException as ex: - raise ex + except CommandException: + raise except Exception as ex: raise ReportScheduleUnexpectedError(str(ex)) from ex diff --git a/superset/commands/security/create.py b/superset/commands/security/create.py index 618c733158..d70bbb7111 100644 --- a/superset/commands/security/create.py +++ b/superset/commands/security/create.py @@ -42,7 +42,7 @@ class CreateRLSRuleCommand(BaseCommand): return RLSDAO.create(attributes=self._properties) except DAOCreateFailedError as ex: logger.exception(ex.exception) - raise ex + raise def validate(self) -> None: roles = populate_roles(self._roles) diff --git a/superset/commands/security/update.py b/superset/commands/security/update.py index f3a6cea607..54d7a66a2a 100644 --- a/superset/commands/security/update.py +++ b/superset/commands/security/update.py @@ -47,7 +47,7 @@ class UpdateRLSRuleCommand(BaseCommand): rule = RLSDAO.update(self._model, self._properties) except DAOUpdateFailedError as ex: logger.exception(ex.exception) - raise ex + raise return rule diff --git a/superset/commands/sql_lab/execute.py b/superset/commands/sql_lab/execute.py index 533264fb28..911424af51 100644 --- a/superset/commands/sql_lab/execute.py +++ b/superset/commands/sql_lab/execute.py @@ -115,10 +115,10 @@ class ExecuteSqlCommand(BaseCommand): "status": status, "payload": self._execution_context_convertor.serialize_payload(), } - except (SupersetErrorException, SupersetErrorsException) as ex: + except (SupersetErrorException, SupersetErrorsException): # to make sure we raising the original # SupersetErrorsException || SupersetErrorsException - raise ex + raise except Exception as ex: raise SqlLabException(self._execution_context, exception=ex) from ex @@ -158,9 +158,9 @@ class ExecuteSqlCommand(BaseCommand): return self._sql_json_executor.execute( self._execution_context, rendered_query, self._log_params ) - except Exception as ex: + except Exception: self._query_dao.update(query, {"status": QueryStatus.FAILED}) - raise ex + raise def _get_the_query_db(self) -> Database: mydb: Any = self._database_dao.find_by_id(self._execution_context.database_id) diff --git a/superset/common/query_object.py b/superset/common/query_object.py index 209e6f0029..299947d277 100644 --- a/superset/common/query_object.py +++ b/superset/common/query_object.py @@ -276,7 +276,7 @@ class QueryObject: # pylint: disable=too-many-instance-attributes return None except QueryObjectValidationError as ex: if raise_exceptions: - raise ex + raise return ex def _validate_no_have_duplicate_labels(self) -> None: diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index 587a184e17..11ad95bb44 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -1727,11 +1727,11 @@ class SqlaTable( self.schema or None, mutator=assign_column_label, ) - except (SupersetErrorException, SupersetErrorsException) as ex: + except (SupersetErrorException, SupersetErrorsException): # SupersetError(s) exception should not be captured; instead, they should # bubble up to the Flask error handler so they are returned as proper SIP-40 # errors. This is particularly important for database OAuth2, see SIP-85. - raise ex + raise except Exception as ex: # pylint: disable=broad-except # TODO (betodealmeida): review exception handling while querying the external # database. Ideally we'd expect and handle external database error, but diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py index cd37e4e602..a9a5cf7655 100644 --- a/superset/db_engine_specs/base.py +++ b/superset/db_engine_specs/base.py @@ -2001,7 +2001,7 @@ class BaseEngineSpec: # pylint: disable=too-many-public-methods extra = json.loads(database.extra) except json.JSONDecodeError as ex: logger.error(ex, exc_info=True) - raise ex + raise return extra @staticmethod @@ -2022,7 +2022,7 @@ class BaseEngineSpec: # pylint: disable=too-many-public-methods params.update(encrypted_extra) except json.JSONDecodeError as ex: logger.error(ex, exc_info=True) - raise ex + raise @classmethod def is_readonly_query(cls, parsed_query: ParsedQuery) -> bool: diff --git a/superset/db_engine_specs/ocient.py b/superset/db_engine_specs/ocient.py index 02d19add82..e5826097ef 100644 --- a/superset/db_engine_specs/ocient.py +++ b/superset/db_engine_specs/ocient.py @@ -315,12 +315,12 @@ class OcientEngineSpec(BaseEngineSpec): ) -> list[tuple[Any, ...]]: try: rows: list[tuple[Any, ...]] = super().fetch_data(cursor, limit) - except Exception as exception: + except Exception: with OcientEngineSpec.query_id_mapping_lock: del OcientEngineSpec.query_id_mapping[ getattr(cursor, "superset_query_id") ] - raise exception + raise # TODO: Unsure if we need to verify that we are receiving rows: if len(rows) > 0 and type(rows[0]).__name__ == "Row": diff --git a/superset/db_engine_specs/snowflake.py b/superset/db_engine_specs/snowflake.py index 3d394385ee..72116cfc32 100644 --- a/superset/db_engine_specs/snowflake.py +++ b/superset/db_engine_specs/snowflake.py @@ -368,7 +368,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec): encrypted_extra = json.loads(database.encrypted_extra) except json.JSONDecodeError as ex: logger.error(ex, exc_info=True) - raise ex + raise auth_method = encrypted_extra.get("auth_method", None) auth_params = encrypted_extra.get("auth_params", {}) if not auth_method: diff --git a/superset/db_engine_specs/trino.py b/superset/db_engine_specs/trino.py index 600f236b48..350337c6b2 100644 --- a/superset/db_engine_specs/trino.py +++ b/superset/db_engine_specs/trino.py @@ -342,7 +342,7 @@ class TrinoEngineSpec(PrestoBaseEngineSpec): connect_args["auth"] = trino_auth(**auth_params) except json.JSONDecodeError as ex: logger.error(ex, exc_info=True) - raise ex + raise @classmethod def get_dbapi_exception_mapping(cls) -> dict[type[Exception], type[Exception]]: diff --git a/superset/migrations/versions/2021-04-12_12-38_fc3a3a8ff221_migrate_filter_sets_to_new_format.py b/superset/migrations/versions/2021-04-12_12-38_fc3a3a8ff221_migrate_filter_sets_to_new_format.py index a7f85e5106..cb1aaa26da 100644 --- a/superset/migrations/versions/2021-04-12_12-38_fc3a3a8ff221_migrate_filter_sets_to_new_format.py +++ b/superset/migrations/versions/2021-04-12_12-38_fc3a3a8ff221_migrate_filter_sets_to_new_format.py @@ -197,9 +197,9 @@ def upgrade(): dashboard.json_metadata = json.dumps(json_metadata, sort_keys=True) - except Exception as e: + except Exception: print(f"Parsing json_metadata for dashboard {dashboard.id} failed.") - raise e + raise session.commit() session.close() @@ -225,9 +225,9 @@ def downgrade(): changed_filter_sets += 1 changed_filters += downgrade_filter_set(filter_set) dashboard.json_metadata = json.dumps(json_metadata, sort_keys=True) - except Exception as e: + except Exception: print(f"Parsing json_metadata for dashboard {dashboard.id} failed.") - raise e + raise session.commit() session.close() diff --git a/superset/migrations/versions/2021-04-29_15-32_f1410ed7ec95_migrate_native_filters_to_new_schema.py b/superset/migrations/versions/2021-04-29_15-32_f1410ed7ec95_migrate_native_filters_to_new_schema.py index ab60f9d00c..5ea4188cd4 100644 --- a/superset/migrations/versions/2021-04-29_15-32_f1410ed7ec95_migrate_native_filters_to_new_schema.py +++ b/superset/migrations/versions/2021-04-29_15-32_f1410ed7ec95_migrate_native_filters_to_new_schema.py @@ -111,9 +111,9 @@ def upgrade(): changed_filters += upgrades[0] changed_filter_sets += upgrades[1] dashboard.json_metadata = json.dumps(json_metadata, sort_keys=True) - except Exception as e: + except Exception: print(f"Parsing json_metadata for dashboard {dashboard.id} failed.") - raise e + raise session.commit() session.close() @@ -151,9 +151,9 @@ def downgrade(): changed_filters += downgrades[0] changed_filter_sets += downgrades[1] dashboard.json_metadata = json.dumps(json_metadata, sort_keys=True) - except Exception as e: + except Exception: print(f"Parsing json_metadata for dashboard {dashboard.id} failed.") - raise e + raise session.commit() session.close() diff --git a/superset/migrations/versions/2021-08-03_15-36_143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py b/superset/migrations/versions/2021-08-03_15-36_143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py index f49a37a105..186bdc043d 100644 --- a/superset/migrations/versions/2021-08-03_15-36_143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py +++ b/superset/migrations/versions/2021-08-03_15-36_143b6f2815da_migrate_pivot_table_v2_heatmaps_to_new_.py @@ -92,9 +92,9 @@ def upgrade(): ] changed_slices += 1 slice.params = json.dumps(params, sort_keys=True) - except Exception as e: + except Exception: print(f"Parsing json_metadata for slice {slice.id} failed.") - raise e + raise session.commit() session.close() diff --git a/superset/migrations/versions/2021-12-13_14-06_fe23025b9441_rename_big_viz_total_form_data_fields.py b/superset/migrations/versions/2021-12-13_14-06_fe23025b9441_rename_big_viz_total_form_data_fields.py index f2e8407add..8d676f625a 100644 --- a/superset/migrations/versions/2021-12-13_14-06_fe23025b9441_rename_big_viz_total_form_data_fields.py +++ b/superset/migrations/versions/2021-12-13_14-06_fe23025b9441_rename_big_viz_total_form_data_fields.py @@ -63,12 +63,12 @@ def upgrade(): if header_timestamp_format: params["time_format"] = header_timestamp_format slc.params = json.dumps(params, sort_keys=True) - except Exception as e: + except Exception: logger.exception( f"An error occurred: parsing params for slice {slc.id} failed." f"You need to fix it before upgrading your DB." ) - raise e + raise session.commit() session.close() @@ -89,12 +89,12 @@ def downgrade(): if force_timestamp_formatting: params["header_format_selector"] = force_timestamp_formatting slc.params = json.dumps(params, sort_keys=True) - except Exception as e: + except Exception: logger.exception( f"An error occurred: parsing params for slice {slc.id} failed. " "You need to fix it before downgrading your DB." ) - raise e + raise session.commit() session.close() diff --git a/superset/migrations/versions/2021-12-17_16-56_31bb738bd1d2_move_pivot_table_v2_legacy_order_by_to_.py b/superset/migrations/versions/2021-12-17_16-56_31bb738bd1d2_move_pivot_table_v2_legacy_order_by_to_.py index f9ee00b705..3849403159 100644 --- a/superset/migrations/versions/2021-12-17_16-56_31bb738bd1d2_move_pivot_table_v2_legacy_order_by_to_.py +++ b/superset/migrations/versions/2021-12-17_16-56_31bb738bd1d2_move_pivot_table_v2_legacy_order_by_to_.py @@ -61,12 +61,12 @@ def upgrade(): if legacy_order_by: params["series_limit_metric"] = legacy_order_by slc.params = json.dumps(params, sort_keys=True) - except Exception as e: + except Exception: logger.exception( f"An error occurred: parsing params for slice {slc.id} failed." f"You need to fix it before upgrading your DB." ) - raise e + raise session.commit() session.close() @@ -84,12 +84,12 @@ def downgrade(): if series_limit_metric: params["legacy_order_by"] = series_limit_metric slc.params = json.dumps(params, sort_keys=True) - except Exception as e: + except Exception: logger.exception( f"An error occurred: parsing params for slice {slc.id} failed. " "You need to fix it before downgrading your DB." ) - raise e + raise session.commit() session.close() diff --git a/superset/migrations/versions/2023-05-11_12-41_4ea966691069_cross_filter_global_scoping.py b/superset/migrations/versions/2023-05-11_12-41_4ea966691069_cross_filter_global_scoping.py index 3eb7af7bb9..cd03ea7cc2 100644 --- a/superset/migrations/versions/2023-05-11_12-41_4ea966691069_cross_filter_global_scoping.py +++ b/superset/migrations/versions/2023-05-11_12-41_4ea966691069_cross_filter_global_scoping.py @@ -90,9 +90,9 @@ def upgrade(): if needs_upgrade: dashboard.json_metadata = json.dumps(json_metadata) - except Exception as e: + except Exception: logger.exception("Failed to run up migration") - raise e + raise session.commit() session.close() @@ -127,9 +127,9 @@ def downgrade(): dashboard.json_metadata = json.dumps(json_metadata) - except Exception as e: + except Exception: logger.exception("Failed to run down migration") - raise e + raise session.commit() session.close() diff --git a/superset/models/core.py b/superset/models/core.py index c8c875e435..bcc80a7ccf 100755 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -570,7 +570,7 @@ class Database(Model, AuditMixinNullable, ImportExportMixin): # pylint: disable except Exception as ex: if self.is_oauth2_enabled() and self.db_engine_spec.needs_oauth2(ex): self.db_engine_spec.start_oauth2_dance(self) - raise ex + raise def get_default_catalog(self) -> str | None: """ @@ -906,7 +906,7 @@ class Database(Model, AuditMixinNullable, ImportExportMixin): # pylint: disable encrypted_extra = json.loads(self.encrypted_extra) except json.JSONDecodeError as ex: logger.error(ex, exc_info=True) - raise ex + raise return encrypted_extra # pylint: disable=invalid-name diff --git a/superset/models/helpers.py b/superset/models/helpers.py index 48b95566af..a044ff75e1 100644 --- a/superset/models/helpers.py +++ b/superset/models/helpers.py @@ -310,7 +310,7 @@ class ImportExportMixin: try: obj_query = db.session.query(cls).filter(and_(*filters)) obj = obj_query.one_or_none() - except MultipleResultsFound as ex: + except MultipleResultsFound: logger.error( "Error importing %s \n %s \n %s", cls.__name__, @@ -318,7 +318,7 @@ class ImportExportMixin: yaml.safe_dump(dict_rep), exc_info=True, ) - raise ex + raise if not obj: is_new_obj = True diff --git a/superset/sql_lab.py b/superset/sql_lab.py index 0e77c5a902..cb2cbe455c 100644 --- a/superset/sql_lab.py +++ b/superset/sql_lab.py @@ -312,9 +312,9 @@ def execute_sql_statement( # pylint: disable=too-many-statements level=ErrorLevel.ERROR, ) ) from ex - except OAuth2RedirectError as ex: + except OAuth2RedirectError: # user needs to authenticate with OAuth2 in order to run query - raise ex + raise except Exception as ex: # query is stopped in another thread/worker # stopping raises expected exceptions which we should skip diff --git a/superset/sql_validators/presto_db.py b/superset/sql_validators/presto_db.py index 06bee217cf..010272ea3e 100644 --- a/superset/sql_validators/presto_db.py +++ b/superset/sql_validators/presto_db.py @@ -138,7 +138,7 @@ class PrestoDBSQLValidator(BaseSQLValidator): ) except Exception as ex: logger.exception("Unexpected error running validation query: %s", str(ex)) - raise ex + raise @classmethod def validate( diff --git a/superset/sqllab/sql_json_executer.py b/superset/sqllab/sql_json_executer.py index 246154f47b..fde73aef0a 100644 --- a/superset/sqllab/sql_json_executer.py +++ b/superset/sqllab/sql_json_executer.py @@ -97,8 +97,8 @@ class SynchronousSqlJsonExecutor(SqlJsonExecutorBase): ) self._query_dao.update_saved_query_exec_info(query_id) execution_context.set_execution_result(data) - except SupersetTimeoutException as ex: - raise ex + except SupersetTimeoutException: + raise except Exception as ex: logger.exception("Query %i failed unexpectedly", query_id) raise SupersetGenericDBErrorException( diff --git a/superset/tasks/async_queries.py b/superset/tasks/async_queries.py index b804847cd8..5be7acc8cc 100644 --- a/superset/tasks/async_queries.py +++ b/superset/tasks/async_queries.py @@ -55,8 +55,9 @@ def _create_query_context_from_form(form_data: dict[str, Any]) -> QueryContext: return ChartDataQueryContextSchema().load(form_data) except KeyError as ex: raise ValidationError("Request is incorrect") from ex - except ValidationError as error: - raise error + except ValidationError: # pylint: disable=try-except-raise + # Make sure to bubble this up + raise def _load_user_from_job_metadata(job_metadata: dict[str, Any]) -> User: @@ -96,7 +97,7 @@ def load_chart_data_into_cache( ) except SoftTimeLimitExceeded as ex: logger.warning("A timeout occurred while loading chart data, error: %s", ex) - raise ex + raise except Exception as ex: # TODO: QueryContext should support SIP-40 style errors error = str(ex.message if hasattr(ex, "message") else ex) @@ -104,7 +105,7 @@ def load_chart_data_into_cache( async_query_manager.update_job( job_metadata, async_query_manager.STATUS_ERROR, errors=errors ) - raise ex + raise @celery_app.task(name="load_explore_json_into_cache", soft_time_limit=query_timeout) @@ -162,7 +163,7 @@ def load_explore_json_into_cache( # pylint: disable=too-many-locals logger.warning( "A timeout occurred while loading explore json, error: %s", ex ) - raise ex + raise except Exception as ex: if isinstance(ex, SupersetVizException): errors = ex.errors @@ -173,4 +174,4 @@ def load_explore_json_into_cache( # pylint: disable=too-many-locals async_query_manager.update_job( job_metadata, async_query_manager.STATUS_ERROR, errors=errors ) - raise ex + raise diff --git a/superset/utils/decorators.py b/superset/utils/decorators.py index 70fb305879..8e54541e90 100644 --- a/superset/utils/decorators.py +++ b/superset/utils/decorators.py @@ -57,7 +57,7 @@ def statsd_gauge(metric_prefix: str | None = None) -> Callable[..., Any]: current_app.config["STATS_LOGGER"].gauge( f"{metric_prefix_}.error", 1 ) - raise ex + raise return wrapped @@ -146,8 +146,9 @@ def stats_timing(stats_key: str, stats_logger: BaseStatsLogger) -> Iterator[floa start_ts = now_as_float() try: yield start_ts - except Exception as ex: - raise ex + except Exception: # pylint: disable=try-except-raise + # Make sure to bubble this up + raise finally: stats_logger.timing(stats_key, now_as_float() - start_ts) diff --git a/superset/utils/json.py b/superset/utils/json.py index 0d7e31b9cd..50a76d1a7c 100644 --- a/superset/utils/json.py +++ b/superset/utils/json.py @@ -122,11 +122,11 @@ def json_iso_dttm_ser(obj: Any, pessimistic: bool = False) -> Any: try: return base_json_conv(obj) - except TypeError as ex: + except TypeError: if pessimistic: logger.error("Failed to serialize %s", obj) return f"Unserializable [{type(obj)}]" - raise ex + raise def pessimistic_json_iso_dttm_ser(obj: Any) -> Any: @@ -249,4 +249,4 @@ def loads( ) except JSONDecodeError as ex: logger.error("JSON is not valid %s", str(ex), exc_info=True) - raise ex + raise diff --git a/superset/utils/webdriver.py b/superset/utils/webdriver.py index d79a9c7463..3e4705da6e 100644 --- a/superset/utils/webdriver.py +++ b/superset/utils/webdriver.py @@ -180,9 +180,9 @@ class WebDriverPlaywright(WebDriverProxy): ) element = page.locator(f".{element_name}") element.wait_for() - except PlaywrightTimeout as ex: + except PlaywrightTimeout: logger.exception("Timed out requesting url %s", url) - raise ex + raise try: # chart containers didn't render @@ -191,12 +191,12 @@ class WebDriverPlaywright(WebDriverProxy): slice_container_locator.first.wait_for() for slice_container_elem in slice_container_locator.all(): slice_container_elem.wait_for() - except PlaywrightTimeout as ex: + except PlaywrightTimeout: logger.exception( "Timed out waiting for chart containers to draw at url %s", url, ) - raise ex + raise try: # charts took too long to load logger.debug( @@ -204,11 +204,11 @@ class WebDriverPlaywright(WebDriverProxy): ) for loading_element in page.locator(".loading").all(): loading_element.wait_for(state="detached") - except PlaywrightTimeout as ex: + except PlaywrightTimeout: logger.exception( "Timed out waiting for charts to load at url %s", url ) - raise ex + raise selenium_animation_wait = current_app.config[ "SCREENSHOT_SELENIUM_ANIMATION_WAIT" @@ -366,9 +366,9 @@ class WebDriverSelenium(WebDriverProxy): element = WebDriverWait(driver, self._screenshot_locate_wait).until( EC.presence_of_element_located((By.CLASS_NAME, element_name)) ) - except TimeoutException as ex: + except TimeoutException: logger.exception("Selenium timed out requesting url %s", url) - raise ex + raise try: # chart containers didn't render @@ -378,12 +378,12 @@ class WebDriverSelenium(WebDriverProxy): (By.CLASS_NAME, "chart-container") ) ) - except TimeoutException as ex: + except TimeoutException: logger.exception( "Selenium timed out waiting for chart containers to draw at url %s", url, ) - raise ex + raise try: # charts took too long to load @@ -393,11 +393,11 @@ class WebDriverSelenium(WebDriverProxy): WebDriverWait(driver, self._screenshot_load_wait).until_not( EC.presence_of_all_elements_located((By.CLASS_NAME, "loading")) ) - except TimeoutException as ex: + except TimeoutException: logger.exception( "Selenium timed out waiting for charts to load at url %s", url ) - raise ex + raise selenium_animation_wait = current_app.config[ "SCREENSHOT_SELENIUM_ANIMATION_WAIT" diff --git a/superset/views/base_api.py b/superset/views/base_api.py index a62e963149..9436ce6390 100644 --- a/superset/views/base_api.py +++ b/superset/views/base_api.py @@ -124,7 +124,7 @@ def statsd_metrics(f: Callable[..., Any]) -> Callable[..., Any]: self.incr_stats("warning", func_name) else: self.incr_stats("error", func_name) - raise ex + raise self.send_stats_metrics(response, func_name, duration) return response diff --git a/tests/integration_tests/dashboards/superset_factory_util.py b/tests/integration_tests/dashboards/superset_factory_util.py index aeae6171df..c21b666eec 100644 --- a/tests/integration_tests/dashboards/superset_factory_util.py +++ b/tests/integration_tests/dashboards/superset_factory_util.py @@ -198,15 +198,15 @@ def delete_all_inserted_dashboards(): for dashboard in dashboards_to_delete: try: delete_dashboard(dashboard, False) - except Exception as ex: + except Exception: logger.error(f"failed to delete {dashboard.id}", exc_info=True) - raise ex + raise if len(inserted_dashboards_ids) > 0: db.session.commit() inserted_dashboards_ids.clear() - except Exception as ex2: + except Exception: logger.error("delete_all_inserted_dashboards failed", exc_info=True) - raise ex2 + raise def delete_dashboard(dashboard: Dashboard, do_commit: bool = False) -> None: @@ -245,15 +245,15 @@ def delete_all_inserted_slices(): for slice in slices_to_delete: try: delete_slice(slice, False) - except Exception as ex: + except Exception: logger.error(f"failed to delete {slice.id}", exc_info=True) - raise ex + raise if len(inserted_slices_ids) > 0: db.session.commit() inserted_slices_ids.clear() - except Exception as ex2: + except Exception: logger.error("delete_all_inserted_slices failed", exc_info=True) - raise ex2 + raise def delete_slice(slice_: Slice, do_commit: bool = False) -> None: @@ -278,15 +278,15 @@ def delete_all_inserted_tables(): for table in tables_to_delete: try: delete_sqltable(table, False) - except Exception as ex: + except Exception: logger.error(f"failed to delete {table.id}", exc_info=True) - raise ex + raise if len(inserted_sqltables_ids) > 0: db.session.commit() inserted_sqltables_ids.clear() - except Exception as ex2: + except Exception: logger.error("delete_all_inserted_tables failed", exc_info=True) - raise ex2 + raise def delete_sqltable(table: SqlaTable, do_commit: bool = False) -> None: @@ -313,15 +313,15 @@ def delete_all_inserted_dbs(): for database in databases_to_delete: try: delete_database(database, False) - except Exception as ex: + except Exception: logger.error(f"failed to delete {database.id}", exc_info=True) - raise ex + raise if len(inserted_databases_ids) > 0: db.session.commit() inserted_databases_ids.clear() - except Exception as ex2: + except Exception: logger.error("delete_all_inserted_databases failed", exc_info=True) - raise ex2 + raise def delete_database(database: Database, do_commit: bool = False) -> None:
