fleet-python 0.2.12__py3-none-any.whl → 0.2.15__py3-none-any.whl

fleet/config.py

@@ -1,8 +1,9 @@
 DEFAULT_MAX_RETRIES = 5
+DEFAULT_TIMEOUT = 300.0
 
 GLOBAL_BASE_URL = "https://orchestrator.fleetai.com"
 REGION_BASE_URL = {
     "us-west-1": "https://us-west-1.fleetai.com",
     "us-east-1": "https://us-east-1.fleetai.com",
     "eu-west-2": "https://eu-west-2.fleetai.com",
-}
+}

fleet/instance/__init__.py

@@ -1,6 +1,6 @@
 """Fleet SDK Environment Module."""
 
-from .client import InstanceClient, ValidatorType
+from .client import InstanceClient
 from .models import (
     ResetRequest,
     ResetResponse,
@@ -12,7 +12,6 @@ from .models import (
 )
 
 __all__ = [
-    "ValidatorType",
     "InstanceClient",
     "ResetRequest",
     "ResetResponse",

fleet/instance/base.py

@@ -3,7 +3,10 @@ import httpx_retries
 from typing import Dict, Any, Optional
 
 
-def default_httpx_client(max_retries: int) -> httpx.Client:
+def default_httpx_client(max_retries: int, timeout: float) -> httpx.Client:
+    if max_retries <= 0:
+        return httpx.Client(timeout=timeout)
+
     policy = httpx_retries.Retry(
         total=max_retries,
         status_forcelist=[
@@ -21,7 +24,7 @@ def default_httpx_client(max_retries: int) -> httpx.Client:
         transport=httpx.HTTPTransport(retries=2), retry=policy
     )
     return httpx.Client(
-        timeout=300.0,
+        timeout=timeout,
         transport=retry,
     )
 

fleet/instance/client.py

@@ -10,11 +10,12 @@ from urllib.parse import urlparse
 from ..resources.sqlite import SQLiteResource
 from ..resources.browser import BrowserResource
 from ..resources.base import Resource
+from ..resources.mcp import MCPResource
 
 from ..verifiers import DatabaseSnapshot
 
 from ..exceptions import FleetEnvironmentError
-from ..config import DEFAULT_MAX_RETRIES
+from ..config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT
 
 from .base import SyncWrapper, default_httpx_client
 from .models import (
@@ -46,12 +47,15 @@ class InstanceClient:
     def __init__(
         self,
         url: str,
+        env_key: str,
         httpx_client: Optional[httpx.Client] = None,
     ):
         self.base_url = url
+        self._env_key = env_key
         self.client = SyncWrapper(
             url=self.base_url,
-            httpx_client=httpx_client or default_httpx_client(DEFAULT_MAX_RETRIES),
+            httpx_client=httpx_client
+            or default_httpx_client(DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT),
         )
         self._resources: Optional[List[ResourceModel]] = None
         self._resources_state: Dict[str, Dict[str, Resource]] = {
@@ -61,9 +65,7 @@ class InstanceClient:
     def load(self) -> None:
         self._load_resources()
 
-    def reset(
-        self, reset_request: Optional[ResetRequest] = None
-    ) -> ResetResponse:
+    def reset(self, reset_request: Optional[ResetRequest] = None) -> ResetResponse:
         response = self.client.request(
             "POST", "/reset", json=reset_request.model_dump() if reset_request else None
         )
@@ -87,6 +89,14 @@ class InstanceClient:
             self._resources_state[ResourceType.db.value][name], self.client
         )
 
+    def mcp(self) -> MCPResource:
+        import time
+        time.sleep(5)
+        mcp_url = f"{self.base_url}/mcp"
+        if mcp_url.endswith("/api/v1/env/mcp"):
+            mcp_url = mcp_url.replace("/api/v1/env/mcp", "/mcp")
+        return MCPResource(mcp_url, self._env_key)
+
     def browser(self, name: str) -> BrowserResource:
         return BrowserResource(
             self._resources_state[ResourceType.cdp.value][name], self.client
@@ -136,7 +146,7 @@ class InstanceClient:
 
             self._resources = [ResourceModel(**resource) for resource in resources_list]
             for resource in self._resources:
-                if resource.type not in self._resources_state:
+                if resource.type.value not in self._resources_state:
                     self._resources_state[resource.type.value] = {}
                 self._resources_state[resource.type.value][resource.name] = (
                     RESOURCE_TYPES[resource.type](resource, self.client)

fleet/models.py

@@ -1,14 +1,83 @@
 # generated by datamodel-codegen:
-#   filename:  openapi.json
-#   timestamp: 2025-07-08T18:21:47+00:00
+#   filename:  http://0.0.0.0:8000/openapi.json
+#   timestamp: 2025-07-20T02:00:30+00:00
 
 from __future__ import annotations
 
 from enum import Enum
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union, Tuple
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, conint
 
+class ToolLogEntry(BaseModel):
+    id: int
+    timestamp: str
+    tool_name: str
+    action: str
+    parameters: Dict[str, Any]
+    result: Optional[Dict[str, Any]] = None
+    success: bool = True
+    error: Optional[str] = None
+    duration_ms: Optional[int] = None
+    session_id: Optional[str] = None
+    user_agent: Optional[str] = None
+
+
+class ActionLogEntry(BaseModel):
+    id: int
+    timestamp: str
+    action_type: str
+    payload: str
+    sql: Optional[str] = None
+    args: Optional[str] = None
+    path: Optional[str] = None
+
+
+class EnvironmentSnapshot(BaseModel):
+    env_key: str
+    instance_id: str
+    timestamp: str
+    session_id: str
+    tool_logs: List[ToolLogEntry]
+    action_logs: List[ActionLogEntry]
+    page_url: str
+    viewport_size: Tuple[int, int]
+    metadata: Dict[str, Any] = {}
+
+
+class SnapshotValidation(BaseModel):
+    success: bool
+    page_match: bool
+    action_log_match: bool
+    discrepancies: List[str] = []
+    message: str
+
+
+class ToolLogResponse(BaseModel):
+    success: bool
+    log_id: Optional[int] = None
+    message: str
+
+
+class ToolSessionStartRequest(BaseModel):
+    session_id: str
+    metadata: Optional[Dict[str, Any]] = None
+
+
+class ToolSessionStartResponse(BaseModel):
+    success: bool
+    session_id: str
+    message: str
+
+
+class ToolLogQueryRequest(BaseModel):
+    tool_name: Optional[str] = None
+    action: Optional[str] = None
+    session_id: Optional[str] = None
+    start_time: Optional[str] = None
+    end_time: Optional[str] = None
+    limit: Optional[int] = 10000
+    offset: int = 0
 
 class Environment(BaseModel):
     env_key: str = Field(..., title="Env Key")
@@ -68,6 +137,104 @@ class ValidationError(BaseModel):
     type: str = Field(..., title="Error Type")
 
 
+class VerifiersCheckResponse(BaseModel):
+    key: Optional[str] = Field(
+        None, description="Verifier artifact key", title="Key"
+    )
+    version: Optional[int] = Field(
+        None, description="Version of the verifier artifact", title="Version"
+    )
+    display_src: Optional[str] = Field(
+        None, description="Display source code of the verifier", title="Display Src"
+    )
+    created_at: Optional[str] = Field(
+        None, description="Creation timestamp", title="Created At"
+    )
+    created_by: Optional[str] = Field(
+        None, description="Creator of the verifier", title="Created By"
+    )
+    comment: Optional[str] = Field(
+        None, description="Comment about the verifier", title="Comment"
+    )
+    success: bool = Field(
+        ..., description="Whether the verification was successful", title="Success"
+    )
+
+
+class VerifiersExecuteRequest(BaseModel):
+    sha256: str = Field(..., description="SHA256 hash of the function", title="SHA256")
+    key: Optional[str] = Field(None, description="Verifier key", title="Key")
+    bundle: Optional[str] = Field(None, description="Base64 encoded bundle data", title="Bundle")
+    args: Optional[str] = Field(None, description="Base64 encoded arguments", title="Args")
+    function_name: Optional[str] = Field(
+        "verify", description="Name of the function to execute", title="Function Name"
+    )
+    timeout: Optional[conint(ge=1, le=300)] = Field(
+        60, description="Execution timeout in seconds", title="Timeout"
+    )
+    region: Optional[str] = Field(
+        None, description="AWS region for execution", title="Region"
+    )
+
+
+class VerifiersExecuteResponse(BaseModel):
+    key: Optional[str] = Field(
+        None, description="Key of the verifier artifact", title="Key"
+    )
+    version: Optional[int] = Field(
+        None, description="Version of the verifier artifact", title="Version"
+    )
+    display_src: Optional[str] = Field(
+        None, description="Display source code of the verifier", title="Display Src"
+    )
+    created_at: Optional[str] = Field(
+        None, description="Creation timestamp", title="Created At"
+    )
+    comment: Optional[str] = Field(
+        None, description="Comment about the verifier", title="Comment"
+    )
+    success: bool = Field(
+        ..., description="Whether the verification was successful", title="Success"
+    )
+    result: Any = Field(
+        ..., description="The return value of the function", title="Result"
+    )
+    error: Optional[Dict[str, Any]] = Field(
+        None, description="Error details if verification failed", title="Error"
+    )
+    execution_time_ms: int = Field(
+        ..., description="Execution time in milliseconds", title="Execution Time Ms"
+    )
+    bundle_cache_hit: bool = Field(
+        False,
+        description="Whether the bundle was already cached",
+        title="Bundle Cache Hit",
+    )
+
+
+class VerificationResponse(BaseModel):
+    success: bool = Field(
+        ..., description="Whether the verification was successful", title="Success"
+    )
+    result: Optional[Any] = Field(
+        None, description="The return value of the function", title="Result"
+    )
+    error: Optional[Dict[str, Any]] = Field(
+        None, description="Error details if verification failed", title="Error"
+    )
+    execution_time_ms: int = Field(
+        ..., description="Execution time in milliseconds", title="Execution Time Ms"
+    )
+    bundle_cache_hit: Optional[bool] = Field(
+        False,
+        description="Whether the bundle was already cached",
+        title="Bundle Cache Hit",
+    )
+    meta: Optional[Dict[str, Any]] = Field(
+        None, description="Metadata about the execution", title="Meta"
+    )
+
+
 class HTTPValidationError(BaseModel):
     detail: Optional[List[ValidationError]] = Field(None, title="Detail")
 

fleet/resources/browser.py

@@ -17,16 +17,15 @@ class BrowserResource(Resource):
     def __init__(self, resource: ResourceModel, client: "SyncWrapper"):
         super().__init__(resource)
         self.client = client
-
+    
     def start(self, width: int = 1920, height: int = 1080) -> CDPDescribeResponse:
-        response = self.client.request(
-            "POST",
-            "/resources/cdp/start",
-            json=ChromeStartRequest(resolution=f"{width},{height}").model_dump(),
-        )
-        ChromeStartResponse(**response.json())
+        """Start browser and return CDP information."""
+        request = ChromeStartRequest(resolution=f"{width}x{height}")
+        response = self.client.request("POST", "/resources/cdp/start", json=request.model_dump())
+        
+        # After starting, get the CDP information via describe
         return self.describe()
-
+        
     def describe(self) -> CDPDescribeResponse:
         response = self.client.request("GET", "/resources/cdp/describe")
         if response.status_code != 200:

fleet/resources/mcp.py

@@ -0,0 +1,60 @@
+from typing import Dict
+import aiohttp
+import json
+
+
+class MCPResource:
+    def __init__(self, url: str, env_key: str):
+        self.url = url
+        self._env_key = env_key
+
+    def openai(self) -> Dict[str, str]:
+        return {
+            "type": "mcp",
+            "server_label": self._env_key,
+            "server_url": self.url,
+            "require_approval": "never",
+        }
+
+    def anthropic(self) -> Dict[str, str]:
+        return {
+            "type": "url",
+            "url": self.url,
+            "name": self._env_key,
+        }
+
+    async def list_tools(self):
+        """
+        Make an async request to list available tools from the MCP endpoint.
+        
+        Returns:
+            List of available tools with name, description, and input_schema
+        """
+        async with aiohttp.ClientSession() as session:
+            payload = {
+                "jsonrpc": "2.0",
+                "method": "tools/list",
+                "params": {},
+                "id": 2
+            }
+            
+            async with session.post(self.url, json=payload) as response:
+                data = await response.json()
+                
+                # Extract tools from the response
+                if "result" in data and "tools" in data["result"]:
+                    tools = data["result"]["tools"]
+                    
+                    available_tools = [
+                        {
+                            "name": tool.get("name"),
+                            "description": tool.get("description"),
+                            "input_schema": tool.get("inputSchema"),
+                        }
+                        for tool in tools
+                    ]
+                    
+                    return available_tools
+                else:
+                    # Handle error or empty response
+                    return []