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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pydoll-python
-Version: 1.3.2
+Version: 1.3.3
 Summary: 
 Author: Thalison Fernandes
 Author-email: thalissfernandes99@gmail.com
@@ -740,9 +740,7 @@ from pydoll.events.page import PageEvents
 async def on_page_loaded(event):
     print(f"🌐 Navigating to: {event['params'].get('url')}")
 
-await browser.enable_page_events()  # Activates page events
-await browser.on(PageEvents.PAGE_LOADED, on_page_loaded) # Global listener!
-# Needs to be locally? Use the page.on method!
+await page.enable_page_events()
 await page.on(PageEvents.PAGE_LOADED, on_page_loaded)
 ```
 
@@ -754,20 +752,21 @@ from functools import partial
 async def on_page_loaded(page, event):
     print(f"📄 Page loaded: {await page.current_url}")
 
-await browser.on(PageEvents.PAGE_LOADED, partial(on_page_loaded, page))
+await page.enable_page_events()
+await page.on(PageEvents.PAGE_LOADED, partial(on_page_loaded, page))
 ```
 
 ##### `async enable_page_events() -> None`
-Track everything happening on your pages - loading states, navigation, DOM changes, and more! This works globally or locally. Just use the browser or the page instance to enable the events.
+Track everything happening on your pages - loading states, navigation, DOM changes, and more! This only locally. Just use  the page instance to enable the events.
 
 ```python
 # Enables page event monitoring
-await browser.enable_page_events() # global
+await page.enable_page_events()
 ```
 
 
 ##### `async enable_network_events() -> None`
-See all network activity in real-time - perfect for debugging or monitoring specific API calls!
+See all network activity in real-time - perfect for debugging or monitoring specific API calls! Only works in the page domain.
 
 ```python
 from pydoll.events.network import NetworkEvents
@@ -775,14 +774,14 @@ from pydoll.events.network import NetworkEvents
 async def on_request(event):
     print(f"🔄 Request to: {event['params']['request']['url']} will be sent")
 
-await browser.enable_network_events()
-await browser.on(NetworkEvents.REQUEST_WILL_BE_SENT, on_request)
+await page.enable_network_events()
+await page.on(NetworkEvents.REQUEST_WILL_BE_SENT, on_request)
 
 await page.go_to('https://www.google.com') # This will trigger the on_request callback
 ```
 
 ##### `async enable_dom_events() -> None`
-Watch the page structure change in real-time and react accordingly!
+Watch the page structure change in real-time and react accordingly! Only works on the page domain.
 
 ```python
 from pydoll.events.dom import DomEvents
@@ -790,8 +789,8 @@ from pydoll.events.dom import DomEvents
 async def on_dom_event(event):
     print(f"🔄 The DOM has been updated!")
 
-await browser.enable_dom_events()
-await browser.on(DomEvents.DOCUMENT_UPDATED, on_dom_event)
+await page.enable_dom_events()
+await page.on(DomEvents.DOCUMENT_UPDATED, on_dom_event)
 ```
 
 ##### `async enable_fetch_events(handle_auth_requests: bool = False, resource_type: str = '') -> None`
@@ -822,6 +821,8 @@ async def interceptor(page, event):
 
 await browser.enable_fetch_events(resource_type='xhr') # only intercept XHR requests
 await browser.on(FetchEvents.REQUEST_PAUSED, partial(interceptor, page))
+
+await page.enable_fetch_events() # also works in the page domain!
 ```
 
 With this power, you can transform your automation into something truly intelligent!
@@ -832,6 +833,7 @@ Turn off request interception when you're done.
 ```python
 # Disables request interception
 await browser.disable_fetch_events()
+await page.disable_fetch_events()
 ```
 
 ### Concurrent Scraping
@@ -860,5 +862,13 @@ Get the most out of Pydoll with these tips:
 
 ## 🤝 Contributing
 
-We'd love your help making Pydoll even better! Check out our contribution guidelines to get started. Whether it's fixing bugs, adding features, or improving documentation - all contributions are welcome!
+We'd love your help making Pydoll even better! Check out our [contribution guidelines](CONTRIBUTING.md) to get started. Whether it's fixing bugs, adding features, or improving documentation - all contributions are welcome!
+
+Please make sure to:
+- Write tests for new features or bug fixes
+- Follow our coding style and conventions
+- Use conventional commits for your pull requests
+- Run the lint and test checks before submitting
+
+See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed instructions on how to contribute to the project.
 

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/README.md

@@ -721,9 +721,7 @@ from pydoll.events.page import PageEvents
 async def on_page_loaded(event):
     print(f"🌐 Navigating to: {event['params'].get('url')}")
 
-await browser.enable_page_events()  # Activates page events
-await browser.on(PageEvents.PAGE_LOADED, on_page_loaded) # Global listener!
-# Needs to be locally? Use the page.on method!
+await page.enable_page_events()
 await page.on(PageEvents.PAGE_LOADED, on_page_loaded)
 ```
 
@@ -735,20 +733,21 @@ from functools import partial
 async def on_page_loaded(page, event):
     print(f"📄 Page loaded: {await page.current_url}")
 
-await browser.on(PageEvents.PAGE_LOADED, partial(on_page_loaded, page))
+await page.enable_page_events()
+await page.on(PageEvents.PAGE_LOADED, partial(on_page_loaded, page))
 ```
 
 ##### `async enable_page_events() -> None`
-Track everything happening on your pages - loading states, navigation, DOM changes, and more! This works globally or locally. Just use the browser or the page instance to enable the events.
+Track everything happening on your pages - loading states, navigation, DOM changes, and more! This only locally. Just use  the page instance to enable the events.
 
 ```python
 # Enables page event monitoring
-await browser.enable_page_events() # global
+await page.enable_page_events()
 ```
 
 
 ##### `async enable_network_events() -> None`
-See all network activity in real-time - perfect for debugging or monitoring specific API calls!
+See all network activity in real-time - perfect for debugging or monitoring specific API calls! Only works in the page domain.
 
 ```python
 from pydoll.events.network import NetworkEvents
@@ -756,14 +755,14 @@ from pydoll.events.network import NetworkEvents
 async def on_request(event):
     print(f"🔄 Request to: {event['params']['request']['url']} will be sent")
 
-await browser.enable_network_events()
-await browser.on(NetworkEvents.REQUEST_WILL_BE_SENT, on_request)
+await page.enable_network_events()
+await page.on(NetworkEvents.REQUEST_WILL_BE_SENT, on_request)
 
 await page.go_to('https://www.google.com') # This will trigger the on_request callback
 ```
 
 ##### `async enable_dom_events() -> None`
-Watch the page structure change in real-time and react accordingly!
+Watch the page structure change in real-time and react accordingly! Only works on the page domain.
 
 ```python
 from pydoll.events.dom import DomEvents
@@ -771,8 +770,8 @@ from pydoll.events.dom import DomEvents
 async def on_dom_event(event):
     print(f"🔄 The DOM has been updated!")
 
-await browser.enable_dom_events()
-await browser.on(DomEvents.DOCUMENT_UPDATED, on_dom_event)
+await page.enable_dom_events()
+await page.on(DomEvents.DOCUMENT_UPDATED, on_dom_event)
 ```
 
 ##### `async enable_fetch_events(handle_auth_requests: bool = False, resource_type: str = '') -> None`
@@ -803,6 +802,8 @@ async def interceptor(page, event):
 
 await browser.enable_fetch_events(resource_type='xhr') # only intercept XHR requests
 await browser.on(FetchEvents.REQUEST_PAUSED, partial(interceptor, page))
+
+await page.enable_fetch_events() # also works in the page domain!
 ```
 
 With this power, you can transform your automation into something truly intelligent!
@@ -813,6 +814,7 @@ Turn off request interception when you're done.
 ```python
 # Disables request interception
 await browser.disable_fetch_events()
+await page.disable_fetch_events()
 ```
 
 ### Concurrent Scraping
@@ -841,4 +843,12 @@ Get the most out of Pydoll with these tips:
 
 ## 🤝 Contributing
 
-We'd love your help making Pydoll even better! Check out our contribution guidelines to get started. Whether it's fixing bugs, adding features, or improving documentation - all contributions are welcome!
+We'd love your help making Pydoll even better! Check out our [contribution guidelines](CONTRIBUTING.md) to get started. Whether it's fixing bugs, adding features, or improving documentation - all contributions are welcome!
+
+Please make sure to:
+- Write tests for new features or bug fixes
+- Follow our coding style and conventions
+- Use conventional commits for your pull requests
+- Run the lint and test checks before submitting
+
+See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed instructions on how to contribute to the project.

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

@@ -12,15 +12,15 @@ from pydoll.browser.managers import (
 )
 from pydoll.browser.options import Options
 from pydoll.browser.page import Page
-from pydoll.commands.browser import BrowserCommands
-from pydoll.commands.dom import DomCommands
-from pydoll.commands.fetch import FetchCommands
-from pydoll.commands.network import NetworkCommands
-from pydoll.commands.page import PageCommands
-from pydoll.commands.storage import StorageCommands
-from pydoll.commands.target import TargetCommands
+from pydoll.commands import (
+    BrowserCommands,
+    FetchCommands,
+    NetworkCommands,
+    StorageCommands,
+    TargetCommands,
+)
 from pydoll.connection.connection import ConnectionHandler
