From 35c1314176adff2bddb98bea0d9ad8814309918d Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Mon, 13 Nov 2023 23:46:20 +0800 Subject: [PATCH 1/4] fix(typings): model_id is a multiple option --- superset/cli/thumbnails.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/superset/cli/thumbnails.py b/superset/cli/thumbnails.py index 325fab6853d60..2c687b6b83151 100755 --- a/superset/cli/thumbnails.py +++ b/superset/cli/thumbnails.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import logging -from typing import Union +from typing import List, Union import click from celery.utils.abstract import CallableTask @@ -62,7 +62,7 @@ def compute_thumbnails( dashboards_only: bool, charts_only: bool, force: bool, - model_id: int, + model_id: List[int], ) -> None: """Compute thumbnails""" # pylint: disable=import-outside-toplevel @@ -76,7 +76,7 @@ def compute_thumbnails( def compute_generic_thumbnail( friendly_type: str, model_cls: Union[type[Dashboard], type[Slice]], - model_id: int, + model_id: List[int], compute_func: CallableTask, ) -> None: query = db.session.query(model_cls) From f8ddaeae9404c78f103ed2cb17cb8b2202d48bc1 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:51:40 +0800 Subject: [PATCH 2/4] fix by pre-commit --- superset/cli/thumbnails.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/superset/cli/thumbnails.py b/superset/cli/thumbnails.py index 2c687b6b83151..8d68454b99444 100755 --- a/superset/cli/thumbnails.py +++ b/superset/cli/thumbnails.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import logging -from typing import List, Union +from typing import Union import click from celery.utils.abstract import CallableTask @@ -62,7 +62,7 @@ def compute_thumbnails( dashboards_only: bool, charts_only: bool, force: bool, - model_id: List[int], + model_id: list[int], ) -> None: """Compute thumbnails""" # pylint: disable=import-outside-toplevel @@ -76,7 +76,7 @@ def compute_thumbnails( def compute_generic_thumbnail( friendly_type: str, model_cls: Union[type[Dashboard], type[Slice]], - model_id: List[int], + model_id: list[int], compute_func: CallableTask, ) -> None: query = db.session.query(model_cls) From 1d24494a6a21f09a80dc36fe7d25bbf7f2d8ca1f Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:00:15 +0800 Subject: [PATCH 3/4] rename vars --- superset/cli/thumbnails.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/superset/cli/thumbnails.py b/superset/cli/thumbnails.py index 8d68454b99444..e4852833a4926 100755 --- a/superset/cli/thumbnails.py +++ b/superset/cli/thumbnails.py @@ -56,13 +56,13 @@ default=False, help="Force refresh, even if previously cached", ) -@click.option("--model_id", "-i", multiple=True) +@click.option("--model_id", "-i", "model_ids", multiple=True) def compute_thumbnails( asynchronous: bool, dashboards_only: bool, charts_only: bool, force: bool, - model_id: list[int], + model_ids: list[int], ) -> None: """Compute thumbnails""" # pylint: disable=import-outside-toplevel @@ -76,12 +76,12 @@ def compute_thumbnails( def compute_generic_thumbnail( friendly_type: str, model_cls: Union[type[Dashboard], type[Slice]], - model_id: list[int], + model_ids: list[int], compute_func: CallableTask, ) -> None: query = db.session.query(model_cls) - if model_id: - query = query.filter(model_cls.id.in_(model_id)) + if model_ids: + query = query.filter(model_cls.id.in_(model_ids)) dashboards = query.all() count = len(dashboards) for i, model in enumerate(dashboards): @@ -97,7 +97,7 @@ def compute_generic_thumbnail( if not charts_only: compute_generic_thumbnail( - "dashboard", Dashboard, model_id, cache_dashboard_thumbnail + "dashboard", Dashboard, model_ids, cache_dashboard_thumbnail ) if not dashboards_only: - compute_generic_thumbnail("chart", Slice, model_id, cache_chart_thumbnail) + compute_generic_thumbnail("chart", Slice, model_ids, cache_chart_thumbnail) From d70981e5c0d5ca912372b78b9216d728a74dea56 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Thu, 16 Nov 2023 19:22:22 +0800 Subject: [PATCH 4/4] rename vars --- superset/cli/thumbnails.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/superset/cli/thumbnails.py b/superset/cli/thumbnails.py index e4852833a4926..0dd8edfb13027 100755 --- a/superset/cli/thumbnails.py +++ b/superset/cli/thumbnails.py @@ -56,13 +56,13 @@ default=False, help="Force refresh, even if previously cached", ) -@click.option("--model_id", "-i", "model_ids", multiple=True) +@click.option("--model_id", "-i", multiple=True) def compute_thumbnails( asynchronous: bool, dashboards_only: bool, charts_only: bool, force: bool, - model_ids: list[int], + model_id: list[int], ) -> None: """Compute thumbnails""" # pylint: disable=import-outside-toplevel @@ -97,7 +97,7 @@ def compute_generic_thumbnail( if not charts_only: compute_generic_thumbnail( - "dashboard", Dashboard, model_ids, cache_dashboard_thumbnail + "dashboard", Dashboard, model_id, cache_dashboard_thumbnail ) if not dashboards_only: - compute_generic_thumbnail("chart", Slice, model_ids, cache_chart_thumbnail) + compute_generic_thumbnail("chart", Slice, model_id, cache_chart_thumbnail)