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

osn_selenium/webdrivers/trio_bidi/yandex/base.py

@@ -0,0 +1,120 @@
+import math
+import trio
+from osn_selenium.models import WindowRect
+from osn_selenium.flags.models.yandex import YandexFlags
+from osn_selenium.flags.yandex import YandexFlagsManager
+from typing import (
+	Mapping,
+	Optional,
+	Type,
+	Union
+)
+from osn_selenium.webdrivers.trio_bidi.chrome.base import ChromeBaseMixin
+from osn_selenium._typehints import (
+	ARCHITECTURES_TYPEHINT,
+	PATH_TYPEHINT
+)
+from osn_selenium.webdrivers.unified.yandex.base import (
+	UnifiedYandexBaseMixin
+)
+from osn_selenium.abstract.webdriver.yandex.base import (
+	AbstractYandexBaseMixin
+)
+
+
+__all__ = ["YandexBaseMixin"]
+
+
+class YandexBaseMixin(UnifiedYandexBaseMixin, ChromeBaseMixin, AbstractYandexBaseMixin):
+	"""
+	Base mixin for Yandex WebDrivers handling core initialization and state management.
+
+	This class serves as the foundation for browser-specific implementations, managing
+	the WebDriver executable path, configuration flags, timeouts, and the active
+	driver instance.
+	"""
+	
+	def __init__(
+			self,
+			webdriver_path: str,
+			architecture: ARCHITECTURES_TYPEHINT,
+			flags_manager_type: Type[YandexFlagsManager] = YandexFlagsManager,
+			use_browser_exe: bool = True,
+			browser_name_in_system: str = "Yandex",
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			flags: Optional[YandexFlags] = None,
+			start_page_url: str = "about:blank",
+			implicitly_wait: int = 5,
+			page_load_timeout: int = 5,
+			script_timeout: int = 5,
+			window_rect: Optional[WindowRect] = None,
+			capacity_limiter: Optional[trio.CapacityLimiter] = None,
+			cdp_versioned_packages_paths: Optional[Mapping[int, PATH_TYPEHINT]] = None,
+			ignore_cdp_version_package_missing: bool = True,
+			trio_token: Optional[trio.lowlevel.TrioToken] = None,
+			bidi_buffer_size: Union[int, float] = math.inf,
+	):
+		"""
+		Initializes the Trio-based Yandex WebDriver mixin with specified configuration.
+
+		Args:
+			webdriver_path (str): Path to the YandexDriver executable.
+			architecture (ARCHITECTURE_TYPEHINT): System architecture.
+			flags_manager_type (Type[YandexFlagsManager]): The class type used for managing Yandex flags.
+				Defaults to YandexFlagsManager.
+			use_browser_exe (bool): Whether to use a specific browser executable path or auto-detect.
+				Defaults to True.
+			browser_name_in_system (str): The name of the browser in the system registry or path.
+				Defaults to "Yandex".
+			browser_exe (Optional[PATH_TYPEHINT]): Explicit path to the Yandex browser executable.
+			flags (Optional[YandexFlags]): Initial set of flags.
+			start_page_url (str): The initial URL. Defaults to "about:blank".
+			implicitly_wait (int): Default implicit wait time.
+			page_load_timeout (int): Default page load timeout.
+			script_timeout (int): Default script timeout.
+			window_rect (Optional[WindowRect]): Initial window dimensions.
+			capacity_limiter (Optional[trio.CapacityLimiter]): Trio capacity limiter.
+			cdp_versioned_packages_paths (Optional[Mapping[int, PATH_TYPEHINT]]): Custom local paths for specific CDP versions packages.
+			ignore_cdp_version_package_missing (bool): Whether to ignore missing CDP package errors.
+			trio_token (Optional[trio.lowlevel.TrioToken]): The Trio token for the current event loop.
+			bidi_buffer_size (Union[int, float]): Buffer size for the BiDi task channel.
+		"""
+		
+		ChromeBaseMixin.__init__(
+				self,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				webdriver_path=webdriver_path,
+				architecture=architecture,
+				flags_manager_type=flags_manager_type,
+				flags=flags,
+				start_page_url=start_page_url,
+				implicitly_wait=implicitly_wait,
+				page_load_timeout=page_load_timeout,
+				script_timeout=script_timeout,
+				window_rect=window_rect,
+				capacity_limiter=capacity_limiter,
+				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
+				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
+				trio_token=trio_token,
+				bidi_buffer_size=bidi_buffer_size,
+		)
+		
+		UnifiedYandexBaseMixin.__init__(
+				self,
+				webdriver_path=webdriver_path,
+				architecture=architecture,
+				flags_manager_type=flags_manager_type,
+				use_browser_exe=use_browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				browser_exe=browser_exe,
+				flags=flags,
+				start_page_url=start_page_url,
+				implicitly_wait=implicitly_wait,
+				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,
+		)

