pydoll-python 2.1.0__tar.gz → 2.2.0__tar.gz

{pydoll_python-2.1.0 → pydoll_python-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pydoll-python
-Version: 2.1.0
+Version: 2.2.0
 Summary: 
 Author: Thalison Fernandes
 Author-email: thalissfernandes99@gmail.com
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiofiles (>=23.2.1,<24.0.0)
 Requires-Dist: aiohttp (>=3.9.5,<4.0.0)
-Requires-Dist: bs4 (>=0.0.2,<0.0.3)
+Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)
 Requires-Dist: mkdocstrings (>=0.29.1,<0.30.0)
 Requires-Dist: websockets (>=13.1,<14.0)
 Description-Content-Type: text/markdown
@@ -22,8 +22,8 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-    <a href="https://codecov.io/gh/autoscrape-labs/pydoll">
-        <img src="https://codecov.io/gh/autoscrape-labs/pydoll/graph/badge.svg?token=40I938OGM9"/> 
+    <a href="https://codecov.io/gh/autoscrape-labs/pydoll" >
+        <img src="https://codecov.io/gh/autoscrape-labs/pydoll/graph/badge.svg?token=40I938OGM9"/>
     </a>
     <img src="https://github.com/thalissonvs/pydoll/actions/workflows/tests.yml/badge.svg" alt="Tests">
     <img src="https://github.com/thalissonvs/pydoll/actions/workflows/ruff-ci.yml/badge.svg" alt="Ruff CI">

{pydoll_python-2.1.0 → pydoll_python-2.2.0}/README.md

@@ -3,8 +3,8 @@
 </p>
 
 <p align="center">
-    <a href="https://codecov.io/gh/autoscrape-labs/pydoll">
-        <img src="https://codecov.io/gh/autoscrape-labs/pydoll/graph/badge.svg?token=40I938OGM9"/> 
+    <a href="https://codecov.io/gh/autoscrape-labs/pydoll" >
+        <img src="https://codecov.io/gh/autoscrape-labs/pydoll/graph/badge.svg?token=40I938OGM9"/>
     </a>
     <img src="https://github.com/thalissonvs/pydoll/actions/workflows/tests.yml/badge.svg" alt="Tests">
     <img src="https://github.com/thalissonvs/pydoll/actions/workflows/ruff-ci.yml/badge.svg" alt="Ruff CI">

{pydoll_python-2.1.0 → pydoll_python-2.2.0}/pydoll/browser/chromium/base.py

@@ -215,10 +215,30 @@ class Browser(ABC):  # noqa: PLR0904
 
         Targets include pages, service workers, shared workers, and browser process.
         Useful for debugging and managing multiple tabs.
+
+        Returns:
+            List of TargetInfo objects.
         """
         response: GetTargetsResponse = await self._execute_command(TargetCommands.get_targets())
         return response['result']['targetInfos']
 
+    async def get_opened_tabs(self) -> list[Tab]:
+        """
+        Get all opened tabs that are not extensions and have the type 'page'
+
+        Returns:
+            List of Tab instances. The last tab is the most recent one.
+        """
+        targets = await self.get_targets()
+        valid_tab_targets = [
+            target for target in targets if target['type'] == 'page'
+            and 'extension' not in target['url']
+        ]
+        return [
+            Tab(self, self._connection_port, target['targetId']) for target
+            in reversed(valid_tab_targets)
+        ]
+
     async def set_download_path(self, path: str, browser_context_id: Optional[str] = None):
         """Set download directory path (convenience method for set_download_behavior)."""
         return await self._execute_command(

{pydoll_python-2.1.0 → pydoll_python-2.2.0}/pydoll/browser/tab.py

@@ -68,8 +68,43 @@ class Tab(FindElementsMixin):  # noqa: PLR0904
     Primary interface for web page automation including navigation, DOM manipulation,
     JavaScript execution, event handling, network monitoring, and specialized tasks
     like Cloudflare bypass.
+
+    This class implements a singleton pattern based on target_id to ensure
+    only one Tab instance exists per browser tab.
     """
 
