oagi-core 0.9.1__tar.gz → 0.10.0__tar.gz

{oagi_core-0.9.1 → oagi_core-0.10.0}/Makefile

@@ -46,13 +46,17 @@ test-verbose: .uv install-dev
 
 .PHONY: version
 version:
-	@if [ -z "$(VERSION)" ]; then \
-		echo "Usage: make version VERSION=x.y.z"; \
-		echo "Current version: $$(grep '^version = ' pyproject.toml | head -1 | cut -d'"' -f2)"; \
+	@if [ -n "$(filter-out $@,$(MAKECMDGOALS))" ]; then \
+		VERSION=$(filter-out $@,$(MAKECMDGOALS)); \
+	else \
+		echo "Usage: make version <version>"; \
 		exit 1; \
-	fi
-	@echo "Updating version to $(VERSION) in all files..."
-	@sed -i '' 's/^version = ".*"/version = "$(VERSION)"/' pyproject.toml
-	@sed -i '' 's/^version = ".*"/version = "$(VERSION)"/' metapackage/pyproject.toml
-	@sed -i '' 's/oagi-core\[desktop,server\]==.*/oagi-core[desktop,server]==$(VERSION)",/' metapackage/pyproject.toml
-	make build-all
+	fi; \
+	echo "Updating version to $$VERSION..."; \
+	uv version $$VERSION; \
+	(cd metapackage && uv version $$VERSION); \
+	sed -i '' 's/oagi-core\[desktop,server\]==.*/oagi-core[desktop,server]=='$$VERSION'",/' metapackage/pyproject.toml; \
+	make build-all
+
+%:
+	@:

{oagi_core-0.9.1 → oagi_core-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.9.1
+Version: 0.10.0
 Summary: Official API of OpenAGI Foundation
 Project-URL: Homepage, https://github.com/agiopen-org/oagi
 Author-email: OpenAGI Foundation <contact@agiopen.org>
@@ -32,6 +32,7 @@ Requires-Dist: rich>=13.0.0
 Provides-Extra: desktop
 Requires-Dist: pillow>=11.3.0; extra == 'desktop'
 Requires-Dist: pyautogui>=0.9.54; extra == 'desktop'
+Requires-Dist: pyobjc-framework-quartz>=9.0; (sys_platform == 'darwin') and extra == 'desktop'
 Provides-Extra: server
 Requires-Dist: fastapi[standard]>=0.115.0; extra == 'server'
 Requires-Dist: pydantic-settings>=2.0.0; extra == 'server'
@@ -72,8 +73,8 @@ pip install oagi-core[server]   # Server support
 
 Set your API credentials:
 ```bash
-export OAGI_API_KEY="your-api-key"
-export OAGI_BASE_URL="https://api.oagi.com"  # or your server URL
+export OAGI_API_KEY="your-api-key" # get your API key from https://developer.openagi.org/
+# export OAGI_BASE_URL="https://api.agiopen.org/", # optional, defaults to production endpoint
 ```
 
 ### Automated Task Execution
@@ -81,21 +82,25 @@ export OAGI_BASE_URL="https://api.oagi.com"  # or your server URL
 Run tasks automatically with screenshot capture and action execution:
 
 ```python
-from oagi import ShortTask, ScreenshotMaker, PyautoguiActionHandler
-
-task = ShortTask()
-completed = task.auto_mode(
-    "Search weather on Google",
-    max_steps=10,
-    executor=PyautoguiActionHandler(),  # Executes mouse/keyboard actions
-    image_provider=ScreenshotMaker(),    # Captures screenshots
-)
+import asyncio
+from oagi import AsyncDefaultAgent, AsyncPyautoguiActionHandler, AsyncScreenshotMaker
+
+async def main():
+    agent = AsyncDefaultAgent(max_steps=10)
+    completed = await agent.execute(
+        "Search weather on Google",
+        action_handler=AsyncPyautoguiActionHandler(),  # Executes mouse/keyboard actions
+        image_provider=AsyncScreenshotMaker(),         # Captures screenshots
+    )
+    return completed
+
+asyncio.run(main())
 ```
 
 Configure PyAutoGUI behavior with custom settings:
 
 ```python
-from oagi import PyautoguiActionHandler, PyautoguiConfig
+from oagi import AsyncPyautoguiActionHandler, PyautoguiConfig
 
 # Customize action behavior
 config = PyautoguiConfig(
@@ -107,8 +112,7 @@ config = PyautoguiConfig(
     capslock_mode="session" # Caps lock mode: 'session' or 'system' (default: 'session')
 )
 
-executor = PyautoguiActionHandler(config=config)
-task.auto_mode("Complete form", executor=executor, image_provider=ScreenshotMaker())
+action_handler = AsyncPyautoguiActionHandler(config=config)
 ```
 
 ### Image Processing
@@ -129,20 +133,28 @@ config = ImageConfig(
 compressed = image.transform(config)
 ```
 
-### Async Support
+### Manual Control with Actor
 
-Use async client for non-blocking operations and better concurrency:
+For step-by-step control over task execution:
 
 ```python
 import asyncio
-from oagi import AsyncShortTask
+from oagi import AsyncActor, AsyncPyautoguiActionHandler, AsyncScreenshotMaker
 
 async def main():
-    # Async task automation
-    task = AsyncShortTask()
-    async with task:
-        await task.init_task("Complete the form")
-        # ... continue with async operations
+    async with AsyncActor() as actor:
+        await actor.init_task("Complete the form")
+        image_provider = AsyncScreenshotMaker()
+        action_handler = AsyncPyautoguiActionHandler()
+
+        for _ in range(10):
+            image = await image_provider()
+            step = await actor.step(image)
+
+            if step.stop:
+                break
+
+            await action_handler(step.actions)
 
 asyncio.run(main())
 ```
@@ -150,9 +162,10 @@ asyncio.run(main())
 ## Examples
 
 See the [`examples/`](examples/) directory for more usage patterns:
-- `google_weather.py` - Basic task execution with `ShortTask`
+- `execute_task_auto.py` - Automated task execution with `AsyncDefaultAgent`
+- `execute_task_manual.py` - Manual step-by-step control with `Actor`
+- `continued_session.py` - Continuing tasks across sessions
 - `screenshot_with_config.py` - Image compression and optimization
-- `execute_task_auto.py` - Automated task execution
 - `socketio_server_basic.py` - Socket.IO server example
 - `socketio_client_example.py` - Socket.IO client implementation
 

{oagi_core-0.9.1 → oagi_core-0.10.0}/README.md

@@ -31,8 +31,8 @@ pip install oagi-core[server]   # Server support
 
 Set your API credentials:
 ```bash
-export OAGI_API_KEY="your-api-key"
-export OAGI_BASE_URL="https://api.oagi.com"  # or your server URL
+export OAGI_API_KEY="your-api-key" # get your API key from https://developer.openagi.org/
+# export OAGI_BASE_URL="https://api.agiopen.org/", # optional, defaults to production endpoint
 ```
 
 ### Automated Task Execution
@@ -40,21 +40,25 @@ export OAGI_BASE_URL="https://api.oagi.com"  # or your server URL
 Run tasks automatically with screenshot capture and action execution:
 
 ```python
-from oagi import ShortTask, ScreenshotMaker, PyautoguiActionHandler
-
-task = ShortTask()
-completed = task.auto_mode(
-    "Search weather on Google",
-    max_steps=10,
-    executor=PyautoguiActionHandler(),  # Executes mouse/keyboard actions
-    image_provider=ScreenshotMaker(),    # Captures screenshots
-)
+import asyncio
+from oagi import AsyncDefaultAgent, AsyncPyautoguiActionHandler, AsyncScreenshotMaker
+
+async def main():
+    agent = AsyncDefaultAgent(max_steps=10)
+    completed = await agent.execute(
+        "Search weather on Google",
+        action_handler=AsyncPyautoguiActionHandler(),  # Executes mouse/keyboard actions
+        image_provider=AsyncScreenshotMaker(),         # Captures screenshots
+    )
+    return completed
+
+asyncio.run(main())
 ```
 
 Configure PyAutoGUI behavior with custom settings:
 
 ```python
-from oagi import PyautoguiActionHandler, PyautoguiConfig
+from oagi import AsyncPyautoguiActionHandler, PyautoguiConfig
 
 # Customize action behavior
 config = PyautoguiConfig(
@@ -66,8 +70,7 @@ config = PyautoguiConfig(
     capslock_mode="session" # Caps lock mode: 'session' or 'system' (default: 'session')
 )
 
-executor = PyautoguiActionHandler(config=config)
-task.auto_mode("Complete form", executor=executor, image_provider=ScreenshotMaker())
+action_handler = AsyncPyautoguiActionHandler(config=config)
 ```
 
 ### Image Processing
@@ -88,20 +91,28 @@ config = ImageConfig(
 compressed = image.transform(config)
 ```
 
-### Async Support
+### Manual Control with Actor
 
-Use async client for non-blocking operations and better concurrency:
+For step-by-step control over task execution:
 
 ```python
 import asyncio
-from oagi import AsyncShortTask
+from oagi import AsyncActor, AsyncPyautoguiActionHandler, AsyncScreenshotMaker
 
 async def main():
-    # Async task automation
-    task = AsyncShortTask()
-    async with task:
-        await task.init_task("Complete the form")
-        # ... continue with async operations
+    async with AsyncActor() as actor:
+        await actor.init_task("Complete the form")
+        image_provider = AsyncScreenshotMaker()
+        action_handler = AsyncPyautoguiActionHandler()
+
+        for _ in range(10):
+            image = await image_provider()
+            step = await actor.step(image)
+
+            if step.stop:
+                break
+
+            await action_handler(step.actions)
 
 asyncio.run(main())
 ```
@@ -109,9 +120,10 @@ asyncio.run(main())
 ## Examples
 
 See the [`examples/`](examples/) directory for more usage patterns:
-- `google_weather.py` - Basic task execution with `ShortTask`
+- `execute_task_auto.py` - Automated task execution with `AsyncDefaultAgent`
+- `execute_task_manual.py` - Manual step-by-step control with `Actor`
+- `continued_session.py` - Continuing tasks across sessions
 - `screenshot_with_config.py` - Image compression and optimization
-- `execute_task_auto.py` - Automated task execution
 - `socketio_server_basic.py` - Socket.IO server example
 - `socketio_client_example.py` - Socket.IO client implementation
 

oagi_core-0.10.0/examples/execute_task_auto.py

@@ -0,0 +1,37 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+import asyncio
+
+from oagi import (
+    AsyncDefaultAgent,
+    AsyncPyautoguiActionHandler,
+    AsyncScreenshotMaker,
+)
+
+
+def execute_task_auto(task_desc, max_steps=5):
+    """Synchronous wrapper for async task execution."""
+    return asyncio.run(async_execute_task_auto(task_desc, max_steps))
+
+
+async def async_execute_task_auto(task_desc, max_steps=5):
+    # set OAGI_API_KEY and OAGI_BASE_URL
+    # or AsyncDefaultAgent(api_key="your_api_key", base_url="your_base_url")
+    agent = AsyncDefaultAgent(max_steps=max_steps)
+
+    # executor = lambda actions: print(actions) for debugging
+    action_handler = AsyncPyautoguiActionHandler()
+    image_provider = AsyncScreenshotMaker()
+
+    is_completed = await agent.execute(
+        task_desc,
+        action_handler=action_handler,
+        image_provider=image_provider,
+    )
+
+    return is_completed, await image_provider.last_image()

{oagi_core-0.9.1 → oagi_core-0.10.0}/examples/google_weather.py

@@ -9,7 +9,7 @@
 from examples.execute_task_manual import execute_task_manual
 
 is_completed, screenshot = execute_task_manual(
-    desc := "Search weather with Google", max_steps=5
+    desc := "Search weather with Google", max_steps=10
 )
 
 print(f"is_completed: {is_completed}, desc: {desc}")

oagi_core-0.10.0/examples/tasker_agent_example.py

@@ -0,0 +1,79 @@
+# -----------------------------------------------------------------------------
+#  Copyright (c) OpenAGI Foundation
+#  All rights reserved.
+#
+#  This file is part of the official API project.
+#  Licensed under the MIT License.
+# -----------------------------------------------------------------------------
+
+import asyncio
+import os
+import traceback
+
+from oagi import (
+    AsyncAgentObserver,
+    AsyncPyautoguiActionHandler,
+    AsyncScreenshotMaker,
+    TaskerAgent,
+)
+
+
+async def main():
+    # Create observer for recording execution history
+    observer = AsyncAgentObserver()
+
+    # Initialize the tasker agent
+    # Note: Ensure OAGI_API_KEY and OAGI_BASE_URL environment variables are set
+    tasker = TaskerAgent(
+        api_key=os.getenv("OAGI_API_KEY"),
+        base_url=os.getenv("OAGI_BASE_URL", "https://api.agiopen.org"),
+        model="lux-actor-1",
+        max_steps=30,
+        temperature=0.5,
+        step_observer=observer,
+    )
+
+    # Define the task with multiple todos
+    task_description = "Open a web browser and search for information about Python"
+
+    # Break down into specific todos
+    todos = [
+        "Search for 'Python programming language'",
+        "Click on the official Python.org website link",
+    ]
+
+    # Define deliverables to achieve
+    deliverables = [
+        "Python.org website is opened",
+    ]
+
+    # Set the task
+    tasker.set_task(
+        task=task_description,
+        todos=todos,
+        deliverables=deliverables,
+    )
+
+    image_provider = AsyncScreenshotMaker()
+    action_handler = AsyncPyautoguiActionHandler()
+
+    try:
+        # Execute the task
+        success = await tasker.execute(
+            instruction="",
+            action_handler=action_handler,
+            image_provider=image_provider,
+        )
+        print(f"Tasker success: {success}")
+
+    except Exception as e:
+        print(f"\nError during execution: {e}")
+        traceback.print_exc()
+
+    observer.export("html", export_file := "export.html")
+    print(f"\nExecution history exported: {export_file}")
+
+
+if __name__ == "__main__":
+    # Run the async main function
+    asyncio.run(main())

{oagi_core-0.9.1 → oagi_core-0.10.0}/metapackage/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oagi"
-version = "0.9.1"
+version = "0.10.0"
 description = "Official API of OpenAGI Foundation (metapackage with all features)"
 readme = "README.md"
 license = "MIT"
@@ -16,7 +16,7 @@ authors = [
 requires-python = ">= 3.10"
 
 dependencies = [
-    "oagi-core[desktop,server]==0.9.1",
+    "oagi-core[desktop,server]==0.10.0",
 ]
 
 [project.urls]