fleet-python 0.2.21__py3-none-any.whl → 0.2.23__py3-none-any.whl

fleet/env/client.py

@@ -1,9 +1,9 @@
-from ..client import Fleet, Environment
+from ..client import Fleet, SyncEnv
 from ..models import Environment as EnvironmentModel
 from typing import List, Optional
 
 
-def make(env_key: str, region: Optional[str] = None) -> Environment:
+def make(env_key: str, region: Optional[str] = None) -> SyncEnv:
     return Fleet().make(env_key, region=region)
 
 
@@ -17,9 +17,9 @@ def list_regions() -> List[str]:
 
 def list_instances(
     status: Optional[str] = None, region: Optional[str] = None
-) -> List[Environment]:
+) -> List[SyncEnv]:
     return Fleet().instances(status=status, region=region)
 
 
-def get(instance_id: str) -> Environment:
+def get(instance_id: str) -> SyncEnv:
     return Fleet().instance(instance_id)

fleet/instance/client.py

@@ -7,14 +7,12 @@ import time
 import logging
 from urllib.parse import urlparse
 
-from fleet.verifiers.parse import convert_verifier_string, extract_function_name
-
 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 fleet.verifiers.parse import convert_verifier_string, extract_function_name
 
 from ..exceptions import FleetEnvironmentError
 from ..config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT
@@ -49,11 +47,9 @@ 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
@@ -67,7 +63,9 @@ 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
         )
@@ -91,14 +89,6 @@ 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
@@ -125,7 +115,6 @@ class InstanceClient:
         except:
             pass
 
-        # Extract function name if not provided
         if function_name is None:
             function_name = extract_function_name(function_code)
 

fleet/models.py

@@ -1,276 +1,321 @@
 # generated by datamodel-codegen:
-#   filename:  http://0.0.0.0:8000/openapi.json
-#   timestamp: 2025-07-20T02:00:30+00:00
+#   filename:  https://orchestrator.fleetai.com/openapi.json
+#   timestamp: 2025-08-03T22:47:20+00:00
 
 from __future__ import annotations
 
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union, Tuple
+from typing import Any, Dict, List, Optional, Union
 
 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 CDPDescribeResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    url: str = Field(..., title='Url')
+    devtools_url: str = Field(..., title='Devtools Url')
+
+
+class ChromeStartRequest(BaseModel):
+    start_page: Optional[str] = Field('about:blank', title='Start Page')
+    resolution: Optional[str] = Field('1920x1080', title='Resolution')
+
+
+class ChromeStartResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    message: str = Field(..., title='Message')
+
+
+class ChromeStatusResponse(BaseModel):
+    running: bool = Field(..., title='Running')
+    message: str = Field(..., title='Message')
+
 
 class Environment(BaseModel):
-    env_key: str = Field(..., title="Env Key")
-    name: str = Field(..., title="Name")
-    description: Optional[str] = Field(..., title="Description")
-    default_version: Optional[str] = Field(..., title="Default Version")
-    versions: Dict[str, str] = Field(..., title="Versions")
+    env_key: str = Field(..., title='Env Key')
+    name: str = Field(..., title='Name')
+    description: Optional[str] = Field(..., title='Description')
+    default_version: Optional[str] = Field(..., title='Default Version')
+    versions: Dict[str, str] = Field(..., title='Versions')
 
 
 class Instance(BaseModel):
-    instance_id: str = Field(..., title="Instance Id")
-    env_key: str = Field(..., title="Env Key")
-    version: str = Field(..., title="Version")
-    status: str = Field(..., title="Status")
-    subdomain: str = Field(..., title="Subdomain")
-    created_at: str = Field(..., title="Created At")
-    updated_at: str = Field(..., title="Updated At")
-    terminated_at: Optional[str] = Field(None, title="Terminated At")
-    team_id: str = Field(..., title="Team Id")
-    region: str = Field(..., title="Region")
+    instance_id: str = Field(..., title='Instance Id')
+    env_key: str = Field(..., title='Env Key')
+    version: str = Field(..., title='Version')
+    status: str = Field(..., title='Status')
+    subdomain: str = Field(..., title='Subdomain')
+    created_at: str = Field(..., title='Created At')
+    updated_at: str = Field(..., title='Updated At')
+    terminated_at: Optional[str] = Field(None, title='Terminated At')
+    team_id: str = Field(..., title='Team Id')
+    region: str = Field(..., title='Region')
+    env_variables: Optional[Dict[str, Any]] = Field(None, title='Env Variables')
 
 
 class InstanceRequest(BaseModel):
