oagi 0.4.3__py3-none-any.whl → 0.6.0__py3-none-any.whl

oagi/async_client.py

@@ -1,239 +0,0 @@
-# -----------------------------------------------------------------------------
-#  Copyright (c) OpenAGI Foundation
-#  All rights reserved.
-#
-#  This file is part of the official API project.
-#  Licensed under the MIT License.
-# -----------------------------------------------------------------------------
-
-import os
-from functools import wraps
-
-import httpx
-
-from .exceptions import (
-    APIError,
-    AuthenticationError,
-    ConfigurationError,
-    NetworkError,
-    NotFoundError,
-    RateLimitError,
-    RequestTimeoutError,
-    ServerError,
-    ValidationError,
-)
-from .logging import get_logger
-from .sync_client import ErrorResponse, LLMResponse
-
-logger = get_logger("async_client")
-
-
-def async_log_trace_on_failure(func):
-    """Async decorator that logs trace ID when a method fails."""
-
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        try:
-            return await func(*args, **kwargs)
-        except Exception as e:
-            # Try to get response from the exception if it has one
-            if (response := getattr(e, "response", None)) is not None:
-                logger.error(f"Request Id: {response.headers.get('x-request-id', '')}")
-                logger.error(f"Trace Id: {response.headers.get('x-trace-id', '')}")
-            raise
-
-    return wrapper
-
-
-class AsyncClient:
-    """Async HTTP client for the OAGI API."""
-
-    def __init__(self, base_url: str | None = None, api_key: str | None = None):
-        # Get from environment if not provided
-        self.base_url = base_url or os.getenv("OAGI_BASE_URL")
-        self.api_key = api_key or os.getenv("OAGI_API_KEY")
-
-        # Validate required configuration
-        if not self.base_url:
-            raise ConfigurationError(
-                "OAGI base URL must be provided either as 'base_url' parameter or "
-                "OAGI_BASE_URL environment variable"
-            )
-
-        if not self.api_key:
-            raise ConfigurationError(
-                "OAGI API key must be provided either as 'api_key' parameter or "
-                "OAGI_API_KEY environment variable"
-            )
-
-        self.base_url = self.base_url.rstrip("/")
-        self.client = httpx.AsyncClient(base_url=self.base_url)
-        self.timeout = 60
-
-        logger.info(f"AsyncClient initialized with base_url: {self.base_url}")
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.client.aclose()
-
-    async def close(self):
-        """Close the underlying httpx async client"""
-        await self.client.aclose()
-
-    @async_log_trace_on_failure
-    async def create_message(
-        self,
-        model: str,
-        screenshot: str,  # base64 encoded
-        task_description: str | None = None,
-        task_id: str | None = None,
-        instruction: str | None = None,
-        max_actions: int | None = 5,
-        api_version: str | None = None,
-    ) -> LLMResponse:
-        """
-        Call the /v1/message endpoint to analyze task and screenshot
-
-        Args:
-            model: The model to use for task analysis
-            screenshot: Base64-encoded screenshot image
-            task_description: Description of the task (required for new sessions)
-            task_id: Task ID for continuing existing task
-            instruction: Additional instruction when continuing a session (only works with task_id)
-            max_actions: Maximum number of actions to return (1-20)
-            api_version: API version header
-
-        Returns:
-            LLMResponse: The response from the API
-
-        Raises:
-            httpx.HTTPStatusError: For HTTP error responses
-        """
-        headers = {}
-        if api_version:
-            headers["x-api-version"] = api_version
-        if self.api_key:
-            headers["x-api-key"] = self.api_key
-
-        payload = {"model": model, "screenshot": screenshot}
-
-        if task_description is not None:
-            payload["task_description"] = task_description
-        if task_id is not None:
-            payload["task_id"] = task_id
-        if instruction is not None:
-            payload["instruction"] = instruction
-        if max_actions is not None:
-            payload["max_actions"] = max_actions
-
-        logger.info(f"Making async API request to /v1/message with model: {model}")
-        logger.debug(
-            f"Request includes task_description: {task_description is not None}, task_id: {task_id is not None}"
-        )
-
-        try:
-            response = await self.client.post(
-                "/v1/message", json=payload, headers=headers, timeout=self.timeout
-            )
-        except httpx.TimeoutException as e:
-            logger.error(f"Request timed out after {self.timeout} seconds")
-            raise RequestTimeoutError(
-                f"Request timed out after {self.timeout} seconds", e
-            )
-        except httpx.NetworkError as e:
-            logger.error(f"Network error: {e}")
-            raise NetworkError(f"Network error: {e}", e)
-
-        try:
-            response_data = response.json()
-        except ValueError:
-            # If response is not JSON, raise API error
-            logger.error(f"Non-JSON API response: {response.status_code}")
-            raise APIError(
-                f"Invalid response format (status {response.status_code})",
-                status_code=response.status_code,
-                response=response,
-            )
-
-        # Check if it's an error response (non-200 status or has error field)
-        if response.status_code != 200:
-            error_resp = ErrorResponse(**response_data)
-            if error_resp.error:
-                error_code = error_resp.error.code
-                error_msg = error_resp.error.message
-                logger.error(f"API Error [{error_code}]: {error_msg}")
-
-                # Map to specific exception types based on status code
-                exception_class = self._get_exception_class(response.status_code)
-                raise exception_class(
-                    error_msg,
-                    code=error_code,
-                    status_code=response.status_code,
-                    response=response,
-                )
-            else:
-                # Error response without error details
-                logger.error(
-                    f"API error response without details: {response.status_code}"
-                )
-                exception_class = self._get_exception_class(response.status_code)
-                raise exception_class(
-                    f"API error (status {response.status_code})",
-                    status_code=response.status_code,
-                    response=response,
-                )
-
-        # Parse successful response
-        result = LLMResponse(**response_data)
-
-        # Check if the response contains an error (even with 200 status)
-        if result.error:
-            logger.error(
-                f"API Error in response: [{result.error.code}]: {result.error.message}"
-            )
-            raise APIError(
-                result.error.message,
-                code=result.error.code,
-                status_code=200,
-                response=response,
-            )
-
-        logger.info(
-            f"Async API request successful - task_id: {result.task_id}, step: {result.current_step}, complete: {result.is_complete}"
-        )
-        logger.debug(f"Response included {len(result.actions)} actions")
-        return result
-
-    def _get_exception_class(self, status_code: int) -> type[APIError]:
-        """Get the appropriate exception class based on status code."""
-        status_map = {
-            401: AuthenticationError,
-            404: NotFoundError,
-            422: ValidationError,
-            429: RateLimitError,
-        }
-
-        if status_code >= 500:
-            return ServerError
-
-        return status_map.get(status_code, APIError)
-
-    async def health_check(self) -> dict:
-        """
-        Call the /health endpoint for health check
-
-        Returns:
-            dict: Health check response
-        """
-        logger.debug("Making async health check request")
-        try:
-            response = await self.client.get("/health")
-            response.raise_for_status()
-            result = response.json()
-            logger.debug("Async health check successful")
-            return result
-        except httpx.HTTPStatusError as e:
-            logger.warning(f"Async health check failed: {e}")
-            raise

