Rename take_screenshot -> screenshot_b64, small cleanup

Author: stephanlensky

CHANGELOG.md

@@ -11,12 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added `tab.take_screenshot` and `element.take_screenshot` methods to return screenshot as base64 string @falmar
+- Added `tab.screenshot_b64` and `element.screenshot_b64` methods to return screenshot as base64 string @falmar
 
 ### Changed
 
-- Changed `take.save_screenshot` and `element.save_screenshot` to use `self.take_screenshot` to fetch screenshot data and only perform the file saving @falmar
-
 ### Removed
 
 ## [0.6.1] - 2025-04-25

zendriver/core/element.py

@@ -810,14 +810,14 @@ async def query_selector(self, selector):
         await self.update()
         return await self.tab.query_selector(selector, self)
 
-    async def take_screenshot(
+    async def screenshot_b64(
         self,
         format: str = "jpeg",
         scale: typing.Optional[typing.Union[int, float]] = 1,
-    ):
+    ) -> str:
         """
-        Takes a screenshot of this element (only)
-        This is not the same as :py:obj:`Tab.take_screenshot`, which takes a "regular" screenshot
+        Takes a screenshot of this element (only) and return the result as a base64 encoded string.
+        This is not the same as :py:obj:`Tab.screenshot_b64`, which takes a "regular" screenshot
 
         When the element is hidden, or has no size, or is otherwise not capturable, a RuntimeError is raised
 
@@ -848,7 +848,7 @@ async def take_screenshot(
                 "could not take screenshot. most possible cause is the page has not finished loading yet."
             )
 
-        return str(data)
+        return data
 
     async def save_screenshot(
         self,
@@ -890,7 +890,7 @@ async def save_screenshot(
 
         path.parent.mkdir(parents=True, exist_ok=True)
 
-        data = await self.take_screenshot(format, scale)
+        data = await self.screenshot_b64(format, scale)
 
         data_bytes = base64.b64decode(data)
         if not path:

zendriver/core/tab.py

@@ -1285,7 +1285,7 @@ async def download_file(self, url: str, filename: Optional[PathLike] = None):
                 arguments=[cdp.runtime.CallArgument(object_id=body.object_id)],
             )
         )
-      
+
     async def save_snapshot(self, filename: str = "snapshot.mhtml") -> None:
         """
         Saves a snapshot of the page.
@@ -1302,15 +1302,15 @@ async def save_snapshot(self, filename: str = "snapshot.mhtml") -> None:
 
         with open(filename, "w") as file:
             file.write(data)
-            
-    async def take_screenshot(
+
+    async def screenshot_b64(
         self,
         format: str = "jpeg",
         full_page: bool = False,
     ) -> str:
         """
-        Takes a screenshot of the page.
-        This is not the same as :py:obj:`Element.take_screenshot`, which takes a screenshot of a single element only
+        Takes a screenshot of the page and return the result as a base64 encoded string.
+        This is not the same as :py:obj:`Element.screenshot_b64`, which takes a screenshot of a single element only
 
         :param format: jpeg or png (defaults to jpeg)
         :type format: str
@@ -1339,7 +1339,7 @@ async def take_screenshot(
                 "could not take screenshot. most possible cause is the page has not finished loading yet."
             )
 
-        return str(data)
+        return data
 
     async def save_screenshot(
         self,
@@ -1367,6 +1367,7 @@ async def save_screenshot(
             ext = ".png"
 
         if not filename or filename == "auto":
+            assert self.target is not None
             parsed = urllib.parse.urlparse(self.target.url)
             parts = parsed.path.split("/")
             last_part = parts[-1]
@@ -1378,7 +1379,7 @@ async def save_screenshot(
             path = pathlib.Path(filename)
         path.parent.mkdir(parents=True, exist_ok=True)
 
-        data = await self.take_screenshot(format=format, full_page=full_page)
+        data = await self.screenshot_b64(format=format, full_page=full_page)
 
         import base64