+    _instances: dict[str, 'Tab'] = {}
+
+    def __new__(
+        cls,
+        browser: 'Browser',
+        connection_port: int,
+        target_id: str,
+        browser_context_id: Optional[str] = None,
+    ) -> 'Tab':
+        """
+        Create or return existing Tab instance for the given target_id.
+
+        Args:
+            browser: Browser instance that created this tab.
+            connection_port: CDP WebSocket port.
+            target_id: CDP target identifier for this tab.
+            browser_context_id: Optional browser context ID.
+
+        Returns:
+            Tab instance (new or existing) for the target_id.
+        """
+        if target_id in cls._instances:
+            existing_instance = cls._instances[target_id]
+            existing_instance._browser = browser
+            existing_instance._connection_port = connection_port
+            existing_instance._browser_context_id = browser_context_id
+            return existing_instance
+
+        instance = super().__new__(cls)
+        cls._instances[target_id] = instance
+        return instance
+
     def __init__(
         self,
         browser: 'Browser',
@@ -86,18 +121,57 @@ class Tab(FindElementsMixin):  # noqa: PLR0904
             target_id: CDP target identifier for this tab.
             browser_context_id: Optional browser context ID.
         """
-        self._browser = browser
-        self._connection_port = connection_port
-        self._target_id = target_id
-        self._connection_handler = ConnectionHandler(connection_port, self._target_id)
-        self._page_events_enabled = False
-        self._network_events_enabled = False
-        self._fetch_events_enabled = False
-        self._dom_events_enabled = False
-        self._runtime_events_enabled = False
-        self._intercept_file_chooser_dialog_enabled = False
+        if hasattr(self, '_initialized') and self._initialized:
+            return
+
+        self._browser: 'Browser' = browser
+        self._connection_port: int = connection_port
+        self._target_id: str = target_id
+        self._connection_handler: ConnectionHandler = ConnectionHandler(
+            connection_port, self._target_id
+        )
+        self._page_events_enabled: bool = False
+        self._network_events_enabled: bool = False
+        self._fetch_events_enabled: bool = False
+        self._dom_events_enabled: bool = False
+        self._runtime_events_enabled: bool = False
+        self._intercept_file_chooser_dialog_enabled: bool = False
         self._cloudflare_captcha_callback_id: Optional[int] = None
-        self._browser_context_id = browser_context_id
+        self._browser_context_id: Optional[str] = browser_context_id
+        self._initialized: bool = True
+
+    @classmethod
+    def _remove_instance(cls, target_id: str) -> None:
+        """
+        Remove instance from registry when tab is closed.
+
+        Args:
+            target_id: Target ID to remove from registry.
+        """
+        cls._instances.pop(target_id, None)
+
+    @classmethod
+    def get_instance(cls, target_id: str) -> Optional['Tab']:
+        """
+        Get existing Tab instance for target_id if it exists.
+
+        Args:
+            target_id: Target ID to look up.
+
+        Returns:
+            Existing Tab instance or None if not found.
+        """
+        return cls._instances.get(target_id)
+
+    @classmethod
+    def get_all_instances(cls) -> dict[str, 'Tab']:
+        """
+        Get all active Tab instances.
+
+        Returns:
+            Dictionary mapping target_id to Tab instances.
+        """
+        return cls._instances.copy()
 
     @property
     def page_events_enabled(self) -> bool:
@@ -283,7 +357,9 @@ class Tab(FindElementsMixin):  # noqa: PLR0904
         Note:
             Tab instance becomes invalid after calling this method.
         """
-        return await self._execute_command(PageCommands.close())
+        result = await self._execute_command(PageCommands.close())
+        self._remove_instance(self._target_id)
+        return result
 
     async def get_frame(self, frame: WebElement) -> IFrame:
         """

{pydoll_python-2.1.0 → pydoll_python-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydoll-python"
-version = "2.1.0"
+version = "2.2.0"
 description = ""
 authors = ["Thalison Fernandes <thalissfernandes99@gmail.com>"]
 readme = "README.md"
@@ -13,7 +13,7 @@ python = "^3.10"
 websockets = "^13.1"
 aiohttp = "^3.9.5"
 aiofiles = "^23.2.1"
-bs4 = "^0.0.2"
+beautifulsoup4 = "^4.12.3"
 mkdocstrings = "^0.29.1"
 
 
@@ -64,4 +64,4 @@ post_test = 'coverage html'
 [tool.mypy]
 exclude = [
     "tests/",
-]
+]