oagi/async_short_task.py

@@ -1,56 +0,0 @@
-# -----------------------------------------------------------------------------
-#  Copyright (c) OpenAGI Foundation
-#  All rights reserved.
-#
-#  This file is part of the official API project.
-#  Licensed under the MIT License.
-# -----------------------------------------------------------------------------
-
-from .async_task import AsyncTask
-from .logging import get_logger
-from .types import AsyncActionHandler, AsyncImageProvider
-
-logger = get_logger("async_short_task")
-
-
-class AsyncShortTask(AsyncTask):
-    """Async task implementation with automatic mode for short-duration tasks."""
-
-    def __init__(
-        self,
-        api_key: str | None = None,
-        base_url: str | None = None,
-        model: str = "vision-model-v1",
-    ):
-        super().__init__(api_key=api_key, base_url=base_url, model=model)
-
-    async def auto_mode(
-        self,
-        task_desc: str,
-        max_steps: int = 5,
-        executor: AsyncActionHandler = None,
-        image_provider: AsyncImageProvider = None,
-    ) -> bool:
-        """Run the task in automatic mode with the provided executor and image provider."""
-        logger.info(
-            f"Starting async auto mode for task: '{task_desc}' (max_steps: {max_steps})"
-        )
-        await self.init_task(task_desc, max_steps=max_steps)
-
-        for i in range(max_steps):
-            logger.debug(f"Async auto mode step {i + 1}/{max_steps}")
-            image = await image_provider()
-            step = await self.step(image)
-            if executor:
-                logger.debug(f"Executing {len(step.actions)} actions asynchronously")
-                await executor(step.actions)
-            if step.stop:
-                logger.info(
-                    f"Async auto mode completed successfully after {i + 1} steps"
-                )
-                return True
-
-        logger.warning(
-            f"Async auto mode reached max steps ({max_steps}) without completion"
-        )
-        return False

oagi/short_task.py

