oagi-core 0.10.3__py3-none-any.whl → 0.12.0__py3-none-any.whl

oagi/handler/_macos.py

@@ -6,6 +6,15 @@
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
 
+"""macOS-specific keyboard and mouse input handling.
+
+This module provides:
+- macos_click(): Fix for PyAutoGUI multi-click bug on macOS
+- typewrite_exact(): Type text exactly, ignoring system capslock state
+"""
+
+import time
+
 import pyautogui
 
 from ..exceptions import check_optional_dependency
@@ -13,6 +22,134 @@ from ..exceptions import check_optional_dependency
 check_optional_dependency("Quartz", "macOS multiple clicks", "desktop")
 import Quartz  # noqa: E402
 
+# macOS virtual key codes for typeable characters
+KEYCODE_MAP = {
+    "a": 0x00,
+    "b": 0x0B,
+    "c": 0x08,
+    "d": 0x02,
+    "e": 0x0E,
+    "f": 0x03,
+    "g": 0x05,
+    "h": 0x04,
+    "i": 0x22,
+    "j": 0x26,
+    "k": 0x28,
+    "l": 0x25,
+    "m": 0x2E,
+    "n": 0x2D,
+    "o": 0x1F,
+    "p": 0x23,
+    "q": 0x0C,
+    "r": 0x0F,
+    "s": 0x01,
+    "t": 0x11,
+    "u": 0x20,
+    "v": 0x09,
+    "w": 0x0D,
+    "x": 0x07,
+    "y": 0x10,
+    "z": 0x06,
+    "1": 0x12,
+    "2": 0x13,
+    "3": 0x14,
+    "4": 0x15,
+    "5": 0x17,
+    "6": 0x16,
+    "7": 0x1A,
+    "8": 0x1C,
+    "9": 0x19,
+    "0": 0x1D,
+    " ": 0x31,  # space
+    "-": 0x1B,
+    "=": 0x18,
+    "[": 0x21,
+    "]": 0x1E,
+    "\\": 0x2A,
+    ";": 0x29,
+    "'": 0x27,
+    "`": 0x32,
+    ",": 0x2B,
+    ".": 0x2F,
+    "/": 0x2C,
+    "\t": 0x30,  # tab
+    "\n": 0x24,  # return
+}
+
+# Characters that require shift key (on US keyboard layout)
+SHIFT_CHARS = set('~!@#$%^&*()_+{}|:"<>?ABCDEFGHIJKLMNOPQRSTUVWXYZ')
+
+# Mapping of shifted characters to their base key
+SHIFT_KEY_MAP = {
+    "~": "`",
+    "!": "1",
+    "@": "2",
+    "#": "3",
+    "$": "4",
+    "%": "5",
+    "^": "6",
+    "&": "7",
+    "*": "8",
+    "(": "9",
+    ")": "0",
+    "_": "-",
+    "+": "=",
+    "{": "[",
+    "}": "]",
+    "|": "\\",
+    ":": ";",
+    '"': "'",
+    "<": ",",
+    ">": ".",
+    "?": "/",
+}
+
+
+def typewrite_exact(text: str, interval: float = 0.01) -> None:
+    """Type text exactly as specified, ignoring system capslock state.
+
+    This function uses Quartz CGEventCreateKeyboardEvent with explicit
+    flag control via CGEventSetFlags() to type each character with the
+    correct case, regardless of the system's capslock state.
+
+    Args:
+        text: The text to type exactly as specified
+        interval: Time in seconds between each character (default: 0.01)
+    """
+    for char in text:
+        # Determine if this character needs shift
+        needs_shift = char in SHIFT_CHARS
+
+        # Get the base key (for shifted chars, look up the unshifted version)
+        if char.isupper():
+            base_char = char.lower()
+        elif char in SHIFT_KEY_MAP:
+            base_char = SHIFT_KEY_MAP[char]
+        else:
+            base_char = char
+
+        # Get keycode for the base character
+        keycode = KEYCODE_MAP.get(base_char)
+        if keycode is None:
+            # Character not in our keycode map, skip it
+            continue
+
+        # Set flags: shift if needed, otherwise clear all flags
+        flags = Quartz.kCGEventFlagMaskShift if needs_shift else 0
+
+        # Key down
+        event_down = Quartz.CGEventCreateKeyboardEvent(None, keycode, True)
+        Quartz.CGEventSetFlags(event_down, flags)
+        Quartz.CGEventPost(Quartz.kCGHIDEventTap, event_down)
+
+        # Key up
+        event_up = Quartz.CGEventCreateKeyboardEvent(None, keycode, False)
+        Quartz.CGEventSetFlags(event_up, flags)
+        Quartz.CGEventPost(Quartz.kCGHIDEventTap, event_up)
+
+        if interval > 0:
+            time.sleep(interval)
+
 
 def macos_click(x: int, y: int, clicks: int = 1) -> None:
     """

oagi/handler/_windows.py

@@ -0,0 +1,101 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+"""Windows-specific keyboard input handling.
+
+This module provides typewrite_exact() which types text exactly as specified,
+ignoring the system's capslock state by using SendInput with KEYEVENTF_UNICODE.
+"""
+
+import ctypes
+import time
+from ctypes import wintypes
+
+INPUT_KEYBOARD = 1
+KEYEVENTF_UNICODE = 0x0004
+KEYEVENTF_KEYUP = 0x0002
+
+
+class KEYBDINPUT(ctypes.Structure):
+    _fields_ = [
+        ("wVk", wintypes.WORD),
+        ("wScan", wintypes.WORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(ctypes.c_ulong)),
+    ]
+
+
+class MOUSEINPUT(ctypes.Structure):
+    _fields_ = [
+        ("dx", ctypes.c_long),
+        ("dy", ctypes.c_long),
+        ("mouseData", wintypes.DWORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(ctypes.c_ulong)),
+    ]
+
+
+class HARDWAREINPUT(ctypes.Structure):
+    _fields_ = [
+        ("uMsg", wintypes.DWORD),
+        ("wParamL", wintypes.WORD),
+        ("wParamH", wintypes.WORD),
+    ]
+
+
+class INPUT(ctypes.Structure):
+    class _I(ctypes.Union):
+        _fields_ = [
+            ("ki", KEYBDINPUT),
+            ("mi", MOUSEINPUT),
+            ("hi", HARDWAREINPUT),
+        ]
+
+    _anonymous_ = ("i",)
+    _fields_ = [
+        ("type", wintypes.DWORD),
+        ("i", _I),
+    ]
+
+
+# Configure SendInput with proper argtypes for 64-bit compatibility
+SendInput = ctypes.windll.user32.SendInput
+SendInput.argtypes = [wintypes.UINT, ctypes.POINTER(INPUT), ctypes.c_int]
+SendInput.restype = wintypes.UINT
+
+
+def typewrite_exact(text: str, interval: float = 0.01) -> None:
+    """Type text exactly using Unicode input - ignores capslock, keyboard layout, etc.
+
+    This function uses SendInput with KEYEVENTF_UNICODE to send characters
+    directly by their Unicode codepoint, completely bypassing keyboard state
+    (capslock, layout, etc.).
+
+    Args:
+        text: The text to type exactly as specified
+        interval: Time in seconds between each character (default: 0.01)
+    """
+    for char in text:
+        inputs = (INPUT * 2)()
+
+        # Key down
+        inputs[0].type = INPUT_KEYBOARD
+        inputs[0].ki.wScan = ord(char)
+        inputs[0].ki.dwFlags = KEYEVENTF_UNICODE
+
+        # Key up
+        inputs[1].type = INPUT_KEYBOARD
+        inputs[1].ki.wScan = ord(char)
+        inputs[1].ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP
+
+        SendInput(2, inputs, ctypes.sizeof(INPUT))
+
+        if interval > 0:
+            time.sleep(interval)

oagi/handler/async_pyautogui_action_handler.py

@@ -29,6 +29,14 @@ class AsyncPyautoguiActionHandler:
         self.sync_handler = PyautoguiActionHandler(config=config)
         self.config = config or PyautoguiConfig()
 
+    def reset(self):
+        """Reset handler state.
+
+        Delegates to the underlying synchronous handler's reset method.
+        Called at automation start/end and when FINISH action is received.
+        """
+        self.sync_handler.reset()
+
     async def __call__(self, actions: list[Action]) -> None:
         """
         Execute actions asynchronously using a thread pool executor.

