oagi-core 0.10.1__py3-none-any.whl → 0.10.2__py3-none-any.whl

oagi/server/socketio_server.py

@@ -16,7 +16,13 @@ from pydantic import ValidationError
 from ..agent import AsyncDefaultAgent, create_agent
 from ..client import AsyncClient
 from ..exceptions import check_optional_dependency
-from ..types.models.action import Action, ActionType
+from ..types.models.action import (
+    Action,
+    ActionType,
+    parse_coords,
+    parse_drag_coords,
+    parse_scroll,
+)
 from .agent_wrappers import SocketIOActionHandler, SocketIOImageProvider
 from .config import ServerConfig
 from .models import (
@@ -275,31 +281,29 @@ class SessionNamespace(socketio.AsyncNamespace):
                 | ActionType.LEFT_TRIPLE
                 | ActionType.RIGHT_SINGLE
             ):
-                coords = arg.split(",")
-                if len(coords) >= 2:
-                    x, y = int(coords[0]), int(coords[1])
-                else:
+                coords = parse_coords(arg)
+                if not coords:
                     logger.warning(f"Invalid action coordinates: {arg}")
                     return None
 
                 return await self.call(
                     action.type.value,
-                    ClickEventData(**common, x=x, y=y).model_dump(),
+                    ClickEventData(**common, x=coords[0], y=coords[1]).model_dump(),
                     to=session.socket_id,
                     timeout=self.config.socketio_timeout,
                 )
 
             case ActionType.DRAG:
-                coords = arg.split(",")
-                if len(coords) >= 4:
-                    x1, y1, x2, y2 = (int(coords[i]) for i in range(4))
-                else:
+                coords = parse_drag_coords(arg)
+                if not coords:
                     logger.warning(f"Invalid drag coordinates: {arg}")
                     return None
 
                 return await self.call(
                     "drag",
-                    DragEventData(**common, x1=x1, y1=y1, x2=x2, y2=y2).model_dump(),
+                    DragEventData(
+                        **common, x1=coords[0], y1=coords[1], x2=coords[2], y2=coords[3]
+                    ).model_dump(),
                     to=session.socket_id,
                     timeout=self.config.socketio_timeout,
                 )
@@ -326,11 +330,8 @@ class SessionNamespace(socketio.AsyncNamespace):
                 )
 
             case ActionType.SCROLL:
-                parts = arg.split(",")
-                if len(parts) >= 3:
-                    x, y = int(parts[0]), int(parts[1])
-                    direction = parts[2].strip().lower()
-                else:
+                result = parse_scroll(arg)
+                if not result:
                     logger.warning(f"Invalid scroll coordinates: {arg}")
                     return None
 
@@ -340,9 +341,9 @@ class SessionNamespace(socketio.AsyncNamespace):
                     "scroll",
                     ScrollEventData(
                         **common,
-                        x=x,
-                        y=y,
-                        direction=direction,
+                        x=result[0],
+                        y=result[1],
+                        direction=result[2],
                         count=count,  # type: ignore
                     ).model_dump(),
                     to=session.socket_id,

oagi/types/__init__.py

@@ -11,7 +11,15 @@ from .async_action_handler import AsyncActionHandler
 from .async_image_provider import AsyncImageProvider
 from .image import Image
 from .image_provider import ImageProvider
