Skip to content

Three separate small improvements #4

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

Merged
psarka merged 3 commits into from
Apr 4, 2025
Merged

Three separate small improvements #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ba815
For unknown reasons keydown + keyup is more reliable than hotkey
Apr 1, 2025
b6bdefe
Reduce additional built-in wait by pyautogui
Apr 1, 2025
5fb939a
Make mouse movements visible
Apr 1, 2025
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
18 changes: 12 additions & 6 deletions src/generalagents/macos/computer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import pyautogui
from PIL import Image
from pytweening import easeInOutQuad

from generalagents.action import (
Action,
Expand All @@ -23,6 +24,8 @@
)

pyautogui.FAILSAFE = True # Move mouse to corner to abort
pyautogui.PAUSE = 0.001 # We are waiting manually in the code
MOUSE_SETTINGS = {"duration": 0.101, "tween": easeInOutQuad} # duration <= 0.1 is treated as 0 by pyautogui


class Computer:
Expand Down Expand Up @@ -52,25 +55,28 @@ def _scaled(self, coord: Coordinate) -> tuple[int, int]:
def _execute_action(self, action: Action) -> None:
match action:
case ActionKeyPress(kind="key_press", keys=keys) if keys:
pyautogui.hotkey(*keys)
for key in keys:
pyautogui.keyDown(key)
for key in reversed(keys):
pyautogui.keyUp(key)

case ActionType(kind="type", text=text) if text:
pyautogui.write(text)

case ActionLeftClick(kind="left_click", coordinate=coord):
pyautogui.click(*self._scaled(coord), button="left")
pyautogui.click(*self._scaled(coord), button="left", **MOUSE_SETTINGS)

case ActionRightClick(kind="right_click", coordinate=coord):
pyautogui.click(*self._scaled(coord), button="right")
pyautogui.click(*self._scaled(coord), button="right", **MOUSE_SETTINGS)

case ActionDoubleClick(kind="double_click", coordinate=coord):
pyautogui.doubleClick(*self._scaled(coord))
pyautogui.doubleClick(*self._scaled(coord), **MOUSE_SETTINGS)

case ActionTripleClick(kind="triple_click", coordinate=coord):
pyautogui.tripleClick(*self._scaled(coord))
pyautogui.tripleClick(*self._scaled(coord), **MOUSE_SETTINGS)

case ActionMouseMove(kind="mouse_move", coordinate=coord):
pyautogui.moveTo(*self._scaled(coord))
pyautogui.moveTo(*self._scaled(coord), **MOUSE_SETTINGS)

case ActionDrag(kind="drag", drag_start=start, drag_end=end):
pyautogui.moveTo(*self._scaled(start))
Expand Down