-    env_key: str = Field(..., title="Env Key")
-    version: Optional[str] = Field(None, title="Version")
-    region: Optional[str] = Field("us-east-2", title="Region")
-    seed: Optional[int] = Field(None, title="Seed")
-    timestamp: Optional[int] = Field(None, title="Timestamp")
-    p_error: Optional[float] = Field(None, title="P Error")
-    avg_latency: Optional[float] = Field(None, title="Avg Latency")
-    run_id: Optional[str] = Field(None, title="Run Id")
-    task_id: Optional[str] = Field(None, title="Task Id")
+    env_key: str = Field(..., title='Env Key')
+    version: Optional[str] = Field(None, title='Version')
+    region: Optional[str] = Field('us-west-1', title='Region')
+    seed: Optional[int] = Field(None, title='Seed')
+    timestamp: Optional[int] = Field(None, title='Timestamp')
+    p_error: Optional[float] = Field(None, title='P Error')
+    avg_latency: Optional[float] = Field(None, title='Avg Latency')
+    run_id: Optional[str] = Field(None, title='Run Id')
+    task_id: Optional[str] = Field(None, title='Task Id')
+    force_pull: Optional[bool] = Field(None, title='Force Pull')
+    env_variables: Optional[Dict[str, Any]] = Field(None, title='Env Variables')
+    created_from: Optional[str] = Field(None, title='Created From')
 
 
 class InstanceStatus(Enum):
-    pending = "pending"
-    running = "running"
-    stopped = "stopped"
-    error = "error"
+    pending = 'pending'
+    running = 'running'
+    stopped = 'stopped'
+    error = 'error'
 
 
 class ManagerURLs(BaseModel):
-    api: str = Field(..., title="Api")
-    docs: str = Field(..., title="Docs")
-    reset: str = Field(..., title="Reset")
-    diff: str = Field(..., title="Diff")
-    snapshot: str = Field(..., title="Snapshot")
-    execute_verifier_function: str = Field(..., title="Execute Verifier Function")
+    api: str = Field(..., title='Api')
+    docs: str = Field(..., title='Docs')
+    reset: str = Field(..., title='Reset')
+    diff: str = Field(..., title='Diff')
+    snapshot: str = Field(..., title='Snapshot')
+    execute_verifier_function: str = Field(..., title='Execute Verifier Function')
     execute_verifier_function_with_upload: str = Field(
-        ..., title="Execute Verifier Function With Upload"
+        ..., title='Execute Verifier Function With Upload'
     )
 
 
+class QueryRequest(BaseModel):
+    query: str = Field(..., title='Query')
+    args: Optional[List] = Field(None, title='Args')
+    read_only: Optional[bool] = Field(True, title='Read Only')
+
+
+class QueryResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    columns: Optional[List[str]] = Field(None, title='Columns')
+    rows: Optional[List[List]] = Field(None, title='Rows')
+    rows_affected: Optional[int] = Field(None, title='Rows Affected')
+    last_insert_id: Optional[int] = Field(None, title='Last Insert Id')
+    error: Optional[str] = Field(None, title='Error')
+    message: str = Field(..., title='Message')
+
+
+class RecreateResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    instance_id: str = Field(..., title='Instance Id')
+    env_key: str = Field(..., title='Env Key')
+    version: str = Field(..., title='Version')
+    recreated_at: str = Field(..., title='Recreated At')
+
+
+class ResourceMode(Enum):
+    ro = 'ro'
+    rw = 'rw'
+
+
+class ResourceType(Enum):
+    sqlite = 'sqlite'
+    cdp = 'cdp'
+
+
+class RestoreRequest(BaseModel):
+    backup_id: Optional[str] = Field(None, title='Backup Id')
+
+
+class RestoreResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    backup_id: str = Field(..., title='Backup Id')
+    source_instance_id: str = Field(..., title='Source Instance Id')
+    target_instance_id: str = Field(..., title='Target Instance Id')
+    restored_at: str = Field(..., title='Restored At')
+
+
+class SnapshotResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    backup_id: str = Field(..., title='Backup Id')
+    instance_id: str = Field(..., title='Instance Id')
+    s3_key: str = Field(..., title='S3 Key')
+    created_at: str = Field(..., title='Created At')
+
+
+class TableSchema(BaseModel):
+    name: str = Field(..., title='Name')
+    sql: str = Field(..., title='Sql')
+    columns: List[Dict[str, Any]] = Field(..., title='Columns')
+
+
+class TaskRequest(BaseModel):
+    key: str = Field(..., title='Key')
+    prompt: str = Field(..., title='Prompt')
+    environment_id: str = Field(..., title='Environment Id')
+    verifier_id: Optional[str] = Field(None, title='Verifier Id')
+
+
+class TaskResponse(BaseModel):
+    key: str = Field(..., title='Key')
+    prompt: str = Field(..., title='Prompt')
+    team_id: str = Field(..., title='Team Id')
+    environment_id: str = Field(..., title='Environment Id')
+    created_at: str = Field(..., title='Created At')
+    verifier_id: Optional[str] = Field(None, title='Verifier Id')
+
+
 class ValidationError(BaseModel):
