fleet-python 0.2.42__py3-none-any.whl → 0.2.44__py3-none-any.whl

fleet/tasks.py

@@ -47,7 +47,7 @@ class Task(BaseModel):
     @property
     def env_key(self) -> str:
         """Get the environment key combining env_id and version."""
-        if self.version:
+        if self.version and self.version != "None" and ":" not in self.env_id:
             return f"{self.env_id}:{self.version}"
         return self.env_id
 
@@ -70,17 +70,13 @@ class Task(BaseModel):
             import inspect
 
             # Check if verifier has remote method (for decorated verifiers)
-            if hasattr(self.verifier, 'remote'):
-                result = self.verifier.remote(env, *args, **kwargs)
-            else:
-                # For verifiers created from string, call directly
-                result = self.verifier(env, *args, **kwargs)
+            result = self.verifier.remote(env, *args, **kwargs)
 
             # If the result is a coroutine, we need to run it
             if inspect.iscoroutine(result):
                 # Check if we're already in an event loop
                 try:
-                    loop = asyncio.get_running_loop()
+                    asyncio.get_running_loop()
                     # We're in an async context, can't use asyncio.run()
                     raise RuntimeError(
                         "Cannot run async verifier in sync mode while event loop is running. "
@@ -126,93 +122,88 @@ class Task(BaseModel):
 
 
 def verifier_from_string(
-    verifier_func: str,
-    verifier_id: str,
-    verifier_key: str,
-    sha256: str = ""
-) -> 'VerifierFunction':
+    verifier_func: str, verifier_id: str, verifier_key: str, sha256: str = ""
+) -> "VerifierFunction":
     """Create a verifier function from string code.
-    
+
     Args:
         verifier_func: The verifier function code as a string
         verifier_id: Unique identifier for the verifier
         verifier_key: Key/name for the verifier
         sha256: SHA256 hash of the verifier code
-        
+
     Returns:
         VerifierFunction instance that can be used to verify tasks
     """
     try:
         import inspect
-        from .verifiers import verifier, SyncVerifierFunction
+        from .verifiers import SyncVerifierFunction
         from .verifiers.code import TASK_SUCCESSFUL_SCORE, TASK_FAILED_SCORE
         from .verifiers.db import IgnoreConfig
-        
+
         # Create a globals namespace with all required imports
         exec_globals = globals().copy()
-        exec_globals.update({
-            'TASK_SUCCESSFUL_SCORE': TASK_SUCCESSFUL_SCORE,
-            'TASK_FAILED_SCORE': TASK_FAILED_SCORE,
-            'IgnoreConfig': IgnoreConfig,
-            'Environment': object  # Add Environment type if needed
-        })
-        
+        exec_globals.update(
+            {
+                "TASK_SUCCESSFUL_SCORE": TASK_SUCCESSFUL_SCORE,
+                "TASK_FAILED_SCORE": TASK_FAILED_SCORE,
+                "IgnoreConfig": IgnoreConfig,
+                "Environment": object,  # Add Environment type if needed
+            }
+        )
+
         # Create a local namespace for executing the code
         local_namespace = {}
-        
+
         # Execute the verifier code in the namespace
         exec(verifier_func, exec_globals, local_namespace)
-        
+
         # Find the function that was defined
         func_obj = None
         for name, obj in local_namespace.items():
             if inspect.isfunction(obj):
                 func_obj = obj
                 break
-        
+
         if func_obj is None:
             raise ValueError("No function found in verifier code")
-        
-        # Create a wrapper function that provides the necessary globals
-        def wrapped_verifier(env, *args, **kwargs):
-            # Set up globals for the function execution
-            func_globals = func_obj.__globals__.copy() if hasattr(func_obj, '__globals__') else {}
-            func_globals.update({
-                'TASK_SUCCESSFUL_SCORE': TASK_SUCCESSFUL_SCORE,
-                'TASK_FAILED_SCORE': TASK_FAILED_SCORE,
-                'IgnoreConfig': IgnoreConfig
-            })
-            
-            # Create a new function with the updated globals
-            import types
-            new_func = types.FunctionType(
-                func_obj.__code__,
-                func_globals,
-                func_obj.__name__,
-                func_obj.__defaults__,
-                func_obj.__closure__
-            )
-            
-            return new_func(env, *args, **kwargs)
-        
-        # Create an AsyncVerifierFunction instance with the wrapped function
-        verifier_instance = SyncVerifierFunction(wrapped_verifier, verifier_key, verifier_id)
-        
+
+        # Create an SyncVerifierFunction instance with raw code
+        verifier_instance = SyncVerifierFunction(
+            func=func_obj,
+            key=verifier_key,
+            verifier_id=verifier_id,
+            sha256=sha256,
+            raw_code=verifier_func,
+        )
+
         # Store additional metadata
         verifier_instance._verifier_code = verifier_func
         verifier_instance._sha256 = sha256