-from pydoll.events.fetch import FetchEvents
+from pydoll.events import FetchEvents, PageEvents
 
 
 class Browser(ABC):  # noqa: PLR0904
@@ -188,6 +188,10 @@ class Browser(ABC):  # noqa: PLR0904
         Returns:
             int: The ID of the registered callback.
         """
+        if event_name in PageEvents.ALL_EVENTS:
+            raise exceptions.EventNotSupported(
+                'Page events are not supported in the browser domain.'
+            )
 
         async def callback_wrapper(event):
             asyncio.create_task(callback(event))
@@ -232,7 +236,7 @@ class Browser(ABC):  # noqa: PLR0904
         Stops the running browser process.
 
         Raises:
-            ValueError: If the browser is not currently running.
+            BrowserNotRunning: If the browser is not currently running.
         """
         if await self._is_browser_running():
             await self._execute_command(BrowserCommands.CLOSE)
@@ -296,51 +300,6 @@ class Browser(ABC):  # noqa: PLR0904
             BrowserCommands.set_window_minimized(window_id)
         )
 
-    async def enable_page_events(self):
-        """
-        Enables listening for page-related events over the websocket
-        connection. Once this method is invoked, the connection will emit
-        events pertaining to page activities, such as loading, navigation,
-        and DOM updates, to any registered event callbacks. For a comprehensive
-        list of available page events and their purposes, refer to the
-        PageEvents class documentation.
-        This functionality is crucial for monitoring and reacting to changes
-        in the page state in real-time.
-
-        This method has a global scope and can be used to listen
-        for events across all pages in the browser. Each Page instance also
-        has an `enable_page_events` method that allows for listening to events
-        on a specific page.
-
-        Returns:
-            None
-        """
-        await self._connection_handler.execute_command(
-            PageCommands.enable_page()
-        )
-
-    async def enable_network_events(self):
-        """
-        Activates listening for network events through the websocket
-        connection. After calling this method, the connection will emit
-        events related to network activities, such as resource loading and
-        response status, to any registered event callbacks. This is essential
-        for debugging network interactions and analyzing resource requests.
-        For details on available network events, consult the NetworkEvents
-        class documentation.
-
-        This method has a global scope and can be used to listen
-        for events across all pages in the browser. Each Page instance also
-        has an `enable_network_events` method that allows for listening to
-        events on a specific page.
-
-        Returns:
-            None
-        """
-        await self._connection_handler.execute_command(
-            NetworkCommands.enable_network_events()
-        )
-
     async def enable_fetch_events(
         self, handle_auth_requests: bool = False, resource_type: str = ''
     ):
@@ -375,27 +334,6 @@ class Browser(ABC):  # noqa: PLR0904
             )
         )
 
-    async def enable_dom_events(self):
-        """
-        Enables DOM-related events for the websocket connection. When invoked,
-        this method allows the connection to listen for changes in the DOM,
-        including node additions, removals, and attribute changes. This feature
-        is vital for applications that need to react to dynamic changes in
-        the page structure. For a full list of available DOM events, refer to
-        the DomCommands class documentation.
-
-        This method has a global scope and can be used to listen
-        for events across all pages in the browser. Each Page instance also has
-        an `enable_dom_events` method that allows for listening to events on
-        a specific page.
-
-        Returns:
-            None
-        """
-        await self._connection_handler.execute_command(
-            DomCommands.enable_dom_events()
-        )
-
     async def disable_fetch_events(self):
         """
         Deactivates the Fetch domain, stopping the interception of network
@@ -548,14 +486,11 @@ class Browser(ABC):  # noqa: PLR0904
             str: The target ID of an existing or new page.
         """
         valid_page = next(
-            (page for page in pages if self._is_valid_page(page)), None
+            (page for page in pages if self._is_valid_page(page)), {}
         )
 
-        if valid_page:
-            try:
-                return valid_page['targetId']
-            except KeyError:
-                pass
+        if valid_page.get('targetId', None):
+            return valid_page['targetId']
 
         return await self.new_page()
 

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

