oagi-core 0.14.0__py3-none-any.whl → 0.14.2__py3-none-any.whl

oagi/handler/ydotool_action_handler.py

@@ -12,8 +12,10 @@ from pydantic import BaseModel, Field
 
 from oagi.handler.screen_manager import Screen
 
+from ..constants import DEFAULT_STEP_DELAY
 from ..types import Action, ActionType, parse_coords, parse_drag_coords, parse_scroll
 from .capslock_manager import CapsLockManager
+from .utils import CoordinateScaler, normalize_key, parse_hotkey
 from .wayland_support import Ydotool, get_screen_size
 
 
@@ -38,6 +40,12 @@ class YdotoolConfig(BaseModel):
         default="",
         description="Custom socket address for ydotool (e.g., '/tmp/ydotool.sock')",
     )
+    post_batch_delay: float = Field(
+        default=DEFAULT_STEP_DELAY,
+        ge=0,
+        description="Delay after executing all actions in a batch (seconds). "
+        "Allows UI to settle before next screenshot.",
+    )
 
 
 class YdotoolActionHandler(Ydotool):
@@ -66,6 +74,13 @@ class YdotoolActionHandler(Ydotool):
         self.caps_manager = CapsLockManager(mode=self.config.capslock_mode)
         # The origin position of coordinates (the top-left corner of the screen)
         self.origin_x, self.origin_y = 0, 0
+        # Initialize coordinate scaler
+        self._coord_scaler = CoordinateScaler(
+            source_width=1000,
+            source_height=1000,
+            target_width=self.screen_width,
+            target_height=self.screen_height,
+        )
 
     def reset(self):
         """Reset handler state.
@@ -83,6 +98,12 @@ class YdotoolActionHandler(Ydotool):
         """
         self.screen_width, self.screen_height = screen.width, screen.height
         self.origin_x, self.origin_y = screen.x, screen.y