-        
+
         return verifier_instance
-        
+
     except Exception as e:
         raise ValueError(f"Failed to create verifier from string: {e}")
 
 
+def load_tasks_from_file(filename: str) -> List[Task]:
+    """Load tasks from a JSON file.
+
+    Example:
+        tasks = fleet.load_tasks_from_file("my_tasks.json")
+    """
+    from .global_client import get_client
+
+    client = get_client()
+    return client.load_tasks_from_file(filename)
+
+
 def load_tasks(
     env_key: Optional[str] = None,
     keys: Optional[List[str]] = None,
     version: Optional[str] = None,
-    team_id: Optional[str] = None
+    team_id: Optional[str] = None,
 ) -> List[Task]:
     """Convenience function to load tasks with optional filtering.
 
@@ -232,17 +223,12 @@ def load_tasks(
 
     client = get_client()
     return client.load_tasks(
-        env_key=env_key,
-        keys=keys,
-        version=version,
-        team_id=team_id
+        env_key=env_key, keys=keys, version=version, team_id=team_id
     )
 
 
 def update_task(
-    task_key: str,
-    prompt: Optional[str] = None,
-    verifier_code: Optional[str] = None
+    task_key: str, prompt: Optional[str] = None, verifier_code: Optional[str] = None
 ):
     """Convenience function to update an existing task.
 
