ai-computer-client 0.3.3__py3-none-any.whl → 0.3.4__py3-none-any.whl

ai_computer/client.py

@@ -6,10 +6,14 @@ from dataclasses import dataclass
 import os
 import mimetypes
 from pathlib import Path
+import logging
 
 from .models import SandboxResponse, StreamEvent, FileOperationResponse
 from .submodules import FileSystemModule, ShellModule, CodeModule
 
+# Set up logging
+logger = logging.getLogger(__name__)
+
 @dataclass
 class SandboxResponse:
     """Response from sandbox operations.
@@ -137,19 +141,23 @@ class SandboxClient:
         """Wait for the sandbox to be ready.
         
         Args:
-            max_attempts: Maximum number of attempts to check if sandbox is ready
+            max_attempts: Maximum number of attempts to check status
             delay: Delay between attempts in seconds
             
         Returns:
-            SandboxResponse indicating if the sandbox is ready
+            SandboxResponse with success=True if sandbox is ready
         """
-        if not self.token or not self.sandbox_id:
-            return SandboxResponse(success=False, error="Client not properly initialized. Call setup() first")
+        if not self.sandbox_id:
+            return SandboxResponse(
+                success=False,
+                error="Sandbox ID not set. Call setup() first."
+            )
             
         headers = {"Authorization": f"Bearer {self.token}"}
         
         for attempt in range(max_attempts):
             try:
+                logger.debug(f"Checking sandbox status (attempt {attempt + 1}/{max_attempts})...")
                 async with aiohttp.ClientSession() as session:
                     async with session.get(
                         f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/status",
@@ -157,13 +165,16 @@ class SandboxClient:
                     ) as response:
                         if response.status != 200:
                             # If we get an error, wait and try again
+                            logger.debug(f"Waiting {delay}s before next attempt...")
                             await asyncio.sleep(delay)
                             continue
                             
                         data = await response.json()
-                        status = data.get("status")
+                        status = data.get("status", "").lower()
+                        logger.debug(f"Current sandbox status: {status}")
                         
-                        if status == "ready":
+                        # Check for both 'ready' and 'running' status as indicators that the sandbox is ready
+                        if status == "ready" or status == "running":
                             return SandboxResponse(success=True, data=data)
                         elif status == "error":
                             return SandboxResponse(
@@ -172,13 +183,18 @@ class SandboxClient:
                             )
                         
                         # If not ready yet, wait and try again
+                        logger.debug(f"Waiting {delay}s before next attempt...")
                         await asyncio.sleep(delay)
                         
             except Exception as e:
                 # If we get an exception, wait and try again
+                logger.error(f"Error checking sandbox status: {str(e)}")
                 await asyncio.sleep(delay)
                 
-        return SandboxResponse(success=False, error="Timed out waiting for sandbox to be ready")
+        return SandboxResponse(
+            success=False,
+            error=f"Sandbox not ready after {max_attempts} attempts"
+        )
     
     async def cleanup(self) -> SandboxResponse:
         """Delete the sandbox.
@@ -367,7 +383,7 @@ class SandboxClient:
         await self.wait_for_ready()
         
         try:
-            response = await self.fs.read_file(remote_path, encoding=None)
+            response = await self.fs.download_bytes(remote_path, timeout=timeout or 300)
             if response.success:
                 return response.data.get('content')
             else:

ai_computer/submodules/code.py

@@ -44,7 +44,7 @@ class CodeModule(BaseSubmodule):
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute/code",
+                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute",
                     headers=headers,
                     json=data
                 ) as response:
@@ -87,7 +87,7 @@ class CodeModule(BaseSubmodule):
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute/code/stream",
+                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute/stream",
                     headers=headers,
                     json=data
                 ) as response:
@@ -186,7 +186,7 @@ result
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute/file",
+                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/execute",
                     headers=headers,
                     json=data
                 ) as response:

