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

osn_selenium/dev_tools/manager/lifecycle.py

@@ -166,7 +166,7 @@ class LifecycleMixin(TargetsMixin):
 				try:
 					await target.stop()
 					await target.stopped_event.wait()
-				except (BaseException):
+				except (BaseException,):
 					pass
 			
 			self._handling_targets = {}

osn_selenium/dev_tools/models.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from osn_selenium.models import DictModel
+from osn_selenium._base_models import DictModel
 
 
 __all__ = ["FingerprintData", "TargetData"]

osn_selenium/dev_tools/settings.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from pydantic import Field
-from osn_selenium.models import DictModel
+from osn_selenium._base_models import DictModel
 from osn_selenium.dev_tools.filters import TargetFilter
 from osn_selenium.dev_tools.domains import DomainsSettings
 from typing import (
@@ -39,6 +39,7 @@ class FingerprintLoggerSettings(DictModel):
 			Defaults to "exclude".
 		category_filter (Optional[Union[str, Sequence[str]]]): Specific categories to filter.
 			Defaults to None.
+		send_wait (bool): Whether to wait for the log to be sent. Defaults to False.
 	"""
 	
 	buffer_size: int = 100
@@ -51,6 +52,7 @@ class FingerprintLoggerSettings(DictModel):
 	] = None
 	category_filter_mode: Literal["exclude", "include"] = "exclude"
 	category_filter: Optional[Union[str, Sequence[str]]] = None
+	send_wait: bool = False
 
 
 class CDPLoggerSettings(DictModel):
@@ -73,6 +75,7 @@ class CDPLoggerSettings(DictModel):
 		target_type_filter (Optional[Union[str, Sequence[str]]]):
 			A single target type string or a sequence of target type strings to filter by.
 			Used in conjunction with `target_type_filter_mode`. Defaults to None.
+		send_wait (bool): Whether to wait for the log to be sent. Defaults to False.
 	"""
 	
 	buffer_size: int = 100
@@ -80,6 +83,7 @@ class CDPLoggerSettings(DictModel):
 	log_level_filter: Optional[Union[CDP_LOG_LEVELS_TYPEHINT, Sequence[CDP_LOG_LEVELS_TYPEHINT]]] = None
 	target_type_filter_mode: Literal["exclude", "include"] = "exclude"
 	target_type_filter: Optional[Union[str, Sequence[str]]] = None
+	send_wait: bool = False
 
 
 class LoggerSettings(DictModel):

osn_selenium/dev_tools/target/base.py

@@ -50,29 +50,6 @@ class BaseMixin:
 		about_to_stop_event (trio.Event): Event set when the target is about to stop.
 		stopped_event (trio.Event): Event set when the target handling has fully stopped.
 		background_task_ended (Optional[trio.Event]): Event set when the background task completes.
-		_is_main_target (bool): Whether this is the primary target.
-		_logger_settings ("LoggerSettings"): Configuration for logging.
-		_domains_settings (Optional["DomainsSettings"]): Configuration for enabled domains and handlers.
-		_new_targets_filter_list (Sequence[Mapping[str, Any]]): Filters for discovering new targets.
-		_new_targets_buffer_size (int): Buffer size for new target events.
-		_nursery_object (trio.Nursery): Trio nursery for background tasks.
-		_target_background_task (Optional[devtools_background_func_type]): Optional background task to run.
-		_add_target_func (Callable): Callback to add a new target.
-		_remove_target_func (Callable): Callback to remove this target.
-		_add_cdp_log_func (Callable): Callback to record a CDP log entry.
-		_add_fingerprint_log_func (Callable): Callback to record a fingerprint log entry.
-		_fingerprint_injection_script (Optional[str]): JS script to inject into the target.
-		_new_targets_events_filters (Any): Validated filters for target events.
-		_cdp_target_type_log_accepted (bool): Whether CDP logging is enabled for this target type.
-		_cdp_log_stats (CDPLoggerChannelStats): Statistics for CDP logs.
-		_fingerprint_log_stats (FingerprintLoggerChannelStats): Statistics for fingerprint logs.
-		_logger_cdp_send_channel (Optional[trio.MemorySendChannel]): Channel to send CDP logs to the logger.
-		_logger_fingerprint_send_channel (Optional[trio.MemorySendChannel]): Channel to send fingerprint logs.
-		_logger (Optional[TargetLogger]): The logger instance for this target.
-		_cdp_session (Optional[CdpSession]): The active CDP session.
-		_new_target_receive_channel (Optional[Tuple[trio.MemoryReceiveChannel, trio.Event]]): Channel for new target events.
-		_detached_receive_channel (Optional[trio.MemoryReceiveChannel]): Channel for detach events.
-		_events_receive_channels (Dict[str, Tuple[trio.MemoryReceiveChannel, trio.Event]]): Channels for domain events.
 	"""
 	
 	def __init__(
@@ -164,6 +141,7 @@ class BaseMixin:
 		self._new_target_receive_channel: Optional[Tuple[trio.MemoryReceiveChannel, trio.Event]] = None
 		self._detached_receive_channel: Optional[trio.MemoryReceiveChannel] = None
 		self._events_receive_channels: Dict[str, Tuple[trio.MemoryReceiveChannel, trio.Event]] = {}
+		self._cancel_scopes: Dict[str, trio.CancelScope] = {}
 	
 	@property
 	def type_(self) -> Optional[str]:
@@ -258,6 +236,17 @@ class BaseMixin:
 		
 		self.target_data.can_access_opener = value
 	
+	@property
+	def cancel_scopes(self) -> Dict[str, trio.CancelScope]:
+		"""
+		Provides access to the dictionary of cancellation scopes.
+
+		Returns:
+			Dict[str, trio.CancelScope]: The cancel scopes dictionary.
+		"""
+		
+		return self._cancel_scopes
+	
 	@property
 	def cdp_log_stats(self) -> CDPLoggerChannelStats:
 		"""

osn_selenium/dev_tools/target/lifecycle.py

@@ -53,12 +53,17 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 			await self._logger.close()
 			self._logger = None
 		
-		for channel in self._events_receive_channels.values():
+		for event_name, channel in self._events_receive_channels.items():
 			await channel[0].aclose()
 			await channel[1].wait()
 		
 		self._events_receive_channels = {}
 		
+		for scope_name, scope in self._cancel_scopes.items():
+			scope.cancel()
+		
+		self._cancel_scopes = {}
+		
 		if self.background_task_ended is not None:
 			await self.background_task_ended.wait()
 			self.background_task_ended = None

osn_selenium/dev_tools/target/logging.py

@@ -64,7 +64,11 @@ class LoggingMixin(BaseMixin):
 			await self._logger.run()
 		
 			try:
-				self._logger_cdp_send_channel.send_nowait(log_entry)
+				if self._logger.filter_cdp_log(log_entry=log_entry):
+					if self._logger_settings.cdp_settings.send_wait:
+						await self._logger_cdp_send_channel.send(log_entry)
+					else:
+						self._logger_cdp_send_channel.send_nowait(log_entry)
 			except trio.WouldBlock:
 				warnings.warn(
 						f"WARNING: Log channel for session {self.target_id} is full. Log dropped:\n{log_entry.model_dump_json(indent=4)}"
@@ -144,7 +148,11 @@ class LoggingMixin(BaseMixin):
 			await self._logger.run()
 		
 			try:
-				self._logger_fingerprint_send_channel.send_nowait(log_entry)
+				if self._logger.filter_fingerprint_log(log_entry=log_entry):
+					if self._logger_settings.fingerprint_settings.send_wait:
+						await self._logger_fingerprint_send_channel.send(log_entry)
+					else:
+						self._logger_fingerprint_send_channel.send_nowait(log_entry)
 			except trio.WouldBlock:
 				warnings.warn(
 						f"WARNING: Log channel for session {self.target_id} is full. Log dropped:\n{log_entry.model_dump_json(indent=4)}"

osn_selenium/exceptions/dependencies.py

@@ -0,0 +1,60 @@
+from typing import Union
+from osn_selenium._cdp_import import (
+	check_cdp_version_exists_on_github
+)
+
+
+__all__ = ["CDPPackageError", "DependencyError"]
+
+_CDP_PACKAGE_EXISTS = """
+CDP package for {version} is not installed.
+Fix: Run the following command:
+\t`pip install git+https://github.com/oddshellnick/osn-selenium-cdp.git@{version}`
+""".strip("\n")
+
+_CDP_PACKAGE_NOT_EXISTS = """
+CDP package for version {version} was not found on GitHub or locally.
+Please check available versions at: https://github.com/oddshellnick/osn-selenium-cdp
+If you need this specific version, you can generate it using the https://github.com/oddshellnick/selenium-package-parser tool.
+""".strip("\n")
+
+
+class DependencyError(Exception):
+	"""
+	Base exception for dependency-related issues.
+	"""
+	
+	pass
+
+
+class CDPPackageError(DependencyError):
+	"""
+	Exception raised when a required CDP package is missing.
+	"""
+	
+	def __init__(self, version: Union[int, str]):
+		"""
+		Initializes the error with version details.
+
+		Args:
+			version (Union[int, str]): The missing CDP version.
+		"""
+		
+		self.version = version if isinstance(version, str) else f"v{version}"
+		
+		super().__init__(self._generate_report())
+	
+	def _generate_report(self) -> str:
+		"""
+		Generates a detailed error message checking remote availability.
+
+		Returns:
+			str: Formatted error message with instructions.
+		"""
+		
+		version_exists_on_github = check_cdp_version_exists_on_github(version=self.version)
+		
+		if version_exists_on_github:
+			return _CDP_PACKAGE_EXISTS.format(version=self.version)
+		
+		return _CDP_PACKAGE_NOT_EXISTS.format(version=self.version)

osn_selenium/executors/sync/cdp.py

@@ -0,0 +1,100 @@
+import importlib
+from typing import TYPE_CHECKING, Any, Dict, Callable
+
+from osn_selenium.abstract.executors.cdp import AbstractCDPExecutor
+from osn_selenium.exceptions.dependencies import CDPPackageError
+
+
+__all__ = ["CDPExecutor"]
+
+if TYPE_CHECKING:
+	from osn_selenium_cdp_v140.executors.sync import CDP140Executor
+	from osn_selenium_cdp_v141.executors.sync import CDP141Executor
+	from osn_selenium_cdp_v142.executors.sync import CDP142Executor
+	from osn_selenium_cdp_v143.executors.sync import CDP143Executor
+	from osn_selenium_cdp_v144.executors.sync import CDP144Executor
+
+
+class CDPExecutor(AbstractCDPExecutor):
+	"""
+	Global CDP executor router. 
+	Handles lazy loading and version-specific package validation.
+	"""
+
+	def __init__(self, execute_function: Callable[[str, Dict[str, Any]], Any]):
+		self._execute_function = execute_function
+		self._v140 = None
+		self._v141 = None
+		self._v142 = None
+		self._v143 = None
+		self._v144 = None
+
+	def get(self, version: int) -> Any:
+		"""
+		Dynamically loads and returns the CDP executor for a specific version.
+
+		Args:
+			version (int): The CDP version number.
+
+		Returns:
+			Any: The version-specific executor instance.
+
+		Raises:
+			CDPPackageError: If the version-specific package is not installed.
+		"""
+	
+		try:
+			if getattr(self, f"_v{version}", None) is None:
+				module = importlib.import_module(f"osn_selenium_cdp_v{version}.executors.sync")
+				executor_type = getattr(module, f"CDP{version}Executor")
+
+				setattr(self, f"_v{version}", executor_type(execute_function=self._execute_function))
+
+			return getattr(self, f"_v{version}", None)
+		except ImportError:
+			raise CDPPackageError(version=version)
+
+	@property
+	def v140(self) -> "CDP140Executor":
+		"""
+		Get or initialize the executor for CDP version 140.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=140)
+
+	@property
+	def v141(self) -> "CDP141Executor":
+		"""
+		Get or initialize the executor for CDP version 141.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=141)
+
+	@property
+	def v142(self) -> "CDP142Executor":
+		"""
+		Get or initialize the executor for CDP version 142.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=142)
+
+	@property
+	def v143(self) -> "CDP143Executor":
+		"""
+		Get or initialize the executor for CDP version 143.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=143)
+
+	@property
+	def v144(self) -> "CDP144Executor":
+		"""
+		Get or initialize the executor for CDP version 144.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=144)

osn_selenium/executors/trio_threads/cdp.py

@@ -0,0 +1,104 @@
+import importlib
+from typing import TYPE_CHECKING, Any, Dict, Callable
+
+import trio
+
+from osn_selenium.abstract.executors.cdp import AbstractCDPExecutor
+from osn_selenium.exceptions.dependencies import CDPPackageError
+
+
+__all__ = ["CDPExecutor"]
+
+if TYPE_CHECKING:
+	from osn_selenium_cdp_v140.executors.trio_threads import CDP140Executor
+	from osn_selenium_cdp_v141.executors.trio_threads import CDP141Executor
+	from osn_selenium_cdp_v142.executors.trio_threads import CDP142Executor
+	from osn_selenium_cdp_v143.executors.trio_threads import CDP143Executor
+	from osn_selenium_cdp_v144.executors.trio_threads import CDP144Executor
+
+
+class CDPExecutor(AbstractCDPExecutor):
+	"""
+	Global CDP executor router. 
+	Handles lazy loading and version-specific package validation.
+	"""
+
+	def __init__(self, execute_function: Callable[[str, Dict[str, Any]], Any], lock: trio.Lock, limiter: trio.CapacityLimiter):
+		self._execute_function = execute_function
+		self._lock = lock
+		self._limiter = limiter
+		self._v140 = None
+		self._v141 = None
+		self._v142 = None
+		self._v143 = None
+		self._v144 = None
+
+	def get(self, version: int) -> Any:
+		"""
+		Dynamically loads and returns the CDP executor for a specific version.
+
+		Args:
+			version (int): The CDP version number.
+
+		Returns:
+			Any: The version-specific executor instance.
+
+		Raises:
+			CDPPackageError: If the version-specific package is not installed.
+		"""
+	
+		try:
+			if getattr(self, f"_v{version}", None) is None:
+				module = importlib.import_module(f"osn_selenium_cdp_v{version}.executors.trio_threads")
+				executor_type = getattr(module, f"CDP{version}Executor")
+
+				setattr(self, f"_v{version}", executor_type(execute_function=self._execute_function, lock=self._lock, limiter=self._limiter))
+
+			return getattr(self, f"_v{version}", None)
+		except ImportError:
+			raise CDPPackageError(version=version)
+
+	@property
+	def v140(self) -> "CDP140Executor":
+		"""
+		Get or initialize the executor for CDP version 140.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=140)
+
+	@property
+	def v141(self) -> "CDP141Executor":
+		"""
+		Get or initialize the executor for CDP version 141.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=141)
+
+	@property
+	def v142(self) -> "CDP142Executor":
+		"""
+		Get or initialize the executor for CDP version 142.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=142)
+
+	@property
+	def v143(self) -> "CDP143Executor":
+		"""
+		Get or initialize the executor for CDP version 143.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=143)
+
+	@property
+	def v144(self) -> "CDP144Executor":
+		"""
+		Get or initialize the executor for CDP version 144.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=144)

