refactor: refactor type hints from List to built-in list for consistency

Author: thalissonvs

pydoll/browser/chromium/base.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from functools import partial
 from random import randint
-from typing import Any, Callable, List, Optional, TypeVar
+from typing import Any, Callable, Optional, TypeVar
 
 from pydoll.browser.interfaces import BrowserOptionsManager
 from pydoll.browser.managers import (
@@ -22,6 +22,7 @@
 from pydoll.constants import (
     AuthChallengeResponseValues,
     DownloadBehavior,
+    NetworkErrorReason,
     PermissionType,
 )
 from pydoll.exceptions import BrowserNotRunning, FailedToStartBrowser, NoValidTabFound
@@ -33,6 +34,7 @@
 )
 from pydoll.protocol.browser.types import WindowBoundsDict
 from pydoll.protocol.fetch.events import FetchEvent
+from pydoll.protocol.fetch.types import HeaderEntry
 from pydoll.protocol.network.types import Cookie, CookieParam, RequestPausedEvent
 from pydoll.protocol.storage.responses import GetCookiesResponse
 from pydoll.protocol.target.responses import (
@@ -70,6 +72,7 @@ def __init__(
         Note:
             Call start() to actually launch the browser.
         """
+        self._validate_connection_port(connection_port)
         self.options = options_manager.initialize_options()
         self._proxy_manager = ProxyManager(self.options)
         self._connection_port = connection_port if connection_port else randint(9223, 9322)
@@ -178,7 +181,7 @@ async def delete_browser_context(self, browser_context_id: str):
             TargetCommands.dispose_browser_context(browser_context_id)
         )
 
-    async def get_browser_contexts(self) -> List[str]:
+    async def get_browser_contexts(self) -> list[str]:
         """Get all browser context IDs including the default context."""
         response: GetBrowserContextsResponse = await self._execute_command(
             TargetCommands.get_browser_contexts()
@@ -205,7 +208,7 @@ async def new_tab(self, url: str = '', browser_context_id: Optional[str] = None)
         target_id = response['result']['targetId']
         return Tab(self, self._connection_port, target_id, browser_context_id)
 
-    async def get_targets(self) -> List[TargetInfo]:
+    async def get_targets(self) -> list[TargetInfo]:
         """
         Get all active targets/pages in browser.
 
@@ -248,12 +251,12 @@ async def delete_all_cookies(self, browser_context_id: Optional[str] = None):
         return await self._execute_command(StorageCommands.clear_cookies(browser_context_id))
 
     async def set_cookies(
-        self, cookies: List[CookieParam], browser_context_id: Optional[str] = None
+        self, cookies: list[CookieParam], browser_context_id: Optional[str] = None
     ):
         """Set multiple cookies in browser or context."""
         return await self._execute_command(StorageCommands.set_cookies(cookies, browser_context_id))
 
-    async def get_cookies(self, browser_context_id: Optional[str] = None) -> List[Cookie]:
+    async def get_cookies(self, browser_context_id: Optional[str] = None) -> list[Cookie]:
         """Get all cookies from browser or context."""
         response: GetCookiesResponse = await self._execute_command(
             StorageCommands.get_cookies(browser_context_id)
@@ -310,7 +313,7 @@ async def set_window_bounds(self, bounds: WindowBoundsDict):
 
     async def grant_permissions(
         self,
-        permissions: List[PermissionType],
+        permissions: list[PermissionType],
         origin: Optional[str] = None,
         browser_context_id: Optional[str] = None,
     ):
@@ -401,6 +404,33 @@ async def continue_request(self, request_id: str):
         """
         return await self._execute_command(FetchCommands.continue_request(request_id))
 
+    async def fail_request(self, request_id: str, error_reason: NetworkErrorReason):
+        """Fail request with error code."""
+        return await self._execute_command(FetchCommands.fail_request(request_id, error_reason))
+
+    async def fulfill_request(
+        self,
+        request_id: str,
+        response_code: int,
+        response_headers: list[HeaderEntry],
+        response_body: dict[Any, Any],
+    ):
+        """Fulfill request with response data."""
+        return await self._execute_command(
+            FetchCommands.fulfill_request(
+                request_id,
+                response_code,
+                response_headers,
+                response_body,
+            )
+        )
+
+    @staticmethod
+    def _validate_connection_port(connection_port: Optional[int]):
+        """Validate connection port."""
+        if connection_port and connection_port < 0:
+            raise ValueError('Connection port must be a positive integer')
+
     async def _continue_request_callback(self, event: RequestPausedEvent):
         """Internal callback to continue paused requests."""
         request_id = event['params']['requestId']
@@ -461,7 +491,7 @@ def _is_valid_tab(target: TargetInfo) -> bool:
         return target.get('type') == 'page' and 'chrome-extension://' not in target.get('url', '')
 
     @staticmethod
-    async def _get_valid_tab_id(targets: List[TargetInfo]) -> str:
+    async def _get_valid_tab_id(targets: list[TargetInfo]) -> str:
         """
         Find valid attached tab ID.
 

pydoll/browser/interfaces.py

@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
-from typing import List
 
 
 class Options(ABC):
     @property
     @abstractmethod
-    def arguments(self) -> List[str]:
+    def arguments(self) -> list[str]:
         pass
 
     @property

pydoll/browser/options.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from pydoll.browser.interfaces import Options
 from pydoll.exceptions import ArgumentAlreadyExistsInOptions
 
@@ -23,7 +21,7 @@ def __init__(self):
         self._binary_location = ''
 
     @property
-    def arguments(self) -> List[str]:
+    def arguments(self) -> list[str]:
         """
         Gets the list of command-line arguments.
 
@@ -33,7 +31,7 @@ def arguments(self) -> List[str]:
         return self._arguments
 
     @arguments.setter
-    def arguments(self, args_list: List[str]):
+    def arguments(self, args_list: list[str]):
         """
         Sets the list of command-line arguments.
 

pydoll/browser/tab.py

@@ -8,10 +8,7 @@
     Any,
     AsyncGenerator,
     Callable,
-    Dict,
-    List,
     Optional,
-    Tuple,
     TypeAlias,
     Union,
     cast,
@@ -38,6 +35,7 @@
     NoDialogPresent,
     NotAnIFrame,
     PageLoadTimeout,
+    WaitElementTimeout,
 )
 from pydoll.protocol.base import Response
 from pydoll.protocol.network.types import Cookie, CookieParam
@@ -203,7 +201,7 @@ async def enable_intercept_file_chooser_dialog(self):
 
     async def enable_auto_solve_cloudflare_captcha(
         self,
-        custom_selector: Optional[Tuple[By, str]] = None,
+        custom_selector: Optional[tuple[By, str]] = None,
         time_before_click: int = 2,
         time_to_wait_captcha: int = 5,
     ):
@@ -312,14 +310,14 @@ async def get_frame(self, frame: WebElement) -> IFrame:
 
         return Tab(self._browser, self._connection_port, iframe_target['targetId'])
 
-    async def get_cookies(self) -> List[Cookie]:
+    async def get_cookies(self) -> list[Cookie]:
         """Get all cookies accessible from current page."""
         response: GetCookiesResponse = await self._execute_command(
             StorageCommands.get_cookies(self._browser_context_id)
         )
         return response['result']['cookies']
 
-    async def set_cookies(self, cookies: List[CookieParam]):
+    async def set_cookies(self, cookies: list[CookieParam]):
         """
         Set multiple cookies for current page.
 
@@ -357,7 +355,7 @@ async def go_to(self, url: str, timeout: int = 300):
 
         try:
             await self._wait_page_load(timeout=timeout)
-        except asyncio.TimeoutError:
+        except WaitElementTimeout:
             raise PageLoadTimeout()
 
     async def refresh(
@@ -382,7 +380,7 @@ async def refresh(
         )
         try:
             await self._wait_page_load()
-        except asyncio.TimeoutError:
+        except WaitElementTimeout:
             raise PageLoadTimeout()
 
     async def take_screenshot(
@@ -534,7 +532,7 @@ async def execute_script(self, script: str, element: Optional[WebElement] = None
 
     @asynccontextmanager
     async def expect_file_chooser(
-        self, files: Union[str, Path, List[Union[str, Path]]]
+        self, files: Union[str, Path, list[Union[str, Path]]]
     ) -> AsyncGenerator[None, None]:
         """
         Context manager for automatic file upload handling.
@@ -571,7 +569,7 @@ async def event_handler(event):
     @asynccontextmanager
     async def expect_and_bypass_cloudflare_captcha(
         self,
-        custom_selector: Optional[Tuple[By, str]] = None,
+        custom_selector: Optional[tuple[By, str]] = None,
         time_before_click: int = 2,
         time_to_wait_captcha: int = 5,
     ) -> AsyncGenerator[None, None]:
@@ -585,7 +583,7 @@ async def expect_and_bypass_cloudflare_captcha(
         """
         captcha_processed = asyncio.Event()
 
-        async def bypass_cloudflare(_: Dict):
+        async def bypass_cloudflare(_: dict):
             try:
                 await self._bypass_cloudflare(
                     _,
@@ -611,7 +609,7 @@ async def bypass_cloudflare(_: Dict):
             if not _before_page_events_enabled:
                 await self.disable_page_events()
 
-    async def on(self, event_name: str, callback: Callable[[Dict], Any], temporary: bool = False):
+    async def on(self, event_name: str, callback: Callable[[dict], Any], temporary: bool = False):
         """
         Register CDP event listener.
 
@@ -664,13 +662,13 @@ async def _wait_page_load(self, timeout: int = 300):
             if response['result']['result']['value'] == 'complete':
                 break
             if asyncio.get_event_loop().time() - start_time > timeout:
-                raise asyncio.TimeoutError('Page load timed out')
+                raise WaitElementTimeout('Page load timed out')
             await asyncio.sleep(0.5)
 
     async def _bypass_cloudflare(
         self,
         event: dict,
-        custom_selector: Optional[Tuple[By, str]] = None,
+        custom_selector: Optional[tuple[By, str]] = None,
         time_before_click: int = 2,
         time_to_wait_captcha: int = 5,
     ):

pydoll/commands/browser_commands.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 
 from pydoll.constants import (
     DownloadBehavior,
@@ -210,15 +210,15 @@ def set_window_minimized(window_id: int) -> Command[Response]:
 
     @staticmethod
     def grant_permissions(
-        permissions: List[PermissionType],
+        permissions: list[PermissionType],
         origin: Optional[str] = None,
         browser_context_id: Optional[str] = None,
     ) -> Command[Response]:
         """
         Generates a command to grant specific permissions to the given origin.
 
         Args:
-            permissions (List[PermissionType]): List of permissions to grant.
+            permissions (list[PermissionType]): list of permissions to grant.
                 See PermissionType enum for available permissions.
             origin (Optional[str]): The origin to grant permissions to.
                 If not specified, grants for all origins.

pydoll/commands/dom_commands.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 
 from pydoll.constants import ElementRelation, IncludeWhitespace, LogicalAxes, PhysicalAxes
 from pydoll.protocol.base import Command, Response
@@ -673,7 +673,7 @@ def set_attribute_value(
 
     @staticmethod
     def set_file_input_files(
-        files: List[str],
+        files: list[str],
         node_id: Optional[int] = None,
         backend_node_id: Optional[int] = None,
         object_id: Optional[str] = None,
@@ -686,7 +686,7 @@ def set_file_input_files(
         a file input, allowing automated tests to provide files programmatically.
 
         Args:
-            files: List of file paths to set.
+            files: list of file paths to set.
             node_id: Identifier of the node.
             backend_node_id: Identifier of the backend node.
             object_id: JavaScript object id of the node wrapper.
@@ -1005,7 +1005,7 @@ def get_frame_owner(
     @staticmethod
     def get_nodes_for_subtree_by_style(
         node_id: int,
-        computed_styles: List[CSSComputedStyleProperty],
+        computed_styles: list[CSSComputedStyleProperty],
         pierce: Optional[bool] = None,
     ) -> Command[GetNodesForSubtreeByStyleResponse]:
         """
@@ -1017,7 +1017,7 @@ def get_nodes_for_subtree_by_style(
 
         Args:
             node_id: Node to start the search from.
-            computed_styles: List of computed style properties to match against.
+            computed_styles: list of computed style properties to match against.
             pierce: Whether or not iframes and shadow roots should be traversed.
 
         Returns:
@@ -1186,7 +1186,7 @@ def push_node_by_path_to_frontend(
 
     @staticmethod
     def push_nodes_by_backend_ids_to_frontend(
-        backend_node_ids: List[int],
+        backend_node_ids: list[int],
     ) -> Command[PushNodesByBackendIdsToFrontendResponse]:
         """
         Requests that a batch of nodes is sent to the caller given their backend node ids.