@@ -1,52 +0,0 @@
-# -----------------------------------------------------------------------------
-#  Copyright (c) OpenAGI Foundation
-#  All rights reserved.
-#
-#  This file is part of the official API project.
-#  Licensed under the MIT License.
-# -----------------------------------------------------------------------------
-
-from .logging import get_logger
-from .task import Task
-from .types import ActionHandler, ImageProvider
-
-logger = get_logger("short_task")
-
-
-class ShortTask(Task):
-    """Task implementation with automatic mode for short-duration tasks."""
-
-    def __init__(
-        self,
-        api_key: str | None = None,
-        base_url: str | None = None,
-        model: str = "vision-model-v1",
-    ):
-        super().__init__(api_key=api_key, base_url=base_url, model=model)
-
-    def auto_mode(
-        self,
-        task_desc: str,
-        max_steps: int = 5,
-        executor: ActionHandler = None,
-        image_provider: ImageProvider = None,
-    ) -> bool:
-        """Run the task in automatic mode with the provided executor and image provider."""
-        logger.info(
-            f"Starting auto mode for task: '{task_desc}' (max_steps: {max_steps})"
-        )
-        self.init_task(task_desc, max_steps=max_steps)
-
-        for i in range(max_steps):
-            logger.debug(f"Auto mode step {i + 1}/{max_steps}")
-            image = image_provider()
-            step = self.step(image)
-            if executor:
-                logger.debug(f"Executing {len(step.actions)} actions")
-                executor(step.actions)
-            if step.stop:
-                logger.info(f"Auto mode completed successfully after {i + 1} steps")
-                return True
-
-        logger.warning(f"Auto mode reached max steps ({max_steps}) without completion")
-        return False

oagi/sync_client.py