oagi/handler/capslock_manager.py

@@ -0,0 +1,55 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+
+class CapsLockManager:
+    """Manages caps lock state for text transformation.
+
+    This class maintains an internal caps lock state that can be toggled
+    independently of the system's caps lock state. This allows for consistent
+    text case handling during automation regardless of the system state.
+    """
+
+    def __init__(self, mode: str = "session"):
+        """Initialize caps lock manager.
+
+        Args:
+            mode: Either "session" (internal state) or "system" (OS-level)
+        """
+        self.mode = mode
+        self.caps_enabled = False
+
+    def reset(self):
+        """Reset caps lock state to default (off).
+
+        Called at automation start/end and when FINISH action is received.
+        """
+        self.caps_enabled = False
+
+    def toggle(self):
+        """Toggle caps lock state in session mode."""
+        if self.mode == "session":
+            self.caps_enabled = not self.caps_enabled
+
+    def transform_text(self, text: str) -> str:
+        """Transform text based on caps lock state.
+
+        Args:
+            text: Input text to transform
+
+        Returns:
+            Transformed text (uppercase alphabets if caps enabled in session mode)
+        """
+        if self.mode == "session" and self.caps_enabled:
+            # Transform letters to uppercase, preserve special characters
+            return "".join(c.upper() if c.isalpha() else c for c in text)
+        return text
+
+    def should_use_system_capslock(self) -> bool:
+        """Check if system-level caps lock should be used."""
+        return self.mode == "system"

