fleet-python 0.2.69b3__py3-none-any.whl → 0.2.70__py3-none-any.whl

fleet/env/client.py

@@ -1,5 +1,5 @@
 from ..client import Fleet, SyncEnv, Task
-from ..models import Environment as EnvironmentModel, AccountResponse, InstanceResponse
+from ..models import Environment as EnvironmentModel, AccountResponse, InstanceResponse, Run, HeartbeatResponse
 from typing import List, Optional, Dict, Any
 
 
@@ -11,6 +11,7 @@ def make(
     image_type: Optional[str] = None,
     ttl_seconds: Optional[int] = None,
     run_id: Optional[str] = None,
+    heartbeat_interval: Optional[int] = None,
 ) -> SyncEnv:
     return Fleet().make(
         env_key,
@@ -20,6 +21,7 @@ def make(
         image_type=image_type,
         ttl_seconds=ttl_seconds,
         run_id=run_id,
+        heartbeat_interval=heartbeat_interval,
     )
 
 
@@ -36,9 +38,9 @@ def list_regions() -> List[str]:
 
 
 def list_instances(
-    status: Optional[str] = None, region: Optional[str] = None, run_id: Optional[str] = None
+    status: Optional[str] = None, region: Optional[str] = None, run_id: Optional[str] = None, profile_id: Optional[str] = None
 ) -> List[SyncEnv]:
-    return Fleet().instances(status=status, region=region, run_id=run_id)
+    return Fleet().instances(status=status, region=region, run_id=run_id, profile_id=profile_id)
 
 
 def get(instance_id: str) -> SyncEnv:
@@ -57,16 +59,45 @@ def close(instance_id: str) -> InstanceResponse:
     return Fleet().close(instance_id)
 
 
-def close_all(run_id: str) -> List[InstanceResponse]:
-    """Close (delete) all instances associated with a run_id.
+def close_all(run_id: Optional[str] = None, profile_id: Optional[str] = None) -> List[InstanceResponse]:
+    """Close (delete) instances using the batch delete endpoint.
     
     Args:
-        run_id: The run ID whose instances should be closed
+        run_id: Optional run ID to filter instances by
+        profile_id: Optional profile ID to filter instances by (use "self" for your own profile)
         
     Returns:
         List[InstanceResponse] containing the deleted instances
+        
+    Note:
+        At least one of run_id or profile_id must be provided.
+    """
+    return Fleet().close_all(run_id=run_id, profile_id=profile_id)
+
+
+def list_runs(profile_id: Optional[str] = None, status: Optional[str] = "active") -> List[Run]:
+    """List all runs (groups of instances by run_id) with aggregated statistics.
+    
+    Args:
+        profile_id: Optional profile ID to filter runs by (use "self" for your own profile)
+        status: Filter by run status - "active" (default), "inactive", or "all"
+        
+    Returns:
+        List[Run] containing run information with instance counts and timestamps
+    """
+    return Fleet().list_runs(profile_id=profile_id, status=status)
+
+
+def heartbeat(instance_id: str) -> HeartbeatResponse:
+    """Send heartbeat to keep instance alive (if heartbeat monitoring is enabled).
+    
+    Args:
+        instance_id: The instance ID to send heartbeat for
+        
+    Returns:
+        HeartbeatResponse containing heartbeat status and deadline information
     """
-    return Fleet().close_all(run_id)
+    return Fleet().heartbeat(instance_id)
 
 
 def account() -> AccountResponse:

fleet/instance/client.py

@@ -83,17 +83,9 @@ class InstanceClient:
         Returns:
             An SQLite database resource for the given database name
         """
-        resource_info = self._resources_state[ResourceType.db.value][name]
-        # Local mode - resource_info is a dict with creation parameters
-        if isinstance(resource_info, dict) and resource_info.get('type') == 'local':
-            # Create new instance each time (matching HTTP mode behavior)
-            return SQLiteResource(
-                resource_info['resource_model'],
-                client=None,
-                db_path=resource_info['db_path']
-            )
-        # HTTP mode - resource_info is a ResourceModel, create new wrapper
-        return SQLiteResource(resource_info, self.client)
+        return SQLiteResource(
+            self._resources_state[ResourceType.db.value][name], self.client
+        )
 
     def browser(self, name: str) -> BrowserResource:
         return BrowserResource(
@@ -183,17 +175,10 @@ class InstanceClient:
         response = self.client.request("GET", "/health")
         return HealthResponse(**response.json())
 
-    def close(self):
-        """Close anchor connections for in-memory databases."""
-        if hasattr(self, '_memory_anchors'):
-            for conn in self._memory_anchors.values():
-                conn.close()
-            self._memory_anchors.clear()
-
     def __enter__(self):
-        """Context manager entry."""
+        """Async context manager entry."""
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        """Context manager exit."""
+        """Async context manager exit."""
         self.close()

fleet/models.py

@@ -71,6 +71,7 @@ class InstanceRequest(BaseModel):
     image_type: Optional[str] = Field(None, title="Image Type")
     created_from: Optional[str] = Field(None, title="Created From")
     ttl_seconds: Optional[int] = Field(None, title="TTL Seconds")
+    heartbeat_interval: Optional[int] = Field(None, title="Heartbeat Interval")
 
 
 class InstanceStatus(Enum):
@@ -365,6 +366,36 @@ class InstanceResponse(BaseModel):
     urls: Optional[InstanceURLs] = Field(None, title="Urls")
     health: Optional[bool] = Field(None, title="Health")
     run_id: Optional[str] = Field(None, title="Run Id")
+    profile_id: Optional[str] = Field(None, title="Profile Id")
+    heartbeat_interval: Optional[int] = Field(None, title="Heartbeat Interval")
+    heartbeat_region: Optional[str] = Field(None, title="Heartbeat Region")
+
+
+class Run(BaseModel):
+    run_id: str = Field(..., title="Run Id")
+    running_count: int = Field(..., title="Running Count")
+    total_count: int = Field(..., title="Total Count")
+    first_created_at: str = Field(..., title="First Created At")
+    last_created_at: str = Field(..., title="Last Created At")
+    profile_id: Optional[str] = Field(None, title="Profile Id")
+
+
+class HeartbeatResponse(BaseModel):
+    """Response from bumping an instance heartbeat."""
+    
+    success: bool = Field(..., description="Whether the heartbeat was successfully updated")
+    instance_id: str = Field(..., description="The instance ID")
+    last_heartbeat: Optional[str] = Field(
+        None,
+        description="ISO 8601 UTC timestamp of the heartbeat (None if not enabled)",
+    )
+    deadline_timestamp: Optional[float] = Field(
+        None,
+        description="Unix timestamp when next heartbeat is due (None if not enabled)",
+    )
+    interval_seconds: Optional[int] = Field(
+        None, description="Heartbeat interval in seconds (None if not enabled)"
+    )
 
 
 class AccountResponse(BaseModel):
@@ -372,3 +403,5 @@ class AccountResponse(BaseModel):
     team_name: str = Field(..., title="Team Name")
     instance_limit: int = Field(..., title="Instance Limit")
     instance_count: int = Field(..., title="Instance Count")
+    profile_id: Optional[str] = Field(None, title="Profile Id")
+    profile_name: Optional[str] = Field(None, title="Profile Name")

fleet/resources/sqlite.py

@@ -675,97 +675,17 @@ class SyncQueryBuilder:
 
 
 class SQLiteResource(Resource):
-    def __init__(
-        self,
-        resource: ResourceModel,
-        client: Optional["SyncWrapper"] = None,
-        db_path: Optional[str] = None,
-    ):
+    def __init__(self, resource: ResourceModel, client: "SyncWrapper"):
         super().__init__(resource)
         self.client = client
-        self.db_path = db_path
-        self._mode = "direct" if db_path else "http"
-
-    @property
-    def mode(self) -> str:
-        """Return the mode of this resource: 'direct' (local file) or 'http' (remote API)."""
-        return self._mode
 
     def describe(self) -> DescribeResponse:
         """Describe the SQLite database schema."""
-        if self._mode == "direct":
-            return self._describe_direct()
-        else:
-            return self._describe_http()
-
-    def _describe_http(self) -> DescribeResponse:
-        """Describe database schema via HTTP API."""
         response = self.client.request(
             "GET", f"/resources/sqlite/{self.resource.name}/describe"
         )
         return DescribeResponse(**response.json())
 
-    def _describe_direct(self) -> DescribeResponse:
-        """Describe database schema from local file or in-memory database."""
-        try:
-            # Check if we need URI mode (for shared memory databases)
-            use_uri = 'mode=memory' in self.db_path
-            conn = sqlite3.connect(self.db_path, uri=use_uri)
-            cursor = conn.cursor()
-
-            # Get all tables
-            cursor.execute(
-                "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'"
-            )
-            table_names = [row[0] for row in cursor.fetchall()]
-
-            tables = []
-            for table_name in table_names:
-                # Get table info
-                cursor.execute(f"PRAGMA table_info({table_name})")
-                columns = cursor.fetchall()
-
-                # Get CREATE TABLE SQL
-                cursor.execute(
-                    f"SELECT sql FROM sqlite_master WHERE type='table' AND name=?",
-                    (table_name,)
-                )
-                sql_row = cursor.fetchone()
-                create_sql = sql_row[0] if sql_row else ""
-
-                table_schema = {
-                    "name": table_name,
-                    "sql": create_sql,
-                    "columns": [
-                        {
-                            "name": col[1],
-                            "type": col[2],
-                            "notnull": bool(col[3]),
-                            "default_value": col[4],
-                            "primary_key": col[5] > 0,
-                        }
-                        for col in columns
-                    ],
-                }
-                tables.append(table_schema)
-
-            conn.close()
-
-            return DescribeResponse(
-                success=True,
-                resource_name=self.resource.name,
-                tables=tables,
-                message="Schema retrieved from local file",
-            )
-        except Exception as e:
-            return DescribeResponse(
-                success=False,
-                resource_name=self.resource.name,
-                tables=None,
-                error=str(e),
-                message=f"Failed to describe database: {str(e)}",
-            )
-
     def query(self, query: str, args: Optional[List[Any]] = None) -> QueryResponse:
         return self._query(query, args, read_only=True)
 
@@ -775,15 +695,6 @@ class SQLiteResource(Resource):
     def _query(
         self, query: str, args: Optional[List[Any]] = None, read_only: bool = True
     ) -> QueryResponse:
-        if self._mode == "direct":
-            return self._query_direct(query, args, read_only)
-        else:
-            return self._query_http(query, args, read_only)
-
-    def _query_http(
-        self, query: str, args: Optional[List[Any]] = None, read_only: bool = True
-    ) -> QueryResponse:
-        """Execute query via HTTP API."""
         request = QueryRequest(query=query, args=args, read_only=read_only)
         response = self.client.request(
             "POST",
@@ -792,59 +703,6 @@ class SQLiteResource(Resource):
         )
         return QueryResponse(**response.json())
 
-    def _query_direct(
-        self, query: str, args: Optional[List[Any]] = None, read_only: bool = True
-    ) -> QueryResponse:
-        """Execute query directly on local SQLite file or in-memory database."""
-        try:
-            # Check if we need URI mode (for shared memory databases)
-            use_uri = 'mode=memory' in self.db_path
-            conn = sqlite3.connect(self.db_path, uri=use_uri)
-            cursor = conn.cursor()
-
-            # Execute the query
-            if args:
-                cursor.execute(query, args)
-            else:
-                cursor.execute(query)
-
-            # For write operations, commit the transaction
-            if not read_only:
-                conn.commit()
-
-            # Get column names if available
-            columns = [desc[0] for desc in cursor.description] if cursor.description else []
-
-            # Fetch results for SELECT queries
-            rows = []
-            rows_affected = 0
-            last_insert_id = None
-
-            if cursor.description:  # SELECT query
-                rows = cursor.fetchall()
-            else:  # INSERT/UPDATE/DELETE
-                rows_affected = cursor.rowcount
-                last_insert_id = cursor.lastrowid if cursor.lastrowid else None
-
-            conn.close()
-
-            return QueryResponse(
-                success=True,
-                columns=columns if columns else None,
-                rows=rows if rows else None,
-                rows_affected=rows_affected if rows_affected > 0 else None,
-                last_insert_id=last_insert_id,
-                message="Query executed successfully",
-            )
-        except Exception as e:
-            return QueryResponse(
-                success=False,
-                columns=None,
-                rows=None,
-                error=str(e),
-                message=f"Query failed: {str(e)}",
-            )
-
     def table(self, table_name: str) -> SyncQueryBuilder:
         """Create a query builder for the specified table."""
         return SyncQueryBuilder(self, table_name)

fleet/tasks.py

@@ -208,12 +208,19 @@ class Task(BaseModel):
         image_type: Optional[str] = None,
         ttl_seconds: Optional[int] = None,
         run_id: Optional[str] = None,
+        heartbeat_interval: Optional[int] = None,
     ):
         """Create an environment instance for this task's environment.
 
         Alias for make() method. Uses the task's env_id (and version if present) to create the env.
         """
-        return self.make(region=region, image_type=image_type, ttl_seconds=ttl_seconds, run_id=run_id)
+        return self.make(
+            region=region,
+            image_type=image_type,
+            ttl_seconds=ttl_seconds,
+            run_id=run_id,
+            heartbeat_interval=heartbeat_interval,
+        )
 
     def make(
         self,
@@ -221,6 +228,7 @@ class Task(BaseModel):
         image_type: Optional[str] = None,
         ttl_seconds: Optional[int] = None,
         run_id: Optional[str] = None,
+        heartbeat_interval: Optional[int] = None,
     ):
         """Create an environment instance with task's configuration.
 
@@ -229,12 +237,14 @@ class Task(BaseModel):
         - data_key (data_id + data_version, if present)
         - env_variables (if present)
         - run_id (if present)
+        - heartbeat_interval (if present)
 
         Args:
             region: Optional AWS region for the environment
             image_type: Optional image type for the environment
             ttl_seconds: Optional TTL in seconds for the instance
             run_id: Optional run ID to group instances
+            heartbeat_interval: Optional heartbeat interval in seconds (30-3600)
 
         Returns:
             Environment instance configured for this task
@@ -242,7 +252,7 @@ class Task(BaseModel):
         Example:
             task = fleet.Task(key="my-task", prompt="...", env_id="my-env",
                             data_id="my-data", data_version="v1.0")
-            env = task.make(region="us-west-2", run_id="my-batch-123")
+            env = task.make(region="us-west-2", run_id="my-batch-123", heartbeat_interval=60)
         """
         if not self.env_id:
             raise ValueError("Task has no env_id defined")
@@ -258,6 +268,7 @@ class Task(BaseModel):
             image_type=image_type,
             ttl_seconds=ttl_seconds,
             run_id=run_id,
+            heartbeat_interval=heartbeat_interval,
         )
 
 
