oagi-core 0.13.0__py3-none-any.whl → 0.13.2__py3-none-any.whl

oagi/actor/base.py

@@ -10,8 +10,8 @@ from uuid import uuid4
 
 from ..constants import (
     DEFAULT_MAX_STEPS,
-    MAX_STEPS_ACTOR,
-    MAX_STEPS_THINKER,
+    MAX_STEPS_ALLOWED_ACTOR,
+    MAX_STEPS_ALLOWED_THINKER,
     MODEL_THINKER,
 )
 from ..logging import get_logger
@@ -51,7 +51,11 @@ class BaseActor:
         Returns:
             Validated max_steps (capped to model limit if exceeded)
         """
-        limit = MAX_STEPS_THINKER if self.model == MODEL_THINKER else MAX_STEPS_ACTOR
+        limit = (
+            MAX_STEPS_ALLOWED_THINKER
+            if self.model == MODEL_THINKER
+            else MAX_STEPS_ALLOWED_ACTOR
+        )
         if max_steps > limit:
             logger.warning(
                 f"max_steps ({max_steps}) exceeds limit for model '{self.model}'. "

oagi/constants.py

@@ -27,8 +27,8 @@ DEFAULT_MAX_STEPS_THINKER = 100
 DEFAULT_MAX_STEPS_TASKER = 60
 
 # Maximum allowed steps per model (hard limits)
-MAX_STEPS_ACTOR = 30
-MAX_STEPS_THINKER = 120
+MAX_STEPS_ALLOWED_ACTOR = 100
+MAX_STEPS_ALLOWED_THINKER = 300
 
 # Reflection intervals
 DEFAULT_REFLECTION_INTERVAL = 4

oagi/handler/pyautogui_action_handler.py

@@ -51,6 +51,10 @@ class PyautoguiConfig(BaseModel):
         default=True,
         description="Replace 'ctrl' with 'command' in hotkey combinations on macOS",
     )
+    click_pre_delay: float = Field(
+        default=0.1,
+        description="Delay in seconds after moving to position before clicking",
+    )
 
 
 class PyautoguiActionHandler:
@@ -158,6 +162,11 @@ class PyautoguiActionHandler:
         keys = [self._normalize_key(key) for key in args_str.split("+")]
         return keys
 
+    def _move_and_wait(self, x: int, y: int) -> None:
+        """Move cursor to position and wait before clicking."""
+        pyautogui.moveTo(x, y)
+        time.sleep(self.config.click_pre_delay)
+
     def _execute_single_action(self, action: Action) -> None:
         """Execute a single action once."""
         arg = action.argument.strip("()")  # Remove outer parentheses if present
@@ -165,25 +174,29 @@ class PyautoguiActionHandler:
         match action.type:
             case ActionType.CLICK:
                 x, y = self._parse_coords(arg)
-                pyautogui.click(x, y)
+                self._move_and_wait(x, y)
+                pyautogui.click()
 
             case ActionType.LEFT_DOUBLE:
                 x, y = self._parse_coords(arg)
+                self._move_and_wait(x, y)
                 if sys.platform == "darwin":
                     _macos.macos_click(x, y, clicks=2)
                 else:
-                    pyautogui.doubleClick(x, y)
+                    pyautogui.doubleClick()
 
             case ActionType.LEFT_TRIPLE:
                 x, y = self._parse_coords(arg)
+                self._move_and_wait(x, y)
                 if sys.platform == "darwin":
                     _macos.macos_click(x, y, clicks=3)
                 else:
-                    pyautogui.tripleClick(x, y)
+                    pyautogui.tripleClick()
 
             case ActionType.RIGHT_SINGLE:
                 x, y = self._parse_coords(arg)
-                pyautogui.rightClick(x, y)
+                self._move_and_wait(x, y)
+                pyautogui.rightClick()
 
             case ActionType.DRAG:
                 x1, y1, x2, y2 = self._parse_drag_coords(arg)

{oagi_core-0.13.0.dist-info → oagi_core-0.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.13.0
+Version: 0.13.2
 Summary: Official API of OpenAGI Foundation
 Project-URL: Homepage, https://github.com/agiopen-org/oagi
 Author-email: OpenAGI Foundation <contact@agiopen.org>

{oagi_core-0.13.0.dist-info → oagi_core-0.13.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 oagi/__init__.py,sha256=ly956qE0F4FlzaU-kPsKAhpG2Kc3D9T_BJDZmWqioOc,5616
-oagi/constants.py,sha256=ywyMimjh15tC5p4MBZjkJIqOVElPRS50iJtrPE3VClw,1211
+oagi/constants.py,sha256=VUEgpwup55rTrvPC2xhtjZgpUHJlVaNRidiUlXXEjx0,1228
 oagi/exceptions.py,sha256=Rco37GQTPYUfc2vRO3hozxPF_s8mKFDpFvBg2UKWo3Y,3066
 oagi/logging.py,sha256=YT3KCMFj5fzO98R9xlDDgfSotUuz1xRD6OZeYM2rKoo,1760
 oagi/platform_info.py,sha256=GEqNWnwePszVEM21toGGi07o3PaX8O059CYRr0RUM_M,1424
 oagi/actor/__init__.py,sha256=g_8_7ZLDLKuCGzyrB42OzY3gSOjd_SxzkJW3_pf-PXs,662
 oagi/actor/async_.py,sha256=DcU6ifAcrYI1GSrTFgMPrWhikjmnJfZVaFsun15DG_k,3768
 oagi/actor/async_short.py,sha256=QSo67aPsd_rxA2J2TR1fv6nJD6wO00q3S-QQYNK93q4,2821
-oagi/actor/base.py,sha256=UUZdS1tufZDIbtQHLs-es6ptGHQpa-EPWf7RSbVpQnU,7921
+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
@@ -46,7 +46,7 @@ oagi/handler/async_screenshot_maker.py,sha256=8QCtUV59ozpOpvkqhUMb8QDI2qje2gsoFT
 oagi/handler/async_ydotool_action_handler.py,sha256=BRGqZB2u1k7R1acUX9k0TfdrmWS2eh3opc8LoqnlwJ4,1848
 oagi/handler/capslock_manager.py,sha256=40LzWt1_1wbncF5koUTdbd9V3eo5Ex_mEWwjtEmHAf4,1878
 oagi/handler/pil_image.py,sha256=GQw2o8ORQinrM3AxhgNBbLhrkZajOL8YagU7UF-kkes,4357
-oagi/handler/pyautogui_action_handler.py,sha256=BVmpKuYAMINJ5Ue_PK_WxFScAqLeyXC64g4NWQUtG_M,10146
+oagi/handler/pyautogui_action_handler.py,sha256=P6YPgsXr3mQn_lh6rVLzWBomg9s5EIwbKZYbOgCAa5A,10640
 oagi/handler/screenshot_maker.py,sha256=j1jTW-awx3vAnb1N5_FIMBC0Z-rNVQbiBP-S6Gh5dlE,1284
 oagi/handler/utils.py,sha256=jj10z-v4_LUuVb8aClyXkUfZVEaqsWgi3be4t3Gw7oI,697
 oagi/handler/wayland_support.py,sha256=jeQDqpwAxxREaGAYePQuK14nuEMPGmMEvMz2ymS-rT4,7727
@@ -75,8 +75,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.13.0.dist-info/METADATA,sha256=ZndadhpFZ4R5JEvm6O3jA_7zc8c2K0evAJRN_zaGa1I,14203
-oagi_core-0.13.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi_core-0.13.0.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
-oagi_core-0.13.0.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi_core-0.13.0.dist-info/RECORD,,
+oagi_core-0.13.2.dist-info/METADATA,sha256=DfZTkJyg0UmS4UH4V67rHhrsdfonwImQnSz7zOdI3QQ,14203
+oagi_core-0.13.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+oagi_core-0.13.2.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
+oagi_core-0.13.2.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
+oagi_core-0.13.2.dist-info/RECORD,,