fleet-python 0.2.11__py3-none-any.whl → 0.2.13__py3-none-any.whl

scripts/fix_sync_imports.py

@@ -25,6 +25,31 @@ def fix_file(filepath: Path) -> bool:
     # Fix any remaining AsyncFleetPlaywrightWrapper references in docstrings
     content = content.replace('AsyncFleetPlaywrightWrapper', 'FleetPlaywrightWrapper')
     
+    # Fix httpx transport classes
+    content = content.replace('httpx.SyncHTTPTransport', 'httpx.HTTPTransport')
+    
+    # Fix imports based on file location
+    # Since async code now imports from sync models/config, we need to fix the generated sync imports
+    rel_path = filepath.relative_to(Path(__file__).parent.parent / "fleet")
+    
+    # Fix imports for files in different subdirectories
+    if "fleet/instance" in str(filepath):
+        # Files in fleet/instance/ should use .. for fleet level imports
+        content = content.replace('from ...config import', 'from ..config import')
+        content = content.replace('from ...instance.models import', 'from .models import')
+    elif "fleet/env" in str(filepath):
+        # Files in fleet/env/ should use .. for fleet level imports
+        content = content.replace('from ...models import', 'from ..models import')
+    elif "fleet/resources" in str(filepath):
+        # Files in fleet/resources/ should use .. for fleet level imports
+        content = content.replace('from ...instance.models import', 'from ..instance.models import')
+    
+    # Fix imports in top-level fleet files
+    if rel_path.parts[0] in ['base.py', 'client.py'] and len(rel_path.parts) == 1:
+        # Top-level files should use . for fleet level imports
+        content = content.replace('from ..models import', 'from .models import')
+        content = content.replace('from ..config import', 'from .config import')
+    
     # Fix playwright imports for sync version
     if 'playwright' in str(filepath):
         # Fix the import statement
@@ -51,19 +76,16 @@ def main():
     """Fix all sync files."""
     sync_dir = Path(__file__).parent.parent / "fleet"
     
-    # Files to fix
-    files_to_fix = [
-        sync_dir / "instance" / "client.py",
-        sync_dir / "playwright.py",
-        # Add other files here as needed
-    ]
-    
-    for filepath in files_to_fix:
-        if filepath.exists():
+    # Process all Python files in the fleet directory (excluding _async)
+    fixed_count = 0
+    for filepath in sync_dir.rglob("*.py"):
+        if "_async" not in str(filepath):
             if fix_file(filepath):
                 print(f"Fixed {filepath}")
-            else:
-                print(f"No changes needed for {filepath}")
+                fixed_count += 1
+    
+    if fixed_count == 0:
+        print("No files needed fixing")
 
 if __name__ == "__main__":
     main()

fleet/_async/instance/models.py

@@ -1,141 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  openapi (2).json
-#   timestamp: 2025-07-09T20:11:31+00:00
-
-from __future__ import annotations
-
-from enum import Enum
-from typing import Any, Dict, List, Optional, Union
-
-from pydantic import BaseModel, Field
-
-
-class CDPDescribeResponse(BaseModel):
-    success: bool = Field(..., title="Success")
-    cdp_page_url: str = Field(..., title="Url")
-    cdp_browser_url: str = Field(..., title="Browser Url")
-    cdp_devtools_url: str = Field(..., title="Devtools Url")
-
-
-class ChromeStartRequest(BaseModel):
-    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 CreateSnapshotsResponse(BaseModel):
-    success: bool = Field(..., title="Success")
-    initial_snapshot_path: Optional[str] = Field(None, title="Initial Snapshot Path")
-    final_snapshot_path: Optional[str] = Field(None, title="Final Snapshot Path")
-    message: str = Field(..., title="Message")
-
-
-class HealthResponse(BaseModel):
-    status: str = Field(..., title="Status")
-    timestamp: str = Field(..., title="Timestamp")
-    service: str = Field(..., title="Service")
-
-
-class LogActionRequest(BaseModel):
-    action_type: str = Field(..., title="Action Type")
-    sql: Optional[str] = Field(None, title="Sql")
-    args: Optional[str] = Field(None, title="Args")
-    path: Optional[str] = Field(None, title="Path")
-    raw_payload: Optional[str] = Field(None, title="Raw Payload")
-
-
-class LogActionResponse(BaseModel):
-    success: bool = Field(..., title="Success")
-    message: str = Field(..., title="Message")
-
-
-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 ResetRequest(BaseModel):
-    timestamp: Optional[int] = Field(None, title="Timestamp")
-    seed: Optional[int] = Field(None, title="Seed")
-
-
-class ResetResponse(BaseModel):
-    success: bool = Field(..., title="Success")
-    message: str = Field(..., title="Message")
-
-
-class ResourceMode(Enum):
-    ro = "ro"
-    rw = "rw"
-
-
-class ResourceType(Enum):
-    db = "sqlite"
-    cdp = "cdp"
-
-
-class TableSchema(BaseModel):
-    name: str = Field(..., title="Name")
-    sql: str = Field(..., title="Sql")
-    columns: List[Dict[str, Any]] = Field(..., title="Columns")
-
-
-class TimestampResponse(BaseModel):
-    timestamp: str = Field(..., title="Timestamp")
-
-
-class ValidationError(BaseModel):
-    loc: List[Union[str, int]] = Field(..., title="Location")
-    msg: str = Field(..., title="Message")
-    type: str = Field(..., title="Error Type")
-
-
-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")
-
-
-class Resource(BaseModel):
-    name: str = Field(..., title="Name")
-    type: ResourceType
-    mode: ResourceMode
-    label: Optional[str] = Field(None, title="Label")
-
-
-class ExecuteFunctionRequest(BaseModel):
-    function_code: str
-    function_name: str
-    text_solution: Optional[str] = None
-
-
-class ExecuteFunctionResponse(BaseModel):
-    success: bool
-    result: Optional[Any] = None
-    error: Optional[str] = None
-    message: str

fleet/_async/models.py

@@ -1,109 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  openapi.json
-#   timestamp: 2025-07-08T18:21:47+00:00
-
-from __future__ import annotations
-
-from enum import Enum
-from typing import Dict, List, Optional, Union
-
-from pydantic import BaseModel, Field
-
-
-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")
-
-
-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")
-
-
-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")
-
-
-class InstanceStatus(Enum):
-    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")
-    execute_verifier_function_with_upload: str = Field(
-        ..., title="Execute Verifier Function With Upload"
-    )
-
-
-class ValidationError(BaseModel):
-    loc: List[Union[str, int]] = Field(..., title="Location")
-    msg: str = Field(..., title="Message")
-    type: str = Field(..., title="Error Type")
-
-
-class HTTPValidationError(BaseModel):
-    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")
-    manager: ManagerURLs
-
-
-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