update

Author: zigai

pyproject.toml

@@ -1,17 +1,17 @@
 [project]
 name = "wrighter"
-version = "0.1.2"
-description = "eb scraping/browser automation framework built on Playwright"
+version = "0.1.3"
+description = "Web scraping/browser automation framework built on Playwright"
 authors = [{ name = "Žiga Ivanšek", email = "[email protected]" }]
 license = { file = "LICENSE.txt" }
 readme = "README.md"
 requires-python = ">=3.10"
 
 dependencies = [
-    "playwright>=1.33.0",
-    "pydantic>=1.10.8",
-    "playwright_stealth>=1.0.5",
-    "stdl>=0.5.5",
+    "playwright>=1.50.0",
+    "pydantic>=2.10.6",
+    "playwright-stealth @ git+https://github.com/Mattwmaster58/playwright_stealth@rc4",
+    "stdl>=0.6.1",
     "loguru>=0.7.0",
 ]
 

wrighter/options.py

@@ -1,4 +1,3 @@
-import json
 import os
 from pathlib import Path
 from typing import Any, Literal, Mapping
@@ -11,7 +10,7 @@
     StorageState,
     ViewportSize,
 )
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 from stdl import fs
 from stdl.st import FG, colored
 
@@ -143,31 +142,34 @@ def persistent_context_options(self) -> dict[str, Any]:
         opts["user_data_dir"] = self.user_data_dir
         return opts
 
-    @validator("browser")
-    def __validate_browser(cls, v: str):
+    @field_validator("browser")
+    @classmethod
+    def validate_browser(cls, v: str) -> str:
         v = v.lower().strip()
         if v == "chrome":
             v = "chromium"
         if v not in BROWSERS:
             raise ValueError(f"Possible values for 'browser' are {BROWSERS}")
         return v
 
-    @validator("permissions", each_item=True)
-    def __validate_permissions(cls, v):
+    @field_validator("permissions", mode="before")
+    @classmethod
+    def validate_permissions(cls, v: T.Any) -> T.Any:
         if isinstance(v, str):
             v = v.lower()
             if v not in PERMISSIONS:
                 raise ValueError(v)
         return v
 
-    @validator("viewport", "screen", "record_video_size")
-    def __validate_viewport_size(cls, v: ViewportSize):
+    @field_validator("viewport", "screen", "record_video_size")
+    @classmethod
+    def validate_viewport_size(cls, v: dict[str, int]) -> dict[str, int]:
         MIN_VIEWPORT_SIZE = 100
         if v["width"] < MIN_VIEWPORT_SIZE or v["height"] < MIN_VIEWPORT_SIZE:
             raise ValueError(v)
         return v
 
-    @validator(
+    @field_validator(
         "user_data_dir",
         "data_dir",
         "executable_path",
@@ -177,7 +179,8 @@ def __validate_viewport_size(cls, v: ViewportSize):
         "record_video_dir",
         "storage_state",
     )
-    def __validate_path(cls, v):
+    @classmethod
+    def validate_path(cls, v: Path) -> str:
         fs.ensure_paths_exist(v)
         return os.path.abspath(str(v))
 

wrighter/plugin_manager.py

@@ -15,8 +15,7 @@ def add_plugin(self, plugin: Plugin, *, existing=True):
 
         Args:
             plugin (Plugin): The plugin to add.
-            existing (bool, optional): If `True`, adds the plugin to all existing pages and contexts.
-                Defaults to `True`.
+            existing (bool, optional): If `True`, adds the plugin to all existing pages and contexts. Defaults to `True`.
 
         Returns:
             None
@@ -34,8 +33,7 @@ def remove_plugin(self, plugin: Plugin, *, existing=True) -> None:
 
         Args:
             plugin (Plugin): The plugin to remove.
-            existing (bool, optional): If `True`, remove the plugin from all existing pages and contexts.
-                Defaults to `True`.
+            existing (bool, optional): If `True`, remove the plugin from all existing pages and contexts. Defaults to `True`.
 
         Returns:
             None
@@ -52,8 +50,7 @@ def remove_all(self, *, existing=True) -> None:
         Remove all plugin from the current instance.
 
         Args:
-            existing (bool, optional): If `True`, alose remove all the plugin all from existing pages and contexts.
-                Defaults to `True`.
+            existing (bool, optional): If `True`, alose remove all the plugin all from existing pages and contexts. Defaults to `True`.
 
         Returns:
             None