fleet-python 0.2.12__py3-none-any.whl → 0.2.15__py3-none-any.whl

fleet/_async/verifiers/verifier.py

@@ -0,0 +1,301 @@
+"""Fleet SDK Verifier - Async Version.
+
+Provides a @verifier decorator that can wrap any sync function to support
+both local execution and remote execution via .remote() method.
+
+The decorated function must take 'env' as its first parameter, making it explicit
+that verifiers operate within an environment context.
+"""
+
+import functools
+import uuid
+import logging
+import hashlib
+import asyncio
+import inspect
+from typing import Any, Callable, Dict, Optional, List, TypeVar, Set, Union
+
+from .bundler import FunctionBundler
+from ..client import AsyncEnv
+
+logger = logging.getLogger(__name__)
+
+F = TypeVar('F', bound=Callable[..., Any])
+
+# Global cache to track which bundle SHAs have been uploaded to S3
+_uploaded_bundle_shas: Set[str] = set()
+
+
+@functools.lru_cache(maxsize=128)
+def _get_bundle_sha(bundle_data: bytes) -> str:
+    """Calculate SHA256 hash of bundle data with LRU caching."""
+    return hashlib.sha256(bundle_data).hexdigest()
+
+
+class AsyncVerifierFunction:
+    """Wrapper for a verified function that supports local execution with env-first pattern."""
+    
+    def __init__(
+        self,
+        func: F,
+        key: str,
+        extra_requirements: Optional[List[str]] = None,
+        verifier_id: Optional[str] = None
+    ):
+        self.func = func
+        self.key = key
+        self.name = key  # Keep name for backward compatibility
+        self.verifier_id = verifier_id or str(uuid.uuid4())
+        self.extra_requirements = extra_requirements or []
+        self._bundler = FunctionBundler()
+        self._bundle_sha: Optional[str] = None  # Cached bundle SHA
+        self._bundle_data: Optional[bytes] = None  # Cached bundle data
+        self._is_async = asyncio.iscoroutinefunction(func)
+        
+        # Copy function metadata
+        functools.update_wrapper(self, func)
+    
+    def _get_or_create_bundle(self) -> tuple[bytes, str]:
+        """Get or create bundle data and return (bundle_data, sha)."""
+        if self._bundle_data is None or self._bundle_sha is None:
+            # Create bundle and cache it
+            self._bundle_data = self._bundler.create_bundle(
+                self.func, 
+                self.extra_requirements,
+                self.verifier_id
+            )
+            self._bundle_sha = _get_bundle_sha(self._bundle_data)
+            logger.debug(f"Created bundle for {self.name} with SHA: {self._bundle_sha}")
+        
+        return self._bundle_data, self._bundle_sha
+    
+    async def _check_bundle_status(self, env: AsyncEnv) -> tuple[str, bool]:
+        """Check if bundle needs to be uploaded and return (sha, needs_upload)."""
+        bundle_data, bundle_sha = self._get_or_create_bundle()
+        
+        # 1. Check local process cache first
+        if bundle_sha in _uploaded_bundle_shas:
+            logger.debug(f"Bundle {bundle_sha[:8]}... found in local cache")
+            return bundle_sha, False  # Already uploaded, no upload needed
+        
+        # 2. Check if bundle exists on server (pseudocode)
+        # TODO: Add endpoint to check if bundle SHA exists in S3
+        try:
+            exists = await env.check_bundle_exists(bundle_sha)
+            if exists.success:
+                logger.info(f"Bundle {bundle_sha[:8]}... found on server, updating cache")
+                _uploaded_bundle_shas.add(bundle_sha)
+                return bundle_sha, False  # Found on server, no upload needed
+        except Exception as e:
+            logger.warning(f"Failed to check bundle existence: {e}")
+        
+        # 3. Bundle not found locally or on server - upload needed
+        logger.info(f"Bundle {bundle_sha[:8]}... needs to be uploaded")
+        return bundle_sha, True  # Upload needed
+    
+    async def __call__(self, env: AsyncEnv, *args, **kwargs) -> float:
+        """Local execution of the verifier function with env as first parameter."""
+        try:
+            if self._is_async:
+                # For async functions, await the result
+                result = await self.func(env, *args, **kwargs)
+            else:
+                # For sync functions, call directly
+                result = self.func(env, *args, **kwargs)
+            
+            # Handle different return types
+            if isinstance(result, (int, float)):
+                # Direct score return
+                return float(result)
+            elif isinstance(result, dict) and "score" in result:
+                # For local execution, return the full dict if that's what the function returns
+                return result
+            else:
+                # Try to extract score from object attributes
+                if hasattr(result, 'score'):
+                    return float(result.score)
+                else:
+                    raise ValueError(f"Verifier function must return a score (number). Got {type(result)}")
+                    
+        except Exception as e:
+            logger.error(f"Error in verifier {self.name}: {e}")
+            # Return error score 0
+            return 0.0
+    
+    async def remote(self, env: AsyncEnv, *args, **kwargs) -> float:
+        """Remote execution of the verifier function with SHA-based bundle caching."""
+        if self._is_async:
+            raise NotImplementedError(
+                f"Async verifier '{self.name}' cannot be executed remotely. "
+                "The remote execution environment only supports synchronous functions. "
+                "Please provide a synchronous version of your verifier."
+            )
+        
+        try:
+            # Check if bundle needs to be uploaded
+            bundle_sha, needs_upload = await self._check_bundle_status(env)
+            
+            if needs_upload:
+                # Need to upload bundle to S3
+                logger.info(f"Uploading bundle {bundle_sha[:8]}... for {self.key}")
+                bundle_data, _ = self._get_or_create_bundle()
+                
+                response = await env.execute_verifier_remote(
+                    bundle_data=bundle_data,
+                    bundle_sha=bundle_sha,
+                    key=self.key,
+                    function_name=self.func.__name__,
+                    args=args,
+                    kwargs=kwargs,
+                    needs_upload=True
+                )
+                
+                # Mark as uploaded after successful execution
+                _uploaded_bundle_shas.add(bundle_sha)
+                logger.debug(f"Registered bundle {bundle_sha[:8]}... as uploaded")
+                
+            else:
+                # Bundle already available - execute without upload
+                logger.info(f"Executing cached bundle {bundle_sha[:8]}... for {self.key}")
+                bundle_data, _ = self._get_or_create_bundle()
+                
+                response = await env.execute_verifier_remote(
+                    bundle_data=bundle_data,  # Still need bundle_data for local caching
+                    bundle_sha=bundle_sha,
+                    key=self.key,
+                    function_name=self.func.__name__,
+                    args=args,
+                    kwargs=kwargs,
+                    needs_upload=False  # Don't upload, just execute
+                )
+            
+            # Handle response
+            if response.success:
+                return self._process_result(response.result)
+            else:
+                self._raise_remote_error(response.error)
+                
+        except Exception as e:
+            logger.error(f"Remote execution failed for {self.key}: {e}")
+            # If it's an HTTP error, try to get more details
+            if hasattr(e, 'response') and hasattr(e.response, 'text'):
+                logger.error(f"Server response: {e.response.text}")
+            raise
+    
+    def _process_result(self, result: Any) -> float:
+        """Process remote execution result, handling different return types."""
+        # Handle different return types like local execution
+        if isinstance(result, (int, float)):
+            return float(result)
+        elif isinstance(result, dict) and "score" in result:
+            return float(result["score"])
+        else:
+            # Try to extract score from object attributes
+            if hasattr(result, 'score'):
+                return float(result.score)
+            else:
+                # Best effort conversion
+                try:
+                    return float(result)
+                except (ValueError, TypeError):
+                    logger.warning(f"Could not convert result to float: {result}")
+                    return 0.0
+    
+    def _raise_remote_error(self, error_info: Dict[str, Any]):
+        """Reconstruct remote error as local exception."""
+        error_type = error_info.get("type", "RuntimeError")
+        message = error_info.get("message", "Remote execution failed")
+        traceback_str = error_info.get("traceback", "")
+        
+        # Create a rich error message
+        full_message = f"""
+Remote verifier execution failed:
+{message}
+
+Remote traceback:
+{traceback_str}
+        """.strip()
+        
+        # Try to raise the original exception type
+        try:
+            exception_class = getattr(__builtins__, error_type, RuntimeError)
+            raise exception_class(full_message)
+        except:
+            raise RuntimeError(full_message)
+    
+    def _get_env_id(self, env: AsyncEnv) -> str:
+        """Generate a unique identifier for the environment."""
+        # Use instance base URL or similar unique identifier
+        if hasattr(env, 'instance') and hasattr(env.instance, 'base_url'):
+            return f"{env.instance.base_url}"
+        else:
+            # Fallback to object id (less ideal but works)
+            return str(id(env))
+    
+    def _is_bundle_not_found_error(self, error: Exception) -> bool:
+        """Check if the error indicates the bundle was not found on the server."""
+        # Check for common "bundle not found" error patterns
+        error_msg = str(error).lower()
+        return (
+            "bundle not found" in error_msg or
+            "verifier not found" in error_msg or
+            "404" in error_msg or
+            "not found" in error_msg
+        )
+
+
+def verifier(
+    key: Optional[str] = None,
+    extra_requirements: Optional[List[str]] = None
+) -> Callable[[F], AsyncVerifierFunction]:
+    """
+    Decorator to create a verifier function with env-first pattern.
+    
+    The decorated function must take 'env' as its first parameter, making it explicit
+    that verifiers operate within an environment context. This makes verifiers reusable
+    across different environments.
+    
+    Args:
+        key: Optional key for the verifier. Defaults to function name.
+        extra_requirements: Additional PyPI packages needed by the verifier.
+    
+    Example:
+        # Synchronous verifier (works locally and remotely)
+        @verifier(key="check_user_count")
+        def check_user_count(env, expected_count: int) -> float:
+            db = env.db()
+            result = db.query("SELECT COUNT(*) FROM users")
+            actual_count = result.rows[0][0]
+            return 1.0 if actual_count >= expected_count else 0.0
+        
+        # Async verifier (only works locally)
+        @verifier(key="check_user_async")
+        async def check_user_async(env, expected_count: int) -> float:
+            db = env.db()
+            result = await db.query("SELECT COUNT(*) FROM users")
+            actual_count = result.rows[0][0]
+            return 1.0 if actual_count >= expected_count else 0.0
+        
+        # Usage
+        env = await flt.env.make_async("fira")
+        
+        # Local execution
+        result = await check_user_count(env, 5)        # sync verifier
+        result = await check_user_async(env, 5)       # async verifier
+        
+        # Remote execution
+        result = await check_user_count.remote(env, 5) # sync verifier works
+        # await check_user_async.remote(env, 5)        # raises NotImplementedError
+    """
+    def decorator(func: F) -> AsyncVerifierFunction:
+        verifier_key = key or func.__name__
+        verifier_uuid = str(uuid.uuid4())
+        
+        return AsyncVerifierFunction(
+            func,
+            verifier_key,
+            extra_requirements,
+            verifier_uuid
+        )
+    
+    return decorator 

