fleet-python 0.2.9__tar.gz → 0.2.11__tar.gz

{fleet_python-0.2.9 → fleet_python-0.2.11}/PKG-INFO

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

{fleet_python-0.2.9 → fleet_python-0.2.11}/examples/example.py

@@ -9,6 +9,9 @@ load_dotenv()
 
 
 async def main():
+    regions = await flt.env.list_regions_async()
+    print("Regions:", regions)
+
     environments = await flt.env.list_envs_async()
     print("Environments:", len(environments))
 

{fleet_python-0.2.9 → fleet_python-0.2.11}/examples/example_sync.py

@@ -11,7 +11,7 @@ def main():
     environments = flt.env.list_envs()
     print("Environments:", len(environments))
 
-    instances = flt.env.list_instances()
+    instances = flt.env.list_instances(status="running")
     print("Instances:", len(instances))
 
     # Create a new instance

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/__init__.py

@@ -18,6 +18,8 @@ from .exceptions import (
     FleetError,
     FleetAPIError,
     FleetTimeoutError,
+    FleetRateLimitError,
+    FleetInstanceLimitError,
     FleetConfigurationError,
 )
 from .client import Fleet, Environment

fleet_python-0.2.11/fleet/_async/base.py

@@ -0,0 +1,132 @@
+import httpx
+from typing import Dict, Any, Optional
+import json
+
+from .models import InstanceResponse
+from .exceptions import (
+    FleetAPIError,
+    FleetAuthenticationError,
+    FleetRateLimitError,
+    FleetInstanceLimitError,
+    FleetTimeoutError,
+)
+
+
+class EnvironmentBase(InstanceResponse):
+    @property
+    def manager_url(self) -> str:
+        return f"{self.urls.manager.api}"
+
+
+class BaseWrapper:
+    def __init__(self, *, api_key: Optional[str], base_url: Optional[str]):
+        if api_key is None:
+            raise ValueError("api_key is required")
+        self.api_key = api_key
+        if base_url is None:
+            base_url = "https://orchestrator.fleetai.com"
+        self.base_url = base_url
+
+    def get_headers(self) -> Dict[str, str]:
+        headers: Dict[str, str] = {
+            "X-Fleet-SDK-Language": "Python",
+            "X-Fleet-SDK-Version": "1.0.0",
+        }
+        headers["Authorization"] = f"Bearer {self.api_key}"
+        return headers
+
+
+class AsyncWrapper(BaseWrapper):
+    def __init__(self, *, httpx_client: httpx.AsyncClient, **kwargs):
+        super().__init__(**kwargs)
+        self.httpx_client = httpx_client
+
+    async def request(
+        self,
+        method: str,
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        json: Optional[Any] = None,
+        **kwargs,
+    ) -> httpx.Response:
+        try:
+            response = await self.httpx_client.request(
+                method,
+                f"{self.base_url}{url}",
+                headers=self.get_headers(),
+                params=params,
+                json=json,
+                **kwargs,
+            )
+            
+            # Check for HTTP errors
+            if response.status_code >= 400:
+                self._handle_error_response(response)
+            
+            return response
+        except httpx.TimeoutException as e:
+            raise FleetTimeoutError(f"Request timed out: {str(e)}")
+        except httpx.RequestError as e:
+            raise FleetAPIError(f"Request failed: {str(e)}")
+    
+    def _handle_error_response(self, response: httpx.Response) -> None:
+        """Handle HTTP error responses and convert to appropriate Fleet exceptions."""
+        status_code = response.status_code
+        
+        # Try to parse error response as JSON
+        try:
+            error_data = response.json()
+            detail = error_data.get("detail", response.text)
+            
+            # Handle structured error responses
+            if isinstance(detail, dict):
+                error_type = detail.get("error_type", "")
+                error_message = detail.get("message", str(detail))
+                
+                if error_type == "instance_limit_exceeded":
+                    raise FleetInstanceLimitError(
+                        error_message,
+                        running_instances=detail.get("running_instances"),
+                        instance_limit=detail.get("instance_limit")
+                    )
+                else:
+                    error_message = detail.get("message", str(detail))
+            else:
+                error_message = detail
+                
+        except (json.JSONDecodeError, ValueError):
+            error_message = response.text
+            error_data = None
+        
+        # Handle specific error types
+        if status_code == 401:
+            raise FleetAuthenticationError(error_message)
+        elif status_code == 429:
+            # Check if it's an instance limit error vs rate limit error (fallback for unstructured errors)
+            if "instance limit" in error_message.lower():
+                # Try to extract instance counts from the error message
+                running_instances = None
+                instance_limit = None
+                if "You have" in error_message and "running instances out of a maximum of" in error_message:
+                    try:
+                        # Extract numbers from message like "You have 5 running instances out of a maximum of 10"
+                        parts = error_message.split("You have ")[1].split(" running instances out of a maximum of ")
+                        if len(parts) == 2:
+                            running_instances = int(parts[0])
+                            instance_limit = int(parts[1].split(".")[0])
+                    except (IndexError, ValueError):
+                        pass
+                
+                raise FleetInstanceLimitError(
+                    error_message, 
+                    running_instances=running_instances, 
+                    instance_limit=instance_limit
+                )
+            else:
+                raise FleetRateLimitError(error_message)
+        else:
+            raise FleetAPIError(
+                error_message,
+                status_code=status_code,
+                response_data=error_data if 'error_data' in locals() else None
+            )

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/_async/client.py

@@ -39,7 +39,7 @@ logger = logging.getLogger(__name__)
 class AsyncEnvironment(EnvironmentBase):
     def __init__(self, httpx_client: Optional[httpx.AsyncClient] = None, **kwargs):
         super().__init__(**kwargs)
-        self._httpx_client = httpx_client or httpx.AsyncClient(timeout=60.0)
+        self._httpx_client = httpx_client or httpx.AsyncClient(timeout=180.0)
         self._instance: Optional[AsyncInstanceClient] = None
 
     @property
@@ -84,7 +84,7 @@ class AsyncFleet:
         base_url: Optional[str] = None,
         httpx_client: Optional[httpx.AsyncClient] = None,
     ):
-        self._httpx_client = httpx_client or httpx.AsyncClient(timeout=60.0)
+        self._httpx_client = httpx_client or httpx.AsyncClient(timeout=180.0)
         self.client = AsyncWrapper(
             api_key=api_key,
             base_url=base_url,
@@ -95,6 +95,10 @@ class AsyncFleet:
         response = await self.client.request("GET", "/v1/env/")
         return [EnvironmentModel(**env_data) for env_data in response.json()]
 
+    async def list_regions(self) -> List[str]:
+        response = await self.client.request("GET", "/v1/regions")
+        return response.json()
+
     async def environment(self, env_key: str) -> EnvironmentModel:
         response = await self.client.request("GET", f"/v1/env/{env_key}")
         return EnvironmentModel(**response.json())

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/_async/env/client.py

@@ -11,6 +11,10 @@ async def list_envs_async() -> List[EnvironmentModel]:
     return await AsyncFleet().list_envs()
 
 
+async def list_regions_async() -> List[str]:
+    return await AsyncFleet().list_regions()
+
+
 async def list_instances_async(
     status: Optional[str] = None, region: Optional[str] = None
 ) -> List[AsyncEnvironment]:

{fleet_python-0.2.9/fleet → fleet_python-0.2.11/fleet/_async}/exceptions.py

@@ -49,6 +49,15 @@ class FleetRateLimitError(FleetAPIError):
         super().__init__(message, status_code=429)
 
 
+class FleetInstanceLimitError(FleetAPIError):
+    """Exception raised when team instance limit is exceeded."""
+    
+    def __init__(self, message: str = "Instance limit exceeded", running_instances: Optional[int] = None, instance_limit: Optional[int] = None):
+        super().__init__(message, status_code=429)
+        self.running_instances = running_instances
+        self.instance_limit = instance_limit
+
+
 class FleetEnvironmentError(FleetError):
     """Exception raised when environment operations fail."""
     

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/_async/instance/client.py

@@ -51,7 +51,7 @@ class AsyncInstanceClient:
         self.base_url = url
         self.client = AsyncWrapper(
             url=self.base_url,
-            httpx_client=httpx_client or httpx.AsyncClient(timeout=60.0),
+            httpx_client=httpx_client or httpx.AsyncClient(timeout=180.0),
         )
         self._resources: Optional[List[ResourceModel]] = None
         self._resources_state: Dict[str, Dict[str, Resource]] = {

fleet_python-0.2.11/fleet/base.py

@@ -0,0 +1,132 @@
+import httpx
+from typing import Dict, Any, Optional
+import json
+
+from .models import InstanceResponse
+from .exceptions import (
+    FleetAPIError,
+    FleetAuthenticationError,
+    FleetRateLimitError,
+    FleetInstanceLimitError,
+    FleetTimeoutError,
+)
+
+
+class EnvironmentBase(InstanceResponse):
+    @property
+    def manager_url(self) -> str:
+        return f"{self.urls.manager.api}"
+
+
+class BaseWrapper:
+    def __init__(self, *, api_key: Optional[str], base_url: Optional[str]):
+        if api_key is None:
+            raise ValueError("api_key is required")
+        self.api_key = api_key
+        if base_url is None:
+            base_url = "https://orchestrator.fleetai.com"
+        self.base_url = base_url
+
+    def get_headers(self) -> Dict[str, str]:
+        headers: Dict[str, str] = {
+            "X-Fleet-SDK-Language": "Python",
+            "X-Fleet-SDK-Version": "1.0.0",
+        }
+        headers["Authorization"] = f"Bearer {self.api_key}"
+        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:
+        try:
+            response = self.httpx_client.request(
+                method,
+                f"{self.base_url}{url}",
+                headers=self.get_headers(),
+                params=params,
+                json=json,
+                **kwargs,
+            )
+            
+            # Check for HTTP errors
+            if response.status_code >= 400:
+                self._handle_error_response(response)
+            
+            return response
+        except httpx.TimeoutException as e:
+            raise FleetTimeoutError(f"Request timed out: {str(e)}")
+        except httpx.RequestError as e:
+            raise FleetAPIError(f"Request failed: {str(e)}")
+    
+    def _handle_error_response(self, response: httpx.Response) -> None:
+        """Handle HTTP error responses and convert to appropriate Fleet exceptions."""
+        status_code = response.status_code
+        
+        # Try to parse error response as JSON
+        try:
+            error_data = response.json()
+            detail = error_data.get("detail", response.text)
+            
+            # Handle structured error responses
+            if isinstance(detail, dict):
+                error_type = detail.get("error_type", "")
+                error_message = detail.get("message", str(detail))
+                
+                if error_type == "instance_limit_exceeded":
+                    raise FleetInstanceLimitError(
+                        error_message,
+                        running_instances=detail.get("running_instances"),
+                        instance_limit=detail.get("instance_limit")
+                    )
+                else:
+                    error_message = detail.get("message", str(detail))
+            else:
+                error_message = detail
+                
+        except (json.JSONDecodeError, ValueError):
+            error_message = response.text
+            error_data = None
+        
+        # Handle specific error types
+        if status_code == 401:
+            raise FleetAuthenticationError(error_message)
+        elif status_code == 429:
+            # Check if it's an instance limit error vs rate limit error (fallback for unstructured errors)
+            if "instance limit" in error_message.lower():
+                # Try to extract instance counts from the error message
+                running_instances = None
+                instance_limit = None
+                if "You have" in error_message and "running instances out of a maximum of" in error_message:
+                    try:
+                        # Extract numbers from message like "You have 5 running instances out of a maximum of 10"
+                        parts = error_message.split("You have ")[1].split(" running instances out of a maximum of ")
+                        if len(parts) == 2:
+                            running_instances = int(parts[0])
+                            instance_limit = int(parts[1].split(".")[0])
+                    except (IndexError, ValueError):
+                        pass
+                
+                raise FleetInstanceLimitError(
+                    error_message, 
+                    running_instances=running_instances, 
+                    instance_limit=instance_limit
+                )
+            else:
+                raise FleetRateLimitError(error_message)
+        else:
+            raise FleetAPIError(
+                error_message,
+                status_code=status_code,
+                response_data=error_data if 'error_data' in locals() else None
+            )

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/client.py

@@ -39,7 +39,7 @@ 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(timeout=60.0)
+        self._httpx_client = httpx_client or httpx.Client(timeout=180.0)
         self._instance: Optional[InstanceClient] = None
 
     @property
@@ -84,7 +84,7 @@ class Fleet:
         base_url: Optional[str] = None,
         httpx_client: Optional[httpx.Client] = None,
     ):
-        self._httpx_client = httpx_client or httpx.Client(timeout=60.0)
+        self._httpx_client = httpx_client or httpx.Client(timeout=180.0)
         self.client = SyncWrapper(
             api_key=api_key,
             base_url=base_url,

fleet_python-0.2.11/fleet/env/__init__.py

@@ -0,0 +1,25 @@
+"""Fleet env module - convenience functions for environment management."""
+
+from .client import make, list_envs, list_regions, get, list_instances
+
+# Import async versions from _async
+from .._async.env.client import (
+    make_async,
+    list_envs_async,
+    list_regions_async,
+    get_async,
+    list_instances_async,
+)
+
+__all__ = [
+    "make",
+    "list_envs",
+    "list_regions",
+    "list_instances",
+    "get",
+    "make_async",
+    "list_envs_async",
+    "list_regions_async",
+    "list_instances_async",
+    "get_async",
+]

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/env/client.py

@@ -11,6 +11,10 @@ def list_envs() -> List[EnvironmentModel]:
     return Fleet().list_envs()
 
 
+def list_regions() -> List[str]:
+    return Fleet().list_regions()
+
+
 def list_instances(
     status: Optional[str] = None, region: Optional[str] = None
 ) -> List[Environment]:

{fleet_python-0.2.9/fleet/_async → fleet_python-0.2.11/fleet}/exceptions.py

@@ -49,6 +49,15 @@ class FleetRateLimitError(FleetAPIError):
         super().__init__(message, status_code=429)
 
 
+class FleetInstanceLimitError(FleetAPIError):
+    """Exception raised when team instance limit is exceeded."""
+    
+    def __init__(self, message: str = "Instance limit exceeded", running_instances: Optional[int] = None, instance_limit: Optional[int] = None):
+        super().__init__(message, status_code=429)
+        self.running_instances = running_instances
+        self.instance_limit = instance_limit
+
+
 class FleetEnvironmentError(FleetError):
     """Exception raised when environment operations fail."""
     

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet/instance/client.py

@@ -50,7 +50,7 @@ class InstanceClient:
         self.base_url = url
         self.client = SyncWrapper(
             url=self.base_url,
-            httpx_client=httpx_client or httpx.Client(timeout=60.0),
+            httpx_client=httpx_client or httpx.Client(timeout=180.0),
         )
         self._resources: Optional[List[ResourceModel]] = None
         self._resources_state: Dict[str, Dict[str, Resource]] = {

{fleet_python-0.2.9 → fleet_python-0.2.11}/fleet_python.egg-info/PKG-INFO

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

{fleet_python-0.2.9 → fleet_python-0.2.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fleet-python"
-version = "0.2.9"
+version = "0.2.11"
 description = "Python SDK for Fleet environments"
 authors = [
     {name = "Fleet AI", email = "nic@fleet.so"},
@@ -92,6 +92,7 @@ testpaths = ["tests"]
 "AsyncFleetPlaywrightWrapper" = "FleetPlaywrightWrapper"
 "make_async" = "make"
 "list_envs_async" = "list_envs"
+"list_regions_async" = "list_regions"
 "list_instances_async" = "list_instances"
 "get_async" = "get"
 "async def" = "def"

fleet_python-0.2.9/fleet/_async/base.py

@@ -1,51 +0,0 @@
-import httpx
-from typing import Dict, Any, Optional
-
-from .models import InstanceResponse
-
-
-class EnvironmentBase(InstanceResponse):
-    @property
-    def manager_url(self) -> str:
-        return f"{self.urls.manager.api}"
-
-
-class BaseWrapper:
-    def __init__(self, *, api_key: Optional[str], base_url: Optional[str]):
-        if api_key is None:
-            raise ValueError("api_key is required")
-        self.api_key = api_key
-        if base_url is None:
-            base_url = "https://fleet.new"
-        self.base_url = base_url
-
-    def get_headers(self) -> Dict[str, str]:
-        headers: Dict[str, str] = {
-            "X-Fleet-SDK-Language": "Python",
-            "X-Fleet-SDK-Version": "1.0.0",
-        }
-        headers["Authorization"] = f"Bearer {self.api_key}"
-        return headers
-
-
-class AsyncWrapper(BaseWrapper):
-    def __init__(self, *, httpx_client: httpx.AsyncClient, **kwargs):
-        super().__init__(**kwargs)
-        self.httpx_client = httpx_client
-
-    async def request(
-        self,
-        method: str,
-        url: str,
-        params: Optional[Dict[str, Any]] = None,
-        json: Optional[Any] = None,
-        **kwargs,
-    ) -> httpx.Response:
-        return await self.httpx_client.request(
-            method,
-            f"{self.base_url}{url}",
-            headers=self.get_headers(),
-            params=params,
-            json=json,
-            **kwargs,
-        )

fleet_python-0.2.9/fleet/base.py

@@ -1,51 +0,0 @@
-import httpx
-from typing import Dict, Any, Optional
-
-from .models import InstanceResponse
-
-
-class EnvironmentBase(InstanceResponse):
-    @property
-    def manager_url(self) -> str:
-        return f"{self.urls.manager.api}"
-
-
-class BaseWrapper:
-    def __init__(self, *, api_key: Optional[str], base_url: Optional[str]):
-        if api_key is None:
-            raise ValueError("api_key is required")
-        self.api_key = api_key
-        if base_url is None:
-            base_url = "https://fleet.new"
-        self.base_url = base_url
-
-    def get_headers(self) -> Dict[str, str]:
-        headers: Dict[str, str] = {
-            "X-Fleet-SDK-Language": "Python",
-            "X-Fleet-SDK-Version": "1.0.0",
-        }
-        headers["Authorization"] = f"Bearer {self.api_key}"
-        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,
-        )

fleet_python-0.2.9/fleet/env/__init__.py

@@ -1,17 +0,0 @@
-"""Fleet env module - convenience functions for environment management."""
-
-from .client import make, list_envs, get, list_instances
-
-# Import async versions from _async
-from .._async.env.client import make_async, list_envs_async, get_async, list_instances_async
-
-__all__ = [
-    "make",
-    "list_envs", 
-    "list_instances",
-    "get",
-    "make_async",
-    "list_envs_async",
-    "list_instances_async",
-    "get_async",
-]