osn_selenium/executors/trio_threads/javascript.py

@@ -1,5 +1,5 @@
 import trio
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.javascript.models import JS_Scripts
 from typing import (
 	Any,

osn_selenium/executors/unified/javascript.py

@@ -21,10 +21,6 @@ __all__ = ["UnifiedJSExecutor"]
 class UnifiedJSExecutor:
 	"""
 	A unified executor for JavaScript scripts within the Selenium environment.
-
-	Attributes:
-		_execute_function (Callable[[str, Any], Any]): The internal function used to execute JS code.
-		_scripts (JS_Scripts): A collection of pre-defined JavaScript scripts.
 	"""
 	
 	def __init__(self, execute_function: Callable[[str, Any], Any]):

osn_selenium/flags/base.py

@@ -1,5 +1,5 @@
 from copy import deepcopy
-from osn_selenium.models import DictModel
+from osn_selenium._base_models import DictModel
 from typing import (
 	Any,
 	Dict,
@@ -47,14 +47,6 @@ class BrowserFlagsManager:
 
 	This class provides a structured way to define, set, and build browser options
 	for various Selenium WebDriver instances.
-
-	Attributes:
-		_flags_types (Dict[str, FlagType]): A dictionary mapping flag types to their handler functions.
-		_flags_definitions (Dict[str, FlagDefinition]): A dictionary of all available flag definitions.
-		_flags_definitions_by_types (Dict[str, Dict[str, FlagDefinition]]): Flags definitions grouped by type.
-		_arguments (Dict[str, ArgumentValue]): Stores the configured command-line arguments.
-		_experimental_options (Dict[str, ExperimentalOptionValue]): Stores the configured experimental options.
-		_attributes (Dict[str, AttributeValue]): Stores the configured WebDriver attributes.
 	"""
 	
 	def __init__(

osn_selenium/flags/blink.py

@@ -44,12 +44,6 @@ class BlinkFlagsManager(BrowserFlagsManager):
 	This class extends `BrowserFlagsManager` to handle Blink-specific features,
 	such as `--enable-blink-features` and `--disable-blink-features`, and provides
 	a comprehensive set of predefined flags for these browsers.
-
-	Attributes:
-		_browser_exe (Optional[PATH_TYPEHINT]): Path to the browser executable.
-		_start_page_url (Optional[str]): The URL to open when the browser starts.
-		_enable_blink_features (Dict[str, str]): Stores enabled Blink feature commands.
-		_disable_blink_features (Dict[str, str]): Stores disabled Blink feature commands.
 	"""
 	
 	def __init__(

osn_selenium/flags/models/base.py

@@ -1,8 +1,4 @@
 from pydantic import Field
-from osn_selenium.models import (
-	DictModel,
-	ExtraDictModel
-)
 from typing import (
 	Any,
 	Callable,
@@ -10,6 +6,10 @@ from typing import (
 	Literal,
 	Optional
 )
+from osn_selenium._base_models import (
+	DictModel,
+	ExtraDictModel
+)
 from osn_selenium.flags._typehints import (
 	ANY_WEBDRIVER_OPTION_TYPEHINT
 )

osn_selenium/flags/models/blink.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 from typing import Optional
-from osn_selenium.models import ExtraDictModel
 from osn_selenium._typehints import PATH_TYPEHINT
+from osn_selenium._base_models import ExtraDictModel
 from osn_selenium.flags._typehints import (
 	AUTOPLAY_POLICY_TYPEHINT,
 	LOG_LEVEL_TYPEHINT,

osn_selenium/flags/models/values.py

@@ -1,5 +1,5 @@
 from typing import Any
-from osn_selenium.models import DictModel
+from osn_selenium._base_models import DictModel
 
 
 __all__ = ["ArgumentValue", "AttributeValue", "ExperimentalOptionValue"]

osn_selenium/instances/sync/action_chains/__init__.py

@@ -1,6 +1,9 @@
+from osn_selenium.instances.sync.action_chains.move import MoveMixin
 from osn_selenium.instances.sync.action_chains.click import ClickMixin
 from osn_selenium.instances.sync.action_chains.utils import UtilsMixin
+from osn_selenium.instances.sync.action_chains.scroll import ScrollMixin
 from osn_selenium.instances.sync.action_chains.hm_move import HMMoveMixin
+from osn_selenium.instances.sync.action_chains.keyboard import KeyboardMixin
 from osn_selenium.instances.sync.action_chains.hm_scroll import HMScrollMixin
 from osn_selenium.abstract.instances.action_chains import AbstractActionChains
 from osn_selenium.instances.sync.action_chains.hm_keyboard import HMKeyboardMixin
@@ -17,6 +20,9 @@ class ActionChains(
 		HMKeyboardMixin,
 		HMMoveMixin,
 		HMScrollMixin,
+		KeyboardMixin,
+		MoveMixin,
+		ScrollMixin,
 		AbstractActionChains,
 ):
 	"""

osn_selenium/instances/sync/shadow_root.py

@@ -1,11 +1,12 @@
 from selenium.webdriver.common.by import By
+from osn_selenium.instances._typehints import SHADOW_ROOT_TYPEHINT
 from typing import (
 	List,
 	Optional,
 	Self,
-	TYPE_CHECKING
+	TYPE_CHECKING,
+	Type
 )
-from osn_selenium.instances._typehints import SHADOW_ROOT_TYPEHINT
 from osn_selenium.exceptions.instance import (
 	CannotConvertTypeError
 )
@@ -14,6 +15,9 @@ from osn_selenium.abstract.instances.shadow_root import AbstractShadowRoot
 from selenium.webdriver.remote.shadowroot import (
 	ShadowRoot as legacyShadowRoot
 )
+from selenium.webdriver.remote.webelement import (
+	WebElement as legacyWebElement
+)
 from osn_selenium.instances.convert import (
 	get_legacy_instance,
 	get_sync_instance_wrapper
@@ -25,6 +29,28 @@ __all__ = ["ShadowRoot"]
 if TYPE_CHECKING:
 	from osn_selenium.instances.sync.web_element import WebElement
 
+_WEB_ELEMENT_TYPE: Optional[Type["WebElement"]] = None
+
+
+def _build_web_element(legacy_element: legacyWebElement):
+	"""
+	Builds a wrapped WebElement from a legacy element.
+
+	Args:
+		legacy_element (legacyWebElement): The legacy Selenium WebElement instance.
+
+	Returns:
+		WebElement: The wrapped WebElement instance.
+	"""
+	
+	global _WEB_ELEMENT_TYPE
+	
+	if _WEB_ELEMENT_TYPE is None:
+		from osn_selenium.instances.sync.web_element import WebElement
+		_WEB_ELEMENT_TYPE = WebElement
+	
+	return get_sync_instance_wrapper(wrapper_class=_WEB_ELEMENT_TYPE, legacy_object=legacy_element)
+
 
 class ShadowRoot(UnifiedShadowRoot, AbstractShadowRoot):
 	"""
@@ -47,17 +73,13 @@ class ShadowRoot(UnifiedShadowRoot, AbstractShadowRoot):
 	def find_element(self, by: str = By.ID, value: Optional[str] = None) -> "WebElement":
 		legacy_element = self._find_element_impl(by=by, value=value)
 		
-		from osn_selenium.instances.sync.web_element import WebElement
-		
-		return get_sync_instance_wrapper(wrapper_class=WebElement, legacy_object=legacy_element)
+		return _build_web_element(legacy_element=legacy_element)
 	
 	def find_elements(self, by: str = By.ID, value: Optional[str] = None) -> List["WebElement"]:
 		legacy_elements = self._find_elements_impl(by=by, value=value)
 		
-		from osn_selenium.instances.sync.web_element import WebElement
-		
 		return [
-			get_sync_instance_wrapper(wrapper_class=WebElement, legacy_object=legacy_element)
+			_build_web_element(legacy_element=legacy_element)
 			for legacy_element in legacy_elements
 		]
 	

osn_selenium/instances/trio_threads/action_chains/__init__.py

@@ -1,7 +1,10 @@
+from osn_selenium.instances.trio_threads.action_chains.move import MoveMixin
 from osn_selenium.abstract.instances.action_chains import AbstractActionChains
 from osn_selenium.instances.trio_threads.action_chains.click import ClickMixin
 from osn_selenium.instances.trio_threads.action_chains.utils import UtilsMixin
+from osn_selenium.instances.trio_threads.action_chains.scroll import ScrollMixin
 from osn_selenium.instances.trio_threads.action_chains.hm_move import HMMoveMixin
+from osn_selenium.instances.trio_threads.action_chains.keyboard import KeyboardMixin
 from osn_selenium.instances.trio_threads.action_chains.hm_scroll import HMScrollMixin
 from osn_selenium.instances.trio_threads.action_chains.hm_keyboard import HMKeyboardMixin
 from osn_selenium.instances.trio_threads.action_chains.drag_and_drop import DragAndDropMixin
@@ -17,6 +20,9 @@ class ActionChains(
 		HMKeyboardMixin,
 		HMMoveMixin,
 		HMScrollMixin,
+		KeyboardMixin,
+		MoveMixin,
+		ScrollMixin,
 		AbstractActionChains,
 ):
 	"""

osn_selenium/instances/trio_threads/action_chains/base.py

@@ -1,5 +1,5 @@
 import trio
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	Any,
 	Callable,

osn_selenium/instances/trio_threads/alert.py

@@ -1,6 +1,6 @@
 import trio
 from typing import Optional, Self
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances._typehints import ALERT_TYPEHINT
 from osn_selenium.instances.unified.alert import UnifiedAlert
 from osn_selenium.instances.convert import get_legacy_instance

osn_selenium/instances/trio_threads/browser.py

@@ -1,6 +1,6 @@
 import trio
 from typing import List, Self
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances._typehints import BROWSER_TYPEHINT
 from osn_selenium.instances.convert import get_legacy_instance
 from osn_selenium.instances.unified.browser import UnifiedBrowser

osn_selenium/instances/trio_threads/browsing_context.py

@@ -1,5 +1,5 @@
 import trio
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances.convert import get_legacy_instance
 from osn_selenium.exceptions.instance import (
 	CannotConvertTypeError

osn_selenium/instances/trio_threads/dialog.py

@@ -1,6 +1,6 @@
 import trio
 from typing import List, Optional, Self
-from osn_selenium.base_mixin import TrioThreadMixin
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from selenium.webdriver.common.fedcm.account import Account
 from osn_selenium.instances._typehints import DIALOG_TYPEHINT
 from osn_selenium.instances.convert import get_legacy_instance