-from .models import Action, ActionType, ImageConfig, Step
+from .models import (
+    Action,
+    ActionType,
+    ImageConfig,
+    Step,
+    parse_coords,
+    parse_drag_coords,
+    parse_scroll,
+)
 from .step_observer import (
     ActionEvent,
     AsyncObserver,
@@ -47,4 +55,7 @@ __all__ = [
     "ImageProvider",
     "AsyncImageProvider",
     "URL",
+    "parse_coords",
+    "parse_drag_coords",
+    "parse_scroll",
 ]

oagi/types/models/__init__.py

@@ -6,7 +6,13 @@
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
 
-from .action import Action, ActionType
+from .action import (
+    Action,
+    ActionType,
+    parse_coords,
+    parse_drag_coords,
+    parse_scroll,
+)
 from .client import (
     ErrorDetail,
     ErrorResponse,
@@ -29,4 +35,7 @@ __all__ = [
     "Step",
     "UploadFileResponse",
     "Usage",
+    "parse_coords",
+    "parse_drag_coords",
+    "parse_scroll",
 ]

oagi/types/models/action.py

@@ -6,6 +6,7 @@
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
 
+import re
 from enum import Enum
 
 from pydantic import BaseModel, Field
@@ -31,3 +32,53 @@ class Action(BaseModel):
     count: int | None = Field(
         default=1, ge=1, description="Number of times to repeat the action"
     )
+
+
+def parse_coords(args_str: str) -> tuple[int, int] | None:
+    """Extract x, y coordinates from argument string.
+
+    Args:
+        args_str: Argument string in format "x, y" (normalized 0-1000 range)
+
+    Returns:
+        Tuple of (x, y) coordinates, or None if parsing fails
+    """
+    match = re.match(r"(\d+),\s*(\d+)", args_str)
+    if not match:
+        return None
+    return int(match.group(1)), int(match.group(2))
+
+
+def parse_drag_coords(args_str: str) -> tuple[int, int, int, int] | None:
+    """Extract x1, y1, x2, y2 coordinates from drag argument string.
+
+    Args:
+        args_str: Argument string in format "x1, y1, x2, y2" (normalized 0-1000 range)
+
+    Returns:
+        Tuple of (x1, y1, x2, y2) coordinates, or None if parsing fails
+    """
+    match = re.match(r"(\d+),\s*(\d+),\s*(\d+),\s*(\d+)", args_str)
+    if not match:
+        return None
+    return (
+        int(match.group(1)),
+        int(match.group(2)),
+        int(match.group(3)),
+        int(match.group(4)),
+    )
+
+
+def parse_scroll(args_str: str) -> tuple[int, int, str] | None:
+    """Extract x, y, direction from scroll argument string.
+
+    Args:
+        args_str: Argument string in format "x, y, direction" (normalized 0-1000 range)
+
+    Returns:
+        Tuple of (x, y, direction) where direction is "up" or "down", or None if parsing fails
+    """
+    match = re.match(r"(\d+),\s*(\d+),\s*(\w+)", args_str)
+    if not match:
+        return None
+    return int(match.group(1)), int(match.group(2)), match.group(3).lower()

{oagi_core-0.10.1.dist-info → oagi_core-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.10.1
+Version: 0.10.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.10.1.dist-info → oagi_core-0.10.2.dist-info}/RECORD

@@ -2,23 +2,24 @@ oagi/__init__.py,sha256=xI--F3inDKuNQ2caI4Xx0rdFuUxO24cEeAX6WoGi170,4836
 oagi/exceptions.py,sha256=Rco37GQTPYUfc2vRO3hozxPF_s8mKFDpFvBg2UKWo3Y,3066
 oagi/logging.py,sha256=YT3KCMFj5fzO98R9xlDDgfSotUuz1xRD6OZeYM2rKoo,1760
 oagi/agent/__init__.py,sha256=KTVLUMhbjgpTJoOWMUZkkiqwhgumvbOZV2tJ9XCLfao,901
-oagi/agent/default.py,sha256=VaDiYISM0Y3l_xhSvWcIZQDiUj_ebHg9tgWLnr-OWuY,4116
-oagi/agent/factories.py,sha256=WP4ONu9JBDaJYmK18OuFihAX7YKCeOKgOh981lYguXo,2113
+oagi/agent/default.py,sha256=JZ4N2RRl0i5W60jumVg9j22XYWi9wn3yMFL92YVdpQA,4359
+oagi/agent/factories.py,sha256=QF-Ivey9yx2uDcVSHLXidM-gAPLj1L9jkoQ0tgGJFBw,2293
 oagi/agent/protocol.py,sha256=IQJGiMN4yZIacrh5e9JQsoM9TyHb8wJRQR4LAk8dSA0,1615
 oagi/agent/registry.py,sha256=7bMA2-pH3xQ9ZavrHB_mnc2fOGSMeICPbOGtHoM7It0,4851
 oagi/agent/observer/__init__.py,sha256=YZ4qvR22pFB0mSDMX6iKKLbBA1dB-nqC7HZVvdMIVGw,909
 oagi/agent/observer/agent_observer.py,sha256=fBs4X2_YKhYVThJocjMM-65JAHQSCLJPvzy8OXMt5pY,2864
 oagi/agent/observer/events.py,sha256=xc3Z1UGpX69BqhO9cQiGmnRhDZbMYya1kuXm6bXtjWI,625
-oagi/agent/observer/exporters.py,sha256=im1aK8UkGfWbRnVIYdsoCKVX_JYrcEvzRMDD2CK3gcM,15245
+oagi/agent/observer/exporters.py,sha256=uwVMIvsa5HR4VatvxJscvRErr7sUdjFtR5GOA6xms1w,11830
 oagi/agent/observer/protocol.py,sha256=jyRXoCG4CdvaPaDASar1rSbwc7vdpkar39KkGpwf8jw,411
+oagi/agent/observer/report_template.html,sha256=NOp280_-P2g_4TYbtqPhYxv-y_x3PwovoDUt_CajdoY,14729
 oagi/agent/tasker/__init__.py,sha256=1iTEFe7lzcqh96TL9R0QADPpLJLrUP0shtZ4DlZSv_8,764
 oagi/agent/tasker/memory.py,sha256=NR13l5yxRA8GUE-oupAP4W1n80ZNG0SxpUfxsNltkUY,5033
 oagi/agent/tasker/models.py,sha256=sMQgwIMKhT1tvVF2yoc1hh8GwEiJ6i6qPMy9WoiA8JM,2137
 oagi/agent/tasker/planner.py,sha256=1NJQ2279GlGLMTB6JUhgnJtN46iiEGy2O_czaxRQwsE,14437
-oagi/agent/tasker/taskee_agent.py,sha256=b2oHkHrZak3S5gMVffjht7ra8et8xDAADoDlfZFy_os,16731
-oagi/agent/tasker/tasker_agent.py,sha256=ZZXJpT1tHpYJB8nQpz3LSNrW21DxkWBk-g5bY0gWxRk,10732
+oagi/agent/tasker/taskee_agent.py,sha256=X5pFcZIG3uE6p23c2FDdIUZtOnCgW0a9Sdt13NLR5-E,17040
+oagi/agent/tasker/tasker_agent.py,sha256=YrblKaTDTjiBt0N3_jDgmJAB7smSxvCJy_2nC9-vtnk,10920
 oagi/cli/__init__.py,sha256=aDnJViTseShpo5fdGPTj-ELysZhmdvB6Z8mEj2D-_N4,359
-oagi/cli/agent.py,sha256=tXn53MKKLs446gRXZf-22Yj1b3cTZh7qfsiFKq4xsRY,9447
+oagi/cli/agent.py,sha256=fTqr50Q0QO9Gsy_P7iJcb4K7TaDeY3kUXTDQrePVlVQ,9756
 oagi/cli/display.py,sha256=rkAxuHa40ZtKdmvwARev1rgyfsNyVvQ-J6RdjOZIPwc,1729
 oagi/cli/main.py,sha256=faHns0HaQCGyylDn2YZLpjQESuEiMYjoQVoMkt8FsH4,2292
 oagi/cli/server.py,sha256=Z1ic8r55yaeQBFRCsMNZStC1jRiJdnDGqe9On9LmFzQ,3031
@@ -33,7 +34,7 @@ oagi/handler/_macos.py,sha256=aHkp-xGzvWL_SBjuS690i9jf93OITFJfGHzHeYCK65I,1957
 oagi/handler/async_pyautogui_action_handler.py,sha256=hQzseR1yBD0QMpgsEVNsUmuApGVAIIyGYD06BXd82Dc,1615
 oagi/handler/async_screenshot_maker.py,sha256=8QCtUV59ozpOpvkqhUMb8QDI2qje2gsoFT1qB60tfJM,1689
 oagi/handler/pil_image.py,sha256=yUcAoGBL-aZ0PCjSaAmQsDwtyzjldXHqXQp_OYRk6e4,4080
-oagi/handler/pyautogui_action_handler.py,sha256=SwoKOUw6SJuDA2dAqSXk3iMyvqpzTYnPxNi3L06JZV4,10847
+oagi/handler/pyautogui_action_handler.py,sha256=AIzxLCZipWlIP8wsJ4qtwhT-bp06KW5ly4FADl_odjQ,10559
 oagi/handler/screenshot_maker.py,sha256=j1jTW-awx3vAnb1N5_FIMBC0Z-rNVQbiBP-S6Gh5dlE,1284
 oagi/server/__init__.py,sha256=uZx8u3vJUb87kkNzwmmVrgAgbqRu0WxyMIQCLSx56kk,452
 oagi/server/agent_wrappers.py,sha256=j8va0A7u80bzOM82nndAplK1uaO_T3kufHWScK6kfWM,3263
@@ -41,14 +42,14 @@ oagi/server/config.py,sha256=2gJ-pDpYAxNUubwSsGKOieGcOtNX9b5YGuSqtf6g2P0,1607
 oagi/server/main.py,sha256=jnTxk7Prc5CzlsUnkBNJp4MOoYN-7HN_Be_m1d3COa8,4829
 oagi/server/models.py,sha256=7zsmjvnIZ0JUcCpE8F2A1OqX4_kGJydraRkbvPHnvn8,2593
 oagi/server/session_store.py,sha256=922Sz00_Ao-9fA0dhA1lrzs7yd6wo7xpdYJH4hZmEaI,3634
-oagi/server/socketio_server.py,sha256=NFw5Zu7yCFLW-gOu9OX8k6mNFaCN2jtX1Tob_9w5YM0,14344
+oagi/server/socketio_server.py,sha256=9FNkx6K-ZbRWylHCKv8zrW0pkiKybDN5pWBANTnouts,14211
 oagi/task/__init__.py,sha256=g_8_7ZLDLKuCGzyrB42OzY3gSOjd_SxzkJW3_pf-PXs,662
 oagi/task/async_.py,sha256=ev1jnuOQIYahjjMlSCFwtaeyOliePZCpEVt3ocsZXAI,3124
 oagi/task/async_short.py,sha256=VMIBKcTQMjadWXPHiJXWlYZqr5v4MeGVYnuKOs7dS3Y,2752
 oagi/task/base.py,sha256=D4e4N1cWoObMzaGcXyXGBPKyNbzmxABIjxbHiVrK548,5664
 oagi/task/short.py,sha256=xSR5_9BX35UMfITXtCgKXRLU92f4vnqa06c-HSjUO0A,2561
 oagi/task/sync.py,sha256=ciDkQYJQZkQyp8buNIKXU9Oy6kD7WIezCh2L0trLDDc,2958
-oagi/types/__init__.py,sha256=TCdHA8zPJAzpo-jgkfcWTWmbrWglOpShGQFcLoxV_xw,1187
+oagi/types/__init__.py,sha256=nhxQBaDssygtscetliQa3AaryvuNZhkVmBYsVcuR-qg,1332
 oagi/types/action_handler.py,sha256=NH8E-m5qpGqWcXzTSWfF7W0Xdp8SkzJsbhCmQ0B96cg,1075
 oagi/types/async_action_handler.py,sha256=k1AaqSkFcXlxwW8sn-w0WFHGsIqHFLbcOPrkknmSVug,1116
 oagi/types/async_image_provider.py,sha256=UwDl7VOCA3tiSP5k1fnxK86iEa84Yr57MVaoBSa3hOE,1203
@@ -56,13 +57,13 @@ oagi/types/image.py,sha256=KgPCCTJ6D5vHIaGZdbTE7eQEa1WlT6G9tf59ZuUCV2U,537
 oagi/types/image_provider.py,sha256=IhKEnwCGZ5l_rO3AvJ6xv5RZMTmTDmqsFRynI9h0R_M,1145
 oagi/types/step_observer.py,sha256=wXuChzsof7Rh4azvDTIQ22gAwZAYjMAOVIuL8ZGtw-M,2315
 oagi/types/url.py,sha256=Q-1jf5L_4rad4dxyLTg4MXadGgpkH3w4dcoVrVupW-A,54
-oagi/types/models/__init__.py,sha256=I86Z2moM8hCog_1K1FG_uATcBmWFv_UFetLAjzPzWAY,742
-oagi/types/models/action.py,sha256=hh6mRRSSWgrW4jpZo71zGMCOcZpV5_COu4148uG6G48,967
+oagi/types/models/__init__.py,sha256=gnFh4TddritHjT0Chy-4fv3KZIC6bYCUyGmWm_2IuZw,879
+oagi/types/models/action.py,sha256=Q14xfYJrj9IsrqxDpEIzd6iWS-gLmNHfIX6Ef8k0O9E,2497
 oagi/types/models/client.py,sha256=1xIKBgLSheHfqYbcyRKMDOLQJaKijaKQ5l-COc6e7_k,1471
 oagi/types/models/image_config.py,sha256=tl6abVg_-IAPLwpaWprgknXu7wRWriMg-AEVyUX73v0,1567
 oagi/types/models/step.py,sha256=RSI4H_2rrUBq_xyCoWKaq7JHdJWNobtQppaKC1l0aWU,471
-oagi_core-0.10.1.dist-info/METADATA,sha256=o1zoJQaVrlJwL_a8KBwYJeTpmo7ktC_kE4NPVsNfXB0,8269
-oagi_core-0.10.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi_core-0.10.1.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
-oagi_core-0.10.1.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi_core-0.10.1.dist-info/RECORD,,
+oagi_core-0.10.2.dist-info/METADATA,sha256=zEpy_q3jUhSphhGi6QYKkvjGvZKLnDq6QSPlOtJ8ppw,8269
+oagi_core-0.10.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+oagi_core-0.10.2.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
+oagi_core-0.10.2.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
+oagi_core-0.10.2.dist-info/RECORD,,