oagi/handler/pyautogui_action_handler.py

@@ -13,48 +13,15 @@ from pydantic import BaseModel, Field
 
 from ..exceptions import check_optional_dependency
 from ..types import Action, ActionType, parse_coords, parse_drag_coords, parse_scroll
+from .capslock_manager import CapsLockManager
 
 check_optional_dependency("pyautogui", "PyautoguiActionHandler", "desktop")
 import pyautogui  # noqa: E402
 
 if sys.platform == "darwin":
     from . import _macos
-
-
-class CapsLockManager:
-    """Manages caps lock state for text transformation."""
-
-    def __init__(self, mode: str = "session"):
-        """Initialize caps lock manager.
-
-        Args:
-            mode: Either "session" (internal state) or "system" (OS-level)
-        """
-        self.mode = mode
-        self.caps_enabled = False
-
-    def toggle(self):
-        """Toggle caps lock state in session mode."""
-        if self.mode == "session":
-            self.caps_enabled = not self.caps_enabled
-
-    def transform_text(self, text: str) -> str:
-        """Transform text based on caps lock state.
-
-        Args:
-            text: Input text to transform
-
-        Returns:
-            Transformed text (uppercase if caps enabled in session mode)
-        """
-        if self.mode == "session" and self.caps_enabled:
-            # Transform letters to uppercase, preserve special characters
-            return "".join(c.upper() if c.isalpha() else c for c in text)
-        return text
-
-    def should_use_system_capslock(self) -> bool:
-        """Check if system-level caps lock should be used."""
-        return self.mode == "system"
+elif sys.platform == "win32":
+    from . import _windows
 
 
 class PyautoguiConfig(BaseModel):
@@ -111,6 +78,14 @@ class PyautoguiActionHandler:
         # Initialize caps lock manager
         self.caps_manager = CapsLockManager(mode=self.config.capslock_mode)
 