@@ -286,11 +297,8 @@ def verifier_from_string(
         # Remove lines like: @verifier(key="...")
         cleaned_code = re.sub(r"@verifier\([^)]*\)\s*\n", "", verifier_func)
         # Also remove the verifier import if present
-        # Use MULTILINE flag to match beginning of lines with ^
-        cleaned_code = re.sub(r"^from fleet\.verifiers.*import.*verifier.*$\n?", "", cleaned_code, flags=re.MULTILINE)
-        cleaned_code = re.sub(r"^from fleet import verifier.*$\n?", "", cleaned_code, flags=re.MULTILINE)
-        cleaned_code = re.sub(r"^import fleet\.verifiers.*$\n?", "", cleaned_code, flags=re.MULTILINE)
-        cleaned_code = re.sub(r"^import fleet$\n?", "", cleaned_code, flags=re.MULTILINE)
+        cleaned_code = re.sub(r"from fleet import.*verifier.*\n", "", cleaned_code)
+        cleaned_code = re.sub(r"import.*verifier.*\n", "", cleaned_code)
 
         # Create a globals namespace with all required imports
         exec_globals = globals().copy()

fleet/verifiers/bundler.py

@@ -37,7 +37,7 @@ class FunctionBundler:
     ) -> bytes:
         """Create a function bundle with statically extracted code."""
 
