fleet-python 0.2.26__py3-none-any.whl → 0.2.27__py3-none-any.whl

scripts/fix_sync_imports.py

@@ -9,18 +9,38 @@ def fix_file(filepath: Path) -> bool:
     content = filepath.read_text()
     original = content
     
-    # Remove asyncio import if it exists
-    content = re.sub(r'^import asyncio.*\n', '', content, flags=re.MULTILINE)
-    content = re.sub(r'^import asyncio as async_time.*\n', '', content, flags=re.MULTILINE)
-    # Also remove indented asyncio imports (like in functions)
-    content = re.sub(r'^\s+import asyncio.*\n', '', content, flags=re.MULTILINE)
+    # Handle asyncio imports - replace with inspect in verifier files, remove elsewhere
+    if 'verifier' in str(filepath).lower() and 'iscoroutinefunction' in content:
+        # In verifier files, replace asyncio with inspect
+        content = re.sub(r'^import asyncio\b', 'import inspect', content, flags=re.MULTILINE)
+        content = content.replace('asyncio.iscoroutinefunction', 'inspect.iscoroutinefunction')
+    else:
+        # In other files, remove asyncio imports
+        content = re.sub(r'^import asyncio.*\n', '', content, flags=re.MULTILINE)
+        content = re.sub(r'^import asyncio as async_time.*\n', '', content, flags=re.MULTILINE)
+        # Also remove indented asyncio imports (like in functions)
+        content = re.sub(r'^\s+import asyncio.*\n', '', content, flags=re.MULTILINE)
     
     # Fix any remaining asyncio.sleep or async_time.sleep calls
     content = content.replace('asyncio.sleep(', 'time.sleep(')
     content = content.replace('async_time.sleep(', 'time.sleep(')
     
-    # Fix absolute imports to relative imports for verifiers
-    content = content.replace('from fleet.verifiers import', 'from ..verifiers import')
+    # Fix absolute imports to relative imports for verifiers based on file location
+    rel_path = filepath.relative_to(Path(__file__).parent.parent / "fleet")
+    depth = len(rel_path.parts) - 1  # -1 because the file itself doesn't count
+
+    # Fix verifier imports specifically - only in non-verifiers directories
+    if 'verifiers' not in str(rel_path):
+        content = content.replace('from ..verifiers', 'from .verifiers')
+    
+    # Fix specific cases for verifiers/__init__.py
+    if rel_path == Path('verifiers/__init__.py'):
+        # These should be relative imports within the verifiers package
+        content = content.replace('from ...verifiers.db import', 'from .db import')
+        content = content.replace('from ...verifiers.code import', 'from .code import')
+        # Also handle the case where unasync transformed fleet.verifiers to ..verifiers
+        content = content.replace('from ..verifiers.db import', 'from .db import')
+        content = content.replace('from ..verifiers.code import', 'from .code import')
     
     # Fix any remaining AsyncFleetPlaywrightWrapper references in docstrings
     content = content.replace('AsyncFleetPlaywrightWrapper', 'FleetPlaywrightWrapper')
@@ -56,6 +76,23 @@ def fix_file(filepath: Path) -> bool:
         content = content.replace('"Environment",', '"SyncEnv",')
         content = content.replace("'Environment',", "'SyncEnv',")
     
+    # Add async-to-sync conversion to client.py _create_verifier_from_data method
+    if rel_path.parts[0] == 'client.py' and len(rel_path.parts) == 1:
+        # Find the _create_verifier_from_data method and add async-to-sync conversion
+        if '_create_verifier_from_data' in content and 'from .verifiers.verifier import SyncVerifierFunction' in content:
+            # Look for the line where we have the verifier_code and add conversion before any other processing
+            insertion_point = 'from .verifiers.verifier import SyncVerifierFunction'
+            if insertion_point in content:
+                replacement = insertion_point + '''
+
+        # Convert async verifier code to sync
+        if 'async def' in verifier_code:
+            verifier_code = verifier_code.replace('async def', 'def')
+        if 'await ' in verifier_code:
+            verifier_code = verifier_code.replace('await ', '')'''
+                
+                content = content.replace(insertion_point, replacement)
+    
     # Fix playwright imports for sync version
     if 'playwright' in str(filepath):
         # Fix the import statement

fleet/tasks.py

@@ -1,44 +0,0 @@
-"""Fleet SDK Task Model."""
-
-from __future__ import annotations
-
-import re
-from datetime import datetime
-from typing import Any, Dict, Optional
-from uuid import UUID
-
-from pydantic import BaseModel, Field, validator
-
-# Import the shared VerifierFunction type that works for both async and sync
-from fleet.types import VerifierFunction
-
-
-class Task(BaseModel):
-    """A task model representing a single task in the Fleet system."""
-    
-    key: str = Field(..., description="Unique task key identifier")
-    prompt: str = Field(..., description="Task prompt or instruction")
-    env_id: str = Field(..., description="Environment identifier")
-    created_at: Optional[datetime] = Field(None, description="Task creation timestamp")
-    verifier: Optional[Any] = Field(None, description="Verifier function with decorator (async or sync)")
-    metadata: Optional[Dict[str, Any]] = Field(default_factory=dict, description="Additional task metadata")
-
-    @validator('key')
-    def validate_key_format(cls, v):
-        """Validate key follows kebab-case format."""
-        if not re.match(r'^[a-z0-9]+(-[a-z0-9]+)*$', v):
-            raise ValueError(f'Invalid task key format: {v}. Must follow kebab-case format.')
-        return v
-
-    @validator('created_at', pre=True, always=True)
-    def set_created_at(cls, v):
-        """Set created_at to current time if not provided."""
-        return v or datetime.now()
-
-    class Config:
-        """Pydantic model configuration."""
-        json_encoders = {
-            datetime: lambda v: v.isoformat(),
-        }
-        # Allow arbitrary types for the verifier field
-        arbitrary_types_allowed = True