QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 15:44:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Refactor command exceptions (#24117)

Browse Source
This commit is contained in:
John Bodley
2023-05-19 09:08:12 -07:00
committed by GitHub
parent 0496779434
commit 8b4222ff9e
22 changed files with 44 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/annotation_layers/annotations/commands/create.py
View File

@@ -73,6 +73,4 @@ class CreateAnnotationCommand(BaseCommand):
exceptions.append(AnnotationDatesValidationError())
if exceptions:
exception = AnnotationInvalidError()
exception.add_list(exceptions)
raise exception
raise AnnotationInvalidError(exceptions=exceptions)

4
superset/annotation_layers/annotations/commands/update.py
View File

@@ -87,6 +87,4 @@ class UpdateAnnotationCommand(BaseCommand):
exceptions.append(AnnotationDatesValidationError())
if exceptions:
exception = AnnotationInvalidError()
exception.add_list(exceptions)
raise exception
raise AnnotationInvalidError(exceptions=exceptions)

4
superset/annotation_layers/commands/create.py
View File

@@ -54,6 +54,4 @@ class CreateAnnotationLayerCommand(BaseCommand):
exceptions.append(AnnotationLayerNameUniquenessValidationError())
if exceptions:
exception = AnnotationLayerInvalidError()
exception.add_list(exceptions)
raise exception
raise AnnotationLayerInvalidError(exceptions=exceptions)

4
superset/annotation_layers/commands/update.py
View File

@@ -63,6 +63,4 @@ class UpdateAnnotationLayerCommand(BaseCommand):
exceptions.append(AnnotationLayerNameUniquenessValidationError())
if exceptions:
exception = AnnotationLayerInvalidError()
exception.add_list(exceptions)
raise exception
raise AnnotationLayerInvalidError(exceptions=exceptions)

4
superset/charts/commands/create.py
View File

@@ -77,6 +77,4 @@ class CreateChartCommand(CreateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = ChartInvalidError()
exception.add_list(exceptions)
raise exception
raise ChartInvalidError(exceptions=exceptions)

4
superset/charts/commands/update.py
View File

@@ -114,6 +114,4 @@ class UpdateChartCommand(UpdateMixin, BaseCommand):
self._properties["dashboards"] = dashboards
if exceptions:
exception = ChartInvalidError()
exception.add_list(exceptions)
raise exception
raise ChartInvalidError(exceptions=exceptions)

20
superset/commands/exceptions.py
View File

@@ -56,22 +56,26 @@ class CommandInvalidError(CommandException):
status = 422
def __init__(self, message: str = "") -> None:
self._invalid_exceptions: List[ValidationError] = []
def __init__(
self,
message: str = "",
exceptions: Optional[List[ValidationError]] = None,
) -> None:
self._exceptions = exceptions or []
super().__init__(message)
def add(self, exception: ValidationError) -> None:
self._invalid_exceptions.append(exception)
def append(self, exception: ValidationError) -> None:
self._exceptions.append(exception)
def add_list(self, exceptions: List[ValidationError]) -> None:
self._invalid_exceptions.extend(exceptions)
def extend(self, exceptions: List[ValidationError]) -> None:
self._exceptions.extend(exceptions)
def get_list_classnames(self) -> List[str]:
return list(sorted({ex.__class__.__name__ for ex in self._invalid_exceptions}))
return list(sorted({ex.__class__.__name__ for ex in self._exceptions}))
def normalized_messages(self) -> Dict[Any, Any]:
errors: Dict[Any, Any] = {}
for exception in self._invalid_exceptions:
for exception in self._exceptions:
errors.update(exception.normalized_messages())
return errors

7
superset/commands/importers/v1/__init__.py
View File

@@ -108,9 +108,10 @@ class ImportModelsCommand(BaseCommand):
self._prevent_overwrite_existing_model(exceptions)
if exceptions:
exception = CommandInvalidError(f"Error importing {self.model_name}")
exception.add_list(exceptions)
raise exception
raise CommandInvalidError(
f"Error importing {self.model_name}",
exceptions,
)
def _prevent_overwrite_existing_model( # pylint: disable=invalid-name
self, exceptions: List[ValidationError]

7
superset/commands/importers/v1/assets.py
View File

@@ -172,6 +172,7 @@ class ImportAssetsCommand(BaseCommand):
)
if exceptions:
exception = CommandInvalidError("Error importing assets")
exception.add_list(exceptions)
raise exception
raise CommandInvalidError(
"Error importing assets",
exceptions,
)

8
superset/dashboards/commands/create.py
View File

@@ -63,9 +63,7 @@ class CreateDashboardCommand(CreateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DashboardInvalidError()
exception.add_list(exceptions)
raise exception
raise DashboardInvalidError(exceptions=exceptions)
try:
roles = populate_roles(role_ids)
@@ -73,6 +71,4 @@ class CreateDashboardCommand(CreateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DashboardInvalidError()
exception.add_list(exceptions)
raise exception
raise DashboardInvalidError(exceptions=exceptions)

8
superset/dashboards/commands/update.py
View File

@@ -92,9 +92,7 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DashboardInvalidError()
exception.add_list(exceptions)
raise exception
raise DashboardInvalidError(exceptions=exceptions)
# Validate/Populate role
if roles_ids is None:
@@ -105,6 +103,4 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DashboardInvalidError()
exception.add_list(exceptions)
raise exception
raise DashboardInvalidError(exceptions=exceptions)

2
superset/databases/commands/create.py
View File

@@ -141,7 +141,7 @@ class CreateDatabaseCommand(BaseCommand):
exceptions.append(DatabaseExistsValidationError())
if exceptions:
exception = DatabaseInvalidError()
exception.add_list(exceptions)
exception.extend(exceptions)
event_logger.log_with_context(
action="db_connection_failed.{}.{}".format(
exception.__class__.__name__,

4
superset/databases/commands/update.py
View File

@@ -177,6 +177,4 @@ class UpdateDatabaseCommand(BaseCommand):
):
exceptions.append(DatabaseExistsValidationError())
if exceptions:
exception = DatabaseInvalidError()
exception.add_list(exceptions)
raise exception
raise DatabaseInvalidError(exceptions=exceptions)

2
superset/databases/ssh_tunnel/commands/create.py
View File

@@ -82,7 +82,7 @@ class CreateSSHTunnelCommand(BaseCommand):
exceptions.append(SSHTunnelRequiredFieldValidationError("private_key"))
if exceptions:
exception = SSHTunnelInvalidError()
exception.add_list(exceptions)
exception.extend(exceptions)
event_logger.log_with_context(
action="ssh_tunnel_creation_failed.{}.{}".format(
exception.__class__.__name__,

6
superset/databases/ssh_tunnel/commands/update.py
View File

@@ -58,6 +58,6 @@ class UpdateSSHTunnelCommand(BaseCommand):
"private_key_password"
)
if private_key_password and private_key is None:
exception = SSHTunnelInvalidError()
exception.add(SSHTunnelRequiredFieldValidationError("private_key"))
raise exception
raise SSHTunnelInvalidError(
exceptions=[SSHTunnelRequiredFieldValidationError("private_key")]
)

4
superset/datasets/commands/create.py
View File

@@ -87,6 +87,4 @@ class CreateDatasetCommand(CreateMixin, BaseCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DatasetInvalidError()
exception.add_list(exceptions)
raise exception
raise DatasetInvalidError(exceptions=exceptions)

4
superset/datasets/commands/duplicate.py
View File

@@ -128,6 +128,4 @@ class DuplicateDatasetCommand(CreateMixin, BaseCommand):
exceptions.append(ex)
if exceptions:
exception = DatasetInvalidError()
exception.add_list(exceptions)
raise exception
raise DatasetInvalidError(exceptions=exceptions)

4
superset/datasets/commands/update.py
View File

@@ -122,9 +122,7 @@ class UpdateDatasetCommand(UpdateMixin, BaseCommand):
self._validate_metrics(metrics, exceptions)
if exceptions:
exception = DatasetInvalidError()
exception.add_list(exceptions)
raise exception
raise DatasetInvalidError(exceptions=exceptions)
def _validate_columns(
self, columns: List[Dict[str, Any]], exceptions: List[ValidationError]

4
superset/reports/commands/create.py
View File

@@ -117,9 +117,7 @@ class CreateReportScheduleCommand(CreateMixin, BaseReportScheduleCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = ReportScheduleInvalidError()
exception.add_list(exceptions)
raise exception
raise ReportScheduleInvalidError(exceptions=exceptions)
def _validate_report_extra(self, exceptions: List[ValidationError]) -> None:
extra: Optional[ReportScheduleExtra] = self._properties.get("extra")

4
superset/reports/commands/update.py
View File

@@ -124,6 +124,4 @@ class UpdateReportScheduleCommand(UpdateMixin, BaseReportScheduleCommand):
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = ReportScheduleInvalidError()
exception.add_list(exceptions)
raise exception
raise ReportScheduleInvalidError(exceptions=exceptions)

4
superset/tags/commands/create.py
View File

@@ -60,6 +60,4 @@ class CreateCustomTagCommand(CreateMixin, BaseCommand):
TagCreateFailedError(f"invalid object type {self._object_type}")
)
if exceptions:
exception = TagInvalidError()
exception.add_list(exceptions)
raise exception
raise TagInvalidError(exceptions=exceptions)

8
superset/tags/commands/delete.py
View File

@@ -86,9 +86,7 @@ class DeleteTaggedObjectCommand(DeleteMixin, BaseCommand):
)
)
if exceptions:
exception = TagInvalidError()
exception.add_list(exceptions)
raise exception
raise TagInvalidError(exceptions=exceptions)
class DeleteTagsCommand(DeleteMixin, BaseCommand):
@@ -110,6 +108,4 @@ class DeleteTagsCommand(DeleteMixin, BaseCommand):
if not TagDAO.find_by_name(tag):
exceptions.append(TagNotFoundError(tag))
if exceptions:
exception = TagInvalidError()
exception.add_list(exceptions)
raise exception
raise TagInvalidError(exceptions=exceptions)