-        logger.info(f"Creating function bundle for {func.__name__}")
+        # logger.info(f"Creating function bundle for {func.__name__}")
 
         # 1. Parse the main function and find dependencies
         mod_file = Path(func.__code__.co_filename)
@@ -115,7 +115,7 @@ class FunctionBundler:
 
         # Find function calls within the verifier function
         called_functions = self._extract_function_calls(main_func_ast)
-        logger.debug(f"Functions called in verifier: {called_functions}")
+        # logger.debug(f"Functions called in verifier: {called_functions}")
 
         # Find all functions defined in the module
         module_functions = {}
@@ -128,7 +128,7 @@ class FunctionBundler:
         for func_name in called_functions:
             if func_name in module_functions and func_name != func.__name__:
                 same_module_deps.append(func_name)
-                logger.debug(f"Found same-module dependency: {func_name}")
+                # logger.debug(f"Found same-module dependency: {func_name}")
 
         # Separate local and external imports
         local_imports = {}
@@ -292,7 +292,7 @@ class FunctionBundler:
                     code = ast.unparse(node)
                     extracted_code.append(code)
                 except Exception as e:
-                    logger.warning(f"Could not unparse AST node: {e}")
+                    # logger.warning(f"Could not unparse AST node: {e}")
                     # Fallback to original source extraction
                     lines = content.split("\n")
                     start_line = node.lineno - 1