@@ -263,7 +249,5 @@ def update_task(
 
     client = get_client()
     return client.update_task(
-        task_key=task_key,
-        prompt=prompt,
-        verifier_code=verifier_code
+        task_key=task_key, prompt=prompt, verifier_code=verifier_code
     )

fleet/verifiers/__init__.py

@@ -2,7 +2,7 @@
 
 from .db import DatabaseSnapshot, IgnoreConfig, SnapshotDiff
 from .code import TASK_SUCCESSFUL_SCORE, TASK_FAILED_SCORE
-from .decorator import (
+from .verifier import (
     verifier,
     SyncVerifierFunction,
 )

fleet/verifiers/db.py

@@ -22,9 +22,11 @@ import json
 #  Low‑level helpers
 ################################################################################
 
-SQLValue = str | int | float | None
-Condition = tuple[str, str, SQLValue]  # (column, op, value)
-JoinSpec = tuple[str, dict[str, str]]  # (table, on mapping)
+from typing import Union, Tuple, Dict, List, Optional, Any, Set
+
+SQLValue = Union[str, int, float, None]
+Condition = Tuple[str, str, SQLValue]  # (column, op, value)
+JoinSpec = Tuple[str, Dict[str, str]]  # (table, on mapping)
 
 
 def _is_json_string(value: Any) -> bool:
@@ -98,13 +100,13 @@ class QueryBuilder:
     def __init__(self, snapshot: "DatabaseSnapshot", table: str):  # noqa: UP037
         self._snapshot = snapshot
         self._table = table
-        self._select_cols: list[str] = ["*"]
-        self._conditions: list[Condition] = []
-        self._joins: list[JoinSpec] = []
-        self._limit: int | None = None
-        self._order_by: str | None = None
+        self._select_cols: List[str] = ["*"]
+        self._conditions: List[Condition] = []
+        self._joins: List[JoinSpec] = []
+        self._limit: Optional[int] = None
+        self._order_by: Optional[str] = None
         # Cache for idempotent executions
-        self._cached_rows: list[dict[str, Any]] | None = None
+        self._cached_rows: Optional[List[Dict[str, Any]]] = None
 
     # ---------------------------------------------------------------------
     #  Column projection / limiting / ordering
@@ -150,12 +152,12 @@ class QueryBuilder:
     def lte(self, column: str, value: SQLValue) -> "QueryBuilder":  # noqa: UP037
         return self._add_condition(column, "<=", value)
 
-    def in_(self, column: str, values: list[SQLValue]) -> "QueryBuilder":  # noqa: UP037
+    def in_(self, column: str, values: List[SQLValue]) -> "QueryBuilder":  # noqa: UP037
         qb = self._clone()
         qb._conditions.append((column, "IN", tuple(values)))
         return qb
 
-    def not_in(self, column: str, values: list[SQLValue]) -> "QueryBuilder":  # noqa: UP037
+    def not_in(self, column: str, values: List[SQLValue]) -> "QueryBuilder":  # noqa: UP037
         qb = self._clone()
         qb._conditions.append((column, "NOT IN", tuple(values)))
         return qb
@@ -174,7 +176,7 @@ class QueryBuilder:
     # ---------------------------------------------------------------------
     #  JOIN (simple inner join)
     # ---------------------------------------------------------------------
-    def join(self, other_table: str, on: dict[str, str]) -> "QueryBuilder":  # noqa: UP037
+    def join(self, other_table: str, on: Dict[str, str]) -> "QueryBuilder":  # noqa: UP037
         """`on` expects {local_col: remote_col}."""
         qb = self._clone()
         qb._joins.append((other_table, on))
@@ -183,10 +185,10 @@ class QueryBuilder:
     # ---------------------------------------------------------------------
     #  Execution helpers
     # ---------------------------------------------------------------------
-    def _compile(self) -> tuple[str, list[Any]]:
+    def _compile(self) -> Tuple[str, List[Any]]:
         cols = ", ".join(self._select_cols)
         sql = [f"SELECT {cols} FROM {self._table}"]
-        params: list[Any] = []
+        params: List[Any] = []
 
         # Joins -------------------------------------------------------------
         for tbl, onmap in self._joins:
@@ -224,7 +226,7 @@ class QueryBuilder:
 
         return " ".join(sql), params
 
-    def _execute(self) -> list[dict[str, Any]]:
+    def _execute(self) -> List[Dict[str, Any]]:
         if self._cached_rows is not None:
             return self._cached_rows
 
@@ -255,10 +257,10 @@ class QueryBuilder:
         conn.close()
         return _CountResult(val)
 
-    def first(self) -> dict[str, Any] | None:
+    def first(self) -> Optional[Dict[str, Any]]:
         return self.limit(1)._execute()[0] if self.limit(1)._execute() else None
 
-    def all(self) -> list[dict[str, Any]]:
+    def all(self) -> List[Dict[str, Any]]:
         return self._execute()
 
     # Assertions -----------------------------------------------------------
@@ -357,9 +359,9 @@ class IgnoreConfig:
 
     def __init__(
         self,
-        tables: set[str] | None = None,
-        fields: set[str] | None = None,
-        table_fields: dict[str, set[str]] | None = None,
+        tables: Optional[Set[str]] = None,
+        fields: Optional[Set[str]] = None,
+        table_fields: Optional[Dict[str, Set[str]]] = None,
     ):
         """
         Args:
@@ -386,7 +388,7 @@ class IgnoreConfig:
         return False
 
 
-def _format_row_for_error(row: dict[str, Any], max_fields: int = 10) -> str:
+def _format_row_for_error(row: Dict[str, Any], max_fields: int = 10) -> str:
     """Format a row dictionary for error messages with truncation if needed."""
     if not row:
         return "{empty row}"
@@ -402,7 +404,7 @@ def _format_row_for_error(row: dict[str, Any], max_fields: int = 10) -> str:
         return "{" + ", ".join(shown_items) + f", ... +{remaining} more fields" + "}"
 
 
-def _get_row_identifier(row: dict[str, Any]) -> str:
+def _get_row_identifier(row: Dict[str, Any]) -> str:
     """Extract a meaningful identifier from a row for error messages."""
     # Try common ID fields first
     for id_field in ["id", "pk", "primary_key", "key"]:
@@ -429,7 +431,7 @@ class SnapshotDiff:
         self,
         before: DatabaseSnapshot,
         after: DatabaseSnapshot,
-        ignore_config: IgnoreConfig | None = None,
+        ignore_config: Optional[IgnoreConfig] = None,
     ):
         from .sql_differ import SQLiteDiffer  # local import to avoid circularity
 
@@ -437,14 +439,14 @@ class SnapshotDiff:
         self.after = after
         self.ignore_config = ignore_config or IgnoreConfig()
         self._differ = SQLiteDiffer(before.db_path, after.db_path)
-        self._cached: dict[str, Any] | None = None
+        self._cached: Optional[Dict[str, Any]] = None
 
     # ------------------------------------------------------------------
     def _collect(self):
         if self._cached is not None:
             return self._cached
         all_tables = set(self.before.tables()) | set(self.after.tables())
-        diff: dict[str, dict[str, Any]] = {}
+        diff: Dict[str, Dict[str, Any]] = {}
         for tbl in all_tables:
             if self.ignore_config.should_ignore_table(tbl):
                 continue
@@ -453,12 +455,12 @@ class SnapshotDiff:
         return diff
 
     # ------------------------------------------------------------------
-    def expect_only(self, allowed_changes: list[dict[str, Any]]):
+    def expect_only(self, allowed_changes: List[Dict[str, Any]]):
         """Allowed changes is a list of {table, pk, field, after} (before optional)."""
         diff = self._collect()
 
         def _is_change_allowed(
-            table: str, row_id: str, field: str | None, after_value: Any
+            table: str, row_id: str, field: Optional[str], after_value: Any
         ) -> bool:
             """Check if a change is in the allowed list using semantic comparison."""
             for allowed in allowed_changes:
@@ -596,7 +598,10 @@ class SnapshotDiff:
         return self
 
     def expect(
-        self, *, allow: list[dict[str, Any]] = None, forbid: list[dict[str, Any]] = None
+        self,
+        *,
+        allow: Optional[List[Dict[str, Any]]] = None,
+        forbid: Optional[List[Dict[str, Any]]] = None,
     ):
         """More granular: allow / forbid per‑table and per‑field."""
         allow = allow or []
@@ -629,7 +634,7 @@ class SnapshotDiff:
 class DatabaseSnapshot:
     """Represents a snapshot of an SQLite DB with DSL entrypoints."""
 
-    def __init__(self, db_path: str, *, name: str | None = None):
+    def __init__(self, db_path: str, *, name: Optional[str] = None):
         self.db_path = db_path
         self.name = name or f"snapshot_{datetime.utcnow().isoformat()}"
         self.created_at = datetime.utcnow()
@@ -639,7 +644,7 @@ class DatabaseSnapshot:
         return QueryBuilder(self, table)
 
     # Metadata -------------------------------------------------------------
-    def tables(self) -> list[str]:
+    def tables(self) -> List[str]:
         conn = sqlite3.connect(self.db_path)
         cur = conn.cursor()
         cur.execute(
@@ -654,7 +659,7 @@ class DatabaseSnapshot:
     def diff(
         self,
         other: "DatabaseSnapshot",  # noqa: UP037
-        ignore_config: IgnoreConfig | None = None,
+        ignore_config: Optional[IgnoreConfig] = None,
     ) -> SnapshotDiff:
         return SnapshotDiff(self, other, ignore_config)
 
@@ -663,7 +668,7 @@ class DatabaseSnapshot:
     ############################################################################
 
     def expect_row(
-        self, table: str, where: dict[str, SQLValue], expect: dict[str, SQLValue]
+        self, table: str, where: Dict[str, SQLValue], expect: Dict[str, SQLValue]
     ):
         qb = self.table(table)
         for k, v in where.items():
@@ -676,10 +681,10 @@ class DatabaseSnapshot:
     def expect_rows(
         self,
         table: str,
-        where: dict[str, SQLValue],
+        where: Dict[str, SQLValue],
         *,
-        count: int | None = None,
-        contains: list[dict[str, SQLValue]] | None = None,
+        count: Optional[int] = None,
+        contains: Optional[List[Dict[str, SQLValue]]] = None,
     ):
         qb = self.table(table)
         for k, v in where.items():
@@ -694,7 +699,7 @@ class DatabaseSnapshot:
                     raise AssertionError(f"Expected a row matching {cond} in {table}")
         return self
 
-    def expect_absent_row(self, table: str, where: dict[str, SQLValue]):
+    def expect_absent_row(self, table: str, where: Dict[str, SQLValue]):
         qb = self.table(table)
         for k, v in where.items():
             qb = qb.eq(k, v)

fleet/verifiers/parse.py

@@ -1,7 +1,10 @@
 import re
 
 
-def extract_function_name(function_code: str) -> str | None:
+from typing import Optional
+
+
+def extract_function_name(function_code: str) -> Optional[str]:
     """
     Extract function name from Python function code.
 

fleet/verifiers/sql_differ.py

@@ -1,5 +1,5 @@
 import sqlite3
-from typing import Any
+from typing import Any, Optional, List, Dict, Tuple
 
 
 class SQLiteDiffer:
@@ -7,7 +7,7 @@ class SQLiteDiffer:
         self.before_db = before_db
         self.after_db = after_db
 
-    def get_table_schema(self, db_path: str, table_name: str) -> list[str]:
+    def get_table_schema(self, db_path: str, table_name: str) -> List[str]:
         """Get column names for a table"""
         conn = sqlite3.connect(db_path)
         cursor = conn.cursor()
@@ -16,7 +16,7 @@ class SQLiteDiffer:
         conn.close()
         return columns
 
-    def get_primary_key_columns(self, db_path: str, table_name: str) -> list[str]:
+    def get_primary_key_columns(self, db_path: str, table_name: str) -> List[str]:
         """Get all primary key columns for a table, ordered by their position"""
         conn = sqlite3.connect(db_path)
         cursor = conn.cursor()
@@ -34,7 +34,7 @@ class SQLiteDiffer:
         pk_columns.sort(key=lambda x: x[0])
         return [col[1] for col in pk_columns]
 
-    def get_all_tables(self, db_path: str) -> list[str]:
+    def get_all_tables(self, db_path: str) -> List[str]:
         """Get all table names from database"""
         conn = sqlite3.connect(db_path)
         cursor = conn.cursor()
@@ -49,8 +49,8 @@ class SQLiteDiffer:
         self,
         db_path: str,
         table_name: str,
-        primary_key_columns: list[str] | None = None,
-    ) -> tuple[dict[Any, dict], list[str]]:
+        primary_key_columns: Optional[List[str]] = None,
+    ) -> Tuple[Dict[Any, dict], List[str]]:
         """Get table data indexed by primary key (single column or composite)"""
         conn = sqlite3.connect(db_path)
         conn.row_factory = sqlite3.Row
@@ -97,7 +97,7 @@ class SQLiteDiffer:
         conn.close()
         return data, primary_key_columns
 
-    def compare_rows(self, before_row: dict, after_row: dict) -> dict[str, dict]:
+    def compare_rows(self, before_row: dict, after_row: dict) -> Dict[str, dict]:
         """Compare two rows field by field"""
         changes = {}
 
@@ -113,7 +113,7 @@ class SQLiteDiffer:
         return changes
 
     def diff_table(
-        self, table_name: str, primary_key_columns: list[str] | None = None
+        self, table_name: str, primary_key_columns: Optional[List[str]] = None
     ) -> dict:
         """Create comprehensive diff of a table"""
         before_data, detected_pk = self.get_table_data(

fleet/verifiers/verifier.py

@@ -12,10 +12,22 @@ import uuid
 import logging
 import hashlib
 import inspect
-from typing import Any, Callable, Dict, Optional, List, TypeVar, Set
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Optional,
+    List,
+    TypeVar,
+    Set,
+    TYPE_CHECKING,
+    Tuple,
+)
 
 from .bundler import FunctionBundler
-from ..client import SyncEnv
+
+if TYPE_CHECKING:
+    from ..client import SyncEnv
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +68,7 @@ class SyncVerifierFunction:
         # Copy function metadata
         functools.update_wrapper(self, func)
 
