Skip to content

fix(computer-server): lazy-load native handlers #1421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
spqw wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(computer-server): lazy-load native handlers #1421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions libs/python/computer-server/computer_server/handlers/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@

OS_TYPE = get_current_os()

if OS_TYPE == "android":
from .android import (
AndroidAccessibilityHandler,
AndroidAutomationHandler,
AndroidDesktopHandler,
AndroidFileHandler,
AndroidWindowHandler,
)
elif OS_TYPE == "darwin":
from computer_server.diorama.macos import MacOSDioramaHandler

from .macos import MacOSAccessibilityHandler, MacOSAutomationHandler
elif OS_TYPE == "linux":
from .linux import LinuxAccessibilityHandler, LinuxAutomationHandler
elif OS_TYPE == "windows":
from .windows import WindowsAccessibilityHandler, WindowsAutomationHandler

from .generic import GenericDesktopHandler, GenericFileHandler, GenericWindowHandler


Expand Down Expand Up @@ -81,6 +64,14 @@ def create_handlers() -> Tuple[
GenericWindowHandler(),
)
elif OS_TYPE == "android":
from .android import (
AndroidAccessibilityHandler,
AndroidAutomationHandler,
AndroidDesktopHandler,
AndroidFileHandler,
AndroidWindowHandler,
)

return (
AndroidAccessibilityHandler(),
AndroidAutomationHandler(),
Expand All @@ -90,6 +81,10 @@ def create_handlers() -> Tuple[
AndroidWindowHandler(),
)
elif OS_TYPE == "darwin":
from computer_server.diorama.macos import MacOSDioramaHandler

from .macos import MacOSAccessibilityHandler, MacOSAutomationHandler

return (
MacOSAccessibilityHandler(),
MacOSAutomationHandler(),
Expand All @@ -99,6 +94,8 @@ def create_handlers() -> Tuple[
GenericWindowHandler(),
)
elif OS_TYPE == "linux":
from .linux import LinuxAccessibilityHandler, LinuxAutomationHandler

return (
LinuxAccessibilityHandler(),
LinuxAutomationHandler(),
Expand All @@ -108,6 +105,8 @@ def create_handlers() -> Tuple[
GenericWindowHandler(),
)
elif OS_TYPE == "windows":
from .windows import WindowsAccessibilityHandler, WindowsAutomationHandler

return (
WindowsAccessibilityHandler(),
WindowsAutomationHandler(),
Expand Down