fleet-python 0.2.92__tar.gz → 0.2.94__tar.gz

{fleet_python-0.2.92/fleet_python.egg-info → fleet_python-0.2.94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.92
+Version: 0.2.94
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/__init__.py

@@ -73,7 +73,7 @@ from . import env
 from . import global_client as _global_client
 from ._async import global_client as _async_global_client
 
-__version__ = "0.2.92"
+__version__ = "0.2.93"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/_async/__init__.py

@@ -44,7 +44,7 @@ from ..types import VerifierFunction
 from .. import env
 from . import global_client as _async_global_client
 
-__version__ = "0.2.92"
+__version__ = "0.2.93"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/_async/base.py

@@ -26,7 +26,7 @@ from .exceptions import (
 try:
     from .. import __version__
 except ImportError:
-    __version__ = "0.2.92"
+    __version__ = "0.2.93"
 
 logger = logging.getLogger(__name__)
 

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/agent/gemini_cua/Dockerfile

@@ -18,13 +18,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 WORKDIR /app
 
-# Install Python deps
+# Install Python deps (includes fleet-python for utils like fleet.utils.playwright)
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt && playwright install chromium
 
-# Copy server files (all from same directory)
-COPY playwright_utils.py .
-COPY mcp_server.py .
+# Copy MCP server files (standalone scripts that import from installed fleet-python)
+COPY mcp_server/ ./mcp_server/
+
+# Copy start script
 COPY start.sh .
 RUN chmod +x start.sh
 

fleet_python-0.2.94/fleet/agent/gemini_cua/mcp/main.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+"""
+CUA Server - Computer Use Agent MCP Server
+
+MCP server with playwright browser control using FastMCP's streamable-http transport.
+
+Env vars:
+    FLEET_ENV_URL: URL to navigate to
+    PORT: Server port (default: 8765)
+    SCREEN_WIDTH/HEIGHT: Browser size
+    HEADLESS: "true" or "false" (default: true)
+"""
+
+import logging
+import os
+from contextlib import asynccontextmanager
+from typing import Optional
+
+from mcp.server.fastmcp import FastMCP
+from starlette.requests import Request
+from starlette.responses import JSONResponse
+
+from fleet.utils.playwright import PlaywrightComputer
+
+# Support both module and standalone execution
+try:
+    from .tools import register_tools
+except ImportError:
+    from tools import register_tools
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
+logger = logging.getLogger(__name__)
+
+
+# =============================================================================
+# Setup
+# =============================================================================
+
+computer: Optional[PlaywrightComputer] = None
+PORT = int(os.environ.get("PORT", "8765"))
+
+
+def get_computer() -> PlaywrightComputer:
+    """Get the current computer instance."""
+    if computer is None:
+        raise RuntimeError("Computer not initialized")
+    return computer
+
+
+@asynccontextmanager
+async def lifespan(app):
+    """Initialize browser on startup, cleanup on shutdown."""
+    global computer
+    
+    url = os.environ.get("FLEET_ENV_URL", "about:blank")
+    width = int(os.environ.get("SCREEN_WIDTH", "1366"))
+    height = int(os.environ.get("SCREEN_HEIGHT", "768"))
+    headless = os.environ.get("HEADLESS", "true").lower() == "true"
+    highlight = os.environ.get("HIGHLIGHT_MOUSE", "false").lower() == "true"
+    
+    logger.info(f"CUA Server: {width}x{height}, headless={headless}, url={url}")
+    
+    computer = PlaywrightComputer(
+        screen_size=(width, height),
+        initial_url=url,
+        headless=headless,
+        highlight_mouse=highlight or not headless,
+    )
+    
+    try:
+        logger.info("Starting Playwright browser...")
+        await computer.start()
+        logger.info(f"Browser started, navigated to: {computer.current_url}")
+        yield
+    except Exception as e:
+        logger.error(f"Browser startup FAILED: {type(e).__name__}: {e}")
+        raise
+    finally:
+        logger.info("Stopping Playwright browser...")
+        try:
+            await computer.stop()
+            logger.info("Browser stopped")
+        except Exception as e:
+            logger.error(f"Browser stop error: {type(e).__name__}: {e}")
+
+
+mcp = FastMCP("cua-server", lifespan=lifespan, host="0.0.0.0", port=PORT)
+
+# Register all tools
+register_tools(mcp, get_computer)
+
+
+# =============================================================================
+# Routes
+# =============================================================================
+
+@mcp.custom_route("/health", methods=["GET"])
+async def health_check(request: Request) -> JSONResponse:
+    return JSONResponse({"status": "ok", "url": computer.current_url if computer else ""})
+
+
+# =============================================================================
+# Main
+# =============================================================================
+
+if __name__ == "__main__":
+    logger.info(f"Starting CUA Server on port {PORT}")
+    mcp.run(transport="streamable-http")

fleet_python-0.2.94/fleet/agent/gemini_cua/mcp_server/__init__.py

@@ -0,0 +1,5 @@
+"""MCP server for Gemini CUA agent.
+
+This folder is named 'mcp_server' instead of 'mcp' to avoid shadowing the 'mcp' package.
+"""
+

fleet_python-0.2.94/fleet/agent/gemini_cua/mcp_server/main.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+"""
+CUA Server - Computer Use Agent MCP Server
+
+MCP server with playwright browser control using FastMCP's streamable-http transport.
+
+Env vars:
+    FLEET_ENV_URL: URL to navigate to
+    PORT: Server port (default: 8765)
+    SCREEN_WIDTH/HEIGHT: Browser size
+    HEADLESS: "true" or "false" (default: true)
+"""
+
+import logging
+import os
+from contextlib import asynccontextmanager
+from typing import Optional
+
+from mcp.server.fastmcp import FastMCP
+from starlette.requests import Request
+from starlette.responses import JSONResponse
+
+from fleet.utils.playwright import PlaywrightComputer
+
+# Import tools (standalone execution in container)
+from tools import register_tools
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
+logger = logging.getLogger(__name__)
+
+
+# =============================================================================
+# Setup
+# =============================================================================
+
+computer: Optional[PlaywrightComputer] = None
+PORT = int(os.environ.get("PORT", "8765"))
+
+
+def get_computer() -> PlaywrightComputer:
+    """Get the current computer instance."""
+    if computer is None:
+        raise RuntimeError("Computer not initialized")
+    return computer
+
+
+@asynccontextmanager
+async def lifespan(app):
+    """Initialize browser on startup, cleanup on shutdown."""
+    global computer
+    
+    url = os.environ.get("FLEET_ENV_URL", "about:blank")
+    width = int(os.environ.get("SCREEN_WIDTH", "1366"))
+    height = int(os.environ.get("SCREEN_HEIGHT", "768"))
+    headless = os.environ.get("HEADLESS", "true").lower() == "true"
+    highlight = os.environ.get("HIGHLIGHT_MOUSE", "false").lower() == "true"
+    
+    logger.info(f"CUA Server: {width}x{height}, headless={headless}, url={url}")
+    
+    computer = PlaywrightComputer(
+        screen_size=(width, height),
+        initial_url=url,
+        headless=headless,
+        highlight_mouse=highlight or not headless,
+    )
+    
+    try:
+        logger.info("Starting Playwright browser...")
+        await computer.start()
+        logger.info(f"Browser started, navigated to: {computer.current_url}")
+        yield
+    except Exception as e:
+        logger.error(f"Browser startup FAILED: {type(e).__name__}: {e}")
+        raise
+    finally:
+        logger.info("Stopping Playwright browser...")
+        try:
+            await computer.stop()
+            logger.info("Browser stopped")
+        except Exception as e:
+            logger.error(f"Browser stop error: {type(e).__name__}: {e}")
+
+
+mcp = FastMCP("cua-server", lifespan=lifespan, host="0.0.0.0", port=PORT)
+
+# Register all tools
+register_tools(mcp, get_computer)
+
+
+# =============================================================================
+# Routes
+# =============================================================================
+
+@mcp.custom_route("/health", methods=["GET"])
+async def health_check(request: Request) -> JSONResponse:
+    return JSONResponse({"status": "ok", "url": computer.current_url if computer else ""})
+
+
+# =============================================================================
+# Main
+# =============================================================================
+
+if __name__ == "__main__":
+    logger.info(f"Starting CUA Server on port {PORT}")
+    mcp.run(transport="streamable-http")

fleet_python-0.2.94/fleet/agent/gemini_cua/mcp_server/tools.py

@@ -0,0 +1,178 @@
+"""MCP tool definitions for CUA server."""
+
+import base64
+import logging
+from typing import Callable
+
+from mcp.server.fastmcp import FastMCP
+from mcp.types import ImageContent, TextContent
+
+from fleet.utils.playwright import PlaywrightComputer, KEY_SPEC
+
+logger = logging.getLogger(__name__)
+
+
+def register_tools(mcp: FastMCP, get_computer: Callable[[], PlaywrightComputer]) -> None:
+    """Register all CUA tools with the MCP server.
+    
+    Args:
+        mcp: FastMCP server instance
+        get_computer: Callable that returns the current PlaywrightComputer instance
+    """
+    
+    def _dx(x: int) -> int:
+        """Denormalize x: [0,1000] -> pixels."""
+        return int(x / 1000 * get_computer().width)
+
+    def _dy(y: int) -> int:
+        """Denormalize y: [0,1000] -> pixels."""
+        return int(y / 1000 * get_computer().height)
+
+    def _screenshot_response(img: bytes) -> list:
+        """Return screenshot as proper MCP content types."""
+        computer = get_computer()
+        return [
+            ImageContent(type="image", data=base64.b64encode(img).decode(), mimeType="image/png"),
+            TextContent(type="text", text=f"URL: {computer.current_url}"),
+        ]
+
+    @mcp.tool()
+    async def computer_screenshot() -> list:
+        """Takes a screenshot of the computer screen. Use this to see what's on screen."""
+        logger.info("computer_screenshot()")
+        try:
+            result = await get_computer().screenshot()
+            logger.info(f"computer_screenshot() -> {len(result)} bytes")
+            return _screenshot_response(result)
+        except Exception as e:
+            logger.error(f"computer_screenshot() FAILED: {type(e).__name__}: {e}")
+            raise
+
+    @mcp.tool()
+    async def mouse_click(x: int, y: int, button: str, repeats: int = 1) -> None:
+        """Performs a mouse click.
+
+        Args:
+            x: The normalized x coordinate within the [0, 1000] range of the image.
+            y: The normalized y coordinate within the [0, 1000] range of the image.
+            button: The button to click. Either 'left', 'middle' or 'right'.
+            repeats: The number of times to click. Default is 1.
+        """
+        logger.info(f"mouse_click({x}, {y}, {button}, {repeats})")
+        try:
+            await get_computer().mouse_click(_dx(x), _dy(y), button, repeats)
+        except Exception as e:
+            logger.error(f"mouse_click FAILED: {type(e).__name__}: {e}")
+            raise
+
+    @mcp.tool()
+    async def mouse_move(x: int, y: int) -> None:
+        """Moves the mouse to a new position.
+
+        Args:
+            x: The normalized x coordinate within the [0, 1000] range of the image.
+            y: The normalized y coordinate within the [0, 1000] range of the image.
+        """
+        logger.info(f"mouse_move({x}, {y})")
+        await get_computer().mouse_move(_dx(x), _dy(y))
+
+    @mcp.tool()
+    async def mouse_down(button: str) -> None:
+        """Keeps a mouse button down.
+
+        Args:
+            button: The button to press down. Either 'left', 'middle' or 'right'.
+        """
+        logger.info(f"mouse_down({button})")
+        await get_computer().mouse_down(button)
+
+    @mcp.tool()
+    async def mouse_up(button: str) -> None:
+        """Releases a mouse button after executing a mouse down action.
+
+        Args:
+            button: The button to release. Either 'left', 'middle' or 'right'.
+        """
+        logger.info(f"mouse_up({button})")
+        await get_computer().mouse_up(button)
+
+    @mcp.tool()
+    async def mouse_scroll(dx: int, dy: int) -> None:
+        """Uses the mouse to perform a two dimensional scroll.
+
+        Args:
+            dx: The number of pixels to scroll horizontally.
+            dy: The number of pixels to scroll vertically.
+        """
+        logger.info(f"mouse_scroll({dx}, {dy})")
+        await get_computer().mouse_scroll(dx, dy)
+
+    @mcp.tool()
+    async def mouse_drag(x_start: int, y_start: int, x_end: int, y_end: int, button: str = "left") -> None:
+        """Drag mouse from a point A to a point B.
+
+        Args:
+            x_start: The x coordinate of the starting point normalized within [0, 1000].
+            y_start: The y coordinate of the starting point normalized within [0, 1000].
+            x_end: The x coordinate of the destination point normalized within [0, 1000].
+            y_end: The y coordinate of the destination point normalized within [0, 1000].
+            button: The mouse button: left, right, middle. Default is 'left'.
+        """
+        logger.info(f"mouse_drag({x_start}, {y_start} -> {x_end}, {y_end})")
+        await get_computer().mouse_drag(_dx(x_start), _dy(y_start), _dx(x_end), _dy(y_end), button)
+
+    @mcp.tool()
+    async def wait(seconds: int) -> None:
+        """Waits for a given number of seconds. Use if the screen is blank or page is loading.
+
+        Args:
+            seconds: The number of seconds to wait.
+        """
+        logger.info(f"wait({seconds})")
+        await get_computer().wait(seconds)
+
+    @mcp.tool()
+    async def type_text(input_text: str, press_enter: bool) -> None:
+        """Type text on a keyboard.
+
+        Args:
+            input_text: The input text to type.
+            press_enter: Whether to press enter after typing.
+        """
+        logger.info(f"type_text({input_text[:50]}{'...' if len(input_text) > 50 else ''}, enter={press_enter})")
+        try:
+            await get_computer().type_text(input_text, press_enter)
+        except Exception as e:
+            logger.error(f"type_text FAILED: {type(e).__name__}: {e}")
+            raise
+
+    @mcp.tool()
+    async def key_combination(keys_to_press: list[str]) -> None:
+        f"""Performs a key combination. {KEY_SPEC}
+
+        Args:
+            keys_to_press: The list of keys to press.
+        """
+        logger.info(f"key_combination({keys_to_press})")
+        await get_computer().key_combination(keys_to_press)
+
+    @mcp.tool()
+    async def key_down(key: str) -> None:
+        f"""Keeps a keyboard key down. {KEY_SPEC}
+
+        Args:
+            key: The key to press down.
+        """
+        logger.info(f"key_down({key})")
+        await get_computer().key_down(key)
+
+    @mcp.tool()
+    async def key_up(key: str) -> None:
+        f"""Releases a keyboard key after executing a key down action. {KEY_SPEC}
+
+        Args:
+            key: The key to press up.
+        """
+        logger.info(f"key_up({key})")
+        await get_computer().key_up(key)
+

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/agent/gemini_cua/requirements.txt

@@ -1,3 +1,4 @@
+fleet-python
 playwright>=1.40.0
 mcp[cli]>=1.2.0
 uvicorn>=0.30.0

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/agent/gemini_cua/start.sh

@@ -26,6 +26,5 @@ if [ "$HEADLESS" != "true" ]; then
     echo ""
 fi
 
-# Start the MCP server
-exec python mcp_server.py
-
+# Start the MCP server (standalone script, imports from installed fleet-python)
+exec python mcp_server/main.py

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/agent/orchestrator.py

@@ -236,13 +236,18 @@ class AgentOrchestrator:
         from fleet._async import load_tasks
         from rich.console import Console
         from rich.live import Live
+        from rich.panel import Panel
         from rich.spinner import Spinner
 
         console = Console()
 
         # Create job via Fleet API (name generated server-side)
         self._job_id = await fleet.job_async()
-        console.print(f"Job: https://fleetai.com/dashboard/jobs/{self._job_id}")
+        console.print(Panel(
+            f"[bold]Live agent traces[/bold]\n\n  https://www.fleetai.com/dashboard/jobs/{self._job_id}",
+            border_style="cyan",
+        ))
+        console.print()
 
         # Create log directory: ~/.fleet/logs/{job_id}/
         self._log_dir = Path.home() / ".fleet" / "logs" / self._job_id
@@ -278,6 +283,9 @@ class AgentOrchestrator:
 
         semaphore = asyncio.Semaphore(self.config.max_concurrent)
         results = [None] * len(tasks)
+        completed_count = 0
+        passed_count = 0
+        total_count = len(tasks)
 
         with Progress(
             SpinnerColumn(),
@@ -286,12 +294,23 @@ class AgentOrchestrator:
             TaskProgressColumn(),
             console=console,
         ) as progress:
-            task_progress = progress.add_task("Running tasks", total=len(tasks))
+            task_progress = progress.add_task(
+                f"[cyan]Running ({completed_count}/{total_count}) | {passed_count} passed[/cyan]",
+                total=len(tasks)
+            )
 
             async def run_with_semaphore(idx, task):
+                nonlocal completed_count, passed_count
                 async with semaphore:
                     result = await self._run_task(task)
-                    progress.update(task_progress, advance=1)
+                    completed_count += 1
+                    if result.verification_success:
+                        passed_count += 1
+                    progress.update(
+                        task_progress,
+                        advance=1,
+                        description=f"[cyan]Running ({completed_count}/{total_count}) | {passed_count} passed[/cyan]"
+                    )
                     return idx, result
 
             completed = await asyncio.gather(
@@ -329,7 +348,7 @@ class AgentOrchestrator:
         # Print summary statistics
         self._print_stats()
 
-        return final
+        return final, self._job_id
 
     async def _build_docker_image(self, agent_path: Path):
         """Build Docker image for CUA server."""
@@ -670,6 +689,7 @@ class AgentOrchestrator:
 
         env.update(
             {
+                "PYTHONUNBUFFERED": "1",  # Ensure real-time output
                 "FLEET_MCP_URL": f"http://localhost:{port}",
                 "FLEET_SESSION_LOG": str(
                     session_log_file
@@ -695,9 +715,36 @@ class AgentOrchestrator:
             env=env,
         )
 
+        short_key = task_key[:20]
+        stdout_lines = []
+        stderr_lines = []
+
+        async def read_stdout():
+            while True:
+                line = await proc.stdout.readline()
+                if not line:
+                    break
+                line_str = line.decode().rstrip()
+                stdout_lines.append(line_str)
+                # Show step updates in real-time
+                if line_str.startswith("STEP:") or line_str.startswith("Step "):
+                    print(f"[{short_key}] {line_str}")
+                elif self.config.verbose:
+                    logger.info(f"[{short_key}] {line_str}")
+
+        async def read_stderr():
+            while True:
+                line = await proc.stderr.readline()
+                if not line:
+                    break
+                line_str = line.decode().rstrip()
+                stderr_lines.append(line_str)
+                if self.config.verbose:
+                    logger.warning(f"[{short_key}] stderr: {line_str}")
+
         try:
-            stdout, stderr = await asyncio.wait_for(
-                proc.communicate(),
+            await asyncio.wait_for(
+                asyncio.gather(read_stdout(), read_stderr(), proc.wait()),
                 timeout=self.config.timeout_seconds,
             )
         except asyncio.TimeoutError:
@@ -710,8 +757,8 @@ class AgentOrchestrator:
             )
 
         # Parse result from stdout/stderr
-        stdout_str = stdout.decode()
-        stderr_str = stderr.decode()
+        stdout_str = "\n".join(stdout_lines)
+        stderr_str = "\n".join(stderr_lines)
 
         # Show full output in verbose mode
         if self.config.verbose:
@@ -725,7 +772,6 @@ class AgentOrchestrator:
 
         # Always show stderr if agent crashed (non-zero exit or has stderr)
         if proc.returncode != 0 or stderr_str:
-            short_key = task_key[:20]
             if stderr_str:
                 print(f"[{short_key}] Agent stderr: {stderr_str[:500]}")
 
@@ -773,7 +819,7 @@ async def run_agent(
     api_keys: Optional[Dict[str, str]] = None,
     headful: bool = False,
     verbose: bool = False,
-) -> List[TaskResult]:
+) -> Tuple[List[TaskResult], str]:
     """Run agent on Fleet tasks.
 
     Args:
@@ -789,7 +835,7 @@ async def run_agent(
         verbose: Enable verbose agent logging
 
     Returns:
-        List of TaskResult
+        Tuple of (List of TaskResult, job_id)
     """
     config = AgentConfig(
         project_key=project_key,

{fleet_python-0.2.92 → fleet_python-0.2.94}/fleet/base.py

@@ -27,7 +27,7 @@ from .exceptions import (
 try:
     from . import __version__
 except ImportError:
-    __version__ = "0.2.92"
+    __version__ = "0.2.93"
 
 logger = logging.getLogger(__name__)