@@ -186,6 +186,10 @@ class BrowserProcessManager:
         """
         if self._process:
             self._process.terminate()
+            try:
+                self._process.wait(timeout=15)
+            except subprocess.TimeoutExpired:
+                self._process.kill()
 
 
 class TempDirectoryManager:

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

@@ -3,12 +3,14 @@ import json
 
 import aiofiles
 
-from pydoll.commands.dom import DomCommands
-from pydoll.commands.fetch import FetchCommands
-from pydoll.commands.network import NetworkCommands
-from pydoll.commands.page import PageCommands
-from pydoll.commands.runtime import RuntimeCommands
-from pydoll.commands.storage import StorageCommands
+from pydoll.commands import (
+    DomCommands,
+    FetchCommands,
+    NetworkCommands,
+    PageCommands,
+    RuntimeCommands,
+    StorageCommands,
+)
 from pydoll.connection.connection import ConnectionHandler
 from pydoll.element import WebElement
 from pydoll.exceptions import InvalidFileExtension

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/commands/__init__.py

@@ -1,4 +1,5 @@
 # global imports
+from pydoll.commands.browser import BrowserCommands
 from pydoll.commands.dom import DomCommands
 from pydoll.commands.fetch import FetchCommands
 from pydoll.commands.input import InputCommands
@@ -6,6 +7,7 @@ from pydoll.commands.network import NetworkCommands
 from pydoll.commands.page import PageCommands
 from pydoll.commands.runtime import RuntimeCommands
 from pydoll.commands.storage import StorageCommands
+from pydoll.commands.target import TargetCommands
 
 __all__ = [
     'DomCommands',
@@ -15,4 +17,6 @@ __all__ = [
     'PageCommands',
     'RuntimeCommands',
     'StorageCommands',
+    'BrowserCommands',
+    'TargetCommands',
 ]

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/commands/dom.py

@@ -24,6 +24,7 @@ class DomCommands:
     ]
 
     ENABLE = {'method': 'DOM.enable'}
+    DISABLE = {'method': 'DOM.disable'}
     DOM_DOCUMENT = {'method': 'DOM.getDocument'}
     DESCRIBE_NODE_TEMPLATE = {'method': 'DOM.describeNode', 'params': {}}
     FIND_ELEMENT_TEMPLATE = {'method': 'DOM.querySelector', 'params': {}}
@@ -138,6 +139,13 @@ class DomCommands:
         """
         return cls.ENABLE
 
+    @classmethod
+    def disable_dom_events(cls) -> dict:
+        """
+        Generates a command to disable the DOM domain in CDP.
+        """
+        return cls.DISABLE
+
     @classmethod
     def get_current_url(cls) -> dict:
         """

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/connection/connection.py

@@ -208,7 +208,9 @@ class ConnectionHandler:
         """
         ws_address = await self._resolve_ws_address()
         logger.info(f'Connecting to {ws_address}')
-        self._ws_connection = await self._ws_connector(ws_address)
+        self._ws_connection = await self._ws_connector(
+            ws_address, max_size=1024 * 1024 * 10  # 10MB
+        )
         self._receive_task = asyncio.create_task(self._receive_events())
         logger.debug('WebSocket connection established')
 

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/element.py

@@ -5,10 +5,12 @@ import aiofiles
 from bs4 import BeautifulSoup
 
 from pydoll import exceptions
-from pydoll.commands.dom import DomCommands
-from pydoll.commands.input import InputCommands
-from pydoll.commands.page import PageCommands
-from pydoll.commands.runtime import RuntimeCommands
+from pydoll.commands import (
+    DomCommands,
+    InputCommands,
+    PageCommands,
+    RuntimeCommands,
+)
 from pydoll.connection.connection import ConnectionHandler
 from pydoll.constants import Scripts
 from pydoll.mixins.find_elements import FindElementsMixin

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/events/page.py

@@ -142,3 +142,22 @@ class PageEvents:
     This event is useful for tracking changes in the document state, such as
     anchor links or in-page navigation, without requiring a full page reload.
     """
+
+    ALL_EVENTS = [
+        PAGE_LOADED,
+        DOM_CONTENT_LOADED,
+        FILE_CHOOSER_OPENED,
+        FRAME_ATTACHED,
+        FRAME_DETACHED,
+        FRAME_NAVIGATED,
+        JS_DIALOG_CLOSED,
+        JS_DIALOG_OPENING,
+        LIFECYCLE_EVENT,
+        WINDOW_OPENED,
+        DOCUMENT_OPENED,
+        FRAME_STARTED_LOADING,
+        FRAME_STOPPED_LOADING,
+        DOWNLOAD_PROGRESS,
+        DOWNLOAD_WILL_BEGIN,
+        NAVIGATED_WITHIN_DOCUMENT,
+    ]

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/exceptions.py

@@ -87,3 +87,13 @@ class InvalidFileExtension(Exception):
 
     def __str__(self):
         return self.message
+
+
+class EventNotSupported(Exception):
+    message = 'The event is not supported'
+
+    def __init__(self, message: str = ''):
+        self.message = message or self.message
+
+    def __str__(self):
+        return self.message

{pydoll_python-1.3.2 → pydoll_python-1.3.3}/pydoll/mixins/find_elements.py

@@ -1,8 +1,10 @@
 import asyncio
 
 from pydoll import exceptions
-from pydoll.commands.dom import DomCommands
-from pydoll.commands.runtime import RuntimeCommands
+from pydoll.commands import (
+    DomCommands,
+    RuntimeCommands,
+)
 
 
 def create_web_element(*args, **kwargs):

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

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