Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Refactor ownership #21938

Merged
merged 1 commit into from
Nov 2, 2022
Merged

chore: Refactor ownership #21938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions superset/datasets/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from zipfile import is_zipfile, ZipFile

import yaml
from flask import g, request, Response, send_file
from flask import request, Response, send_file
from flask_appbuilder.api import expose, protect, rison, safe
from flask_appbuilder.models.sqla.interface import SQLAInterface
from flask_babel import ngettext
Expand Down Expand Up @@ -585,7 +585,7 @@ def duplicate(self) -> Response:
return self.response_400(message=error.messages)

try:
new_model = DuplicateDatasetCommand([g.user.id], item).run()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was wrong. It was passing in a List[int] whereas the class signature expected User. I'm somewhat perplexed as to why Mypy didn't report this an error. See this Slack thread for details.

new_model = DuplicateDatasetCommand(item).run()
return self.response(201, id=new_model.id, result=item)
except DatasetInvalidError as ex:
return self.response_422(
Expand Down
6 changes: 2 additions & 4 deletions superset/datasets/commands/duplicate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from typing import Any, Dict, List

from flask_appbuilder.models.sqla import Model
from flask_appbuilder.security.sqla.models import User
from flask_babel import gettext as __
from marshmallow import ValidationError
from sqlalchemy.exc import SQLAlchemyError
Expand All @@ -44,8 +43,7 @@


class DuplicateDatasetCommand(CreateMixin, BaseCommand):
def __init__(self, user: User, data: Dict[str, Any]):
self._actor = user
def __init__(self, data: Dict[str, Any]) -> None:
self._base_model: SqlaTable = SqlaTable()
self._properties = data.copy()

Expand Down Expand Up @@ -122,7 +120,7 @@ def validate(self) -> None:
exceptions.append(DatasetExistsValidationError(table_name=duplicate_name))

try:
owners = self.populate_owners(self._actor)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the previous comment. I gather Mypy didn't barf because it was being passed List[int] as opposed to User per the class __init__ method.

Note, per here there's no need to specify [g.user.id] given that it defaults to the current user if not specified.

owners = self.populate_owners()
self._properties["owners"] = owners
except ValidationError as ex:
exceptions.append(ex)
Expand Down