QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-26 03:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move dashboard screenshot standalone logic (#23003)

Browse Source
This commit is contained in:
Elizabeth Thompson
2023-02-15 14:35:08 -08:00
committed by GitHub
parent f6c304437a
commit 4ddf67fc14
12 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/charts/api.py
View File

@@ -560,7 +560,7 @@ class ChartRestApi(BaseSupersetModelRestApi):
if not chart: if not chart:
return self.response_404() return self.response_404()
chart_url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true") chart_url = get_url_path("Superset.slice", slice_id=chart.id)
screenshot_obj = ChartScreenshot(chart_url, chart.digest) screenshot_obj = ChartScreenshot(chart_url, chart.digest)
cache_key = screenshot_obj.cache_key(window_size, thumb_size) cache_key = screenshot_obj.cache_key(window_size, thumb_size)
image_url = get_url_path( image_url = get_url_path(
@@ -683,7 +683,7 @@ class ChartRestApi(BaseSupersetModelRestApi):
return self.response_404() return self.response_404()
current_user = get_current_user() current_user = get_current_user()
url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true") url = get_url_path("Superset.slice", slice_id=chart.id)
if kwargs["rison"].get("force", False): if kwargs["rison"].get("force", False):
logger.info( logger.info(
"Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id) "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)

9
superset/cli/thumbnails.py
View File

@@ -22,7 +22,6 @@ from celery.utils.abstract import CallableTask
from flask.cli import with_appcontext from flask.cli import with_appcontext
from superset.extensions import db from superset.extensions import db
from superset.utils.urls import get_url_path
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -94,13 +93,7 @@ def compute_thumbnails(
action = "Processing" action = "Processing"
msg = f'{action} {friendly_type} "{model}" ({i+1}/{count})' msg = f'{action} {friendly_type} "{model}" ({i+1}/{count})'
click.secho(msg, fg="green") click.secho(msg, fg="green")
if friendly_type == "chart": func(None, model.id, force=force)
url = get_url_path(
"Superset.slice", slice_id=model.id, standalone="true"
)
else:
url = get_url_path("Superset.dashboard", dashboard_id_or_slug=model.id)
func(url, model.digest, force=force)
if not charts_only: if not charts_only:
compute_generic_thumbnail( compute_generic_thumbnail(

3
superset/reports/commands/execute.py
View File

@@ -75,7 +75,6 @@ from superset.utils.core import HeaderDataType, override_user
from superset.utils.csv import get_chart_csv_data, get_chart_dataframe from superset.utils.csv import get_chart_csv_data, get_chart_dataframe
from superset.utils.screenshots import ChartScreenshot, DashboardScreenshot from superset.utils.screenshots import ChartScreenshot, DashboardScreenshot
from superset.utils.urls import get_url_path from superset.utils.urls import get_url_path
from superset.utils.webdriver import DashboardStandaloneMode
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -172,7 +171,6 @@ class BaseReportState:
"ExploreView.root", "ExploreView.root",
user_friendly=user_friendly, user_friendly=user_friendly,
form_data=json.dumps({"slice_id": self._report_schedule.chart_id}), form_data=json.dumps({"slice_id": self._report_schedule.chart_id}),
standalone="true",
force=force, force=force,
**kwargs, **kwargs,
) )
@@ -190,7 +188,6 @@ class BaseReportState:
"Superset.dashboard", "Superset.dashboard",
user_friendly=user_friendly, user_friendly=user_friendly,
dashboard_id_or_slug=self._report_schedule.dashboard_id, dashboard_id_or_slug=self._report_schedule.dashboard_id,
standalone=DashboardStandaloneMode.REPORT.value,
force=force, force=force,
**kwargs, **kwargs,
) )

8
superset/reports/notifications/email.py
View File

@@ -32,7 +32,6 @@ from superset.reports.notifications.base import BaseNotification
from superset.reports.notifications.exceptions import NotificationError from superset.reports.notifications.exceptions import NotificationError
from superset.utils.core import HeaderDataType, send_email_smtp from superset.utils.core import HeaderDataType, send_email_smtp
from superset.utils.decorators import statsd_gauge from superset.utils.decorators import statsd_gauge
from superset.utils.urls import modify_url_query
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -129,11 +128,6 @@ class EmailNotification(BaseNotification): # pylint: disable=too-few-public-met
html_table = "" html_table = ""
call_to_action = __(app.config["EMAIL_REPORTS_CTA"]) call_to_action = __(app.config["EMAIL_REPORTS_CTA"])
url = (
modify_url_query(self._content.url, standalone="0")
if self._content.url is not None
else ""
)
img_tags = [] img_tags = []
for msgid in images.keys(): for msgid in images.keys():
img_tags.append( img_tags.append(
@@ -162,7 +156,7 @@ class EmailNotification(BaseNotification): # pylint: disable=too-few-public-met
<body> <body>
<div>{description}</div> <div>{description}</div>
<br> <br>
<b><a href="{url}">{call_to_action}</a></b><p></p> <b><a href="{self._content.url}">{call_to_action}</a></b><p></p>
{html_table} {html_table}
{img_tag} {img_tag}
</body> </body>

8
superset/reports/notifications/slack.py
View File

@@ -44,7 +44,6 @@ from superset.reports.notifications.exceptions import (
NotificationUnprocessableException, NotificationUnprocessableException,
) )
from superset.utils.decorators import statsd_gauge from superset.utils.decorators import statsd_gauge
from superset.utils.urls import modify_url_query
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -63,11 +62,6 @@ class SlackNotification(BaseNotification): # pylint: disable=too-few-public-met
return json.loads(self._recipient.recipient_config_json)["target"] return json.loads(self._recipient.recipient_config_json)["target"]
def _message_template(self, table: str = "") -> str: def _message_template(self, table: str = "") -> str:
url = (
modify_url_query(self._content.url, standalone="0")
if self._content.url is not None
else ""
)
return __( return __(
"""*%(name)s* """*%(name)s*
@@ -79,7 +73,7 @@ class SlackNotification(BaseNotification): # pylint: disable=too-few-public-met
""", """,
name=self._content.name, name=self._content.name,
description=self._content.description or "", description=self._content.description or "",
url=url, url=self._content.url,
table=table, table=table,
) )

2
superset/tasks/thumbnails.py
View File

@@ -48,7 +48,7 @@ def cache_chart_thumbnail(
logger.warning("No cache set, refusing to compute") logger.warning("No cache set, refusing to compute")
return None return None
chart = cast(Slice, Slice.get(chart_id)) chart = cast(Slice, Slice.get(chart_id))
url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true") url = get_url_path("Superset.slice", slice_id=chart.id)
logger.info("Caching chart: %s", url) logger.info("Caching chart: %s", url)
_, username = get_executor( _, username = get_executor(
executor_types=current_app.config["THUMBNAIL_EXECUTE_AS"], executor_types=current_app.config["THUMBNAIL_EXECUTE_AS"],

20
superset/utils/screenshots.py
View File

@@ -23,7 +23,13 @@ from typing import Optional, TYPE_CHECKING, Union
from flask import current_app from flask import current_app
from superset.utils.hashing import md5_sha_from_dict from superset.utils.hashing import md5_sha_from_dict
from superset.utils.webdriver import WebDriverProxy, WindowSize from superset.utils.urls import modify_url_query
from superset.utils.webdriver import (
ChartStandaloneMode,
DashboardStandaloneMode,
WebDriverProxy,
WindowSize,
)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -205,6 +211,11 @@ class ChartScreenshot(BaseScreenshot):
window_size: Optional[WindowSize] = None, window_size: Optional[WindowSize] = None,
thumb_size: Optional[WindowSize] = None, thumb_size: Optional[WindowSize] = None,
): ):
# Chart reports are in standalone="true" mode
url = modify_url_query(
url,
standalone=ChartStandaloneMode.HIDE_NAV.value,
)
super().__init__(url, digest) super().__init__(url, digest)
self.window_size = window_size or (800, 600) self.window_size = window_size or (800, 600)
self.thumb_size = thumb_size or (800, 600) self.thumb_size = thumb_size or (800, 600)
@@ -221,6 +232,13 @@ class DashboardScreenshot(BaseScreenshot):
window_size: Optional[WindowSize] = None, window_size: Optional[WindowSize] = None,
thumb_size: Optional[WindowSize] = None, thumb_size: Optional[WindowSize] = None,
): ):
# per the element above, dashboard screenshots
# should always capture in standalone
url = modify_url_query(
url,
standalone=DashboardStandaloneMode.REPORT.value,
)
super().__init__(url, digest) super().__init__(url, digest)
self.window_size = window_size or (1600, 1200) self.window_size = window_size or (1600, 1200)
self.thumb_size = thumb_size or (800, 600) self.thumb_size = thumb_size or (800, 600)

4
superset/utils/urls.py
View File

@@ -48,7 +48,9 @@ def modify_url_query(url: str, **kwargs: Any) -> str:
v = [v] v = [v]
params[k] = v params[k] = v
parts[3] = "&".join(f"{k}={urllib.parse.quote(v[0])}" for k, v in params.items()) parts[3] = "&".join(
f"{k}={urllib.parse.quote(str(v[0]))}" for k, v in params.items()
)
return urllib.parse.urlunsplit(parts) return urllib.parse.urlunsplit(parts)

5
superset/utils/webdriver.py
View File

@@ -51,6 +51,11 @@ class DashboardStandaloneMode(Enum):
REPORT = 3 REPORT = 3
class ChartStandaloneMode(Enum):
HIDE_NAV = "true"
SHOW_NAV = 0
def find_unexpected_errors(driver: WebDriver) -> List[str]: def find_unexpected_errors(driver: WebDriver) -> List[str]:
error_messages = [] error_messages = []

24
tests/integration_tests/cli_tests.py
View File

@@ -27,7 +27,9 @@ import yaml
from freezegun import freeze_time from freezegun import freeze_time
import superset.cli.importexport import superset.cli.importexport
from superset import app import superset.cli.thumbnails
from superset import app, db
from superset.models.dashboard import Dashboard
from tests.integration_tests.fixtures.birth_names_dashboard import ( from tests.integration_tests.fixtures.birth_names_dashboard import (
load_birth_names_dashboard_with_slices, load_birth_names_dashboard_with_slices,
load_birth_names_data, load_birth_names_data,
@@ -495,3 +497,23 @@ def test_failing_import_datasets_versioned_export(
) )
assert_cli_fails_properly(response, caplog) assert_cli_fails_properly(response, caplog)
@pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@mock.patch("superset.tasks.thumbnails.cache_dashboard_thumbnail")
def test_compute_thumbnails(thumbnail_mock, app_context, fs):
thumbnail_mock.return_value = None
runner = app.test_cli_runner()
dashboard = db.session.query(Dashboard).filter_by(slug="births").first()
response = runner.invoke(
superset.cli.thumbnails.compute_thumbnails,
["-d", "-i", dashboard.id],
)
thumbnail_mock.assert_called_with(
None,
dashboard.id,
force=False,
)
assert response.exit_code == 0

40
tests/integration_tests/reports/commands_tests.py
View File

@@ -663,11 +663,9 @@ def test_email_chart_report_schedule(
) )
# assert that the link sent is correct # assert that the link sent is correct
assert ( assert (
'<a href="http://0.0.0.0:8080/explore/?' '<a href="http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+'
"form_data=%7B%22slice_id%22%3A%20" f"{create_report_email_chart.chart.id}"
f"{create_report_email_chart.chart.id}%7D&" '%7D&force=false">Explore in Superset</a>' in email_mock.call_args[0][2]
'standalone=0&force=false">Explore in Superset</a>'
in email_mock.call_args[0][2]
) )
# Assert the email smtp address # Assert the email smtp address
assert email_mock.call_args[0][0] == notification_targets[0] assert email_mock.call_args[0][0] == notification_targets[0]
@@ -720,11 +718,9 @@ def test_email_chart_report_schedule_alpha_owner(
# assert that the link sent is correct # assert that the link sent is correct
assert ( assert (
'<a href="http://0.0.0.0:8080/explore/?' '<a href="http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+'
"form_data=%7B%22slice_id%22%3A%20" f"{create_report_email_chart_alpha_owner.chart.id}"
f"{create_report_email_chart_alpha_owner.chart.id}%7D&" '%7D&force=false">Explore in Superset</a>' in email_mock.call_args[0][2]
'standalone=0&force=false">Explore in Superset</a>'
in email_mock.call_args[0][2]
) )
# Assert the email smtp address # Assert the email smtp address
assert email_mock.call_args[0][0] == notification_targets[0] assert email_mock.call_args[0][0] == notification_targets[0]
@@ -767,11 +763,9 @@ def test_email_chart_report_schedule_force_screenshot(
) )
# assert that the link sent is correct # assert that the link sent is correct
assert ( assert (
'<a href="http://0.0.0.0:8080/explore/?' '<a href="http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+'
"form_data=%7B%22slice_id%22%3A%20" f"{create_report_email_chart_force_screenshot.chart.id}"
f"{create_report_email_chart_force_screenshot.chart.id}%7D&" '%7D&force=true">Explore in Superset</a>' in email_mock.call_args[0][2]
'standalone=0&force=true">Explore in Superset</a>'
in email_mock.call_args[0][2]
) )
# Assert the email smtp address # Assert the email smtp address
assert email_mock.call_args[0][0] == notification_targets[0] assert email_mock.call_args[0][0] == notification_targets[0]
@@ -806,11 +800,9 @@ def test_email_chart_alert_schedule(
notification_targets = get_target_from_report_schedule(create_alert_email_chart) notification_targets = get_target_from_report_schedule(create_alert_email_chart)
# assert that the link sent is correct # assert that the link sent is correct
assert ( assert (
'<a href="http://0.0.0.0:8080/explore/?' '<a href="http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+'
"form_data=%7B%22slice_id%22%3A%20" f"{create_alert_email_chart.chart.id}"
f"{create_alert_email_chart.chart.id}%7D&" '%7D&force=true">Explore in Superset</a>' in email_mock.call_args[0][2]
'standalone=0&force=true">Explore in Superset</a>'
in email_mock.call_args[0][2]
) )
# Assert the email smtp address # Assert the email smtp address
assert email_mock.call_args[0][0] == notification_targets[0] assert email_mock.call_args[0][0] == notification_targets[0]
@@ -880,11 +872,9 @@ def test_email_chart_report_schedule_with_csv(
) )
# assert that the link sent is correct # assert that the link sent is correct
assert ( assert (
'<a href="http://0.0.0.0:8080/explore/?' '<a href="http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+'
"form_data=%7B%22slice_id%22%3A%20"
f"{create_report_email_chart_with_csv.chart.id}%7D&" f"{create_report_email_chart_with_csv.chart.id}%7D&"
'standalone=0&force=false">Explore in Superset</a>' 'force=false">Explore in Superset</a>' in email_mock.call_args[0][2]
in email_mock.call_args[0][2]
) )
# Assert the email smtp address # Assert the email smtp address
assert email_mock.call_args[0][0] == notification_targets[0] assert email_mock.call_args[0][0] == notification_targets[0]
@@ -1313,7 +1303,7 @@ def test_slack_chart_report_schedule_with_text(
| 1 | c21 | c22 | c23 |""" | 1 | c21 | c22 | c23 |"""
assert table_markdown in post_message_mock.call_args[1]["text"] assert table_markdown in post_message_mock.call_args[1]["text"]
assert ( assert (
f"<http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A%20{create_report_slack_chart_with_text.chart.id}%7D&standalone=0&force=false|Explore in Superset>" f"<http://0.0.0.0:8080/explore/?form_data=%7B%22slice_id%22%3A+{create_report_slack_chart_with_text.chart.id}%7D&force=false|Explore in Superset>"
in post_message_mock.call_args[1]["text"] in post_message_mock.call_args[1]["text"]
) )

5
tests/unit_tests/utils/urls_tests.py
View File

@@ -37,6 +37,11 @@ def test_convert_dashboard_link() -> None:
assert test_url == "http://localhost:9000/superset/dashboard/3/?standalone=0" assert test_url == "http://localhost:9000/superset/dashboard/3/?standalone=0"
def test_convert_dashboard_link_with_integer() -> None:
test_url = modify_url_query(EXPLORE_DASHBOARD_LINK, standalone=0)
assert test_url == "http://localhost:9000/superset/dashboard/3/?standalone=0"
@pytest.mark.parametrize( @pytest.mark.parametrize(
"url,is_safe", "url,is_safe",
[ [