@@ -1,289 +0,0 @@
-# -----------------------------------------------------------------------------
-#  Copyright (c) OpenAGI Foundation
-#  All rights reserved.
-#
-#  This file is part of the official API project.
-#  Licensed under the MIT License.
-# -----------------------------------------------------------------------------
-
-import base64
-import os
-from functools import wraps
-
-import httpx
-from httpx import Response
-from pydantic import BaseModel
-
-from .exceptions import (
-    APIError,
-    AuthenticationError,
-    ConfigurationError,
-    NetworkError,
-    NotFoundError,
-    RateLimitError,
-    RequestTimeoutError,
-    ServerError,
-    ValidationError,
-)
-from .logging import get_logger
-from .types import Action
-
-logger = get_logger("sync_client")
-
-
-class Usage(BaseModel):
-    prompt_tokens: int
-    completion_tokens: int
-    total_tokens: int
-
-
-class ErrorDetail(BaseModel):
-    """Detailed error information."""
-
-    code: str
-    message: str
-
-
-class ErrorResponse(BaseModel):
-    """Standard error response format."""
-
-    error: ErrorDetail | None
-
-
-class LLMResponse(BaseModel):
-    id: str
-    task_id: str
-    object: str = "task.completion"
-    created: int
-    model: str
-    task_description: str
-    current_step: int
-    is_complete: bool
-    actions: list[Action]
-    reason: str | None = None
-    usage: Usage
-    error: ErrorDetail | None = None
-
-
-def _log_trace_id(response: Response):
-    logger.error(f"Request Id: {response.headers.get('x-request-id', '')}")
-    logger.error(f"Trace Id: {response.headers.get('x-trace-id', '')}")
-
-
-def log_trace_on_failure(func):
-    """Decorator that logs trace ID when a method fails."""
-
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception as e:
-            # Try to get response from the exception if it has one
-            if (response := getattr(e, "response", None)) is not None:
-                _log_trace_id(response)
-            raise
-
-    return wrapper
-
-
-class SyncClient:
-    def __init__(self, base_url: str | None = None, api_key: str | None = None):
-        # Get from environment if not provided
-        self.base_url = base_url or os.getenv("OAGI_BASE_URL")
-        self.api_key = api_key or os.getenv("OAGI_API_KEY")
-
-        # Validate required configuration
-        if not self.base_url:
-            raise ConfigurationError(
-                "OAGI base URL must be provided either as 'base_url' parameter or "
-                "OAGI_BASE_URL environment variable"
-            )
-
-        if not self.api_key:
-            raise ConfigurationError(
-                "OAGI API key must be provided either as 'api_key' parameter or "
-                "OAGI_API_KEY environment variable"
-            )
-
-        self.base_url = self.base_url.rstrip("/")
-        self.client = httpx.Client(base_url=self.base_url)
-        self.timeout = 60
-
-        logger.info(f"SyncClient initialized with base_url: {self.base_url}")
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.client.close()
-
-    def close(self):
-        """Close the underlying httpx client"""
-        self.client.close()
-
-    @log_trace_on_failure
-    def create_message(
-        self,
-        model: str,
-        screenshot: str,  # base64 encoded
-        task_description: str | None = None,
-        task_id: str | None = None,
-        instruction: str | None = None,
-        max_actions: int | None = 5,
-        api_version: str | None = None,
-    ) -> LLMResponse:
-        """
-        Call the /v1/message endpoint to analyze task and screenshot
-
-        Args:
-            model: The model to use for task analysis
-            screenshot: Base64-encoded screenshot image
-            task_description: Description of the task (required for new sessions)
-            task_id: Task ID for continuing existing task
-            instruction: Additional instruction when continuing a session (only works with task_id)
-            max_actions: Maximum number of actions to return (1-20)
-            api_version: API version header
-
-        Returns:
-            LLMResponse: The response from the API
-
-        Raises:
-            httpx.HTTPStatusError: For HTTP error responses
-        """
-        headers = {}
-        if api_version:
-            headers["x-api-version"] = api_version
-        if self.api_key:
-            headers["x-api-key"] = self.api_key
-
-        payload = {"model": model, "screenshot": screenshot}
-
-        if task_description is not None:
-            payload["task_description"] = task_description
-        if task_id is not None:
-            payload["task_id"] = task_id
-        if instruction is not None:
-            payload["instruction"] = instruction
-        if max_actions is not None:
-            payload["max_actions"] = max_actions
-
-        logger.info(f"Making API request to /v1/message with model: {model}")
-        logger.debug(
-            f"Request includes task_description: {task_description is not None}, task_id: {task_id is not None}"
-        )
-
-        try:
-            response = self.client.post(
-                "/v1/message", json=payload, headers=headers, timeout=self.timeout
-            )
-        except httpx.TimeoutException as e:
-            logger.error(f"Request timed out after {self.timeout} seconds")
-            raise RequestTimeoutError(
-                f"Request timed out after {self.timeout} seconds", e
-            )
-        except httpx.NetworkError as e:
-            logger.error(f"Network error: {e}")
-            raise NetworkError(f"Network error: {e}", e)
-
-        try:
-            response_data = response.json()
-        except ValueError:
-            # If response is not JSON, raise API error
-            logger.error(f"Non-JSON API response: {response.status_code}")
-            raise APIError(
-                f"Invalid response format (status {response.status_code})",
-                status_code=response.status_code,
-                response=response,
-            )
-
-        # Check if it's an error response (non-200 status or has error field)
-        if response.status_code != 200:
-            error_resp = ErrorResponse(**response_data)
-            if error_resp.error:
-                error_code = error_resp.error.code
-                error_msg = error_resp.error.message
-                logger.error(f"API Error [{error_code}]: {error_msg}")
-
-                # Map to specific exception types based on status code
-                exception_class = self._get_exception_class(response.status_code)
-                raise exception_class(
-                    error_msg,
-                    code=error_code,
-                    status_code=response.status_code,
-                    response=response,
-                )
-            else:
-                # Error response without error details
-                logger.error(
-                    f"API error response without details: {response.status_code}"
-                )
-                exception_class = self._get_exception_class(response.status_code)
-                raise exception_class(
-                    f"API error (status {response.status_code})",
-                    status_code=response.status_code,
-                    response=response,
-                )
-
-        # Parse successful response
-        result = LLMResponse(**response_data)
-
-        # Check if the response contains an error (even with 200 status)
-        if result.error:
-            logger.error(
-                f"API Error in response: [{result.error.code}]: {result.error.message}"
-            )
-            raise APIError(
-                result.error.message,
-                code=result.error.code,
-                status_code=200,
-                response=response,
-            )
-
-        logger.info(
-            f"API request successful - task_id: {result.task_id}, step: {result.current_step}, complete: {result.is_complete}"
-        )
-        logger.debug(f"Response included {len(result.actions)} actions")
-        return result
-
-    def _get_exception_class(self, status_code: int) -> type[APIError]:
-        """Get the appropriate exception class based on status code."""
-        status_map = {
-            401: AuthenticationError,
-            404: NotFoundError,
-            422: ValidationError,
-            429: RateLimitError,
-        }
-
-        if status_code >= 500:
-            return ServerError
-
-        return status_map.get(status_code, APIError)
-
-    def health_check(self) -> dict:
-        """
-        Call the /health endpoint for health check
-
-        Returns:
-            dict: Health check response
-        """
-        logger.debug("Making health check request")
-        try:
-            response = self.client.get("/health")
-            response.raise_for_status()
-            result = response.json()
-            logger.debug("Health check successful")
-            return result
-        except httpx.HTTPStatusError as e:
-            logger.warning(f"Health check failed: {e}")
-            raise
-
-
-def encode_screenshot_from_bytes(image_bytes: bytes) -> str:
-    """Helper function to encode image bytes to base64 string"""
-    return base64.b64encode(image_bytes).decode("utf-8")
-
-
-def encode_screenshot_from_file(image_path: str) -> str:
-    """Helper function to encode image file to base64 string"""
-    with open(image_path, "rb") as f:
-        return encode_screenshot_from_bytes(f.read())