-    def _get_or_create_bundle(self) -> tuple[bytes, str]:
+    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:
             # If we have raw code, create a bundle from it
@@ -98,7 +110,7 @@ class SyncVerifierFunction:
 
         return self._bundle_data, self._bundle_sha
 
-    def _check_bundle_status(self, env: SyncEnv) -> tuple[str, bool]:
+    def _check_bundle_status(self, env: "SyncEnv") -> Tuple[str, bool]:
         """Check if bundle needs to be uploaded and return (sha, needs_upload)."""
         bundle_data, bundle_sha = self._get_or_create_bundle()
 
@@ -129,7 +141,7 @@ class SyncVerifierFunction:
         logger.info(f"Bundle {bundle_sha[:8]}... needs to be uploaded")
         return bundle_sha, True  # Upload needed
 
-    def __call__(self, env: SyncEnv, *args, **kwargs) -> float:
+    def __call__(self, env: "SyncEnv", *args, **kwargs) -> float:
         """Local execution of the verifier function with env as first parameter."""
         try:
             if self._is_async:
@@ -160,7 +172,7 @@ class SyncVerifierFunction:
             # Return error score 0
             return 0.0
 
-    def remote(self, env: SyncEnv, *args, **kwargs) -> float:
+    def remote(self, env: "SyncEnv", *args, **kwargs) -> float:
         """Remote execution of the verifier function with SHA-based bundle caching."""
         # Async verifiers are now supported by the backend
         # if self._is_async:
@@ -272,7 +284,7 @@ Remote traceback:
         except:
             raise RuntimeError(full_message)
 
-    def _get_env_id(self, env: SyncEnv) -> str:
+    def _get_env_id(self, env: "SyncEnv") -> 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"):

{fleet_python-0.2.42.dist-info → fleet_python-0.2.44.dist-info}/METADATA

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