+    def reset(self):
+        """Reset handler state.
+
+        Called at automation start/end and when FINISH action is received.
+        Resets the internal capslock state.
+        """
+        self.caps_manager.reset()
+
     def _denormalize_coords(self, x: float, y: float) -> tuple[int, int]:
         """Convert coordinates from 0-1000 range to actual screen coordinates.
 
@@ -238,7 +213,14 @@ class PyautoguiActionHandler:
                 text = arg.strip("\"'")
                 # Apply caps lock transformation if needed
                 text = self.caps_manager.transform_text(text)
-                pyautogui.typewrite(text)
+                # Use platform-specific typing that ignores system capslock
+                if sys.platform == "darwin":
+                    _macos.typewrite_exact(text)
+                elif sys.platform == "win32":
+                    _windows.typewrite_exact(text)
+                else:
+                    # Fallback for other platforms
+                    pyautogui.typewrite(text)
 
             case ActionType.SCROLL:
                 x, y, direction = self._parse_scroll(arg)
@@ -251,8 +233,8 @@ class PyautoguiActionHandler:
                 pyautogui.scroll(scroll_amount)
 
             case ActionType.FINISH:
-                # Task completion - no action needed
-                pass
+                # Task completion - reset handler state
+                self.reset()
 
             case ActionType.WAIT:
                 # Wait for a short period

oagi/server/session_store.py

@@ -11,7 +11,7 @@ from datetime import datetime
 from typing import Any
 from uuid import uuid4
 
-from ..constants import MODE_ACTOR, MODEL_ACTOR
+from ..constants import DEFAULT_TEMPERATURE_LOW, MODE_ACTOR, MODEL_ACTOR
 
 
 class Session:
@@ -21,7 +21,7 @@ class Session:
         instruction: str,
         mode: str = MODE_ACTOR,
         model: str = MODEL_ACTOR,
-        temperature: float = 0.0,
+        temperature: float = DEFAULT_TEMPERATURE_LOW,
     ):
         self.session_id: str = session_id
         self.instruction: str = instruction
@@ -57,7 +57,7 @@ class SessionStore:
         instruction: str,
         mode: str = MODE_ACTOR,
         model: str = MODEL_ACTOR,
-        temperature: float = 0.0,
+        temperature: float = DEFAULT_TEMPERATURE_LOW,
         session_id: str | None = None,
     ) -> str:
         if session_id is None:

oagi/server/socketio_server.py

@@ -158,8 +158,8 @@ class SessionNamespace(socketio.AsyncNamespace):
             session_store.update_activity(session_id)
 
             logger.info(
-                f"Session {session_id} initialized with: {event_data.instruction} "
-                f"(mode={event_data.mode}, model={event_data.model})"
+                f"Session {session_id} initialized with: {session.instruction} "
+                f"(mode={session.mode}, model={session.model})"
             )
 
             # Create agent and wrappers
@@ -168,8 +168,8 @@ class SessionNamespace(socketio.AsyncNamespace):
                 api_key=self.config.oagi_api_key,
                 base_url=self.config.oagi_base_url,
                 max_steps=self.config.max_steps,
-                model=event_data.model,
-                temperature=event_data.temperature,
+                model=session.model,
+                temperature=session.temperature,
             )
 
             action_handler = SocketIOActionHandler(self, session)

oagi/task/__init__.py

@@ -6,16 +6,30 @@
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
 
-from .async_ import AsyncActor, AsyncTask
-from .async_short import AsyncShortTask
-from .short import ShortTask
-from .sync import Actor, Task
+"""Deprecated: Use oagi.actor instead. This module will be removed in a future version."""
+
+import warnings
+
+from oagi.actor import (
+    Actor,
+    AsyncActor,
+    AsyncShortTask,
+    AsyncTask,
+    ShortTask,
+    Task,
+)
+
+warnings.warn(
+    "oagi.task is deprecated, use oagi.actor instead",
+    DeprecationWarning,
+    stacklevel=2,
+)
 
 __all__ = [
     "Actor",
     "AsyncActor",
-    "Task",  # Deprecated: Use Actor instead
-    "AsyncTask",  # Deprecated: Use AsyncActor instead
-    "ShortTask",  # Deprecated
-    "AsyncShortTask",  # Deprecated
+    "Task",
+    "AsyncTask",
+    "ShortTask",
+    "AsyncShortTask",
 ]

oagi/types/__init__.py

@@ -32,7 +32,7 @@ from .step_observer import (
     SplitEvent,
     StepEvent,
 )
-from .url import URL
+from .url import URL, extract_uuid_from_url
 
 __all__ = [
     "Action",
@@ -55,6 +55,7 @@ __all__ = [
     "ImageProvider",
     "AsyncImageProvider",
     "URL",
+    "extract_uuid_from_url",
     "parse_coords",
     "parse_drag_coords",
     "parse_scroll",

oagi/types/models/__init__.py

@@ -17,7 +17,6 @@ from .client import (
     ErrorDetail,
     ErrorResponse,
     GenerateResponse,
-    LLMResponse,
     UploadFileResponse,
     Usage,
 )
@@ -31,7 +30,6 @@ __all__ = [
     "ErrorResponse",
     "GenerateResponse",
     "ImageConfig",
-    "LLMResponse",
     "Step",
     "UploadFileResponse",
     "Usage",

oagi/types/models/action.py

@@ -81,4 +81,7 @@ def parse_scroll(args_str: str) -> tuple[int, int, str] | None:
     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()
+    direction = match.group(3).lower()
+    if direction not in ("up", "down"):
+        return None
+    return int(match.group(1)), int(match.group(2)), direction

oagi/types/models/client.py

@@ -8,8 +8,6 @@
 
 from pydantic import BaseModel, Field
 
-from .action import Action
-
 
 class Usage(BaseModel):
     prompt_tokens: int
@@ -30,21 +28,6 @@ class ErrorResponse(BaseModel):
     error: ErrorDetail | None
 
 
-class LLMResponse(BaseModel):
-    id: str
-    task_id: str
-    object: str = "task.completion"
-    created: int
-    model: str
-    task_description: str
-    is_complete: bool
-    actions: list[Action]
-    reason: str | None = None
-    usage: Usage
-    error: ErrorDetail | None = None
-    raw_output: str | None = None
-
-
 class UploadFileResponse(BaseModel):
     """Response from S3 presigned URL upload."""
 
@@ -66,3 +49,4 @@ class GenerateResponse(BaseModel):
         deprecated=True,
         description="This field is deprecated",
     )
+    request_id: str | None = None

oagi/types/step_observer.py

@@ -35,6 +35,7 @@ class StepEvent(BaseEvent):
     step_num: int
     image: bytes | str
     step: Step
+    task_id: str | None = None
 
 
 class ActionEvent(BaseEvent):
@@ -68,6 +69,7 @@ class PlanEvent(BaseEvent):
     image: bytes | str | None = None
     reasoning: str
     result: str | None = None
+    request_id: str | None = None
 
 
 ObserverEvent = ImageEvent | StepEvent | ActionEvent | LogEvent | SplitEvent | PlanEvent

oagi/types/url.py

@@ -1,3 +1,28 @@
+import re
 from typing import NewType
 
 URL = NewType("URL", str)
+
+# Pattern to extract UUID from S3 URL
+# Formats:
+#   - https://bucket.s3.amazonaws.com/{user_id}/{uuid}.{ext}  (download URL)
+#   - https://bucket.s3.amazonaws.com/{user_id}/{uuid}?...    (presigned URL)
+_UUID_PATTERN = re.compile(
+    r"/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:\.[a-z]+)?(?:\?|$)",
+    re.IGNORECASE,
+)
+
+
+def extract_uuid_from_url(url: str) -> str | None:
+    """Extract UUID from S3 URL.
+
+    Args:
+        url: S3 URL in one of these formats:
+            - https://bucket.s3.amazonaws.com/{user_id}/{uuid}.jpg (download URL)
+            - https://bucket.s3.amazonaws.com/{user_id}/{uuid}?... (presigned URL)
+
+    Returns:
+        UUID string if found, None otherwise
+    """
+    match = _UUID_PATTERN.search(url)
+    return match.group(1) if match else None

oagi/utils/__init__.py

@@ -0,0 +1,12 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+from .output_parser import parse_raw_output
+from .prompt_builder import build_prompt
+
+__all__ = ["build_prompt", "parse_raw_output"]