oagi-0.4.3.dist-info/RECORD

@@ -1,30 +0,0 @@
-oagi/__init__.py,sha256=m-Z121YCIwQOPXpTC8kd_UIJizcX8QuHyrSSguQ0KE0,2187
-oagi/async_client.py,sha256=oDj4kIdtaV37uopoAeClCFQTxrYRwHV2HwMAcMdVYwE,8455
-oagi/async_pyautogui_action_handler.py,sha256=F-lKyePCONWI03WnSxpX_QwxONbvnfdQu51wTod6mdw,1614
-oagi/async_screenshot_maker.py,sha256=pI-dbLcYOzcO1ffgTmozAdbYJQNBPKA7hmqj1RxEmIY,1688
-oagi/async_short_task.py,sha256=jvFTbmXTxFlkpAwmWeZlxbTSv_RB7V561hxw6gUcigw,1961
-oagi/async_single_step.py,sha256=QawXO4GyfMz6O9jV8QBC1vKxFuS9vjKQxxJ1nwgHBzI,2838
-oagi/async_task.py,sha256=bclqtgg7mI2WAp-62jOz044tVk4wruycpn9NYDncnA8,4145
-oagi/exceptions.py,sha256=VMwVS8ouE9nHhBpN3AZMYt5_U2kGcihWaTnBhoQLquo,1662
-oagi/logging.py,sha256=CWe89mA5MKTipIvfrqSYkv2CAFNBSwHMDQMDkG_g64g,1350
-oagi/pil_image.py,sha256=Zp7YNwyE_AT25ZEFsWKbzMxbO8JOQsJ1Espph5ye8k8,3804
-oagi/pyautogui_action_handler.py,sha256=8IFbU4p907L4b3TV3Eeh0-c-pYL2lYw-_qf1r8TtPTw,9811
-oagi/screenshot_maker.py,sha256=sVuW7jn-K4FmLhmYI-akdNI-UVcTeBzh9P1_qJhoq1s,1282
-oagi/short_task.py,sha256=9l1PDX70vDUEX2CIJ66yaAtb96P3mK_m95JffspnYFI,1779
-oagi/single_step.py,sha256=djhGOHzA5Y3-9_ity9QiJr_ObZZ04blSmNZsLXXXfkg,2939
-oagi/sync_client.py,sha256=E6EgFIe-H91rdsPhF1puwrBTpOnKaL6JA1WHR4R-CLY,9395
-oagi/task.py,sha256=JfsugIhBrwDmi1xOEVQdqmXsGFK-H4p17-B4rM8kbWs,4001
-oagi/types/__init__.py,sha256=YXxL-30f92qAf9U6LZuVCtKFG-Pi3xahKedaNxyrxFE,766
-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=wnhRyPtTmuALt45Qore74-RCkP5yxU9sZGjvOzFqzOk,1170
-oagi/types/image.py,sha256=KgPCCTJ6D5vHIaGZdbTE7eQEa1WlT6G9tf59ZuUCV2U,537
-oagi/types/image_provider.py,sha256=oYFdOYznrK_VOR9egzOjw5wFM5w8EY2sY01pH0ANAgU,1112
-oagi/types/models/__init__.py,sha256=bVzzGxb6lVxAQyJpy0Z1QknSe-xC3g4OIDr7t-p_3Ys,467
-oagi/types/models/action.py,sha256=hh6mRRSSWgrW4jpZo71zGMCOcZpV5_COu4148uG6G48,967
-oagi/types/models/image_config.py,sha256=tl6abVg_-IAPLwpaWprgknXu7wRWriMg-AEVyUX73v0,1567
-oagi/types/models/step.py,sha256=RSI4H_2rrUBq_xyCoWKaq7JHdJWNobtQppaKC1l0aWU,471
-oagi-0.4.3.dist-info/METADATA,sha256=fdp0bxPUM_ajJpP1pGxC8OVQy24kgvCQTHckH85XGZI,4799
-oagi-0.4.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi-0.4.3.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi-0.4.3.dist-info/RECORD,,