@@ -305,11 +305,11 @@ class FunctionBundler:
                     extracted_code.append(code)
 
             result = "\n\n".join(extracted_code)
-            logger.debug(f"Extracted {len(extracted_code)} items from {file_path}")
+            # logger.debug(f"Extracted {len(extracted_code)} items from {file_path}")
             return result
 
         except Exception as e:
-            logger.warning(f"Failed to extract functions from {file_path}: {e}")
+            # logger.warning(f"Failed to extract functions from {file_path}: {e}")
             # Fallback to including the entire file
             with open(file_path, "r", encoding="utf-8") as f:
                 return f.read()
@@ -464,14 +464,14 @@ class FunctionBundler:
                 version = dist.version  # Get the installed version
                 package_with_version = f"{package_name}=={version}"
                 packages.add(package_with_version)
-                logger.debug(f"Mapped {mod} -> {package_with_version}")
+                # logger.debug(f"Mapped {mod} -> {package_with_version}")
             except imd.PackageNotFoundError:
                 # Skip stdlib or local modules
-                logger.debug(f"Skipping {mod} (stdlib or local)")
+                # logger.debug(f"Skipping {mod} (stdlib or local)")
                 continue
 
         package_list = list(packages)
-        logger.debug(f"Final package list: {package_list}")
+        # logger.debug(f"Final package list: {package_list}")
         return package_list
 
     def _merge_requirements(
@@ -511,10 +511,10 @@ class FunctionBundler:
             if pkg_name not in seen_packages:
                 final_requirements.append(req)
                 seen_packages.add(pkg_name)
-            else:
-                logger.debug(
-                    f"Skipping auto-detected {req}, using explicit version instead"
-                )
+            # else:
+            #     logger.debug(
+            #         f"Skipping auto-detected {req}, using explicit version instead"
+            #     )
 
         # Always ensure fleet-python is included
         if "fleet-python" not in seen_packages:
@@ -565,9 +565,9 @@ class FunctionBundler:
                         )
                         if dep_src:
                             same_module_code += f"\n{dep_src}\n"
-                            logger.debug(
-                                f"Extracted same-module dependency: {dep_name}"
-                            )
+                            # logger.debug(
+                            #     f"Extracted same-module dependency: {dep_name}"
+                            # )
 
                 # Create verifier.py with the main function
                 verifier_file = build_dir / "verifier.py"
@@ -586,7 +586,7 @@ class FunctionBundler:
 {code}
 """
                     dest_path.write_text(extracted_content)
-                    logger.debug(f"Created extracted file: {relative_path}")
+                    # logger.debug(f"Created extracted file: {relative_path}")
 
                     # Ensure __init__.py files exist
                     self._ensure_init_files(Path(relative_path), build_dir)
@@ -595,7 +595,7 @@ class FunctionBundler:
                 return self._create_zip_bundle(build_dir)
 
             except Exception as e:
-                logger.error(f"Failed to build function bundle: {e}")
+                # logger.error(f"Failed to build function bundle: {e}")
                 raise RuntimeError(f"Function bundle creation failed: {e}")
 
     def _ensure_init_files(self, rel_path: Path, build_dir: Path):
@@ -607,7 +607,7 @@ class FunctionBundler:
             if not init_file.exists():
                 init_file.parent.mkdir(parents=True, exist_ok=True)
                 init_file.write_text("# Auto-generated __init__.py")
-                logger.debug(f"Created __init__.py: {current}")
+                # logger.debug(f"Created __init__.py: {current}")
             current = current.parent
 
     def _create_zip_bundle(self, build_dir: Path) -> bytes:
@@ -621,7 +621,7 @@ class FunctionBundler:
                     zf.write(file_path, arcname)
 
         bundle_size = len(zip_buffer.getvalue())
-        logger.debug(f"Created function bundle ({bundle_size:,} bytes)")
+        # logger.debug(f"Created function bundle ({bundle_size:,} bytes)")
         return zip_buffer.getvalue()
 
     def _extract_function_source(
@@ -662,7 +662,8 @@ class FunctionBundler:
                     return "\n".join(func_lines)
 
         except Exception as e:
-            logger.warning(f"Failed to extract function {function_name}: {e}")
+            # logger.warning(f"Failed to extract function {function_name}: {e}")
+            pass
 
         return None
 

fleet/verifiers/decorator.py

@@ -49,7 +49,7 @@ class SyncVerifierFunction:
                     )
 
         except Exception as e:
-            logger.error(f"Error in verifier {self.key}: {e}")
+            # logger.error(f"Error in verifier {self.key}: {e}")
             # Return error score 0
             return 0.0