pydoll-python 1.3.0__tar.gz → 1.3.2__tar.gz

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pydoll-python
-Version: 1.3.0
+Version: 1.3.2
 Summary: 
 Author: Thalison Fernandes
 Author-email: thalissfernandes99@gmail.com

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pydoll/browser/base.py

@@ -77,7 +77,9 @@ class Browser(ABC):  # noqa: PLR0904
             exc_val: The exception value, if raised.
             exc_tb: The traceback, if an exception was raised.
         """
-        await self.stop()
+        if await self._is_browser_running():
+            await self.stop()
+
         await self._connection_handler.close()
 
     async def start(self) -> None:
@@ -137,6 +139,7 @@ class Browser(ABC):  # noqa: PLR0904
         page_id = (
             await self.new_page() if not self._pages else self._pages.pop()
         )
+
         return Page(self._connection_port, page_id)
 
     async def delete_all_cookies(self):
@@ -243,10 +246,25 @@ class Browser(ABC):  # noqa: PLR0904
         Retrieves the ID of the current browser window.
 
         Returns:
-            str: The ID of the current browser window.
+            int: The ID of the current browser window.
+
+        Raises:
+            RuntimeError: If unable to retrieve the window ID.
         """
-        response = await self._execute_command(BrowserCommands.get_window_id())
-        return response['result']['windowId']
+        command = BrowserCommands.get_window_id()
+        response = await self._execute_command(command)
+
+        if response.get('error'):
+            pages = await self.get_targets()
+            target_id = await self._get_valid_target_id(pages)
+            response = await self._execute_command(
+                BrowserCommands.get_window_id_by_target(target_id)
+            )
+
+        if window_id := response.get('result', {}).get('windowId'):
+            return window_id
+
+        raise RuntimeError(response.get('error', {}))
 
     async def set_window_bounds(self, bounds: dict):
         """
@@ -519,7 +537,7 @@ class Browser(ABC):  # noqa: PLR0904
             'url', ''
         )
 
-    async def _get_valid_page(self, pages) -> str:
+    async def _get_valid_page(self, pages: list) -> str:
         """
         Gets the ID of a valid page or creates a new one.
 
@@ -541,6 +559,31 @@ class Browser(ABC):  # noqa: PLR0904
 
         return await self.new_page()
 
+    @staticmethod
+    async def _get_valid_target_id(pages: list) -> str:
+        """
+        Retrieves the target ID of a valid attached browser page.
+
+        Returns:
+            str: The target ID of a valid page.
+
+        """
+
+        valid_page = next(
+            (page for page in pages
+             if page.get('type') == 'page' and page.get('attached')),
+            None
+        )
+
+        if not valid_page:
+            raise RuntimeError("No valid attached browser page found.")
+
+        target_id = valid_page.get('targetId')
+        if not target_id:
+            raise RuntimeError("Valid page found but missing 'targetId'.")
+
+        return target_id
+
     async def _is_browser_running(self, timeout: int = 10) -> bool:
         """
         Checks if the browser process is currently running.
@@ -553,9 +596,10 @@ class Browser(ABC):  # noqa: PLR0904
             if await self._connection_handler.ping():
                 return True
             await asyncio.sleep(1)
+
         return False
 
-    async def _execute_command(self, command: str):
+    async def _execute_command(self, command: dict):
         """
         Executes a command through the connection handler.
 

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pydoll/browser/chrome.py

@@ -46,13 +46,18 @@ class Chrome(Browser):
                 the browser executable is not found at the default location.
         """
         os_name = platform.system()
+
         browser_paths = {
-            'Windows':
+            'Windows': [
                 r'C:\Program Files\Google\Chrome\Application\chrome.exe',
-            'Linux':
+                r'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe',
+            ],
+            'Linux': [
                 '/usr/bin/google-chrome',
-            'Darwin':
-                '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+            ],
+            'Darwin': [
+                '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+            ]
         }
 
         browser_path = browser_paths.get(os_name)
@@ -60,6 +65,6 @@ class Chrome(Browser):
         if not browser_path:
             raise ValueError('Unsupported OS')
 
-        return BrowserOptionsManager.validate_browser_path(
+        return BrowserOptionsManager.validate_browser_paths(
             browser_path
         )

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pydoll/browser/managers.py

@@ -275,7 +275,7 @@ class BrowserOptionsManager:
         options.arguments.append('--no-default-browser-check')
 
     @staticmethod
-    def validate_browser_path(path: str) -> str:
+    def validate_browser_paths(paths: list[str]) -> str:
         """
         Validates the provided browser executable path.
 
@@ -283,7 +283,8 @@ class BrowserOptionsManager:
         the specified path.
 
         Args:
-            path (str): The path to the browser executable.
+            paths (list[str]): Lista de caminhos possíveis do navegador.
+
 
         Returns:
             str: The validated browser path if it exists.
@@ -291,6 +292,7 @@ class BrowserOptionsManager:
         Raises:
             ValueError: If the browser executable is not found at the path.
         """
-        if not os.path.exists(path):
-            raise ValueError(f'Browser not found: {path}')
-        return path
+        for path in paths:
+            if os.path.exists(path) and os.access(path, os.X_OK):
+                return path
+        raise ValueError(f"No valid browser path found in: {paths}")

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pydoll/browser/page.py

@@ -157,6 +157,7 @@ class Page(FindElementsMixin):  # noqa: PLR0904
         """
         if self._connection_handler.dialog:
             return True
+
         return False
 
     async def get_dialog_message(self) -> str:
@@ -256,7 +257,7 @@ class Page(FindElementsMixin):  # noqa: PLR0904
         # TODO: remove the duplicated logic
         """
         response = await self._execute_command(PageCommands.screenshot())
-        return response['result']['data'].encode('utf-8')
+        return response['result']['data']
 
     async def set_download_path(self, path: str):
         """

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pydoll/commands/browser.py

@@ -17,6 +17,10 @@ class BrowserCommands:
 
     CLOSE = {'method': 'Browser.close'}
     GET_WINDOW_ID = {'method': 'Browser.WindowID'}
+    GET_WINDOW_ID_BY_TARGET = {
+        'method': 'Browser.getWindowForTarget',
+        'params': {},
+    }
     SET_WINDOW_BOUNDS_TEMPLATE = {
         'method': 'Browser.setWindowBounds',
         'params': {},
@@ -62,6 +66,21 @@ class BrowserCommands:
         """
         return cls.GET_WINDOW_ID
 
+    @classmethod
+    def get_window_id_by_target(cls, target_id: str) -> dict:
+        """
+        Generates the command to get the ID of the current window.
+
+        Args:
+            target_id (str): The target_id to set for the window.
+
+        Returns:
+            dict: The command to be sent to the browser.
+        """
+        command = cls.GET_WINDOW_ID_BY_TARGET.copy()
+        command['params']['targetId'] = target_id
+        return command
+
     @classmethod
     def set_window_bounds(cls, window_id: int, bounds: dict) -> dict:
         """

{pydoll_python-1.3.0 → pydoll_python-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydoll-python"
-version = "1.3.0"
+version = "1.3.2"
 description = ""
 authors = ["Thalison Fernandes <thalissfernandes99@gmail.com>"]
 readme = "README.md"