fleet-python 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

examples/openai_example.py

@@ -1,14 +1,10 @@
-import base64
-from typing import List, Dict, Callable, Optional
-from playwright.async_api import async_playwright, Browser, Page
-import httpx
-import json
-import io
-from io import BytesIO
-from PIL import Image
-import os
-import asyncio
+from openai import OpenAI
 import fleet as flt
+import json
+from typing import Callable
+
+
+client = OpenAI()
 
 
 def sanitize_message(msg: dict) -> dict:
@@ -22,292 +18,42 @@ def sanitize_message(msg: dict) -> dict:
     return msg
 
 
-async def create_response(**kwargs):
-    url = "https://api.openai.com/v1/responses"
-    headers = {
-        "Authorization": f"Bearer {os.getenv('OPENAI_API_KEY')}",
-        "Content-Type": "application/json",
-    }
-
-    openai_org = os.getenv("OPENAI_ORG")
-    if openai_org:
-        headers["Openai-Organization"] = openai_org
-
-    # Configure timeout: 30 seconds for connect, 60 seconds for read
-    timeout = httpx.Timeout(connect=60.0, read=60.0, write=60.0, pool=60.0)
-
-    async with httpx.AsyncClient(timeout=timeout) as client:
-        response = await client.post(url, headers=headers, json=kwargs)
-
-        if response.status_code != 200:
-            print(f"Error: {response.status_code} {response.text}")
-
-        return response.json()
-
-
-def pp(obj):
-    print(json.dumps(obj, indent=4))
-
-
-def show_image(base_64_image):
-    image_data = base64.b64decode(base_64_image)
-    image = Image.open(BytesIO(image_data))
-    image.show()
-
-
-def calculate_image_dimensions(base_64_image):
-    image_data = base64.b64decode(base_64_image)
-    image = Image.open(io.BytesIO(image_data))
-    return image.size
-
-
-# Optional: key mapping if your model uses "CUA" style keys
-CUA_KEY_TO_PLAYWRIGHT_KEY = {
-    "/": "Divide",
-    "\\": "Backslash",
-    "alt": "Alt",
-    "arrowdown": "ArrowDown",
-    "arrowleft": "ArrowLeft",
-    "arrowright": "ArrowRight",
-    "arrowup": "ArrowUp",
-    "backspace": "Backspace",
-    "capslock": "CapsLock",
-    "cmd": "Meta",
-    "ctrl": "Control",
-    "delete": "Delete",
-    "end": "End",
-    "enter": "Enter",
-    "esc": "Escape",
-    "home": "Home",
-    "insert": "Insert",
-    "option": "Alt",
-    "pagedown": "PageDown",
-    "pageup": "PageUp",
-    "shift": "Shift",
-    "space": " ",
-    "super": "Meta",
-    "tab": "Tab",
-    "win": "Meta",
-}
-
-
-class BasePlaywrightComputer:
-    """
-    Abstract base for Playwright-based computers:
-
-      - Subclasses override `_get_browser_and_page()` to do local or remote connection,
-        returning (Browser, Page).
-      - This base class handles context creation (`__enter__`/`__exit__`),
-        plus standard "Computer" actions like click, scroll, etc.
-      - We also have extra browser actions: `goto(url)` and `back()`.
-    """
-
-    def get_environment(self):
-        return "browser"
-
-    def get_dimensions(self):
-        return (1920, 1080)
-
-    def __init__(self):
-        self._playwright = None
-        self._browser: Browser | None = None
-        self._page: Page | None = None
-
-    async def __aenter__(self):
-        # Start Playwright and call the subclass hook for getting browser/page
-        self._playwright = await async_playwright().start()
-        self._browser, self._page = await self._get_browser_and_page()
-
-        # Set up network interception to flag URLs matching domains in BLOCKED_DOMAINS
-        async def handle_route(route, request):
-            await route.continue_()
-
-        await self._page.route("**/*", handle_route)
-
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        # if self._browser:
-        #     await self._browser.close()
-        if self._playwright:
-            await self._playwright.stop()
-
-    def get_current_url(self) -> str:
-        return self._page.url
-
-    # --- Common "Computer" actions ---
-    async def screenshot(self) -> str:
-        """Capture only the viewport (not full_page)."""
-        png_bytes = await self._page.screenshot(full_page=False)
-        return base64.b64encode(png_bytes).decode("utf-8")
-
-    async def click(self, x: int, y: int, button: str = "left") -> None:
-        if button == "back":
-            await self.back()
-        elif button == "forward":
-            await self.forward()
-        elif button == "wheel":
-            await self._page.mouse.wheel(x, y)
-        else:
-            button_mapping = {"left": "left", "right": "right"}
-            button_type = button_mapping.get(button, "left")
-            await self._page.mouse.click(x, y, button=button_type)
-
-    async def double_click(self, x: int, y: int) -> None:
-        await self._page.mouse.dblclick(x, y)
-
-    async def scroll(self, x: int, y: int, scroll_x: int, scroll_y: int) -> None:
-        await self._page.mouse.move(x, y)
-        await self._page.evaluate(f"window.scrollBy({scroll_x}, {scroll_y})")
-
-    async def type(self, text: str) -> None:
-        await self._page.keyboard.type(text)
-
-    async def wait(self, ms: int = 1000) -> None:
-        await asyncio.sleep(ms / 1000)
-
-    async def move(self, x: int, y: int) -> None:
-        await self._page.mouse.move(x, y)
-
-    async def keypress(self, keys: List[str]) -> None:
-        mapped_keys = [CUA_KEY_TO_PLAYWRIGHT_KEY.get(key.lower(), key) for key in keys]
-        for key in mapped_keys:
-            await self._page.keyboard.down(key)
-        for key in reversed(mapped_keys):
-            await self._page.keyboard.up(key)
-
-    async def drag(self, path: List[Dict[str, int]]) -> None:
-        if not path:
-            return
-        await self._page.mouse.move(path[0]["x"], path[0]["y"])
-        await self._page.mouse.down()
-        for point in path[1:]:
-            await self._page.mouse.move(point["x"], point["y"])
-        await self._page.mouse.up()
-
-    # --- Extra browser-oriented actions ---
-    async def goto(self, url: str) -> None:
-        try:
-            return await self._page.goto(url)
-        except Exception as e:
-            print(f"Error navigating to {url}: {e}")
-
-    async def back(self) -> None:
-        return await self._page.go_back()
-
-    async def forward(self) -> None:
-        return await self._page.go_forward()
-
-    # --- Subclass hook ---
-    async def _get_browser_and_page(self) -> tuple[Browser, Page]:
-        """Subclasses must implement, returning (Browser, Page)."""
-        raise NotImplementedError
-
-
-class FleetPlaywrightBrowser(BasePlaywrightComputer):
-    """Launches a local Chromium instance using Playwright."""
-
-    def __init__(
-        self,
-        fleet: flt.AsyncFleet,
-        env_key: str,
-        version: Optional[str] = None,
-        headless: bool = False,
-    ):
-        super().__init__()
-        self.fleet = fleet
-        self.env_key = env_key
-        self.version = version
-        self.headless = headless
-
-    async def _get_browser_and_page(self) -> tuple[Browser, Page]:
-        width, height = self.get_dimensions()
-
-        # Create an instance of the environment
-        print(f"Creating instance of {self.env_key} {self.version}...")
-        self.instance = await self.fleet.make(
-            flt.InstanceRequest(env_key=self.env_key, version=self.version)
-        )
-
-        # Start the browser
-        print("Starting browser...")
-        await self.instance.env.browser("cdp").start()
-        print("Getting CDP URL...")
-        cdp = await self.instance.env.browser("cdp").describe()
-        print("DevTools URL:", cdp.cdp_devtools_url)
-
-        # Connect to the browser
-        browser = await self._playwright.chromium.connect_over_cdp(cdp.cdp_browser_url)
-
-        # Add event listeners for page creation and closure
-        context = browser.contexts[0]
-        context.on("page", self._handle_new_page)
-
-        page = context.pages[0]
-        await page.set_viewport_size({"width": width, "height": height})
-        page.on("close", self._handle_page_close)
-
-        return browser, page
-
-    def _handle_new_page(self, page: Page):
-        """Handle the creation of a new page."""
-        print("New page created")
-        self._page = page
-        page.on("close", self._handle_page_close)
-
-    def _handle_page_close(self, page: Page):
-        """Handle the closure of a page."""
-        print("Page closed")
-        if self._page == page:
-            if self._browser.contexts[0].pages:
-                self._page = self._browser.contexts[0].pages[-1]
-            else:
-                print("Warning: All pages have been closed.")
-                self._page = None
-
-
 class Agent:
-    """
-    A sample agent class that can be used to interact with a computer.
-
-    (See simple_cua_loop.py for a simple example without an agent.)
-    """
-
     def __init__(
         self,
+        browser,
         model="computer-use-preview",
-        computer: FleetPlaywrightBrowser = None,
         tools: list[dict] = [],
         acknowledge_safety_check_callback: Callable = lambda: False,
     ):
         self.model = model
-        self.computer = computer
+        self.computer = browser
         self.tools = tools
         self.print_steps = True
         self.debug = False
         self.show_images = False
         self.acknowledge_safety_check_callback = acknowledge_safety_check_callback
 
-        if computer:
-            dimensions = computer.get_dimensions()
+        if browser:
+            dimensions = browser.get_dimensions()
             self.tools += [
                 {
                     "type": "computer-preview",
                     "display_width": dimensions[0],
                     "display_height": dimensions[1],
-                    "environment": computer.get_environment(),
+                    "environment": browser.get_environment(),
                 },
             ]
 
     def debug_print(self, *args):
         if self.debug:
-            pp(*args)
+            print(*args)
 
-    async def handle_item(self, item):
+    def handle_item(self, item):
         """Handle each item; may cause a computer action + screenshot."""
         if self.debug:
             print(f"Handling item of type: {item.get('type')}")
-            
+
         if item["type"] == "message":
             if self.print_steps:
                 print(item["content"][0]["text"])
@@ -319,7 +65,7 @@ class Agent:
 
             if hasattr(self.computer, name):  # if function exists on computer, call it
                 method = getattr(self.computer, name)
-                await method(**args)
+                method(**args)
             return [
                 {
                     "type": "function_call_output",
@@ -336,11 +82,9 @@ class Agent:
                 print(f"{action_type}({action_args})")
 
             method = getattr(self.computer, action_type)
-            await method(**action_args)
+            method(**action_args)
 
-            screenshot_base64 = await self.computer.screenshot()
-            if self.show_images:
-                show_image(screenshot_base64)
+            screenshot_base64 = self.computer.screenshot()
 
             # if user doesn't ack all safety checks exit with error
             pending_checks = item.get("pending_safety_checks", [])
@@ -369,7 +113,7 @@ class Agent:
             return [call_output]
         return []
 
-    async def run_full_turn(
+    def run_full_turn(
         self, input_items, print_steps=True, debug=False, show_images=False
     ):
         self.print_steps = print_steps
@@ -381,38 +125,60 @@ class Agent:
         while new_items[-1].get("role") != "assistant" if new_items else True:
             self.debug_print([sanitize_message(msg) for msg in input_items + new_items])
 
-            response = await create_response(
+            # The Responses API rejects unknown keys (e.g. `status`, `encrypted_content`).
+            # Strip them from every item before sending.
+            def _clean_item(msg: dict) -> dict:
+                unwanted_keys = {"status", "encrypted_content"}
+                return {k: v for k, v in msg.items() if k not in unwanted_keys}
+
+            clean_input = [_clean_item(m) for m in (input_items + new_items)]
+
+            response = client.responses.create(
                 model=self.model,
-                input=input_items + new_items,
+                input=clean_input,
                 tools=self.tools,
                 truncation="auto",
             )
-            self.debug_print(response)
 
-            if "output" not in response:
+            # The OpenAI SDK returns a Pydantic model object, not a plain dict.
+            # Convert it to a standard Python dict so the rest of the code can
+            # remain unchanged from the previous implementation.
+            response_dict = (
+                response.model_dump()  # pydantic v2
+                if hasattr(response, "model_dump")
+                else (
+                    response.to_dict_recursive()
+                    if hasattr(response, "to_dict_recursive")
+                    else dict(response)
+                )
+            )
+            self.debug_print(response_dict)
+
+            # Guard against missing/empty output in the response
+            if not response_dict.get("output"):
                 if self.debug:
-                    print("Full response:", response)
-                if "error" in response:
-                    error_msg = response["error"].get("message", "Unknown error")
+                    print("Full response:", response_dict)
+                if response_dict.get("error") is not None:
+                    error_msg = response_dict["error"].get("message", "Unknown error")
                     raise ValueError(f"API Error: {error_msg}")
                 else:
                     raise ValueError("No output from model")
-            else:
-                # Append each item from the model output to conversation history
-                # in the exact order we received them, **without filtering** so that
-                # required pairs such as reasoning → computer_call are preserved.
-                for item in response["output"]:
-                    # First, record the original item itself.
-                    new_items.append(item)
-
-                    # Next, perform any local side-effects (browser actions, etc.).
-                    handled_items = await self.handle_item(item)
-
-                    # If the handler generated additional items (e.g. computer_call_output)
-                    # we append those *immediately* so the order remains:
-                    #   reasoning → computer_call → computer_call_output
-                    if handled_items:
-                        new_items += handled_items
+
+            # Append each item from the model output to conversation history
+            # in the exact order we received them, **without filtering** so that
+            # required pairs such as reasoning → computer_call are preserved.
+            for item in response_dict["output"]:
+                # First, record the original item itself.
+                new_items.append(item)
+
+                # Next, perform any local side-effects (browser actions, etc.).
+                handled_items = self.handle_item(item)
+
+                # If the handler generated additional items (e.g. computer_call_output)
+                # we append those *immediately* so the order remains:
+                #   reasoning → computer_call → computer_call_output
+                if handled_items:
+                    new_items += handled_items
 
         return new_items
 
@@ -420,29 +186,41 @@ class Agent:
 tools = []
 
 
-async def ainput(prompt: str = "") -> str:
-    """Async version of input()"""
-    loop = asyncio.get_event_loop()
-    return await loop.run_in_executor(None, input, prompt)
+def main():
+    # Create a Fleet environment instance
+    instance = flt.env.make("hubspot")
 
+    # Create the Playwright wrapper
+    browser = flt.FleetPlaywrightWrapper(instance)
+    browser.start()
 
-async def main():
-    fleet = flt.AsyncFleet()
-
-    async with FleetPlaywrightBrowser(fleet, "hubspot", "v1.2.7") as computer:
-        agent = Agent(computer=computer, tools=tools)
+    try:
+        agent = Agent(browser, model="computer-use-preview", tools=[])
         items = [
             {
                 "role": "developer",
                 "content": "You have access to a clone of Hubspot. You can use the computer to navigate the browser and perform actions.",
             }
         ]
+
         while True:
-            user_input = await ainput("> ")
-            items.append({"role": "user", "content": user_input})
-            output_items = await agent.run_full_turn(items, show_images=False, debug=False)
-            items += output_items
+            try:
+                user_input = input("> ")
+                items.append({"role": "user", "content": user_input})
+                output_items = agent.run_full_turn(
+                    items, show_images=False, debug=False
+                )
+                items += output_items
+            except (EOFError, KeyboardInterrupt):
+                print("\nShutting down...")
+                break
+            except Exception as e:
+                print(f"Error during interaction: {e}")
+                # Continue the loop for other errors
+    finally:
+        browser.close()
+        instance.close()
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    main()

examples/openai_simple_example.py

@@ -0,0 +1,60 @@
+from openai import OpenAI
+import fleet as flt
+
+client = OpenAI()
+
+
+def main():
+    instance = flt.env.make("hubspot")
+
+    browser = flt.FleetPlaywrightWrapper(instance)
+    browser.start()
+
+    try:
+        width, height = browser.get_dimensions()
+        tools = [
+            {
+                "type": "computer-preview",
+                "display_width": width,
+                "display_height": height,
+                "environment": browser.get_environment(),
+            }
+        ]
+
+        response = client.responses.create(
+            model="computer-use-preview",
+            input=[
+                {
+                    "role": "developer",
+                    "content": "Create a HubSpot deal",
+                }
+            ],
+            tools=tools,
+            truncation="auto",
+        )
+
+        if len(response.output) != 0:
+            if response.output[0].type == "message":
+                print(response.output[0].content[0].text)
+
+            if response.output[0].type == "computer_call":
+                action = response.output[0].action
+                if action.type == "screenshot":
+                    screenshot_base64 = browser.screenshot()
+                    result = {
+                        "type": "input_image",
+                        "image_url": f"data:image/png;base64,{screenshot_base64}",
+                        "current_url": browser.get_current_url(),
+                    }
+                else:
+                    result = browser.execute_computer_action(action)
+
+                print("Computer action result:")
+                print(result)
+    finally:
+        browser.close()
+        instance.close()
+
+
+if __name__ == "__main__":
+    main()

examples/quickstart.py

@@ -35,7 +35,7 @@ async def main():
     # 1. List available environments
     print("\n📋 Available environments:")
     try:
-        environments = await fleet.manager.list_envs()
+        environments = await fleet.instance.list_envs()
         for env in environments:
             print(f"  - {env.env_key}: {env.name}")
             print(f"    Description: {env.description}")
@@ -48,7 +48,7 @@ async def main():
     # 2. Create a new environment instance
     print("\n🚀 Creating new environment...")
     try:
-        env = await fleet.manager.make("fira:v1.2.5", region="us-west-1")
+        env = await fleet.instance.make("fira:v1.2.5", region="us-west-1")
         print(f"✅ Environment created with instance ID: {env.instance_id}")
         
         # Execute a simple action
@@ -85,7 +85,7 @@ async def main():
     # 3. List running instances
     print("\n🏃 Listing running instances...")
     try:
-        instances = await fleet.manager.list_instances(status="running")
+        instances = await fleet.instance.list_instances(status="running")
         if instances:
             print(f"Found {len(instances)} running instances:")
             for instance in instances:
@@ -99,13 +99,13 @@ async def main():
     print("\n🔗 Connecting to existing instance...")
     try:
         # Only get running instances
-        running_instances = await fleet.manager.list_instances(status="running")
+        running_instances = await fleet.instance.list_instances(status="running")
         if running_instances:
             # Find a running instance that's not the one we just created/deleted
             target_instance = running_instances[0]
             print(f"Connecting to running instance: {target_instance.instance_id}")
             
-            env = await fleet.manager.get(target_instance.instance_id)
+            env = await fleet.instance.get(target_instance.instance_id)
             print(f"✅ Connected to instance: {env.instance_id}")
             
             # Execute an action on the existing instance

fleet/__init__.py

@@ -20,8 +20,12 @@ from .exceptions import (
     FleetTimeoutError,
     FleetConfigurationError,
 )
-from .client import Fleet, AsyncFleet, InstanceRequest
-from .manager import (
+from .client import Fleet, Environment
+from ._async.client import AsyncFleet, AsyncEnvironment
+from .models import InstanceRequest
+from .instance import (
+    InstanceClient,
+    AsyncInstanceClient,
     ResetRequest,
     ResetResponse,
     CDPDescribeResponse,
@@ -29,9 +33,22 @@ from .manager import (
     ChromeStartResponse,
     ChromeStatusResponse,
 )
-from .verifiers import *
+from .verifiers import (
+    DatabaseSnapshot,
+    IgnoreConfig,
+    SnapshotDiff,
+    TASK_SUCCESSFUL_SCORE,
+)
 from . import env
 
+# Optional playwright integration
+try:
+    from .playwright import FleetPlaywrightWrapper
+    _PLAYWRIGHT_AVAILABLE = True
+except ImportError:
+    FleetPlaywrightWrapper = None
+    _PLAYWRIGHT_AVAILABLE = False
+
 __version__ = "0.1.1"
 __all__ = [
     "env",
@@ -40,7 +57,11 @@ __all__ = [
     "FleetTimeoutError",
     "FleetConfigurationError",
     "Fleet",
+    "Environment",
     "AsyncFleet",
+    "AsyncEnvironment",
+    "InstanceClient",
+    "AsyncInstanceClient",
     "InstanceRequest",
     "ResetRequest",
     "ResetResponse",
@@ -48,4 +69,12 @@ __all__ = [
     "ChromeStartRequest",
     "ChromeStartResponse",
     "ChromeStatusResponse",
+    "DatabaseSnapshot",
+    "IgnoreConfig",
+    "SnapshotDiff",
+    "TASK_SUCCESSFUL_SCORE",
 ]
+
+# Add playwright wrapper to exports if available
+if _PLAYWRIGHT_AVAILABLE:
+    __all__.append("FleetPlaywrightWrapper")