-    loc: List[Union[str, int]] = Field(..., title="Location")
-    msg: str = Field(..., title="Message")
-    type: str = Field(..., title="Error Type")
+    loc: List[Union[str, int]] = Field(..., title='Location')
+    msg: str = Field(..., title='Message')
+    type: str = Field(..., title='Error Type')
 
 
 class VerifiersCheckResponse(BaseModel):
     key: Optional[str] = Field(
-        None, description="Verifier artifact key", title="Key"
+        None, description='Key of the verifier artifact', title='Key'
     )
     version: Optional[int] = Field(
-        None, description="Version of the verifier artifact", title="Version"
+        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"
+        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"
+        None, description='Creation timestamp', title='Created At'
     )
     comment: Optional[str] = Field(
-        None, description="Comment about the verifier", title="Comment"
+        None, description='Comment about the verifier', title='Comment'
     )
     success: bool = Field(
-        ..., description="Whether the verification was successful", title="Success"
+        ..., 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")
+    key: Optional[str] = Field(
+        None, description='Key of the verifier artifact', title='Key'
+    )
+    sha256: Optional[str] = Field(
+        None,
+        description='SHA256 hash of the function (auto-generated if bundle is provided)',
+        title='Sha256',
+    )
+    bundle: Optional[str] = Field(
+        None, description='Base64 encoded bundle data', title='Bundle'
+    )
+    args: Optional[str] = Field(
+        None, description='Base64 encoded cloudpickled args', title='Args'
+    )
+    args_array: Optional[List] = Field(
+        None,
+        description='Array of argument values to pass to the function',
+        title='Args Array',
+    )
     function_name: Optional[str] = Field(
-        "verify", description="Name of the function to execute", title="Function Name"
+        '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"
+        60, description='Execution timeout in seconds', title='Timeout'
     )
     region: Optional[str] = Field(
-        None, description="AWS region for execution", title="Region"
+        None, description='AWS region for execution', title='Region'
+    )
+    metadata: Optional[Dict[str, Any]] = Field(
+        None, description='Additional metadata', title='Metadata'
+    )
+    comment: Optional[str] = Field(
+        None, description='Comment about the function', title='Comment'
+    )
+    display_src: Optional[str] = Field(
+        None, description='Display source code', title='Display Src'
     )
 
 
 class VerifiersExecuteResponse(BaseModel):
     key: Optional[str] = Field(
-        None, description="Key of the verifier artifact", title="Key"
+        None, description='Key of the verifier artifact', title='Key'
     )
     version: Optional[int] = Field(
-        None, description="Version of the verifier artifact", title="Version"
+        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"
+        None, description='Display source code of the verifier', title='Display Src'
     )
     created_at: Optional[str] = Field(
-        None, description="Creation timestamp", title="Created At"
+        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",
+        None, description='Comment about the verifier', title='Comment'
     )
-
-
-class VerificationResponse(BaseModel):
     success: bool = Field(
-        ..., description="Whether the verification was successful", title="Success"
+        ..., description='Whether the verification was successful', title='Success'
     )
     result: Optional[Any] = Field(
-        None, description="The return value of the function", title="Result"
+        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"
+        None, description='Error details if verification failed', title='Error'
     )
     execution_time_ms: int = Field(
-        ..., description="Execution time in milliseconds", title="Execution Time Ms"
+        ..., 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",
+        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"
+    stdout: Optional[str] = Field(
+        None, description='Captured stdout from execution', title='Stdout'
     )
 
 
+class DescribeResponse(BaseModel):
+    success: bool = Field(..., title='Success')
+    resource_name: str = Field(..., title='Resource Name')
+    tables: Optional[List[TableSchema]] = Field(None, title='Tables')
+    error: Optional[str] = Field(None, title='Error')
+    message: str = Field(..., title='Message')
+
+
 class HTTPValidationError(BaseModel):
-    detail: Optional[List[ValidationError]] = Field(None, title="Detail")
+    detail: Optional[List[ValidationError]] = Field(None, title='Detail')
 
 
 class InstanceURLs(BaseModel):
-    root: str = Field(..., title="Root")
-    app: str = Field(..., title="App")
-    api: Optional[str] = Field(None, title="Api")
-    health: Optional[str] = Field(None, title="Health")
-    api_docs: Optional[str] = Field(None, title="Api Docs")
+    root: str = Field(..., title='Root')
+    app: List[str] = Field(..., title='App')
+    api: Optional[str] = Field(None, title='Api')
+    health: Optional[str] = Field(None, title='Health')
+    api_docs: Optional[str] = Field(None, title='Api Docs')
     manager: ManagerURLs
 
 
+class Resource(BaseModel):
+    name: str = Field(..., title='Name')
+    type: ResourceType
+    mode: ResourceMode
+    label: Optional[str] = Field(None, title='Label')
+
+
+class ResourcesResponse(BaseModel):
+    resources: List[Resource] = Field(..., title='Resources')
+
+
+class TaskListResponse(BaseModel):
+    tasks: List[TaskResponse] = Field(..., title='Tasks')
+    total: int = Field(..., title='Total')
+
+
 class InstanceResponse(BaseModel):
-    instance_id: str = Field(..., title="Instance Id")
-    env_key: str = Field(..., title="Env Key")
-    version: str = Field(..., title="Version")
-    status: str = Field(..., title="Status")
-    subdomain: str = Field(..., title="Subdomain")
-    created_at: str = Field(..., title="Created At")
-    updated_at: str = Field(..., title="Updated At")
-    terminated_at: Optional[str] = Field(None, title="Terminated At")
-    team_id: str = Field(..., title="Team Id")
-    region: str = Field(..., title="Region")
-    urls: InstanceURLs
-    health: Optional[bool] = Field(None, title="Health")
-
-
-class InstanceRecord(BaseModel):
-    instance_id: str
-    env_key: str
-    version: str
-    status: str
-    subdomain: str
-    created_at: str
-    updated_at: str
-    terminated_at: Optional[str] = None
-    team_id: str
-    region: str
+    instance_id: str = Field(..., title='Instance Id')
+    env_key: str = Field(..., title='Env Key')
+    version: str = Field(..., title='Version')
+    status: str = Field(..., title='Status')
+    subdomain: str = Field(..., title='Subdomain')
+    created_at: str = Field(..., title='Created At')
+    updated_at: str = Field(..., title='Updated At')
+    terminated_at: Optional[str] = Field(None, title='Terminated At')
+    team_id: str = Field(..., title='Team Id')
+    region: str = Field(..., title='Region')
+    env_variables: Optional[Dict[str, Any]] = Field(None, title='Env Variables')
+    urls: Optional[InstanceURLs] = Field(None, title='Urls')
+    health: Optional[bool] = Field(None, title='Health')

fleet/resources/browser.py

@@ -17,15 +17,16 @@ 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:
-        """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
+        response = self.client.request(
+            "POST",
+            "/resources/cdp/start",
+            json=ChromeStartRequest(resolution=f"{width},{height}").model_dump(),
+        )
+        ChromeStartResponse(**response.json())
         return self.describe()
-        
+
     def describe(self) -> CDPDescribeResponse:
         response = self.client.request("GET", "/resources/cdp/describe")
         if response.status_code != 200: