raising selenium exceptions

apache · Jan 16, 2025 · 22f419d · 22f419d
1 parent 2b7f3ad
commit 22f419d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
@@ -1304,7 +1304,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
             cache_dashboard_thumbnail.delay(
                 current_user=current_user,
                 dashboard_id=dashboard.id,
-                force=True,
+                force=False,
             )
             return self.response(
                 202,

diff --git a/superset/utils/screenshots.py b/superset/utils/screenshots.py
@@ -224,7 +224,7 @@ def compute_and_cache(  # pylint: disable=too-many-arguments
             with event_logger.log_context(f"screenshot.cache.{self.thumbnail_type}"):
                 cache_payload.update(image)
         self.cache.set(cache_key, cache_payload)
-        logger.info("Updated thumbnail cache")
+        logger.info("Updated thumbnail cache; Status: %s", cache_payload.get_status())
         return
 
     @classmethod

diff --git a/superset/utils/webdriver.py b/superset/utils/webdriver.py
@@ -348,7 +348,7 @@ def find_unexpected_errors(driver: WebDriver) -> list[str]:
 
         return error_messages
 
-    def get_screenshot(self, url: str, element_name: str, user: User) -> bytes | None:
+    def get_screenshot(self, url: str, element_name: str, user: User) -> bytes | None:  # noqa: C901
         driver = self.auth(user)
         driver.set_window_size(*self._window)
         driver.get(url)
@@ -379,7 +379,7 @@ def get_screenshot(self, url: str, element_name: str, user: User) -> bytes | Non
                     )
                 )
             except TimeoutException:
-                logger.info("caught Timeout Exception")
+                logger.info("Timeout Exception caught")
                 # Fallback to allow a screenshot of an empty dashboard
                 try:
                     WebDriverWait(driver, 0).until(
@@ -430,6 +430,9 @@ def get_screenshot(self, url: str, element_name: str, user: User) -> bytes | Non
                     )
 
             img = element.screenshot_as_png
+        except Exception as ex:
+            logger.warning("exception in webdriver", exc_info=ex)
+            raise
         except TimeoutException:
             # raise again for the finally block, but handled above
             raise
@@ -438,10 +441,12 @@ def get_screenshot(self, url: str, element_name: str, user: User) -> bytes | Non
                 "Selenium got a stale element while requesting url %s",
                 url,
             )
+            raise
         except WebDriverException:
             logger.exception(
                 "Encountered an unexpected error when requesting url %s", url
             )
+            raise
         finally:
             self.destroy(driver, current_app.config["SCREENSHOT_SELENIUM_RETRIES"])
         return img