osn-selenium 1.0.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

osn_selenium/webdrivers/unified/core/file.py

@@ -1,6 +1,7 @@
 from contextlib import contextmanager
 from typing import Any, Generator, List
 from osn_selenium.webdrivers._decorators import requires_driver
+from selenium.webdriver.remote.file_detector import FileDetector
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
 
@@ -23,11 +24,11 @@ class UnifiedCoreFileMixin(UnifiedCoreBaseMixin):
 			yield file_detector
 	
 	@requires_driver
-	def _file_detector_get_impl(self) -> Any:
+	def _file_detector_get_impl(self) -> FileDetector:
 		return self._driver_impl.file_detector
 	
 	@requires_driver
-	def _file_detector_set_impl(self, value: Any) -> None:
+	def _file_detector_set_impl(self, value: FileDetector) -> None:
 		self._driver_impl.file_detector = value
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/lifecycle.py

@@ -1,11 +1,13 @@
+from types import TracebackType
 from osn_selenium.models import WindowRect
+from osn_selenium.flags.models.base import BrowserFlags
 from typing import (
 	Any,
 	Dict,
 	Optional,
+	Type,
 	Union
 )
-from osn_selenium.flags.models.base import BrowserFlags
 from osn_selenium.webdrivers._decorators import requires_driver
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from osn_selenium.exceptions.logic import (
@@ -56,7 +58,7 @@ class UnifiedCoreLifecycleMixin(UnifiedCoreSettingsMixin, UnifiedCoreTimeoutsMix
 	def _quit_impl(self) -> None:
 		self._driver_impl.quit()
 	
-	def _close_webdriver_impl(self) -> None:
+	def _stop_webdriver_impl(self) -> None:
 		if self._driver_impl is not None:
 			self._quit_impl()
 		
@@ -68,7 +70,7 @@ class UnifiedCoreLifecycleMixin(UnifiedCoreSettingsMixin, UnifiedCoreTimeoutsMix
 			flags: Optional[BrowserFlags] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		self._close_webdriver_impl()
+		self._stop_webdriver_impl()
 		self._start_webdriver_impl(flags=flags, window_rect=window_rect)
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/script.py

@@ -1,4 +1,6 @@
 from typing import Any, List, Optional
+from selenium.webdriver.common.bidi.script import Script
+from selenium.webdriver.remote.script_key import ScriptKey
 from osn_selenium.webdrivers._decorators import requires_driver
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
@@ -20,13 +22,13 @@ class UnifiedCoreScriptMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.get_pinned_scripts()
 	
 	@requires_driver
-	def _pin_script_impl(self, script: str, script_key: Optional[Any] = None) -> Any:
+	def _pin_script_impl(self, script: str, script_key: Optional[Any] = None) -> ScriptKey:
 		return self._driver_impl.pin_script(script=script, script_key=script_key)
 	
 	@requires_driver
-	def _script_impl(self) -> Any:
+	def _script_impl(self) -> Script:
 		return self._driver_impl.script
 	
 	@requires_driver
-	def _unpin_impl(self, script_key: Any) -> None:
+	def _unpin_impl(self, script_key: ScriptKey) -> None:
 		self._driver_impl.unpin(script_key=script_key)

osn_selenium/webdrivers/unified/core/storage.py

@@ -4,6 +4,7 @@ from typing import (
 	List,
 	Optional
 )
+from selenium.webdriver.common.bidi.storage import Storage
 from osn_selenium.webdrivers._decorators import requires_driver
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
@@ -33,5 +34,5 @@ class UnifiedCoreStorageMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.get_cookies()
 	
 	@requires_driver
-	def _storage_impl(self) -> Any:
+	def _storage_impl(self) -> Storage:
 		return self._driver_impl.storage

osn_selenium/webdrivers/unified/core/window.py

@@ -1,11 +1,12 @@
+from selenium.webdriver.remote.switch_to import SwitchTo
+from osn_selenium.webdrivers._decorators import requires_driver
 from typing import (
-	Any,
+	Dict,
 	List,
 	Literal,
 	Optional,
 	Union
 )
-from osn_selenium.webdrivers._decorators import requires_driver
 from selenium.common.exceptions import (
 	InvalidSessionIdException
 )
@@ -30,7 +31,7 @@ class UnifiedCoreWindowMixin(UnifiedCoreBaseMixin):
 		self._driver_impl.close()
 	
 	@requires_driver
-	def _switch_to_impl(self) -> Any:
+	def _switch_to_impl(self) -> SwitchTo:
 		return self._driver_impl.switch_to
 	
 	@requires_driver
@@ -89,15 +90,15 @@ class UnifiedCoreWindowMixin(UnifiedCoreBaseMixin):
 		self._driver_impl.fullscreen_window()
 	
 	@requires_driver
-	def _get_window_position_impl(self, windowHandle: str = "current") -> Any:
+	def _get_window_position_impl(self, windowHandle: str = "current") -> Dict[str, int]:
 		return self._driver_impl.get_window_position(windowHandle=windowHandle)
 	
 	@requires_driver
-	def _get_window_rect_impl(self) -> Any:
+	def _get_window_rect_impl(self) -> Dict[str, int]:
 		return self._driver_impl.get_window_rect()
 	
 	@requires_driver
-	def _get_window_size_impl(self, windowHandle: str = "current") -> Any:
+	def _get_window_size_impl(self, windowHandle: str = "current") -> Dict[str, int]:
 		return self._driver_impl.get_window_size(windowHandle=windowHandle)
 	
 	@requires_driver
@@ -117,7 +118,7 @@ class UnifiedCoreWindowMixin(UnifiedCoreBaseMixin):
 		setattr(self._driver_impl, "orientation", value)
 	
 	@requires_driver
-	def _set_window_position_impl(self, x: int, y: int, windowHandle: str = "current") -> Any:
+	def _set_window_position_impl(self, x: int, y: int, windowHandle: str = "current") -> Dict[str, int]:
 		return self._driver_impl.set_window_position(x=x, y=y, windowHandle=windowHandle)
 	
 	@requires_driver
@@ -127,7 +128,7 @@ class UnifiedCoreWindowMixin(UnifiedCoreBaseMixin):
 			y: Optional[int] = None,
 			width: Optional[int] = None,
 			height: Optional[int] = None,
-	) -> Any:
+	) -> Dict[str, int]:
 		return self._driver_impl.set_window_rect(x=x, y=y, width=width, height=height)
 	
 	@requires_driver

osn_selenium/webdrivers/unified/edge/base.py

@@ -1,5 +1,9 @@
-from typing import Optional, Type
 from osn_selenium.models import WindowRect
+from typing import (
+	Mapping,
+	Optional,
+	Type
+)
 from selenium.webdriver import Edge as legacyEdge
 from osn_selenium.flags.models.edge import EdgeFlags
 from osn_selenium.flags.edge import EdgeFlagsManager
@@ -30,6 +34,8 @@ class UnifiedEdgeBaseMixin(UnifiedBlinkBaseMixin):
 			page_load_timeout: int = 5,
 			script_timeout: int = 5,
 			window_rect: Optional[WindowRect] = None,
+			cdp_versioned_packages_paths: Optional[Mapping[int, PATH_TYPEHINT]] = None,
+			ignore_cdp_version_package_missing: bool = True,
 	):
 		UnifiedBlinkBaseMixin.__init__(
 				self,
@@ -45,6 +51,8 @@ class UnifiedEdgeBaseMixin(UnifiedBlinkBaseMixin):
 				page_load_timeout=page_load_timeout,
 				script_timeout=script_timeout,
 				window_rect=window_rect,
+				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
+				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
 		)
 	
 	@property