ai_computer/submodules/filesystem.py

@@ -4,6 +4,7 @@ import os
 import mimetypes
 from pathlib import Path
 from typing import Optional, Union, BinaryIO, Dict, Any
+from urllib.parse import quote
 
 from .base import BaseSubmodule
 from ..models import FileOperationResponse, SandboxResponse
@@ -122,14 +123,14 @@ class FileSystemModule(BaseSubmodule):
     async def download_file(
         self,
         remote_path: str,
-        local_path: Optional[Union[str, Path]] = None,
-        timeout: int = 300  # 5 minutes
+        local_path: Optional[str] = None,
+        timeout: int = 300
     ) -> FileOperationResponse:
-        """Download a file from the sandbox.
+        """Download a file from the sandbox to the local filesystem.
         
         Args:
             remote_path: Path to the file in the sandbox
-            local_path: Local path to save the file (if None, uses the filename from remote_path)
+            local_path: Local path to save the file (defaults to basename of remote_path)
             timeout: Maximum download time in seconds
             
         Returns:
@@ -139,15 +140,9 @@ class FileSystemModule(BaseSubmodule):
         if not ready.success:
             return FileOperationResponse(
                 success=False,
-                error=ready.error or "Sandbox not ready"
+                error=ready.error
             )
             
-        # Ensure path is absolute and normalize any double slashes
-        if not remote_path.startswith('/'):
-            remote_path = f"/{remote_path}"
-        clean_path = '/'.join(part for part in remote_path.split('/') if part)
-        clean_path = f"/{clean_path}"
-            
         # Determine local path if not provided
         if local_path is None:
             local_path = os.path.basename(remote_path)
@@ -160,9 +155,12 @@ class FileSystemModule(BaseSubmodule):
             "Authorization": f"Bearer {self.token}"
         }
         
-        params = {
-            "path": remote_path
-        }
+        # Store original path for error messages
+        original_path = remote_path
+        
+        # Ensure path is absolute
+        if not remote_path.startswith('/'):
+            remote_path = f"/{remote_path}"
         
         timeout_settings = aiohttp.ClientTimeout(
             total=timeout,
@@ -173,8 +171,12 @@ class FileSystemModule(BaseSubmodule):
         
         try:
             async with aiohttp.ClientSession(timeout=timeout_settings) as session:
+                # Use the new API endpoint with query parameters
+                url = f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/files"
+                params = {"path": quote(remote_path)}
+                
                 async with session.get(
-                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/files/download",
+                    url,
                     headers=headers,
                     params=params
                 ) as response:
@@ -182,7 +184,7 @@ class FileSystemModule(BaseSubmodule):
                         error_text = await response.text()
                         return FileOperationResponse(
                             success=False,
-                            error=f"Download failed: {error_text}"
+                            error=f"Failed to download file '{original_path}': {error_text}"
                         )
                     
                     # Get content disposition header to extract filename
@@ -225,38 +227,36 @@ class FileSystemModule(BaseSubmodule):
                 error=f"Download failed: {str(e)}"
             )
     
-    async def read_file(self, path: str, encoding: str = 'utf-8') -> SandboxResponse:
-        """Read a file from the sandbox and return its contents.
+    async def read_file(self, path: str, encoding: Optional[str] = 'utf-8') -> SandboxResponse:
+        """Read a file from the sandbox.
         
         Args:
             path: Path to the file in the sandbox
-            encoding: Text encoding to use (set to None for binary files)
+            encoding: Text encoding to use (None for binary)
             
         Returns:
-            SandboxResponse with the file contents in the data field
+            SandboxResponse with the file content
         """
         ready = await self._ensure_ready()
         if not ready.success:
             return ready
-        
-        # Ensure path is absolute and normalize any double slashes
+            
+        # Ensure path is absolute
         if not path.startswith('/'):
             path = f"/{path}"
-        clean_path = '/'.join(part for part in path.split('/') if part)
-        clean_path = f"/{clean_path}"
-        
+            
         headers = {
             "Authorization": f"Bearer {self.token}"
         }
         
-        params = {
-            "path": clean_path
-        }
-        
         try:
             async with aiohttp.ClientSession() as session:
+                # Use the new API endpoint with query parameters
+                url = f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/files"
+                params = {"path": quote(path)}
+                
                 async with session.get(
-                    f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/files/download",
+                    url,
                     headers=headers,
                     params=params
                 ) as response:
@@ -370,4 +370,69 @@ class FileSystemModule(BaseSubmodule):
             # Clean up the temporary file
             if os.path.exists(temp_file.name):
                 os.unlink(temp_file.name)
+                
+    async def download_bytes(self, path: str, timeout: int = 300) -> SandboxResponse:
+        """Download a file from the sandbox into memory.
+        
+        Args:
+            path: Path to the file in the sandbox
+            timeout: Maximum download time in seconds
+            
+        Returns:
+            SandboxResponse with the file content as bytes in the data field
+        """
+        ready = await self._ensure_ready()
+        if not ready.success:
+            return ready
+            
+        # Ensure path is absolute
+        if not path.startswith('/'):
+            path = f"/{path}"
+            
+        headers = {
+            "Authorization": f"Bearer {self.token}"
+        }
+        
+        timeout_settings = aiohttp.ClientTimeout(
+            total=timeout,
+            connect=30,
+            sock_connect=30,
+            sock_read=timeout
+        )
+        
+        try:
+            async with aiohttp.ClientSession(timeout=timeout_settings) as session:
+                # Use the new API endpoint with query parameters
+                url = f"{self.base_url}/api/v1/sandbox/{self.sandbox_id}/files"
+                params = {"path": quote(path)}
+                
+                async with session.get(
+                    url,
+                    headers=headers,
+                    params=params
+                ) as response:
+                    if response.status != 200:
+                        error_text = await response.text()
+                        return SandboxResponse(
+                            success=False,
+                            error=f"Download failed: {error_text}"
+                        )
+                    
+                    # Read the content
+                    content = await response.read()
+                    size = len(content)
+                    
+                    return SandboxResponse(
+                        success=True,
+                        data={
+                            'content': content,
+                            'size': size
+                        }
+                    )
+                    
+        except Exception as e:
+            return SandboxResponse(
+                success=False,
+                error=f"Failed to download file: {str(e)}"
+            )
 

{ai_computer_client-0.3.3.dist-info → ai_computer_client-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-computer-client
-Version: 0.3.3
+Version: 0.3.4
 Summary: Python client for interacting with the AI Computer service
 Project-URL: Homepage, https://github.com/ColeMurray/ai-computer-client-python
 Project-URL: Documentation, https://github.com/ColeMurray/ai-computer-client-python#readme
@@ -23,6 +23,9 @@ Provides-Extra: dev
 Requires-Dist: pytest-asyncio>=0.21.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest>=7.0.0; extra == 'dev'
+Provides-Extra: integration
+Requires-Dist: pytest-asyncio>=0.21.0; extra == 'integration'
+Requires-Dist: pytest>=7.0.0; extra == 'integration'
 Description-Content-Type: text/markdown
 
 # AI Computer Python Client
@@ -201,14 +204,34 @@ class StreamEvent:
 
 ### Running Tests
 
-```bash
-# Install development dependencies
-pip install -e ".[dev]"
+To run the unit tests:
 
-# Run tests
+```bash
 pytest
 ```
 
+### Running Integration Tests
+
+We have a comprehensive suite of integration tests that validate the client against the live API. These tests are automatically run as part of our CI/CD pipeline before each release.
+
+To run the integration tests locally:
+
+1. Set the required environment variables:
+
+```bash
+export AI_COMPUTER_API_KEY="your_api_key_here"
+# Optional: Use a specific sandbox ID (if not provided, a new one will be created)
+export AI_COMPUTER_SANDBOX_ID="optional_sandbox_id"
+```
+
+2. Run the tests:
+
+```bash
+python -m integration_tests.test_integration
+```
+
+For more details, see the [Integration Tests README](integration_tests/README.md).
+
 ### Contributing
 
 1. Fork the repository

ai_computer_client-0.3.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+ai_computer/__init__.py,sha256=0L4QSM3q4zWzYqNwisOqF_8ObcMdacmlXHbn55RX9YU,364
+ai_computer/client.py,sha256=U-xm04Koy429TbiMwJTURLeRH3NWy3lJFX5i7rvvacs,15090
+ai_computer/models.py,sha256=JG3gTKqCVrKlKsr4REAq5tb-WmZttn78LzxlrNiOJsQ,1214
+ai_computer/submodules/__init__.py,sha256=kz4NTuF9r3i_VwTLWsyRHaHKereyq0kFe1HrfKQLtB4,162
+ai_computer/submodules/base.py,sha256=3WoURENRnho26PkdghKM8S9s3-GYr11CwZidXhs-fFM,2530
+ai_computer/submodules/code.py,sha256=8GNpgL-6aVpD1UNtq-nvtvnMQy72dWKe247YA4cLsOs,11201
+ai_computer/submodules/filesystem.py,sha256=7x3g6Cr8PDKIuc9ogETuVjcOAlFKoHXhUcuntgRJv3s,15831
+ai_computer/submodules/shell.py,sha256=lcy4CpgoJWN6tsGi-IUb6PQpywLSNOD3_lt_yvSU6Y8,1632
+ai_computer_client-0.3.4.dist-info/METADATA,sha256=vVUG7UlP2FxGwugFbRm4gdL_JzLW1vt-S_kOH1W6Ugk,6407
+ai_computer_client-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ai_computer_client-0.3.4.dist-info/licenses/LICENSE,sha256=N_0S5G1Wik2LWVDViJMAM0Z-6vTBX1bvDjb8vouBA-c,1068
+ai_computer_client-0.3.4.dist-info/RECORD,,

ai_computer_client-0.3.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-ai_computer/__init__.py,sha256=0L4QSM3q4zWzYqNwisOqF_8ObcMdacmlXHbn55RX9YU,364
-ai_computer/client.py,sha256=ozdVAp_I8l7lGI5zI8cQUN00RfJ_V8XhrkjspwHV5yI,14402
-ai_computer/models.py,sha256=JG3gTKqCVrKlKsr4REAq5tb-WmZttn78LzxlrNiOJsQ,1214
-ai_computer/submodules/__init__.py,sha256=kz4NTuF9r3i_VwTLWsyRHaHKereyq0kFe1HrfKQLtB4,162
-ai_computer/submodules/base.py,sha256=3WoURENRnho26PkdghKM8S9s3-GYr11CwZidXhs-fFM,2530
-ai_computer/submodules/code.py,sha256=U0cLcB7iu90QS3BbFP31oNPJYgpgvYSWzxakhxMa3-A,11216
-ai_computer/submodules/filesystem.py,sha256=79gBefBIMj8qwFwTdVrpktOTqfvAfeZTf_jdTSxtcHs,13610
-ai_computer/submodules/shell.py,sha256=lcy4CpgoJWN6tsGi-IUb6PQpywLSNOD3_lt_yvSU6Y8,1632
-ai_computer_client-0.3.3.dist-info/METADATA,sha256=5kn2XaOh0LeQR7hexOsd1C1pOPrbr-pfWPLhDPUIaWU,5658
-ai_computer_client-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ai_computer_client-0.3.3.dist-info/licenses/LICENSE,sha256=N_0S5G1Wik2LWVDViJMAM0Z-6vTBX1bvDjb8vouBA-c,1068
-ai_computer_client-0.3.3.dist-info/RECORD,,