+        self._coord_scaler = CoordinateScaler(
+            source_width=1000,
+            source_height=1000,
+            target_width=self.screen_width,
+            target_height=self.screen_height,
+        )
 
     def _execute_action(self, action: Action) -> bool:
         """
@@ -161,45 +182,14 @@ class YdotoolActionHandler(Ydotool):
         return finished
 
     def _denormalize_coords(self, x: float, y: float) -> tuple[int, int]:
-        """Convert coordinates from 0-1000 range to actual screen coordinates.
-
-        Also handles corner coordinates to prevent PyAutoGUI fail-safe trigger.
-        Corner coordinates (0,0), (0,max), (max,0), (max,max) are offset by 1 pixel.
-        """
-        screen_x = int(x * self.screen_width / 1000)
-        screen_y = int(y * self.screen_height / 1000)
-
-        # Prevent fail-safe by adjusting corner coordinates
-        # Check if coordinates are at screen corners (with small tolerance)
-        if screen_x < 1:
-            screen_x = 1
-        elif screen_x > self.screen_width - 1:
-            screen_x = self.screen_width - 1
-
-        if screen_y < 1:
-            screen_y = 1
-        elif screen_y > self.screen_height - 1:
-            screen_y = self.screen_height - 1
-
-        # Add origin offset to convert relative to top-left corner
-        screen_x += self.origin_x
-        screen_y += self.origin_y
-
-        return screen_x, screen_y
+        """Convert coordinates from 0-1000 range to actual screen coordinates."""
+        screen_x, screen_y = self._coord_scaler.scale(x, y, prevent_failsafe=True)
+        # Add origin offset for multi-screen support
+        return screen_x + self.origin_x, screen_y + self.origin_y
 
     def _normalize_key(self, key: str) -> str:
         """Normalize key names for consistency."""
-        key = key.strip().lower()
-        # Normalize caps lock variations
-        hotkey_variations_mapping = {
-            "capslock": ["caps_lock", "caps", "capslock"],
-            "pgup": ["page_up", "pageup"],
-            "pgdn": ["page_down", "pagedown"],
-        }
-        for normalized, variations in hotkey_variations_mapping.items():
-            if key in variations:
-                return normalized
-        return key
+        return normalize_key(key)
 
     def _parse_coords(self, args_str: str) -> tuple[int, int]:
         """Extract x, y coordinates from argument string."""
@@ -227,11 +217,7 @@ class YdotoolActionHandler(Ydotool):
 
     def _parse_hotkey(self, args_str: str) -> list[str]:
         """Parse hotkey string into list of keys."""
-        # Remove parentheses if present
-        args_str = args_str.strip("()")
-        # Split by '+' to get individual keys
-        keys = [self._normalize_key(key) for key in args_str.split("+")]
-        return keys
+        return parse_hotkey(args_str.strip("()"), validate=False)
 
     def __call__(self, actions: list[Action]) -> None:
         """Execute the provided list of actions."""
@@ -241,3 +227,7 @@ class YdotoolActionHandler(Ydotool):
             except Exception as e:
                 print(f"Error executing action {action.type}: {e}")
                 raise
+
+        # Wait after batch for UI to settle before next screenshot
+        if self.config.post_batch_delay > 0:
+            time.sleep(self.config.post_batch_delay)

{oagi_core-0.14.0.dist-info → oagi_core-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.14.0
+Version: 0.14.2
 Summary: Official API of OpenAGI Foundation
 Project-URL: Homepage, https://github.com/agiopen-org/oagi
 Author-email: OpenAGI Foundation <contact@agiopen.org>
@@ -154,12 +154,15 @@ from oagi import AsyncPyautoguiActionHandler, PyautoguiConfig
 
 # Customize action behavior
 config = PyautoguiConfig(
-    drag_duration=1.0,      # Slower drags for precision (default: 0.5)
-    scroll_amount=50,       # Larger scroll steps (default: 30)
-    wait_duration=2.0,      # Longer waits (default: 1.0)
-    action_pause=0.2,       # More pause between actions (default: 0.1)
-    hotkey_interval=0.1,    # Interval between keys in hotkey combinations (default: 0.1)
-    capslock_mode="session" # Caps lock mode: 'session' or 'system' (default: 'session')
+    drag_duration=1.0,       # Slower drags for precision (default: 0.5)
+    scroll_amount=50,        # Larger scroll steps (default: 2 on macOS, 100 on others)
+    wait_duration=2.0,       # Longer waits for WAIT action (default: 1.0)
+    action_pause=0.2,        # Pause between PyAutoGUI calls (default: 0.1)
+    hotkey_interval=0.1,     # Interval between keys in hotkey combos (default: 0.1)
+    capslock_mode="session", # Caps lock mode: 'session' or 'system' (default: 'session')
+    macos_ctrl_to_cmd=True,  # Replace ctrl with cmd on macOS (default: True)
+    click_pre_delay=0.1,     # Delay after move before click (default: 0.1)
+    post_batch_delay=1.0,    # Delay after actions before next screenshot (default: 1.0)
 )
 
 action_handler = AsyncPyautoguiActionHandler(config=config)
@@ -279,10 +282,11 @@ from oagi import AsyncYdotoolActionHandler, YdotoolConfig
 # Customize action behavior
 config = YdotoolConfig(
     scroll_amount=50,        # Larger scroll steps (default: 20)
-    wait_duration=2.0,       # Longer waits (default: 1.0)
-    action_pause=1.0,        # More pause between actions (default: 0.5)
+    wait_duration=2.0,       # Longer waits for WAIT action (default: 1.0)
+    action_pause=1.0,        # Pause between Ydotool calls (default: 0.5)
     capslock_mode="session", # Caps lock mode: 'session' or 'system' (default: 'session')
-    socket_address="/tmp/ydotool.sock"  # Customized Socket address for ydotool (ydotool uses 'YDOTOOL_SOCKET' environment variable by default)
+    socket_address="/tmp/ydotool.sock",  # Custom socket address (default: YDOTOOL_SOCKET env var)
+    post_batch_delay=1.0,    # Delay after actions before next screenshot (default: 1.0)
 )
 
 action_handler = AsyncYdotoolActionHandler(config=config)

{oagi_core-0.14.0.dist-info → oagi_core-0.14.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-oagi/__init__.py,sha256=TVBbIMEXQh5Z8JumqrivMPBLYt3E5HmGPi973NDx2Qs,5797
+oagi/__init__.py,sha256=Ft-HT7yXmX9HkHewjn_kQIFJcDj-_KSLgOLNgZeBlyU,6286
 oagi/constants.py,sha256=qcNisliLRZUr6krXpS49AAPfFYvkZuWQcAJ8ZdEnhic,1228
 oagi/exceptions.py,sha256=Rco37GQTPYUfc2vRO3hozxPF_s8mKFDpFvBg2UKWo3Y,3066
 oagi/logging.py,sha256=YT3KCMFj5fzO98R9xlDDgfSotUuz1xRD6OZeYM2rKoo,1760
@@ -10,7 +10,7 @@ oagi/actor/base.py,sha256=-ecocyZ9-NQ4C4jjsHLUcs3ixZ99rFbzqwFsiVKZVR0,8001
 oagi/actor/short.py,sha256=wKLCxvf7Ys6rYxXpHe4zbZdbf_1q1qcmm5WyWubwj3E,2630
 oagi/actor/sync.py,sha256=QTY1WNTI75jwkWBghdVViHIp5rYkbm3kumlLedU8YeQ,3588
 oagi/agent/__init__.py,sha256=KTVLUMhbjgpTJoOWMUZkkiqwhgumvbOZV2tJ9XCLfao,901
-oagi/agent/default.py,sha256=Ax05kBa8Fb14Ev8wd9LS6xkF65grf6qdxxTlgpkkDuk,4715
+oagi/agent/default.py,sha256=mP4Gdld5I0sP0ANyn1CLkFvgk9qPkzYbwJeZUGhlsew,4712
 oagi/agent/factories.py,sha256=syi_EOlU4SUjo-0CKaML8eIPu3ToUEKua2VHp9lvNF0,5839
 oagi/agent/protocol.py,sha256=IQJGiMN4yZIacrh5e9JQsoM9TyHb8wJRQR4LAk8dSA0,1615
 oagi/agent/registry.py,sha256=7bMA2-pH3xQ9ZavrHB_mnc2fOGSMeICPbOGtHoM7It0,4851
@@ -24,7 +24,7 @@ oagi/agent/tasker/__init__.py,sha256=1iTEFe7lzcqh96TL9R0QADPpLJLrUP0shtZ4DlZSv_8
 oagi/agent/tasker/memory.py,sha256=NR13l5yxRA8GUE-oupAP4W1n80ZNG0SxpUfxsNltkUY,5033
 oagi/agent/tasker/models.py,sha256=sMQgwIMKhT1tvVF2yoc1hh8GwEiJ6i6qPMy9WoiA8JM,2137
 oagi/agent/tasker/planner.py,sha256=q6IvH6sfU2kYX1NcC9VHjGaQ0X9jF18yjuAYXisNCg0,15489
-oagi/agent/tasker/taskee_agent.py,sha256=OugYJbTbFKxgNjbIyQBBH4Zm5u5PuWN1F6R81_eIro8,18090
+oagi/agent/tasker/taskee_agent.py,sha256=IfRg_YixHkxHuiGCqok5cPDLD7PXUqlsoRAfWnWswMI,18091
 oagi/agent/tasker/tasker_agent.py,sha256=yb0BdQzJyAPpK3njHPWgQruV8zpUGBXn1WjOGEMIO-g,11291
 oagi/cli/__init__.py,sha256=aDnJViTseShpo5fdGPTj-ELysZhmdvB6Z8mEj2D-_N4,359
 oagi/cli/agent.py,sha256=CWvwwbo4eiq-USYmDHnKafEX8Nk6zsGsUmNzB4QftkQ,13186
@@ -37,21 +37,24 @@ oagi/client/__init__.py,sha256=F9DShPUdb6vZYmN1fpM1VYzp4MWqUao_e_R1KYmM4Q4,410
 oagi/client/async_.py,sha256=BANE0KU14WBuXp6suBhr8JSlpWhN5SR2aJJ7wAJBDLQ,9574
 oagi/client/base.py,sha256=CWAvE0AcpL8HD_i00n7Fq53AIAQGhBhS_n6LifUCqxE,14736
 oagi/client/sync.py,sha256=4xNqqNihXmgLU385h22mMJ9wmmlw-jeOdWI4fmpEpTk,9369
+oagi/converters/__init__.py,sha256=4ADgInzAQNCvghXT4cKYt8zUnj-V-szjzRnrxJRE5Tw,1875
+oagi/converters/base.py,sha256=0wHVMf9xAqVidBD_VtsqfLDlBPOqUADt6or4JGAha1A,9096
+oagi/converters/oagi.py,sha256=tKvT5Pqq1gMqkVPdqU7p6su8r6IeU5-B4A7hvbHFmMA,7437
 oagi/handler/__init__.py,sha256=ZMQIeN_uJKUK_dn0w7ggsPfdRzzwts7G-Sppsrt22Lg,2528
 oagi/handler/_macos.py,sha256=Gs8GrhA_WAyv9Yw0D41duliP32Xk6vouyMeWjWJJT90,5187
 oagi/handler/_windows.py,sha256=MSgPDYEOetSjbn9eJDSrdzBVlUGgGsTlegaTDc4C4Ss,2828
 oagi/handler/_ydotool.py,sha256=WjvE6RGRm8j3SEWpgfMw31aow3z3qkiMupuUHYt-QAM,2948
-oagi/handler/async_pyautogui_action_handler.py,sha256=ZYySg5dSu4MDX0ngwVUJaX3uZA2CuecPN2UqFnCbnec,2174
+oagi/handler/async_pyautogui_action_handler.py,sha256=vZLf6LyRUzPAr8hGmKQDDyXMmc3ZAhlCCN4dIfi3vnY,2245
 oagi/handler/async_screenshot_maker.py,sha256=_myV4Rq6X_evCOuatalFSW5nsUDXi_0ej0GQ7V4n3JE,1856
 oagi/handler/async_ydotool_action_handler.py,sha256=HB4QQk3OaG08g37eLb3EwsnkWKWPrpDei0ZsnBxrGZY,2159
 oagi/handler/capslock_manager.py,sha256=40LzWt1_1wbncF5koUTdbd9V3eo5Ex_mEWwjtEmHAf4,1878
 oagi/handler/pil_image.py,sha256=s8UGZ6ALbmOxRO2GL1EUFN7_6ZEFseSE9OHABCe7wek,5380
-oagi/handler/pyautogui_action_handler.py,sha256=HvupClYrmYuIx_xvXj5SyacDX781bpZkMGEOeXoSQTU,11301
+oagi/handler/pyautogui_action_handler.py,sha256=vA9c2YGV1dNNx3F4a_MGnpS7O4Ww0A0sWxfvgNTMjnc,11162
 oagi/handler/screen_manager.py,sha256=FV0-6ZyTVv9yZlAg4Krga0xW9O_LDsk1iaCJjWgET-g,6565
 oagi/handler/screenshot_maker.py,sha256=740k7NjDRKW6KwVqy_nVoczgVuw9_yTKM0gLFKB1iNs,1600
-oagi/handler/utils.py,sha256=jj10z-v4_LUuVb8aClyXkUfZVEaqsWgi3be4t3Gw7oI,697
+oagi/handler/utils.py,sha256=WnYvPkpiNYDnv4EDLfOTdO5gEGuJVpB42G0HQkp6aEg,18173
 oagi/handler/wayland_support.py,sha256=qUIAQMqc3wp1VIypVmZjFDYT8t0yH0QvikTTV8pD-XA,7905
-oagi/handler/ydotool_action_handler.py,sha256=y-mWXM88j3baPPywXqwASSx7GAs7LbqTgpCA1gN4nF0,9262
+oagi/handler/ydotool_action_handler.py,sha256=gH3ujZgwc6722ZqKEMqibzH67PCGbw8paMqNP-wM5Sc,8996
 oagi/server/__init__.py,sha256=uZx8u3vJUb87kkNzwmmVrgAgbqRu0WxyMIQCLSx56kk,452
 oagi/server/agent_wrappers.py,sha256=j8va0A7u80bzOM82nndAplK1uaO_T3kufHWScK6kfWM,3263
 oagi/server/config.py,sha256=AJ1PLKuxrc6pRuur1hm5DwG2g2otxPwOCfKgzIACkSk,1691
@@ -76,8 +79,8 @@ oagi/types/models/step.py,sha256=RSI4H_2rrUBq_xyCoWKaq7JHdJWNobtQppaKC1l0aWU,471
 oagi/utils/__init__.py,sha256=vHXyX66hEsf33OJJkmZSUjaTYU0UngfbtjcZgxfOj3A,441
 oagi/utils/output_parser.py,sha256=U7vzmoD8pyzDg23z3vy-L9a_jKPsAlr3x8lIdPszrY8,5322
 oagi/utils/prompt_builder.py,sha256=_Q1HY82YUrq3jSCTZ3Rszu3qmI3Wn_fmq8hf14NuwQM,2180
-oagi_core-0.14.0.dist-info/METADATA,sha256=Y7oBSQFVieDeBMwwVMhsrhMMtSPXjM7PIVm72SfTCtM,16508
-oagi_core-0.14.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi_core-0.14.0.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
-oagi_core-0.14.0.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi_core-0.14.0.dist-info/RECORD,,
+oagi_core-0.14.2.dist-info/METADATA,sha256=rb_8vO8vmAfY2wgFWHaO2OqukhFZYYO2KVPBq5SPuGM,16854
+oagi_core-0.14.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+oagi_core-0.14.2.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
+oagi_core-0.14.2.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
+oagi_core-0.14.2.dist-info/RECORD,,