osn_selenium/webdrivers/unified/yandex/base.py

@@ -1,5 +1,9 @@
-from typing import Optional, Type
 from osn_selenium.models import WindowRect
+from typing import (
+	Mapping,
+	Optional,
+	Type
+)
 from osn_selenium.flags.models.yandex import YandexFlags
 from osn_selenium.flags.yandex import YandexFlagsManager
 from selenium.webdriver import (
@@ -32,6 +36,8 @@ class UnifiedYandexBaseMixin(UnifiedChromeBaseMixin):
 			page_load_timeout: int = 5,
 			script_timeout: int = 5,
 			window_rect: Optional[WindowRect] = None,
+			cdp_versioned_packages_paths: Optional[Mapping[int, PATH_TYPEHINT]] = None,
+			ignore_cdp_version_package_missing: bool = True,
 	):
 		UnifiedChromeBaseMixin.__init__(
 				self,
@@ -47,6 +53,8 @@ class UnifiedYandexBaseMixin(UnifiedChromeBaseMixin):
 				page_load_timeout=page_load_timeout,
 				script_timeout=script_timeout,
 				window_rect=window_rect,
+				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
+				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
 		)
 	
 	@property

{osn_selenium-1.0.0.dist-info → osn_selenium-1.2.0.dist-info}/METADATA

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: osn-selenium
-Version: 1.0.0
+Version: 1.2.0
 Summary: An advanced, asynchronous wrapper for Selenium designed for fine-grained browser control. It leverages `trio` for async operations, provides human-like action chains for more natural automation, and offers deep integration with the Chrome DevTools Protocol (CDP) for advanced features like network interception. The library is structured to be extensible, with built-in support for Blink-based browsers like Chrome, Edge, and Yandex.
-Author: oddshellnick
-Author-email: oddshellnick.programming@gmail.com
+Author-email: oddshellnick <oddshellnick.programming@gmail.com>
+Project-URL: Homepage, https://github.com/oddshellnick/osn-selenium
+Project-URL: Issues, https://github.com/oddshellnick/osn-selenium/issues
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: trio<1.0.0,>=0.32.0
 Requires-Dist: selenium<5.0.0,>=4.40.0