fleet/base.py

@@ -1,8 +1,10 @@
 import httpx
 from typing import Dict, Any, Optional
 import json
+import logging
 
 from .models import InstanceResponse
+from .config import GLOBAL_BASE_URL
 from .exceptions import (
     FleetAPIError,
     FleetAuthenticationError,
@@ -18,6 +20,8 @@ from .exceptions import (
     FleetPermissionError,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class EnvironmentBase(InstanceResponse):
     @property
@@ -31,7 +35,7 @@ class BaseWrapper:
             raise ValueError("api_key is required")
         self.api_key = api_key
         if base_url is None:
-            base_url = "https://orchestrator.fleetai.com"
+            base_url = GLOBAL_BASE_URL
         self.base_url = base_url
 
     def get_headers(self) -> Dict[str, str]:
@@ -40,6 +44,10 @@ class BaseWrapper:
             "X-Fleet-SDK-Version": "1.0.0",
         }
         headers["Authorization"] = f"Bearer {self.api_key}"
+        # Debug log
+        import logging
+        logger = logging.getLogger(__name__)
+        logger.debug(f"Headers being sent: {headers}")
         return headers
 
 
@@ -81,6 +89,11 @@ class SyncWrapper(BaseWrapper):
     def _handle_error_response(self, response: httpx.Response) -> None:
         """Handle HTTP error responses and convert to appropriate Fleet exceptions."""
         status_code = response.status_code
+        
+        # Debug log 500 errors
+        if status_code == 500:
+            logger.error(f"Got 500 error from {response.url}")
+            logger.error(f"Response text: {response.text}")
 
         # Try to parse error response as JSON
         try: