oagi 0.6.0__tar.gz → 0.6.2__tar.gz

{oagi-0.6.0 → oagi-0.6.2}/PKG-INFO

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

{oagi-0.6.0 → oagi-0.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oagi"
-version = "0.6.0"
+version = "0.6.2"
 description = "Official API of OpenAGI Foundation"
 readme = "README.md"
 license = { file = "LICENSE" }

{oagi-0.6.0 → oagi-0.6.2}/src/oagi/__init__.py

@@ -5,9 +5,8 @@
 #  This file is part of the official API project.
 #  Licensed under the MIT License.
 # -----------------------------------------------------------------------------
+import importlib
 
-from oagi.async_pyautogui_action_handler import AsyncPyautoguiActionHandler
-from oagi.async_screenshot_maker import AsyncScreenshotMaker
 from oagi.async_single_step import async_single_step
 from oagi.client import AsyncClient, SyncClient
 from oagi.exceptions import (
@@ -22,9 +21,6 @@ from oagi.exceptions import (
     ServerError,
     ValidationError,
 )
-from oagi.pil_image import PILImage
-from oagi.pyautogui_action_handler import PyautoguiActionHandler, PyautoguiConfig
-from oagi.screenshot_maker import ScreenshotMaker
 from oagi.single_step import single_step
 from oagi.task import AsyncShortTask, AsyncTask, ShortTask, Task
 from oagi.types import (
@@ -34,6 +30,27 @@ from oagi.types import (
 )
 from oagi.types.models import ErrorDetail, ErrorResponse, LLMResponse
 
+# Lazy imports for pyautogui-dependent modules
+# These will only be imported when actually accessed
+_LAZY_IMPORTS = {
+    "AsyncPyautoguiActionHandler": "oagi.async_pyautogui_action_handler",
+    "AsyncScreenshotMaker": "oagi.async_screenshot_maker",
+    "PILImage": "oagi.pil_image",
+    "PyautoguiActionHandler": "oagi.pyautogui_action_handler",
+    "PyautoguiConfig": "oagi.pyautogui_action_handler",
+    "ScreenshotMaker": "oagi.screenshot_maker",
+}
+
+
+def __getattr__(name: str):
+    """Lazy import for pyautogui-dependent modules."""
+    if name in _LAZY_IMPORTS:
+        module_name = _LAZY_IMPORTS[name]
+        module = importlib.import_module(module_name)
+        return getattr(module, name)
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
 __all__ = [
     # Core sync classes
     "Task",
@@ -46,15 +63,6 @@ __all__ = [
     # Functions
     "single_step",
     "async_single_step",
-    # Image classes
-    "PILImage",
-    # Handler classes
-    "PyautoguiActionHandler",
-    "PyautoguiConfig",
-    "ScreenshotMaker",
-    # Async handler classes
-    "AsyncPyautoguiActionHandler",
-    "AsyncScreenshotMaker",
     # Async protocols
     "AsyncActionHandler",
     "AsyncImageProvider",
@@ -75,4 +83,14 @@ __all__ = [
     "ServerError",
     "RequestTimeoutError",
     "ValidationError",
+    # Lazy imports
+    # Image classes
+    "PILImage",
+    # Handler classes
+    "PyautoguiActionHandler",
+    "PyautoguiConfig",
+    "ScreenshotMaker",
+    # Async handler classes
+    "AsyncPyautoguiActionHandler",
+    "AsyncScreenshotMaker",
 ]

{oagi-0.6.0 → oagi-0.6.2}/src/oagi/async_single_step.py

@@ -8,7 +8,6 @@
 
 from pathlib import Path
 
-from .pil_image import PILImage
 from .task import AsyncTask
 from .types import Image, Step
 
@@ -64,12 +63,13 @@ async def async_single_step(
         ...     screenshot=image
         ... )
     """
+    # Lazy import PILImage only when needed
+    from .pil_image import PILImage  # noqa: PLC0415
+
     # Handle different screenshot input types
     if isinstance(screenshot, (str, Path)):
-        # Convert file path to PILImage
         screenshot = PILImage.from_file(str(screenshot))
     elif isinstance(screenshot, bytes):
-        # Convert bytes to PILImage
         screenshot = PILImage.from_bytes(screenshot)
 
     # Create a temporary task instance

{oagi-0.6.0 → oagi-0.6.2}/src/oagi/pil_image.py

@@ -9,7 +9,6 @@
 import io
 from typing import Optional
 
-import pyautogui
 from PIL import Image as PILImageLib
 
 from .types.models.image_config import ImageConfig
@@ -39,6 +38,8 @@ class PILImage:
     @classmethod
     def from_screenshot(cls, config: ImageConfig | None = None) -> "PILImage":
         """Create PILImage from screenshot."""
+        import pyautogui  # noqa: PLC0415, avoid no DISPLAY issue in headless environment
+
         screenshot = pyautogui.screenshot()
         return cls(screenshot, config)
 

{oagi-0.6.0 → oagi-0.6.2}/src/oagi/single_step.py

@@ -8,7 +8,6 @@
 
 from pathlib import Path
 
-from .pil_image import PILImage
 from .task import Task
 from .types import Image, Step
 
@@ -62,6 +61,9 @@ def single_step(
         ...     screenshot=image
         ... )
     """
+    # Lazy import PILImage only when needed
+    from .pil_image import PILImage  # noqa: PLC0415
+
     # Convert file paths to bytes using PILImage
     if isinstance(screenshot, (str, Path)):
         path = Path(screenshot) if isinstance(screenshot, str) else screenshot

{oagi-0.6.0 → oagi-0.6.2}/tests/test_pil_image.py

@@ -224,7 +224,7 @@ class TestPILImageFactoryMethods:
         assert isinstance(result, PILImage)
         assert result.image is mock_image
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_from_screenshot(self, mock_screenshot):
         mock_image = MagicMock()
         mock_screenshot.return_value = mock_image

{oagi-0.6.0 → oagi-0.6.2}/tests/test_screenshot_maker.py

@@ -27,7 +27,7 @@ def mock_screenshot_image():
 
 
 class TestScreenshotMaker:
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_takes_screenshot(
         self, mock_screenshot, mock_screenshot_image
     ):
@@ -42,7 +42,7 @@ class TestScreenshotMaker:
         assert isinstance(result, PILImage)
         assert result.image is mock_resized_image
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_stores_last_screenshot(self, mock_screenshot):
         def create_mock_image():
             mock = MagicMock()
@@ -66,7 +66,7 @@ class TestScreenshotMaker:
         assert maker.last_image() is second
         assert maker.last_image() is not first
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_last_image_creates_if_none(
         self, mock_screenshot, mock_screenshot_image
     ):
@@ -79,7 +79,7 @@ class TestScreenshotMaker:
         mock_screenshot.assert_called_once()
         assert isinstance(result, PILImage)
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_image_returns_png_bytes(self, mock_screenshot):
         pil_image = PILImageLib.new("RGB", (10, 10), color="red")
         mock_screenshot.return_value = pil_image
@@ -99,7 +99,7 @@ class TestScreenshotMaker:
             (None, 600, (1920, 600)),  # Uses original width
         ],
     )
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_resize_dimensions(
         self, mock_screenshot, mock_screenshot_image, width, height, expected_size
     ):
@@ -123,7 +123,7 @@ class TestScreenshotMaker:
             ("PNG", b"\x89PNG\r\n\x1a\n"),
         ],
     )
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_format_output(
         self, mock_screenshot, format_name, expected_signature
     ):
@@ -140,7 +140,7 @@ class TestScreenshotMaker:
         result_image = PILImageLib.open(BytesIO(image_bytes))
         assert result_image.format == format_name
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_screenshot_maker_default_resize_1260x700(
         self, mock_screenshot, mock_screenshot_image
     ):
@@ -156,7 +156,7 @@ class TestScreenshotMaker:
         assert isinstance(result, PILImage)
         assert result.image is mock_resized_image
 
-    @patch("oagi.pil_image.pyautogui.screenshot")
+    @patch("pyautogui.screenshot")
     def test_resize_happens_before_format_conversion(self, mock_screenshot):
         original_image = PILImageLib.new("RGB", (2000, 1000), color="green")
         mock_screenshot.return_value = original_image

{oagi-0.6.0 → oagi-0.6.2}/uv.lock

@@ -138,7 +138,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/28/fa/b2ba8229b9381e8f6
 
 [[package]]
 name = "oagi"
-version = "0.6.0"
+version = "0.6.2"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },