[format] Using Black (#7769)

This commit is contained in:
John Bodley
2019-06-25 13:34:48 -07:00
committed by GitHub
parent 0c9e6d0985
commit 5c58fd1802
270 changed files with 15592 additions and 14772 deletions

View File

@@ -33,10 +33,7 @@ from .base import BaseSupersetView, DeleteMixin, SupersetFilter, SupersetModelVi
class QueryFilter(SupersetFilter):
def apply(
self,
query: BaseQuery,
func: Callable) -> BaseQuery:
def apply(self, query: BaseQuery, func: Callable) -> BaseQuery:
"""
Filter queries to only those owned by current user if
can_only_access_owned_queries permission is set.
@@ -44,76 +41,84 @@ class QueryFilter(SupersetFilter):
:returns: query
"""
if security_manager.can_only_access_owned_queries():
query = (
query
.filter(Query.user_id == g.user.get_user_id())
)
query = query.filter(Query.user_id == g.user.get_user_id())
return query
class QueryView(SupersetModelView):
datamodel = SQLAInterface(Query)
list_title = _('List Query')
show_title = _('Show Query')
add_title = _('Add Query')
edit_title = _('Edit Query')
list_title = _("List Query")
show_title = _("Show Query")
add_title = _("Add Query")
edit_title = _("Edit Query")
list_columns = ['username', 'database_name', 'status', 'start_time', 'end_time']
order_columns = ['status', 'start_time', 'end_time']
base_filters = [['id', QueryFilter, lambda: []]]
list_columns = ["username", "database_name", "status", "start_time", "end_time"]
order_columns = ["status", "start_time", "end_time"]
base_filters = [["id", QueryFilter, lambda: []]]
label_columns = {
'user': _('User'),
'username': _('User'),
'database_name': _('Database'),
'status': _('Status'),
'start_time': _('Start Time'),
'end_time': _('End Time'),
"user": _("User"),
"username": _("User"),
"database_name": _("Database"),
"status": _("Status"),
"start_time": _("Start Time"),
"end_time": _("End Time"),
}
appbuilder.add_view(
QueryView,
'Queries',
label=__('Queries'),
category='Manage',
category_label=__('Manage'),
icon='fa-search')
"Queries",
label=__("Queries"),
category="Manage",
category_label=__("Manage"),
icon="fa-search",
)
class SavedQueryView(SupersetModelView, DeleteMixin):
datamodel = SQLAInterface(SavedQuery)
list_title = _('List Saved Query')
show_title = _('Show Saved Query')
add_title = _('Add Saved Query')
edit_title = _('Edit Saved Query')
list_title = _("List Saved Query")
show_title = _("Show Saved Query")
add_title = _("Add Saved Query")
edit_title = _("Edit Saved Query")
list_columns = [
'label', 'user', 'database', 'schema', 'description',
'modified', 'pop_tab_link']
order_columns = [
'label', 'schema', 'description',
'modified']
"label",
"user",
"database",
"schema",
"description",
"modified",
"pop_tab_link",
]
order_columns = ["label", "schema", "description", "modified"]
show_columns = [
'id', 'label', 'user', 'database',
'description', 'sql', 'pop_tab_link']
search_columns = ('label', 'user', 'database', 'schema', 'changed_on')
add_columns = ['label', 'database', 'description', 'sql']
"id",
"label",
"user",
"database",
"description",
"sql",
"pop_tab_link",
]
search_columns = ("label", "user", "database", "schema", "changed_on")
add_columns = ["label", "database", "description", "sql"]
edit_columns = add_columns
base_order = ('changed_on', 'desc')
base_order = ("changed_on", "desc")
label_columns = {
'label': _('Label'),
'user': _('User'),
'database': _('Database'),
'description': _('Description'),
'modified': _('Modified'),
'end_time': _('End Time'),
'pop_tab_link': _('Pop Tab Link'),
'changed_on': _('Changed on'),
"label": _("Label"),
"user": _("User"),
"database": _("Database"),
"description": _("Description"),
"modified": _("Modified"),
"end_time": _("End Time"),
"pop_tab_link": _("Pop Tab Link"),
"changed_on": _("Changed on"),
}
show_template = 'superset/models/savedquery/show.html'
show_template = "superset/models/savedquery/show.html"
def pre_add(self, obj):
obj.user = g.user
@@ -122,18 +127,13 @@ class SavedQueryView(SupersetModelView, DeleteMixin):
self.pre_add(obj)
@has_access
@expose('show/<pk>')
@expose("show/<pk>")
def show(self, pk):
pk = self._deserialize_pk_if_composite(pk)
widgets = self._show(pk)
query = self.datamodel.get(pk).to_json()
query['extra_json'] = json.loads(query['extra_json'])
payload = {
'common': {
'feature_flags': get_feature_flags(),
'query': query,
},
}
query["extra_json"] = json.loads(query["extra_json"])
payload = {"common": {"feature_flags": get_feature_flags(), "query": query}}
return self.render_template(
self.show_template,
@@ -147,15 +147,21 @@ class SavedQueryView(SupersetModelView, DeleteMixin):
class SavedQueryViewApi(SavedQueryView):
list_columns = [
'id', 'label', 'sqlalchemy_uri', 'user_email', 'schema', 'description',
'sql', 'extra_json']
show_columns = [
'label', 'db_id', 'schema', 'description', 'sql', 'extra_json']
"id",
"label",
"sqlalchemy_uri",
"user_email",
"schema",
"description",
"sql",
"extra_json",
]
show_columns = ["label", "db_id", "schema", "description", "sql", "extra_json"]
add_columns = show_columns
edit_columns = add_columns
@has_access_api
@expose('show/<pk>')
@expose("show/<pk>")
def show(self, pk):
return super().show(pk)
@@ -164,20 +170,18 @@ appbuilder.add_view_no_menu(SavedQueryViewApi)
appbuilder.add_view_no_menu(SavedQueryView)
appbuilder.add_link(
__('Saved Queries'),
href='/sqllab/my_queries/',
icon='fa-save',
category='SQL Lab')
__("Saved Queries"), href="/sqllab/my_queries/", icon="fa-save", category="SQL Lab"
)
class SqlLab(BaseSupersetView):
"""The base views for Superset!"""
@expose('/my_queries/')
@expose("/my_queries/")
@has_access
def my_queries(self):
"""Assigns a list of found users to the given role."""
return redirect(
'/savedqueryview/list/?_flt_0_user={}'.format(g.user.id))
return redirect("/savedqueryview/list/?_flt_0_user={}".format(g.user.id))
appbuilder.add_view_no_menu(SqlLab)