v0.3.5 (#89)

.github/workflows/tests.yml

@@ -58,7 +58,7 @@ jobs:
     - name: Install all browsers dependencies
       run: |
         python3 -m pip install --upgrade pip
-        python3 -m pip install playwright==1.52.0 rebrowser-playwright==1.52.0 camoufox
+        python3 -m pip install playwright>=1.55.0 patchright>=1.55.0 camoufox
 
     - name: Retrieve Playwright browsers from cache if any
       id: playwright-cache

README.md

@@ -322,10 +322,9 @@ This project includes code adapted from:
 ## Thanks and References
 
 - [Daijro](https://github.com/daijro)'s brilliant work on [BrowserForge](https://github.com/daijro/browserforge) and [Camoufox](https://github.com/daijro/camoufox)
-- [Vinyzu](https://github.com/Vinyzu)'s work on [Botright](https://github.com/Vinyzu/Botright)
+- [Vinyzu](https://github.com/Vinyzu)'s brilliant work on [Botright](https://github.com/Vinyzu/Botright) and [PatchRight](https://github.com/Kaliiiiiiiiii-Vinyzu/patchright)
 - [brotector](https://github.com/kaliiiiiiiiii/brotector) for browser detection bypass techniques
-- [fakebrowser](https://github.com/kkoooqq/fakebrowser) for fingerprinting research
+- [fakebrowser](https://github.com/kkoooqq/fakebrowser) and [BotBrowser](https://github.com/botswin/BotBrowser) for fingerprinting research
-- [rebrowser-patches](https://github.com/rebrowser/rebrowser-patches) for stealth improvements
 
 ---
 <div align="center"><small>Designed & crafted with ❤️ by Karim Shoair.</small></div><br>

docs/fetching/dynamic.md

@@ -35,7 +35,7 @@ It's the same as the vanilla Playwright option, but it provides a simple stealth
 
 Some of the things this fetcher's stealth mode does include:
 
-  * Patching the CDP runtime fingerprint.
+  * Patching the CDP runtime fingerprint through using PatchRight.
   * Mimics some of the real browsers' properties by injecting several JS files and using custom options.
   * Custom flags are used on launch to hide Playwright even more and make it faster.
   * Generates real browser headers of the same type and user OS, then appends them to the request's headers.

pyproject.toml

@@ -64,16 +64,16 @@ dependencies = [
 
 [project.optional-dependencies]
 fetchers = [
-    "click>=8.2.1",
+    "click>=8.3.0",
     "curl_cffi>=0.13.0",
-    "playwright>=1.52.0",
+    "playwright>=1.55.0",
-    "rebrowser-playwright>=1.52.0",
+    "patchright>=1.55.2",
     "camoufox>=0.4.11",
     "geoip2>=5.1.0",
     "msgspec>=0.19.0",
 ]
 ai = [
-    "mcp>=1.14.0",
+    "mcp>=1.14.1",
     "markdownify>=1.2.0",
     "scrapling[fetchers]",
 ]

scrapling/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "Karim Shoair (karim.shoair@pm.me)"
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 __copyright__ = "Copyright (c) 2024 Karim Shoair"
 
 

scrapling/cli.py

@@ -32,8 +32,8 @@ def __ParseJSONData(json_string: Optional[str] = None) -> Optional[Dict[str, Any
 
     try:
         return json_loads(json_string)
-    except JSONDecodeError as e:  # pragma: no cover
+    except JSONDecodeError as err:  # pragma: no cover
-        raise ValueError(f"Invalid JSON data '{json_string}': {e}")
+        raise ValueError(f"Invalid JSON data '{json_string}': {err}")
 
 
 def __Request_and_Save(
@@ -65,8 +65,8 @@ def __ParseExtractArguments(
         for key, value in _CookieParser(cookies):
             try:
                 parsed_cookies[key] = value
-            except Exception as e:
+            except Exception as err:
-                raise ValueError(f"Could not parse cookies '{cookies}': {e}")
+                raise ValueError(f"Could not parse cookies '{cookies}': {err}")
 
     parsed_json = __ParseJSONData(json)
     parsed_params = {}

scrapling/core/custom_types.py

@@ -145,7 +145,7 @@ class TextHandler(str):
         clean_match: bool = False,
         case_sensitive: bool = True,
         check_match: Literal[False] = False,
-    ) -> "TextHandlers[TextHandler]": ...
+    ) -> "TextHandlers": ...
 
     def re(
         self,
@@ -241,7 +241,7 @@ class TextHandlers(List[TextHandler]):
         replace_entities: bool = True,
         clean_match: bool = False,
         case_sensitive: bool = True,
-    ) -> "TextHandlers[TextHandler]":
+    ) -> "TextHandlers":
         """Call the ``.re()`` method for each element in this list and return
         their results flattened as TextHandlers.
 

scrapling/core/shell.py

@@ -201,7 +201,7 @@ class CurlParser:
                 data_payload = parsed_args.data_binary  # Fallback to string
 
         elif parsed_args.data_raw is not None:
-            data_payload = parsed_args.data_raw
+            data_payload = parsed_args.data_raw.lstrip("$")
 
         elif parsed_args.data is not None:
             data_payload = parsed_args.data
@@ -317,8 +317,8 @@ def show_page_in_browser(page: Selector):  # pragma: no cover
 
     try:
         fd, fname = make_temp_file(prefix="scrapling_view_", suffix=".html")
-        with open(fd, "wb") as f:
+        with open(fd, "w", encoding=page.encoding) as f:
-            f.write(page.body)
+            f.write(page.html_content)
 
         open_in_browser(f"file://{fname}")
     except IOError as e:
@@ -545,7 +545,7 @@ class Convertor:
             for page in pages:
                 match extraction_type:
                     case "markdown":
-                        yield cls._convert_to_markdown(page.body)
+                        yield cls._convert_to_markdown(page.html_content)
                     case "html":
                         yield page.body
                     case "text":

scrapling/engines/_browsers/_base.py

@@ -1,4 +1,4 @@
-from time import time, sleep
+from time import time
 from asyncio import sleep as asyncio_sleep, Lock
 
 from camoufox import DefaultAddons
@@ -44,23 +44,7 @@ class SyncSession:
     ) -> PageInfo:  # pragma: no cover
         """Get a new page to use"""
 
-        # Close all finished pages to ensure clean state
+        # No need to check if a page is available or not in sync code because the code blocked before reaching here till the page closed, ofc.
-        self.page_pool.close_all_finished_pages()
-
-        # If we're at max capacity after cleanup, wait for busy pages to finish
-        if self.page_pool.pages_count >= self.max_pages:
-            start_time = time()
-            while time() - start_time < self._max_wait_for_page:
-                # Wait for any pages to finish, then clean them up
-                sleep(0.05)
-                self.page_pool.close_all_finished_pages()
-                if self.page_pool.pages_count < self.max_pages:
-                    break
-            else:
-                raise TimeoutError(
-                    f"No pages finished to clear place in the pool within the {self._max_wait_for_page}s timeout period"
-                )
-
         page = self.context.new_page()
         page.set_default_navigation_timeout(timeout)
         page.set_default_timeout(timeout)
@@ -76,11 +60,6 @@ class SyncSession:
 
         return self.page_pool.add_page(page)
 
-    @staticmethod
-    def _get_with_precedence(request_value: Any, session_value: Any, sentinel_value: object) -> Any:
-        """Get value with request-level priority over session-level"""
-        return request_value if request_value is not sentinel_value else session_value
-
     def get_pool_stats(self) -> Dict[str, int]:
         """Get statistics about the current page pool"""
         return {
@@ -105,16 +84,11 @@ class AsyncSession(SyncSession):
     ) -> PageInfo:  # pragma: no cover
         """Get a new page to use"""
         async with self._lock:
-            # Close all finished pages to ensure clean state
-            await self.page_pool.aclose_all_finished_pages()
-
             # If we're at max capacity after cleanup, wait for busy pages to finish
             if self.page_pool.pages_count >= self.max_pages:
                 start_time = time()
                 while time() - start_time < self._max_wait_for_page:
-                    # Wait for any pages to finish, then clean them up
                     await asyncio_sleep(0.05)
-                    await self.page_pool.aclose_all_finished_pages()
                     if self.page_pool.pages_count < self.max_pages:
                         break
                 else:

scrapling/engines/_browsers/_camoufox.py

@@ -16,7 +16,7 @@ from playwright.async_api import (
 )
 from playwright._impl._errors import Error as PlaywrightError
 
-from ._validators import validate, CamoufoxConfig
+from ._validators import validate_fetch as _validate
 from ._base import SyncSession, AsyncSession, StealthySessionMixin
 from scrapling.core.utils import log
 from scrapling.core._types import (
@@ -297,23 +297,22 @@ class StealthySession(StealthySessionMixin, SyncSession):
         :param selector_config: The arguments that will be passed in the end while creating the final Selector's class.
         :return: A `Response` object.
         """
-        # Validate all resolved parameters
+        params = _validate(
-        params = validate(
+            [
-            dict(
+                ("google_search", google_search, self.google_search),
-                google_search=self._get_with_precedence(google_search, self.google_search, _UNSET),
+                ("timeout", timeout, self.timeout),
-                timeout=self._get_with_precedence(timeout, self.timeout, _UNSET),
+                ("wait", wait, self.wait),
-                wait=self._get_with_precedence(wait, self.wait, _UNSET),
+                ("page_action", page_action, self.page_action),
-                page_action=self._get_with_precedence(page_action, self.page_action, _UNSET),
+                ("extra_headers", extra_headers, self.extra_headers),
-                extra_headers=self._get_with_precedence(extra_headers, self.extra_headers, _UNSET),
+                ("disable_resources", disable_resources, self.disable_resources),
-                disable_resources=self._get_with_precedence(disable_resources, self.disable_resources, _UNSET),
+                ("wait_selector", wait_selector, self.wait_selector),
-                wait_selector=self._get_with_precedence(wait_selector, self.wait_selector, _UNSET),
+                ("wait_selector_state", wait_selector_state, self.wait_selector_state),
-                wait_selector_state=self._get_with_precedence(wait_selector_state, self.wait_selector_state, _UNSET),
+                ("network_idle", network_idle, self.network_idle),
-                network_idle=self._get_with_precedence(network_idle, self.network_idle, _UNSET),
+                ("load_dom", load_dom, self.load_dom),
-                load_dom=self._get_with_precedence(load_dom, self.load_dom, _UNSET),
+                ("solve_cloudflare", solve_cloudflare, self.solve_cloudflare),
-                solve_cloudflare=self._get_with_precedence(solve_cloudflare, self.solve_cloudflare, _UNSET),
+                ("selector_config", selector_config, self.selector_config),
-                selector_config=self._get_with_precedence(selector_config, self.selector_config, _UNSET),
+            ],
-            ),
+            _UNSET,
-            CamoufoxConfig,
         )
 
         if self._closed:  # pragma: no cover
@@ -381,8 +380,9 @@ class StealthySession(StealthySessionMixin, SyncSession):
                 page_info.page, first_response, final_response, params.selector_config
             )
 
-            # Mark the page as finished for next use
+            # Close the page, to free up resources
-            page_info.mark_finished()
+            page_info.page.close()
+            self.page_pool.pages.remove(page_info)
 
             return response
 
@@ -616,22 +616,22 @@ class AsyncStealthySession(StealthySessionMixin, AsyncSession):
         :param selector_config: The arguments that will be passed in the end while creating the final Selector's class.
         :return: A `Response` object.
         """
-        params = validate(
+        params = _validate(
-            dict(
+            [
-                google_search=self._get_with_precedence(google_search, self.google_search, _UNSET),
+                ("google_search", google_search, self.google_search),
-                timeout=self._get_with_precedence(timeout, self.timeout, _UNSET),
+                ("timeout", timeout, self.timeout),
-                wait=self._get_with_precedence(wait, self.wait, _UNSET),
+                ("wait", wait, self.wait),
-                page_action=self._get_with_precedence(page_action, self.page_action, _UNSET),
+                ("page_action", page_action, self.page_action),
-                extra_headers=self._get_with_precedence(extra_headers, self.extra_headers, _UNSET),
+                ("extra_headers", extra_headers, self.extra_headers),
-                disable_resources=self._get_with_precedence(disable_resources, self.disable_resources, _UNSET),
+                ("disable_resources", disable_resources, self.disable_resources),
-                wait_selector=self._get_with_precedence(wait_selector, self.wait_selector, _UNSET),
+                ("wait_selector", wait_selector, self.wait_selector),
-                wait_selector_state=self._get_with_precedence(wait_selector_state, self.wait_selector_state, _UNSET),
+                ("wait_selector_state", wait_selector_state, self.wait_selector_state),
-                network_idle=self._get_with_precedence(network_idle, self.network_idle, _UNSET),
+                ("network_idle", network_idle, self.network_idle),
-                load_dom=self._get_with_precedence(load_dom, self.load_dom, _UNSET),
+                ("load_dom", load_dom, self.load_dom),
-                solve_cloudflare=self._get_with_precedence(solve_cloudflare, self.solve_cloudflare, _UNSET),
+                ("solve_cloudflare", solve_cloudflare, self.solve_cloudflare),
-                selector_config=self._get_with_precedence(selector_config, self.selector_config, _UNSET),
+                ("selector_config", selector_config, self.selector_config),
-            ),
+            ],
-            CamoufoxConfig,
+            _UNSET,
         )
 
         if self._closed:  # pragma: no cover
@@ -701,8 +701,9 @@ class AsyncStealthySession(StealthySessionMixin, AsyncSession):
                 page_info.page, first_response, final_response, params.selector_config
             )
 
-            # Mark the page as finished for next use
+            # Close the page, to free up resources
-            page_info.mark_finished()
+            await page_info.page.close()
+            self.page_pool.pages.remove(page_info)
 
             return response
 

scrapling/engines/_browsers/_controllers.py

@@ -11,14 +11,12 @@ from playwright.async_api import (
     Playwright as AsyncPlaywright,
     Locator as AsyncLocator,
 )
-from rebrowser_playwright.sync_api import sync_playwright as sync_rebrowser_playwright
+from patchright.sync_api import sync_playwright as sync_patchright
-from rebrowser_playwright.async_api import (
+from patchright.async_api import async_playwright as async_patchright
-    async_playwright as async_rebrowser_playwright,
-)
 
 from scrapling.core.utils import log
 from ._base import SyncSession, AsyncSession, DynamicSessionMixin
-from ._validators import validate, PlaywrightConfig
+from ._validators import validate_fetch as _validate
 from scrapling.core._types import (
     Dict,
     List,
@@ -154,10 +152,7 @@ class DynamicSession(DynamicSessionMixin, SyncSession):
 
     def __create__(self):
         """Create a browser for this instance and context."""
-        sync_context = sync_rebrowser_playwright
+        sync_context = sync_patchright if self.stealth else sync_playwright
-        if not self.stealth or self.real_chrome:
-            # Because rebrowser_playwright doesn't play well with real browsers
-            sync_context = sync_playwright
 
         self.playwright: Playwright = sync_context().start()
 
@@ -229,22 +224,21 @@ class DynamicSession(DynamicSessionMixin, SyncSession):
         :param selector_config: The arguments that will be passed in the end while creating the final Selector's class.
         :return: A `Response` object.
         """
-        # Validate all resolved parameters
+        params = _validate(
-        params = validate(
+            [
-            dict(
+                ("google_search", google_search, self.google_search),
-                google_search=self._get_with_precedence(google_search, self.google_search, _UNSET),
+                ("timeout", timeout, self.timeout),
-                timeout=self._get_with_precedence(timeout, self.timeout, _UNSET),
+                ("wait", wait, self.wait),
-                wait=self._get_with_precedence(wait, self.wait, _UNSET),
+                ("page_action", page_action, self.page_action),
-                page_action=self._get_with_precedence(page_action, self.page_action, _UNSET),
+                ("extra_headers", extra_headers, self.extra_headers),
-                extra_headers=self._get_with_precedence(extra_headers, self.extra_headers, _UNSET),
+                ("disable_resources", disable_resources, self.disable_resources),
-                disable_resources=self._get_with_precedence(disable_resources, self.disable_resources, _UNSET),
+                ("wait_selector", wait_selector, self.wait_selector),
-                wait_selector=self._get_with_precedence(wait_selector, self.wait_selector, _UNSET),
+                ("wait_selector_state", wait_selector_state, self.wait_selector_state),
-                wait_selector_state=self._get_with_precedence(wait_selector_state, self.wait_selector_state, _UNSET),
+                ("network_idle", network_idle, self.network_idle),
-                network_idle=self._get_with_precedence(network_idle, self.network_idle, _UNSET),
+                ("load_dom", load_dom, self.load_dom),
-                load_dom=self._get_with_precedence(load_dom, self.load_dom, _UNSET),
+                ("selector_config", selector_config, self.selector_config),
-                selector_config=self._get_with_precedence(selector_config, self.selector_config, _UNSET),
+            ],
-            ),
+            _UNSET,
-            PlaywrightConfig,
         )
 
         if self._closed:  # pragma: no cover
@@ -305,8 +299,9 @@ class DynamicSession(DynamicSessionMixin, SyncSession):
                 page_info.page, first_response, final_response, params.selector_config
             )
 
-            # Mark the page as finished for next use
+            # Close the page, to free up resources
-            page_info.mark_finished()
+            page_info.page.close()
+            self.page_pool.pages.remove(page_info)
 
             return response
 
@@ -402,10 +397,7 @@ class AsyncDynamicSession(DynamicSessionMixin, AsyncSession):
 
     async def __create__(self):
         """Create a browser for this instance and context."""
-        async_context = async_rebrowser_playwright
+        async_context = async_patchright if self.stealth else async_playwright
-        if not self.stealth or self.real_chrome:
-            # Because rebrowser_playwright doesn't play well with real browsers
-            async_context = async_playwright
 
         self.playwright: AsyncPlaywright = await async_context().start()
 
@@ -478,22 +470,21 @@ class AsyncDynamicSession(DynamicSessionMixin, AsyncSession):
         :param selector_config: The arguments that will be passed in the end while creating the final Selector's class.
         :return: A `Response` object.
         """
-        # Validate all resolved parameters
+        params = _validate(
-        params = validate(
+            [
-            dict(
+                ("google_search", google_search, self.google_search),
-                google_search=self._get_with_precedence(google_search, self.google_search, _UNSET),
+                ("timeout", timeout, self.timeout),
-                timeout=self._get_with_precedence(timeout, self.timeout, _UNSET),
+                ("wait", wait, self.wait),
-                wait=self._get_with_precedence(wait, self.wait, _UNSET),
+                ("page_action", page_action, self.page_action),
-                page_action=self._get_with_precedence(page_action, self.page_action, _UNSET),
+                ("extra_headers", extra_headers, self.extra_headers),
-                extra_headers=self._get_with_precedence(extra_headers, self.extra_headers, _UNSET),
+                ("disable_resources", disable_resources, self.disable_resources),
-                disable_resources=self._get_with_precedence(disable_resources, self.disable_resources, _UNSET),
+                ("wait_selector", wait_selector, self.wait_selector),
-                wait_selector=self._get_with_precedence(wait_selector, self.wait_selector, _UNSET),
+                ("wait_selector_state", wait_selector_state, self.wait_selector_state),
-                wait_selector_state=self._get_with_precedence(wait_selector_state, self.wait_selector_state, _UNSET),
+                ("network_idle", network_idle, self.network_idle),
-                network_idle=self._get_with_precedence(network_idle, self.network_idle, _UNSET),
+                ("load_dom", load_dom, self.load_dom),
-                load_dom=self._get_with_precedence(load_dom, self.load_dom, _UNSET),
+                ("selector_config", selector_config, self.selector_config),
-                selector_config=self._get_with_precedence(selector_config, self.selector_config, _UNSET),
+            ],
-            ),
+            _UNSET,
-            PlaywrightConfig,
         )
 
         if self._closed:  # pragma: no cover
@@ -554,9 +545,9 @@ class AsyncDynamicSession(DynamicSessionMixin, AsyncSession):
                 page_info.page, first_response, final_response, params.selector_config
             )
 
-            # Mark the page as finished for next use
+            # Close the page, to free up resources
-            page_info.mark_finished()
+            await page_info.page.close()
-
+            self.page_pool.pages.remove(page_info)
             return response
 
         except Exception as e:  # pragma: no cover

scrapling/engines/_browsers/_page.py

@@ -6,7 +6,7 @@ from playwright.async_api import Page as AsyncPage
 
 from scrapling.core._types import Optional, List, Literal
 
-PageState = Literal["finished", "ready", "busy", "error"]  # States that a page can be in
+PageState = Literal["ready", "busy", "error"]  # States that a page can be in
 
 
 @dataclass
@@ -23,11 +23,6 @@ class PageInfo:
         self.state = "busy"
         self.url = url
 
-    def mark_finished(self):
-        """Mark the page as finished for new requests"""
-        self.state = "finished"
-        self.url = ""
-
     def mark_error(self):
         """Mark the page as having an error"""
         self.state = "error"
@@ -67,12 +62,6 @@ class PagePool:
         """Get the total number of pages"""
         return len(self.pages)
 
-    @property
-    def finished_count(self) -> int:
-        """Get the number of finished pages"""
-        with self._lock:
-            return sum(1 for p in self.pages if p.state == "finished")
-
     @property
     def busy_count(self) -> int:
         """Get the number of busy pages"""
@@ -83,33 +72,3 @@ class PagePool:
         """Remove pages in error state"""
         with self._lock:
             self.pages = [p for p in self.pages if p.state != "error"]
-
-    def close_all_finished_pages(self):
-        """Close all pages in finished state and remove them from the pool"""
-        with self._lock:
-            pages_to_remove = []
-            for page_info in self.pages:
-                if page_info.state == "finished":
-                    try:
-                        page_info.page.close()
-                    except Exception:
-                        pass
-                    pages_to_remove.append(page_info)
-
-            for page_info in pages_to_remove:
-                self.pages.remove(page_info)
-
-    async def aclose_all_finished_pages(self):
-        """Async version: Close all pages in finished state and remove them from the pool"""
-        with self._lock:
-            pages_to_remove = []
-            for page_info in self.pages:
-                if page_info.state == "finished":
-                    try:
-                        await page_info.page.close()
-                    except Exception:
-                        pass
-                    pages_to_remove.append(page_info)
-
-            for page_info in pages_to_remove:
-                self.pages.remove(page_info)

scrapling/engines/_browsers/_validators.py

@@ -1,21 +1,69 @@
-from msgspec import Struct, convert, ValidationError
-from urllib.parse import urlparse
 from pathlib import Path
+from typing import Annotated
+from dataclasses import dataclass
+from urllib.parse import urlparse
+
+from msgspec import Struct, Meta, convert, ValidationError
 
 from scrapling.core._types import (
-    Optional,
     Dict,
-    Callable,
     List,
+    Tuple,
+    Optional,
+    Callable,
     SelectorWaitStates,
 )
 from scrapling.engines.toolbelt.navigation import construct_proxy_dict
 
 
+# Custom validators for msgspec
+def _validate_file_path(value: str):
+    """Fast file path validation"""
+    path = Path(value)
+    if not path.exists():
+        raise ValueError(f"Init script path not found: {value}")
+    if not path.is_file():
+        raise ValueError(f"Init script is not a file: {value}")
+    if not path.is_absolute():
+        raise ValueError(f"Init script is not a absolute path: {value}")
+
+
+def _validate_addon_path(value: str):
+    """Fast addon path validation"""
+    path = Path(value)
+    if not path.exists():
+        raise FileNotFoundError(f"Addon path not found: {value}")
+    if not path.is_dir():
+        raise ValueError(f"Addon path must be a directory of the extracted addon: {value}")
+
+
+def _validate_cdp_url(cdp_url: str):
+    """Fast CDP URL validation"""
+    try:
+        # Check the scheme
+        if not cdp_url.startswith(("ws://", "wss://")):
+            raise ValueError("CDP URL must use 'ws://' or 'wss://' scheme")
+
+        # Validate hostname and port
+        if not urlparse(cdp_url).netloc:
+            raise ValueError("Invalid hostname for the CDP URL")
+
+    except AttributeError as e:
+        raise ValueError(f"Malformed CDP URL: {cdp_url}: {str(e)}")
+
+    except Exception as e:
+        raise ValueError(f"Invalid CDP URL '{cdp_url}': {str(e)}")
+
+
+# Type aliases for cleaner annotations
+PagesCount = Annotated[int, Meta(ge=1, le=50)]
+Seconds = Annotated[int, float, Meta(ge=0)]
+
+
 class PlaywrightConfig(Struct, kw_only=True, frozen=False):
     """Configuration struct for validation"""
 
-    max_pages: int = 1
+    max_pages: PagesCount = 1
     cdp_url: Optional[str] = None
     headless: bool = True
     google_search: bool = True
@@ -23,13 +71,13 @@ class PlaywrightConfig(Struct, kw_only=True, frozen=False):
     disable_webgl: bool = False
     real_chrome: bool = False
     stealth: bool = False
-    wait: int | float = 0
+    wait: Seconds = 0
     page_action: Optional[Callable] = None
     proxy: Optional[str | Dict[str, str]] = None  # The default value for proxy in Playwright's source is `None`
     locale: str = "en-US"
     extra_headers: Optional[Dict[str, str]] = None
     useragent: Optional[str] = None
-    timeout: int | float = 30000
+    timeout: Seconds = 30000
     init_script: Optional[str] = None
     disable_resources: bool = False
     wait_selector: Optional[str] = None
@@ -41,52 +89,26 @@ class PlaywrightConfig(Struct, kw_only=True, frozen=False):
 
     def __post_init__(self):
         """Custom validation after msgspec validation"""
-        if self.max_pages < 1 or self.max_pages > 50:
-            raise ValueError("max_pages must be between 1 and 50")
-        if self.timeout < 0:
-            raise ValueError("timeout must be >= 0")
         if self.page_action and not callable(self.page_action):
             raise TypeError(f"page_action must be callable, got {type(self.page_action).__name__}")
         if self.proxy:
             self.proxy = construct_proxy_dict(self.proxy, as_tuple=True)
         if self.cdp_url:
-            self.__validate_cdp(self.cdp_url)
+            _validate_cdp_url(self.cdp_url)
+
         if not self.cookies:
             self.cookies = []
         if not self.selector_config:
             self.selector_config = {}
 
         if self.init_script is not None:
-            script_path = Path(self.init_script)
+            _validate_file_path(self.init_script)
-            if not script_path.exists():
-                raise ValueError("Init script path not found")
-            elif not script_path.is_file():
-                raise ValueError("Init script is not a file")
-            elif not script_path.is_absolute():
-                raise ValueError("Init script is not a absolute path")
-
-    @staticmethod
-    def __validate_cdp(cdp_url):
-        try:
-            # Check the scheme
-            if not cdp_url.startswith(("ws://", "wss://")):
-                raise ValueError("CDP URL must use 'ws://' or 'wss://' scheme")
-
-            # Validate hostname and port
-            if not urlparse(cdp_url).netloc:
-                raise ValueError("Invalid hostname for the CDP URL")
-
-        except AttributeError as e:
-            raise ValueError(f"Malformed CDP URL: {cdp_url}: {str(e)}")
-
-        except Exception as e:
-            raise ValueError(f"Invalid CDP URL '{cdp_url}': {str(e)}")
 
 
 class CamoufoxConfig(Struct, kw_only=True, frozen=False):
     """Configuration struct for validation"""
 
-    max_pages: int = 1
+    max_pages: PagesCount = 1
     headless: bool = True  # noqa: F821
     block_images: bool = False
     disable_resources: bool = False
@@ -96,8 +118,8 @@ class CamoufoxConfig(Struct, kw_only=True, frozen=False):
     load_dom: bool = True
     humanize: bool | float = True
     solve_cloudflare: bool = False
-    wait: int | float = 0
+    wait: Seconds = 0
-    timeout: int | float = 30000
+    timeout: Seconds = 30000
     init_script: Optional[str] = None
     page_action: Optional[Callable] = None
     wait_selector: Optional[str] = None
@@ -115,38 +137,23 @@ class CamoufoxConfig(Struct, kw_only=True, frozen=False):
 
     def __post_init__(self):
         """Custom validation after msgspec validation"""
-        if self.max_pages < 1 or self.max_pages > 50:
-            raise ValueError("max_pages must be between 1 and 50")
-        if self.timeout < 0:
-            raise ValueError("timeout must be >= 0")
         if self.page_action and not callable(self.page_action):
             raise TypeError(f"page_action must be callable, got {type(self.page_action).__name__}")
         if self.proxy:
             self.proxy = construct_proxy_dict(self.proxy, as_tuple=True)
 
-        if not self.addons:
+        if self.addons and isinstance(self.addons, list):
-            self.addons = []
-        else:
             for addon in self.addons:
-                addon_path = Path(addon)
+                _validate_addon_path(addon)
-                if not addon_path.exists():
+        else:
-                    raise FileNotFoundError(f"Addon's path not found: {addon}")
+            self.addons = []
-                elif not addon_path.is_dir():
-                    raise ValueError(
-                        f"Addon's path is not a folder, you need to pass a folder of the extracted addon: {addon}"
-                    )
 
         if self.init_script is not None:
-            script_path = Path(self.init_script)
+            _validate_file_path(self.init_script)
-            if not script_path.exists():
-                raise ValueError("Init script path not found")
-            elif not script_path.is_file():
-                raise ValueError("Init script is not a file")
-            elif not script_path.is_absolute():
-                raise ValueError("Init script is not a absolute path")
 
         if not self.cookies:
             self.cookies = []
+        # Cloudflare timeout adjustment
         if self.solve_cloudflare and self.timeout < 60_000:
             self.timeout = 60_000
         if not self.selector_config:
@@ -155,10 +162,68 @@ class CamoufoxConfig(Struct, kw_only=True, frozen=False):
             self.additional_args = {}
 
 
-def validate(params, model):
+# Code parts to validate `fetch` in the least possible numbers of lines overall
-    try:
+class FetchConfig(Struct, kw_only=True):
-        config = convert(params, model)
+    """Configuration struct for `fetch` calls validation"""
-    except ValidationError as e:
-        raise TypeError(f"Invalid argument type: {e}")
 
-    return config
+    google_search: bool = True
+    timeout: Seconds = 30000
+    wait: Seconds = 0
+    page_action: Optional[Callable] = None
+    extra_headers: Optional[Dict[str, str]] = None
+    disable_resources: bool = False
+    wait_selector: Optional[str] = None
+    wait_selector_state: SelectorWaitStates = "attached"
+    network_idle: bool = False
+    load_dom: bool = True
+    solve_cloudflare: bool = False
+    selector_config: Optional[Dict] = {}
+
+    def to_dict(self):
+        return {f: getattr(self, f) for f in self.__struct_fields__}
+
+
+@dataclass
+class _fetch_params:
+    """A dataclass of all parameters used by `fetch` calls"""
+
+    google_search: bool
+    timeout: Seconds
+    wait: Seconds
+    page_action: Optional[Callable]
+    extra_headers: Optional[Dict[str, str]]
+    disable_resources: bool
+    wait_selector: Optional[str]
+    wait_selector_state: SelectorWaitStates
+    network_idle: bool
+    load_dom: bool
+    solve_cloudflare: bool
+    selector_config: Optional[Dict]
+
+
+def validate_fetch(params: List[Tuple], sentinel=None) -> _fetch_params:
+    result = {}
+    overrides = {}
+
+    for arg, request_value, session_value in params:
+        if request_value is not sentinel:
+            overrides[arg] = request_value
+        else:
+            result[arg] = session_value
+
+    if overrides:
+        overrides = validate(overrides, FetchConfig).to_dict()
+        overrides.update(result)
+        return _fetch_params(**overrides)
+
+    if not result.get("solve_cloudflare"):
+        result["solve_cloudflare"] = False
+
+    return _fetch_params(**result)
+
+
+def validate(params: Dict, model) -> PlaywrightConfig | CamoufoxConfig | FetchConfig:
+    try:
+        return convert(params, model)
+    except ValidationError as e:
+        raise TypeError(f"Invalid argument type: {e}") from e

scrapling/engines/static.py

@@ -94,8 +94,8 @@ class FetcherSession:
         self.default_http3 = http3
         self.selector_config = selector_config or {}
 
-        self._curl_session: Optional[CurlSession] = None
+        self._curl_session: Optional[CurlSession] | bool = None
-        self._async_curl_session: Optional[AsyncCurlSession] = None
+        self._async_curl_session: Optional[AsyncCurlSession] | bool = None
 
     def _merge_request_args(self, **kwargs) -> Dict[str, Any]:
         """Merge request-specific arguments with default session arguments."""
@@ -239,7 +239,6 @@ class FetcherSession:
         Perform an HTTP request using the configured session.
 
         :param method: HTTP method to be used, supported methods are ["GET", "POST", "PUT", "DELETE"]
-        :param url: Target URL for the request.
         :param request_args: Arguments to be passed to the session's `request()` method.
         :param max_retries: Maximum number of retries for the request.
         :param retry_delay: Number of seconds to wait between retries.
@@ -280,7 +279,6 @@ class FetcherSession:
         Perform an HTTP request using the configured session.
 
         :param method: HTTP method to be used, supported methods are ["GET", "POST", "PUT", "DELETE"]
-        :param url: Target URL for the request.
         :param request_args: Arguments to be passed to the session's `request()` method.
         :param max_retries: Maximum number of retries for the request.
         :param retry_delay: Number of seconds to wait between retries.

scrapling/engines/toolbelt/navigation.py

@@ -4,7 +4,7 @@ Functions related to files and URLs
 
 from pathlib import Path
 from functools import lru_cache
-from urllib.parse import urlencode, urlparse
+from urllib.parse import urlparse
 
 from playwright.async_api import Route as async_Route
 from msgspec import Struct, structs, convert, ValidationError

scrapling/parser.py

@@ -239,7 +239,7 @@ class Selector(SelectorsGeneration):
         )
 
     def __handle_element(
-        self, element: HtmlElement | _ElementUnicodeResult
+        self, element: Optional[HtmlElement | _ElementUnicodeResult]
     ) -> Optional[Union[TextHandler, "Selector"]]:
         """Used internally in all functions to convert a single element to type (Selector|TextHandler) when possible"""
         if element is None:
@@ -345,7 +345,7 @@ class Selector(SelectorsGeneration):
         return TextHandler(content)
 
     @property
-    def body(self):
+    def body(self) -> str | bytes:
         """Return the raw body of the current `Selector` without any processing. Useful for binary and non-HTML requests."""
         return self._raw_body
 
@@ -1259,7 +1259,7 @@ class Selectors(List[Selector]):
         :param clean_match: if enabled, this will ignore all whitespaces and consecutive spaces while matching
         :param case_sensitive: if disabled, the function will set the regex to ignore the letters case while compiling it
         """
-        results = [n.text.re(regex, replace_entities, clean_match, case_sensitive) for n in self]
+        results = [n.re(regex, replace_entities, clean_match, case_sensitive) for n in self]
         return TextHandlers(flatten(results))
 
     def re_first(

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = scrapling
-version = 0.3.4
+version = 0.3.5
 author = Karim Shoair
 author_email = karim.shoair@pm.me
 description = Scrapling is an undetectable, powerful, flexible, high-performance Python library that makes Web Scraping easy and effortless as it should be!

tests/cli/test_cli.py

@@ -14,6 +14,7 @@ def configure_selector_mock():
     """Helper function to create a properly configured Selector mock"""
     mock_response = MagicMock(spec=Selector)
     mock_response.body = "<html><body>Test content</body></html>"
+    mock_response.html_content = "<html><body>Test content</body></html>"
     mock_response.encoding = "utf-8"
     mock_response.get_all_text.return_value = "Test content"
     mock_response.css_first.return_value = mock_response

tests/fetchers/async/test_camoufox_session.py

@@ -54,16 +54,18 @@ class TestAsyncStealthySession:
         """Test page pool creation and reuse"""
         async with AsyncStealthySession() as session:
             # The first request creates a page
-            _ = await session.fetch(urls["basic"])
+            response = await session.fetch(urls["basic"])
-            assert session.page_pool.pages_count == 1
+            assert response.status == 200
+            assert session.page_pool.pages_count == 0
 
             # The second request should reuse the page
-            _ = await session.fetch(urls["html"])
+            response = await session.fetch(urls["html"])
-            assert session.page_pool.pages_count == 1
+            assert response.status == 200
+            assert session.page_pool.pages_count == 0
 
             # Check pool stats
             stats = session.get_pool_stats()
-            assert stats["total_pages"] == 1
+            assert stats["total_pages"] == 0
             assert stats["max_pages"] == 1
 
     async def test_stealthy_session_with_options(self, urls):

tests/fetchers/async/test_dynamic.py

@@ -56,6 +56,7 @@ class TestDynamicFetcherAsync:
             {"disable_webgl": True, "hide_canvas": False},
             {"disable_webgl": False, "hide_canvas": True, "disable_resources": True},
             {"stealth": True},  # causes issues with GitHub Actions
+            {"stealth": True, "real_chrome": True},  # causes issues with GitHub Actions
             {"wait_selector": "h1", "wait_selector_state": "attached"},
             {"wait_selector": "h1", "wait_selector_state": "visible"},
             {

tests/fetchers/async/test_dynamic_session.py

@@ -53,16 +53,18 @@ class TestAsyncDynamicSession:
         """Test page pool creation and reuse"""
         async with AsyncDynamicSession() as session:
             # The first request creates a page
-            _ = await session.fetch(urls["basic"])
+            response = await session.fetch(urls["basic"])
-            assert session.page_pool.pages_count == 1
+            assert response.status == 200
+            assert session.page_pool.pages_count == 0
             
             # The second request should reuse the page
-            _ = await session.fetch(urls["html"])
+            response = await session.fetch(urls["html"])
-            assert session.page_pool.pages_count == 1
+            assert response.status == 200
+            assert session.page_pool.pages_count == 0
 
             # Check pool stats
             stats = session.get_pool_stats()
-            assert stats["total_pages"] == 1
+            assert stats["total_pages"] == 0
             assert stats["max_pages"] == 1
 
     async def test_dynamic_session_with_options(self, urls):

tests/fetchers/sync/test_dynamic.py

@@ -54,6 +54,7 @@ class TestDynamicFetcher:
             {"disable_webgl": True, "hide_canvas": False},
             {"disable_webgl": False, "hide_canvas": True, "disable_resources": True},
             {"stealth": True},  # causes issues with GitHub Actions
+            {"stealth": True, "real_chrome": True},  # causes issues with GitHub Actions
             {"wait_selector": "h1", "wait_selector_state": "attached"},
             {"wait_selector": "h1", "wait_selector_state": "visible"},
             {

tests/fetchers/test_pages.py

@@ -24,10 +24,6 @@ class TestPageInfo:
         assert page_info.state == "busy"
         assert page_info.url == "https://example.com"
 
-        page_info.mark_finished()
-        assert page_info.state == "finished"
-        assert page_info.url == ""
-
         page_info.mark_error()
         assert page_info.state == "error"
 
@@ -88,21 +84,7 @@ class TestPagePool:
         with pytest.raises(RuntimeError):
             pool.add_page(Mock())
 
-    def test_get_ready_page(self):
-        """Test getting ready page"""
-        pool = PagePool(max_pages=3)
 
-        # Add pages
-        page1 = pool.add_page(Mock())
-        page2 = pool.add_page(Mock())
-
-        # Mark them as finished
-        page1.mark_finished()
-        page2.mark_finished()
-
-        # test
-        pool.close_all_finished_pages()
-        assert pool.pages_count == 0
 
     def test_cleanup_error_pages(self):
         """Test cleaning up error pages"""

tox.ini

@@ -10,8 +10,8 @@ envlist = pre-commit,py{310,311,312,313}
 usedevelop = True
 changedir = tests
 deps =
-    playwright==1.52.0
+    playwright>=1.55.0
-    rebrowser-playwright==1.52.0
+    patchright>=1.55.0
     camoufox
     -r{toxinidir}/tests/requirements.txt
 extras = ai,shell