fleet-python 0.2.3__tar.gz → 0.2.5__tar.gz

{fleet_python-0.2.3 → fleet_python-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.3
+Version: 0.2.5
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0
@@ -31,6 +31,7 @@ Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: isort>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: ruff>=0.1.0; extra == "dev"
+Requires-Dist: unasync>=0.6.0; extra == "dev"
 Provides-Extra: playwright
 Requires-Dist: playwright>=1.40.0; extra == "playwright"
 Dynamic: license-file
@@ -63,20 +64,20 @@ export FLEET_API_KEY="sk_your_key_here"
 import fleet as flt
 
 # Create environment by key
-env = await flt.env.make("fira")
+env = flt.env.make("fira")
 
 # Reset environment with seed and options
-await env.reset(
+env.reset(
     seed=42,
     timestamp=datetime.now()
 )
 
 # Access environment state ('crm' is the resource id for a sqlite database)
 sql = env.state("sqlite://crm")
-await sql.exec("UPDATE customers SET status = 'active' WHERE id = 123")
+sql.exec("UPDATE customers SET status = 'active' WHERE id = 123")
 
 # Clean up
-await env.close()
+env.close()
 ```
 
 ## Environment Management
@@ -85,10 +86,10 @@ await env.close()
 
 ```python
 # Create environment instance with explicit version
-env = await flt.env.make("fira:v1.2.5")
+env = flt.env.make("fira:v1.2.5")
 
 # Create environment instance with default (latest) version
-env = await flt.env.make("fira")
+env = flt.env.make("fira")
 
 ```
 
@@ -96,18 +97,18 @@ env = await flt.env.make("fira")
 
 ```python
 # Connect to a running instance
-env = await flt.env.get("env_instance_id")
+env = flt.env.get("env_instance_id")
 
 # List all running instances
-instances = await flt.env.list_instances()
+instances = flt.env.list_instances()
 for instance in instances:
     print(f"Instance: {instance.instance_id}")
     print(f"Type: {instance.environment_type}")
     print(f"Status: {instance.status}")
 
 # Filter instances by status (running, pending, stopped, error)
-running_instances = await flt.env.list_instances(status_filter="running")
+running_instances = flt.env.list_instances(status_filter="running")
 
 # List available environment types
-available_envs = await flt.env.list_envs()
+available_envs = flt.env.list_envs()
 ```

{fleet_python-0.2.3 → fleet_python-0.2.5}/README.md

@@ -26,20 +26,20 @@ export FLEET_API_KEY="sk_your_key_here"
 import fleet as flt
 
 # Create environment by key
-env = await flt.env.make("fira")
+env = flt.env.make("fira")
 
 # Reset environment with seed and options
-await env.reset(
+env.reset(
     seed=42,
     timestamp=datetime.now()
 )
 
 # Access environment state ('crm' is the resource id for a sqlite database)
 sql = env.state("sqlite://crm")
-await sql.exec("UPDATE customers SET status = 'active' WHERE id = 123")
+sql.exec("UPDATE customers SET status = 'active' WHERE id = 123")
 
 # Clean up
-await env.close()
+env.close()
 ```
 
 ## Environment Management
@@ -48,10 +48,10 @@ await env.close()
 
 ```python
 # Create environment instance with explicit version
-env = await flt.env.make("fira:v1.2.5")
+env = flt.env.make("fira:v1.2.5")
 
 # Create environment instance with default (latest) version
-env = await flt.env.make("fira")
+env = flt.env.make("fira")
 
 ```
 
@@ -59,18 +59,18 @@ env = await flt.env.make("fira")
 
 ```python
 # Connect to a running instance
-env = await flt.env.get("env_instance_id")
+env = flt.env.get("env_instance_id")
 
 # List all running instances
-instances = await flt.env.list_instances()
+instances = flt.env.list_instances()
 for instance in instances:
     print(f"Instance: {instance.instance_id}")
     print(f"Type: {instance.environment_type}")
     print(f"Status: {instance.status}")
 
 # Filter instances by status (running, pending, stopped, error)
-running_instances = await flt.env.list_instances(status_filter="running")
+running_instances = flt.env.list_instances(status_filter="running")
 
 # List available environment types
-available_envs = await flt.env.list_envs()
+available_envs = flt.env.list_envs()
 ```

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/dsl_example.py

@@ -65,7 +65,7 @@ def validate_new_deal_creation(
 async def main():
     # Create a new instance
     print("Creating new Hubspot instance...")
-    env = await flt.env.make("hubspot:v1.2.7")
+    env = await flt.env.make_async("hubspot:v1.2.7")
     print(f"New Instance: {env.instance_id}")
 
     try:
@@ -99,6 +99,7 @@ async def main():
         )
         """
 
+        print("RESOURCES", await env.resources())
         db = env.db()
         insert_result = await db.exec(insert_query)
         print(f"Insert result: {insert_result}")

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/example.py

@@ -6,11 +6,11 @@ import fleet as flt
 
 
 async def main():
-    environments = await flt.env.list_envs()
+    environments = await flt.env.list_envs_async()
     print("Environments:", len(environments))
 
     # Create a new instance
-    env = await flt.env.make("hubspot:v1.2.7")
+    env = await flt.env.make_async("hubspot:v1.2.7")
     print("New Instance:", env.instance_id)
 
     response = await env.reset(seed=42)

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/json_tasks_example.py

@@ -39,7 +39,7 @@ async def main():
     if not file_path.exists():
         raise FileNotFoundError(f"Error: File '{args.json_file}' not found")
 
-    env = await flt.env.make("fira:v1.2.7")
+    env = await flt.env.make_async("fira:v1.2.7")
     print(f"New Instance: {env.urls.app}")
 
     successes = 0

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/nova_act_example.py

@@ -4,7 +4,7 @@ from nova_act import NovaAct, ActResult
 
 
 async def main():
-    instance = await flt.env.make("hubspot")
+    instance = await flt.env.make_async("hubspot:v1.2.7")
     cdp_url = await instance.browser().cdp_url()
 
     loop = asyncio.get_event_loop()

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/openai_example.py

@@ -1,11 +1,10 @@
-import asyncio
-from openai import AsyncOpenAI
+from openai import OpenAI
 import fleet as flt
 import json
 from typing import Callable
 
 
-client = AsyncOpenAI()
+client = OpenAI()
 
 
 def sanitize_message(msg: dict) -> dict:
@@ -50,7 +49,7 @@ class Agent:
         if self.debug:
             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')}")
@@ -66,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",
@@ -83,9 +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()
+            screenshot_base64 = self.computer.screenshot()
 
             # if user doesn't ack all safety checks exit with error
             pending_checks = item.get("pending_safety_checks", [])
@@ -114,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
@@ -134,7 +133,7 @@ class Agent:
 
             clean_input = [_clean_item(m) for m in (input_items + new_items)]
 
-            response = await client.responses.create(
+            response = client.responses.create(
                 model=self.model,
                 input=clean_input,
                 tools=self.tools,
@@ -173,7 +172,7 @@ class Agent:
                 new_items.append(item)
 
                 # Next, perform any local side-effects (browser actions, etc.).
-                handled_items = await self.handle_item(item)
+                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:
@@ -187,19 +186,13 @@ 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)
-
-
-async def main():
+def main():
     # Create a Fleet environment instance
-    instance = await flt.env.make("hubspot")
+    instance = flt.env.make("hubspot")
 
     # Create the Playwright wrapper
     browser = flt.FleetPlaywrightWrapper(instance)
-    await browser.start()
+    browser.start()
 
     try:
         agent = Agent(browser, model="computer-use-preview", tools=[])
@@ -212,9 +205,9 @@ async def main():
 
         while True:
             try:
-                user_input = await ainput("> ")
+                user_input = input("> ")
                 items.append({"role": "user", "content": user_input})
-                output_items = await agent.run_full_turn(
+                output_items = agent.run_full_turn(
                     items, show_images=False, debug=False
                 )
                 items += output_items
@@ -225,9 +218,9 @@ async def main():
                 print(f"Error during interaction: {e}")
                 # Continue the loop for other errors
     finally:
-        await browser.close()
-        await instance.close()
+        browser.close()
+        instance.close()
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    main()

{fleet_python-0.2.3 → fleet_python-0.2.5}/examples/openai_simple_example.py

@@ -1,15 +1,14 @@
-import asyncio
-from openai import AsyncOpenAI
+from openai import OpenAI
 import fleet as flt
 
-client = AsyncOpenAI()
+client = OpenAI()
 
 
-async def main():
-    instance = await flt.env.make("hubspot")
+def main():
+    instance = flt.env.make("hubspot")
 
     browser = flt.FleetPlaywrightWrapper(instance)
-    await browser.start()
+    browser.start()
 
     try:
         width, height = browser.get_dimensions()
@@ -22,7 +21,7 @@ async def main():
             }
         ]
 
-        response = await client.responses.create(
+        response = client.responses.create(
             model="computer-use-preview",
             input=[
                 {
@@ -41,21 +40,21 @@ async def main():
             if response.output[0].type == "computer_call":
                 action = response.output[0].action
                 if action.type == "screenshot":
-                    screenshot_base64 = await browser.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 = await browser.execute_computer_action(action)
+                    result = browser.execute_computer_action(action)
 
                 print("Computer action result:")
                 print(result)
     finally:
-        await browser.close()
-        await instance.close()
+        browser.close()
+        instance.close()
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    main()

{fleet_python-0.2.3 → fleet_python-0.2.5}/fleet/__init__.py

@@ -20,8 +20,11 @@ from .exceptions import (
     FleetTimeoutError,
     FleetConfigurationError,
 )
-from .client import Fleet, AsyncFleet, InstanceRequest
+from .client import Fleet, Environment
+from ._async.client import AsyncFleet, AsyncEnvironment
+from .models import InstanceRequest
 from .instance import (
+    InstanceClient,
     AsyncInstanceClient,
     ResetRequest,
     ResetResponse,
@@ -30,7 +33,12 @@ from .instance import (
     ChromeStartResponse,
     ChromeStatusResponse,
 )
-from .verifiers import *
+from .verifiers import (
+    DatabaseSnapshot,
+    IgnoreConfig,
+    SnapshotDiff,
+    TASK_SUCCESSFUL_SCORE,
+)
 from . import env
 
 # Optional playwright integration
@@ -49,7 +57,10 @@ __all__ = [
     "FleetTimeoutError",
     "FleetConfigurationError",
     "Fleet",
+    "Environment",
     "AsyncFleet",
+    "AsyncEnvironment",
+    "InstanceClient",
     "AsyncInstanceClient",
     "InstanceRequest",
     "ResetRequest",
@@ -58,8 +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")
+    __all__.append("FleetPlaywrightWrapper")

{fleet_python-0.2.3/fleet → fleet_python-0.2.5/fleet/_async}/base.py

@@ -28,29 +28,6 @@ class BaseWrapper:
         return headers
 
 
-class SyncWrapper(BaseWrapper):
-    def __init__(self, *, httpx_client: httpx.Client, **kwargs):
-        super().__init__(**kwargs)
-        self.httpx_client = httpx_client
-
-    def request(
-        self,
-        method: str,
-        url: str,
-        params: Optional[Dict[str, Any]] = None,
-        json: Optional[Any] = None,
-        **kwargs,
-    ) -> httpx.Response:
-        return self.httpx_client.request(
-            method,
-            f"{self.base_url}{url}",
-            headers=self.get_headers(),
-            params=params,
-            json=json,
-            **kwargs,
-        )
-
-
 class AsyncWrapper(BaseWrapper):
     def __init__(self, *, httpx_client: httpx.AsyncClient, **kwargs):
         super().__init__(**kwargs)
@@ -71,4 +48,4 @@ class AsyncWrapper(BaseWrapper):
             params=params,
             json=json,
             **kwargs,
-        )
+        )

{fleet_python-0.2.3/fleet → fleet_python-0.2.5/fleet/_async}/client.py

@@ -14,17 +14,15 @@
 
 """Fleet API Client for making HTTP requests to Fleet services."""
 
-import asyncio
 import os
 import httpx
 import logging
 from typing import Optional, List
 
-from .base import EnvironmentBase, AsyncWrapper, SyncWrapper
+from .base import EnvironmentBase, AsyncWrapper
 from .models import InstanceRequest, InstanceRecord, Environment as EnvironmentModel
 
 from .instance import (
-    InstanceClient,
     AsyncInstanceClient,
     ResetRequest,
     ResetResponse,
@@ -38,19 +36,6 @@ from .resources.browser import AsyncBrowserResource
 logger = logging.getLogger(__name__)
 
 
-class Environment(EnvironmentBase):
-    def __init__(self, httpx_client: Optional[httpx.Client] = None, **kwargs):
-        super().__init__(**kwargs)
-        self._httpx_client = httpx_client or httpx.Client()
-        self._instance: Optional[InstanceClient] = None
-
-    @property
-    def instance(self) -> InstanceClient:
-        if self._instance is None:
-            self._instance = InstanceClient(self.manager_url, self._httpx_client)
-        return self._instance
-
-
 class AsyncEnvironment(EnvironmentBase):
     def __init__(self, httpx_client: Optional[httpx.AsyncClient] = None, **kwargs):
         super().__init__(**kwargs)
@@ -92,51 +77,6 @@ class AsyncEnvironment(EnvironmentBase):
         return await self.instance.verify_raw(function_code, function_name)
 
 
-class Fleet:
-    def __init__(
-        self,
-        api_key: Optional[str] = os.getenv("FLEET_API_KEY"),
-        base_url: Optional[str] = None,
-        httpx_client: Optional[httpx.Client] = None,
-    ):
-        self._httpx_client = httpx_client or httpx.Client(timeout=60.0)
-        self.client = SyncWrapper(
-            api_key=api_key,
-            base_url=base_url,
-            httpx_client=self._httpx_client,
-        )
-
-    def environments(self) -> List[EnvironmentModel]:
-        response = self.client.request("GET", "/v1/env/")
-        return [EnvironmentModel(**env_data) for env_data in response.json()]
-
-    def environment(self, env_key: str) -> EnvironmentModel:
-        response = self.client.request("GET", f"/v1/env/{env_key}")
-        return EnvironmentModel(**response.json())
-
-    def make(self, request: InstanceRequest) -> Environment:
-        response = self.client.request(
-            "POST", "/v1/env/instances", json=request.model_dump()
-        )
-        return Environment(**response.json())
-
-    def instances(self, status: Optional[str] = None) -> List[Environment]:
-        params = {}
-        if status:
-            params["status"] = status
-
-        response = self.client.request("GET", "/v1/env/instances", params=params)
-        return [Environment(**instance_data) for instance_data in response.json()]
-
-    def instance(self, instance_id: str) -> Environment:
-        response = self.client.request("GET", f"/v1/env/instances/{instance_id}")
-        return Environment(**response.json())
-
-    def delete(self, instance_id: str) -> InstanceRecord:
-        response = self.client.request("DELETE", f"/v1/env/instances/{instance_id}")
-        return InstanceRecord(**response.json())
-
-
 class AsyncFleet:
     def __init__(
         self,
@@ -182,20 +122,12 @@ class AsyncFleet:
             params["status"] = status
 
         response = await self.client.request("GET", "/v1/env/instances", params=params)
-        instances = [
-            AsyncEnvironment(**instance_data) for instance_data in response.json()
-        ]
-        await asyncio.gather(*[instance.instance.load() for instance in instances])
-        return instances
+        return [AsyncEnvironment(**instance_data) for instance_data in response.json()]
 
     async def instance(self, instance_id: str) -> AsyncEnvironment:
         response = await self.client.request("GET", f"/v1/env/instances/{instance_id}")
-        instance = AsyncEnvironment(**response.json())
-        await instance.instance.load()
-        return instance
+        return AsyncEnvironment(**response.json())
 
     async def delete(self, instance_id: str) -> InstanceRecord:
-        response = await self.client.request(
-            "DELETE", f"/v1/env/instances/{instance_id}"
-        )
-        return InstanceRecord(**response.json())
+        response = await self.client.request("DELETE", f"/v1/env/instances/{instance_id}")
+        return InstanceRecord(**response.json())

fleet_python-0.2.5/fleet/_async/env/client.py

@@ -0,0 +1,15 @@
+from ..client import AsyncFleet, AsyncEnvironment
+from ..models import Environment as EnvironmentModel
+from typing import List
+
+
+async def make_async(env_key: str) -> AsyncEnvironment:
+    return await AsyncFleet().make(env_key)
+
+
+async def list_envs_async() -> List[EnvironmentModel]:
+    return await AsyncFleet().list_envs()
+
+
+async def get_async(instance_id: str) -> AsyncEnvironment:
+    return await AsyncFleet().instance(instance_id)

{fleet_python-0.2.3/fleet → fleet_python-0.2.5/fleet/_async}/instance/__init__.py

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

{fleet_python-0.2.3/fleet → fleet_python-0.2.5/fleet/_async}/instance/base.py

@@ -14,29 +14,6 @@ class BaseWrapper:
         return headers
 
 
-class SyncWrapper(BaseWrapper):
-    def __init__(self, *, httpx_client: httpx.Client, **kwargs):
-        super().__init__(**kwargs)
-        self.httpx_client = httpx_client
-
-    def request(
-        self,
-        method: str,
-        path: str,
-        params: Optional[Dict[str, Any]] = None,
-        json: Optional[Any] = None,
-        **kwargs,
-    ) -> httpx.Response:
-        return self.httpx_client.request(
-            method,
-            f"{self.url}{path}",
-            headers=self.get_headers(),
-            params=params,
-            json=json,
-            **kwargs,
-        )
-
-
 class AsyncWrapper(BaseWrapper):
     def __init__(self, *, httpx_client: httpx.AsyncClient, **kwargs):
         super().__init__(**kwargs)
@@ -57,4 +34,4 @@ class AsyncWrapper(BaseWrapper):
             params=params,
             json=json,
             **kwargs,
-        )
+        )

{fleet_python-0.2.3/fleet → fleet_python-0.2.5/fleet/_async}/instance/client.py

@@ -1,4 +1,4 @@
-"""Fleet SDK Base Environment Classes."""
+"""Fleet SDK Async Instance Client."""
 
 from typing import Any, Callable, Dict, List, Optional, Tuple
 import asyncio
@@ -12,11 +12,11 @@ from ..resources.sqlite import AsyncSQLiteResource
 from ..resources.browser import AsyncBrowserResource
 from ..resources.base import Resource
 
-from ..verifiers import DatabaseSnapshot
+from ...verifiers import DatabaseSnapshot
 
 from ..exceptions import FleetEnvironmentError, FleetAPIError
 
-from .base import SyncWrapper, AsyncWrapper
+from .base import AsyncWrapper
 from .models import (
     ResetRequest,
     ResetResponse,
@@ -42,23 +42,6 @@ ValidatorType = Callable[
 ]
 
 
-class InstanceClient:
-    def __init__(
-        self,
-        url: str,
-        httpx_client: Optional[httpx.Client] = None,
-    ):
-        self.base_url = url
-        self.client = SyncWrapper(
-            url=self.base_url, httpx_client=httpx_client or httpx.Client()
-        )
-        raise NotImplementedError("SyncManager is not implemented")
-
-    def reset(self) -> ResetResponse:
-        response = self.client.request("POST", "/reset")
-        return ResetResponse(**response.json())
-
-
 class AsyncInstanceClient:
     def __init__(
         self,
@@ -292,4 +275,4 @@ class AsyncInstanceClient:
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         """Async context manager exit."""
-        await self.close()
+        await self.close()