@@ -11,17 +13,13 @@ Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: trio-websocket<1.0.0,>=0.12.0
 Requires-Dist: pywin32>=310; sys_platform == "win32"
 Requires-Dist: osn-system-utils<0.1.0,>=0.0.4
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-dist
-Dynamic: summary
 
 # osn-selenium: Advanced Selenium Wrapper with Async Support and Fingerprinting Protection
 
 osn-selenium is a robust wrapper around Selenium WebDriver designed for automation of Blink-based browsers (Chrome, Edge, Yandex). It extends standard Selenium capabilities by providing native asynchronous support via Trio, deep integration with the Chrome DevTools Protocol (CDP), sophisticated browser fingerprint spoofing, and human-like user interaction simulation.
 
+For more detailed information, please visit the [wiki page](https://github.com/oddshellnick/osn-selenium/wiki).
+
 ## Technologies
 
 | Name       | Badge                                                                                                                                               | Description                                                                                                                                            |
@@ -67,12 +65,23 @@ osn-selenium is a robust wrapper around Selenium WebDriver designed for automati
         pip install osn-selenium
         ```
 
+        **With pip (beta versions):**
+        ```bash
+        pip install -i https://test.pypi.org/simple/ osn_system_utils
+        ```
+
     *   **With git:**
         ```bash
         pip install git+https://github.com/oddshellnick/osn-selenium.git
         ```
         *(Ensure you have git installed)*
 
+    *   **With git (beta versions):**
+        ```bash
+        pip install git+https://github.com/oddshellnick/osn-selenium.git@dev
+        ```
+        *(Ensure you have git installed)*
+
 2.  **Install the required Python packages using pip:**
 
     ```bash
@@ -224,10 +233,15 @@ Utilities for executing JS and managing browser fingerprints.
 
 ## Notes
 
+*   **CDP Versioning and External Packages:** 
+    This library supports a modular CDP (Chrome DevTools Protocol) architecture. Since standard Selenium distributions often deprecate or remove older protocol versions, we maintain a dedicated repository for all versions at [osn-selenium-cdp](https://github.com/oddshellnick/osn-selenium-cdp).
+    *   **Manual Installation:** You can install specific CDP support by targeting the corresponding branch (e.g., `pip install git+https://github.com/oddshellnick/osn-selenium-cdp.git@v131`).
+    *   **Structure Requirement:** If you choose to add or create CDP version packages manually, they **must strictly follow the directory structure** used in the `osn-selenium-cdp` repository. This ensures that the internal `MetaPathFinder` hook can correctly intercept and redirect imports from `selenium.webdriver.common.devtools`. Deviating from this structure will result in `CDPPackageError` or `ImportError`.
 *   **Concurrency Constraints in `trio_threads`:** 
     The `trio_threads` implementation is built using a unified `trio.Lock`. This means that every driver function and every associated instance (including `ActionChains`, `WebElement`, `Alert`, etc.) can execute only one operation at a time. Do not attempt to parallelize multiple operations (coroutines) within a single browser instance, as they will be queued sequentially. The primary purpose of this asynchronous implementation is to enable the simultaneous management of **multiple browser instances** within a single event loop, rather than concurrent interactions with one browser.
 *   **CDP Domains and Background Tasks:** 
     When configuring the domains for network interception, it is highly recommended to provide a `target_background_task` in your `DevToolsSettings`. This is especially critical for websites that dynamically create numerous targets (such as iframes or workers). Without a proper background task to handle these events, the browser's execution flow might hang or fail to process requests for nested targets properly.
+*   **Experimental `trio_bidi` Architecture:** A new experimental architecture, `trio_bidi`, has been introduced. While it currently does not cover 100% of browser capabilities, it supports all core functionalities, including page navigation and element interactions, through native BiDi communication.
 
 ## Future Notes
 
@@ -236,4 +250,4 @@ Utilities for executing JS and managing browser fingerprints.
 *   **macOS Support:** Extending browser auto-detection and lifecycle management for macOS environments.
 *   **High-Level CDP Handlers:** Expanding the `dev_tools.domains` module to include simplified event-driven logic for `Network`, `Page`, and `Runtime` domains, similar to the current `Fetch` implementation.
 *   **Enhanced Human-Like Actions:** Adding more complex Bezier-based mouse movement patterns and advanced typing jitter to further decrease automation footprints.
-*   **Single-Instance Internal Concurrency Research:** While the current `trio_threads` implementation is optimized for managing multiple browser instances concurrently, we are researching ways to enable parallel command execution within a *single* browser instance. This long-term goal involves moving away from the global `trio.Lock` toward a more granular task-dispatching system (potentially using `trio.MemorySendChannel` or direct CDP interaction) to allow simultaneous operations without protocol desynchronization.
+*   **Full BiDi Coverage:** Implementing comprehensive Selenium feature coverage using BiDi mappings to eventually replace the need for synchronous thread pools in async mode.