osn_selenium/webdrivers/trio_bidi/yandex/lifecycle.py

@@ -0,0 +1,85 @@
+from typing import Optional
+from osn_selenium.models import WindowRect
+from osn_selenium._typehints import PATH_TYPEHINT
+from osn_selenium.flags.models.yandex import YandexFlags
+from osn_selenium.webdrivers.trio_bidi.chrome.lifecycle import ChromeLifecycleMixin
+from osn_selenium.webdrivers.unified.yandex.lifecycle import (
+	UnifiedYandexLifecycleMixin
+)
+from osn_selenium.abstract.webdriver.yandex.lifecycle import (
+	AbstractYandexLifecycleMixin
+)
+
+
+__all__ = ["YandexLifecycleMixin"]
+
+
+class YandexLifecycleMixin(
+		UnifiedYandexLifecycleMixin,
+		ChromeLifecycleMixin,
+		AbstractYandexLifecycleMixin
+):
+	"""
+	Mixin for managing the lifecycle of the Yandex WebDriver.
+
+	Handles the creation, startup, shutdown, and restarting processes of the
+	underlying browser instance, ensuring clean session management.
+	"""
+	
+	async def start_webdriver(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+		await self._start_bidi_bridge()
+	
+	async def __aenter__(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.start_webdriver(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+	
+	async def restart_webdriver(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+		
+		await self._stop_bidi_bridge()
+		await self._start_bidi_bridge()

osn_selenium/webdrivers/trio_bidi/yandex/settings.py

@@ -0,0 +1,63 @@
+from typing import Optional
+from osn_selenium.models import WindowRect
+from osn_selenium._typehints import PATH_TYPEHINT
+from osn_selenium.flags.models.yandex import YandexFlags
+from osn_selenium.webdrivers.trio_bidi.chrome.settings import ChromeSettingsMixin
+from osn_selenium.webdrivers.unified.yandex.settings import (
+	UnifiedYandexSettingsMixin
+)
+from osn_selenium.abstract.webdriver.yandex.settings import (
+	AbstractYandexSettingsMixin
+)
+
+
+__all__ = ["YandexSettingsMixin"]
+
+
+class YandexSettingsMixin(
+		UnifiedYandexSettingsMixin,
+		ChromeSettingsMixin,
+		AbstractYandexSettingsMixin
+):
+	"""
+	Mixin for configuring and updating settings of the Yandex WebDriver.
+
+	Provides methods to modify browser flags, window rectangles, and other
+	configuration parameters either before startup or during a reset.
+	"""
+	
+	async def reset_settings(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: str = "",
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._reset_settings_impl)(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+	
+	async def update_settings(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._update_settings_impl)(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)

osn_selenium/webdrivers/trio_threads/blink/__init__.py

@@ -6,6 +6,7 @@ from typing import (
 	Type
 )
 from osn_selenium._typehints import PATH_TYPEHINT
+from osn_selenium.dev_tools.manager import DevTools
 from osn_selenium.flags.blink import BlinkFlagsManager
 from osn_selenium.flags.models.blink import BlinkFlags
 from osn_selenium.dev_tools.settings import DevToolsSettings
@@ -108,7 +109,6 @@ class BlinkWebDriver(
 				page_load_timeout=page_load_timeout,
 				script_timeout=script_timeout,
 				window_rect=window_rect,
-				devtools_settings=devtools_settings,
 				capacity_limiter=capacity_limiter,
 				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
 				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
@@ -132,3 +132,9 @@ class BlinkWebDriver(
 				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
 				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
 		)
+		
+		self._devtools = DevTools(parent_webdriver=self, devtools_settings=devtools_settings)
+	
+	@property
+	def devtools(self) -> DevTools:
+		return self._devtools

osn_selenium/webdrivers/trio_threads/blink/base.py

@@ -8,7 +8,11 @@ from typing import (
 )
 from osn_selenium.flags.blink import BlinkFlagsManager
 from osn_selenium.flags.models.blink import BlinkFlags
+from osn_selenium.executors.trio_threads.cdp import CDPExecutor
 from osn_selenium.webdrivers.trio_threads.core.base import CoreBaseMixin
+from osn_selenium.webdrivers._bridges import (
+	get_cdp_executor_bridge
+)
 from osn_selenium._typehints import (
 	ARCHITECTURES_TYPEHINT,
 	PATH_TYPEHINT
@@ -122,11 +126,21 @@ class BlinkBaseMixin(UnifiedBlinkBaseMixin, CoreBaseMixin, AbstractBlinkBaseMixi
 				script_timeout=script_timeout,
 				window_rect=window_rect,
 		)
+		
+		self._cdp_executor = CDPExecutor(
+				execute_function=get_cdp_executor_bridge(self),
+				lock=self._lock,
+				limiter=self._capacity_limiter,
+		)
 	
 	@property
 	def browser_exe(self) -> Optional[pathlib.Path]:
 		return self._browser_exe_impl
 	
+	@property
+	def cdp(self) -> CDPExecutor:
+		return self._cdp_executor
+	
 	@property
 	def debugging_ip(self) -> Optional[str]:
 		return self._debugging_ip_impl

osn_selenium/webdrivers/trio_threads/blink/lifecycle.py

@@ -26,10 +26,7 @@ class BlinkLifecycleMixin(
 	underlying browser instance, ensuring clean session management.
 	"""
 	
-	async def close_webdriver(self) -> None:
-		await self.sync_to_trio(sync_function=self._close_webdriver_impl)()
-	
-	async def restart_webdriver(
+	async def start_webdriver(
 			self,
 			flags: Optional[BlinkFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -38,16 +35,16 @@ class BlinkLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,
 				use_browser_exe=use_browser_exe,
 				start_page_url=start_page_url,
-				window_rect=window_rect
+				window_rect=window_rect,
 		)
 	
-	async def start_webdriver(
+	async def __aenter__(
 			self,
 			flags: Optional[BlinkFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -56,7 +53,7 @@ class BlinkLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
+		await self.start_webdriver(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,
@@ -64,3 +61,24 @@ class BlinkLifecycleMixin(
 				start_page_url=start_page_url,
 				window_rect=window_rect,
 		)
+	
+	async def restart_webdriver(
+			self,
+			flags: Optional[BlinkFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect
+		)
+	
+	async def stop_webdriver(self) -> None:
+		await self.sync_to_trio(sync_function=self._stop_webdriver_impl)()

osn_selenium/webdrivers/trio_threads/chrome/lifecycle.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.chrome import ChromeFlags
-from osn_selenium.webdrivers.trio_threads.blink import BlinkLifecycleMixin
+from osn_selenium.webdrivers.trio_threads.blink.lifecycle import BlinkLifecycleMixin
 from osn_selenium.webdrivers.unified.chrome.lifecycle import (
 	UnifiedChromeLifecycleMixin
 )
@@ -26,7 +26,7 @@ class ChromeLifecycleMixin(
 	underlying browser instance, ensuring clean session management.
 	"""
 	
-	async def restart_webdriver(
+	async def start_webdriver(
 			self,
 			flags: Optional[ChromeFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -35,7 +35,7 @@ class ChromeLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,
@@ -44,7 +44,7 @@ class ChromeLifecycleMixin(
 				window_rect=window_rect,
 		)
 	
-	async def start_webdriver(
+	async def __aenter__(
 			self,
 			flags: Optional[ChromeFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -53,7 +53,25 @@ class ChromeLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
+		await self.start_webdriver(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+	
+	async def restart_webdriver(
+			self,
+			flags: Optional[ChromeFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,

osn_selenium/webdrivers/trio_threads/chrome/settings.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.chrome import ChromeFlags
-from osn_selenium.webdrivers.trio_threads.blink import BlinkSettingsMixin
+from osn_selenium.webdrivers.trio_threads.blink.settings import BlinkSettingsMixin
 from osn_selenium.webdrivers.unified.chrome.settings import (
 	UnifiedChromeSettingsMixin
 )

osn_selenium/webdrivers/trio_threads/core/__init__.py

@@ -6,10 +6,8 @@ from typing import (
 	Type
 )
 from osn_selenium._typehints import PATH_TYPEHINT
-from osn_selenium.dev_tools.manager import DevTools
 from osn_selenium.flags.base import BrowserFlagsManager
 from osn_selenium.flags.models.base import BrowserFlags
-from osn_selenium.dev_tools.settings import DevToolsSettings
 from osn_selenium.webdrivers.trio_threads.core.auth import CoreAuthMixin
 from osn_selenium.webdrivers.trio_threads.core.base import CoreBaseMixin
 from osn_selenium.webdrivers.trio_threads.core.file import CoreFileMixin
@@ -67,7 +65,6 @@ class CoreWebDriver(
 			page_load_timeout: int = 5,
 			script_timeout: int = 5,
 			window_rect: Optional[WindowRect] = None,
-			devtools_settings: Optional[DevToolsSettings] = None,
 			capacity_limiter: Optional[trio.CapacityLimiter] = None,
 			cdp_versioned_packages_paths: Optional[Mapping[int, PATH_TYPEHINT]] = None,
 			ignore_cdp_version_package_missing: bool = True,
@@ -89,7 +86,6 @@ class CoreWebDriver(
 				asynchronous script to finish execution. Defaults to 5.
 			window_rect (Optional[WindowRect]): The initial size and position of the
 				browser window. Defaults to None.
-			devtools_settings (Optional[DevToolsSettings]): Configuration for Chrome DevTools Protocol.
 			capacity_limiter (Optional[trio.CapacityLimiter]): A Trio capacity limiter used to
 				throttle concurrent thread-based operations. Defaults to None.
 		"""
@@ -107,9 +103,3 @@ class CoreWebDriver(
 				cdp_versioned_packages_paths=cdp_versioned_packages_paths,
 				ignore_cdp_version_package_missing=ignore_cdp_version_package_missing,
 		)
-		
-		self._devtools = DevTools(parent_webdriver=self, devtools_settings=devtools_settings)
-	
-	@property
-	def devtools(self) -> DevTools:
-		return self._devtools

osn_selenium/webdrivers/trio_threads/core/actions.py

@@ -3,8 +3,8 @@ from typing import (
 	List,
 	Optional
 )
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium._typehints import DEVICES_TYPEHINT
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.webdrivers._bridges import (
 	get_js_executor_bridge
 )

osn_selenium/webdrivers/trio_threads/core/auth.py

@@ -1,10 +1,10 @@
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	Any,
 	List,
 	Optional,
 	Union
 )
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances.trio_threads.fedcm import FedCM
 from osn_selenium.instances.trio_threads.dialog import Dialog
 from osn_selenium.webdrivers.unified.core.auth import UnifiedCoreAuthMixin

osn_selenium/webdrivers/trio_threads/core/base.py

@@ -1,9 +1,9 @@
 import trio
 from osn_selenium.models import WindowRect
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.flags.base import BrowserFlagsManager
 from osn_selenium.flags.models.base import BrowserFlags
 from selenium.webdriver.common.bidi.session import Session
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	Any,
 	Dict,
@@ -12,10 +12,12 @@ from typing import (
 	Type
 )
 from selenium.webdriver.remote.errorhandler import ErrorHandler
-from osn_selenium.executors.trio_threads.cdp import CDPExecutor
 from osn_selenium.executors.trio_threads.javascript import JSExecutor
 from selenium.webdriver.remote.locator_converter import LocatorConverter
 from selenium.webdriver.remote.remote_connection import RemoteConnection
+from osn_selenium.webdrivers._bridges import (
+	get_js_executor_bridge
+)
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 from osn_selenium._typehints import (
 	ARCHITECTURES_TYPEHINT,
@@ -27,10 +29,6 @@ from osn_selenium.abstract.webdriver.core.base import (
 from selenium.webdriver.remote.webdriver import (
 	WebDriver as legacyWebDriver
 )
-from osn_selenium.webdrivers._bridges import (
-	get_cdp_executor_bridge,
-	get_js_executor_bridge
-)
 
 
 __all__ = ["CoreBaseMixin"]
@@ -104,12 +102,6 @@ class CoreBaseMixin(UnifiedCoreBaseMixin, TrioThreadMixin, AbstractCoreBaseMixin
 				else trio.CapacityLimiter(100),
 		)
 		
-		self._cdp_executor = CDPExecutor(
-				execute_function=get_cdp_executor_bridge(self),
-				lock=self._lock,
-				limiter=self._capacity_limiter,
-		)
-		
 		self._js_executor = JSExecutor(
 				execute_function=get_js_executor_bridge(self),
 				lock=self._lock,
@@ -132,10 +124,6 @@ class CoreBaseMixin(UnifiedCoreBaseMixin, TrioThreadMixin, AbstractCoreBaseMixin
 	def caps(self, value: Dict[str, Any]) -> None:
 		self._caps_set_impl(value=value)
 	
-	@property
-	def cdp(self) -> CDPExecutor:
-		return self._cdp_executor
-	
 	@property
 	def command_executor(self) -> RemoteConnection:
 		return self._command_executor_get_impl()

osn_selenium/webdrivers/trio_threads/core/capture.py

@@ -1,5 +1,6 @@
-from typing import Any, Optional
+from typing import Optional
 from osn_selenium.trio_threads_mixin import TrioThreadMixin
+from selenium.webdriver.common.print_page_options import PrintOptions
 from osn_selenium.webdrivers.unified.core.capture import (
 	UnifiedCoreCaptureMixin
 )
@@ -31,7 +32,7 @@ class CoreCaptureMixin(UnifiedCoreCaptureMixin, TrioThreadMixin, AbstractCoreCap
 	async def page_source(self) -> str:
 		return await self.sync_to_trio(sync_function=self._page_source_impl)()
 	
-	async def print_page(self, print_options: Optional[Any] = None) -> str:
+	async def print_page(self, print_options: Optional[PrintOptions] = None) -> str:
 		return await self.sync_to_trio(sync_function=self._print_page_impl)(print_options=print_options)
 	
 	async def save_screenshot(self, filename: str) -> bool:

osn_selenium/webdrivers/trio_threads/core/file.py

@@ -5,6 +5,7 @@ from typing import (
 	List
 )
 from osn_selenium.trio_threads_mixin import TrioThreadMixin
+from selenium.webdriver.remote.file_detector import FileDetector
 from osn_selenium.webdrivers.unified.core.file import UnifiedCoreFileMixin
 from osn_selenium.abstract.webdriver.core.file import (
 	AbstractCoreFileMixin
@@ -29,11 +30,11 @@ class CoreFileMixin(UnifiedCoreFileMixin, TrioThreadMixin, AbstractCoreFileMixin
 		await self.sync_to_trio(sync_function=self._download_file_impl)(file_name=file_name, target_directory=target_directory)
 	
 	@property
-	async def file_detector(self) -> Any:
+	async def file_detector(self) -> FileDetector:
 		return await self.sync_to_trio(sync_function=self._file_detector_get_impl)()
 	
 	@file_detector.setter
-	async def file_detector(self, value: Any) -> None:
+	async def file_detector(self, value: FileDetector) -> None:
 		await self.sync_to_trio(sync_function=self._file_detector_set_impl)(value=value)
 	
 	@asynccontextmanager