fleet-python 0.2.37__tar.gz → 0.2.39__tar.gz

{fleet_python-0.2.37 → fleet_python-0.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.37
+Version: 0.2.39
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0
@@ -12,12 +12,11 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.0

{fleet_python-0.2.37 → fleet_python-0.2.39}/fleet/_async/client.py

@@ -44,7 +44,12 @@ from .instance import (
     ResetResponse,
     ExecuteFunctionResponse,
 )
-from ..config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT, REGION_BASE_URL
+from ..config import (
+    DEFAULT_MAX_RETRIES,
+    DEFAULT_TIMEOUT,
+    REGION_BASE_URL,
+    GLOBAL_BASE_URL,
+)
 from .instance.base import default_httpx_client
 from .instance.client import ValidatorType
 from .resources.base import Resource
@@ -196,7 +201,12 @@ class AsyncFleet:
         response = await self.client.request("GET", f"/v1/env/{env_key}")
         return EnvironmentModel(**response.json())
 
-    async def make(self, env_key: str, region: Optional[str] = None, env_variables: Optional[Dict[str, Any]] = None) -> AsyncEnv:
+    async def make(
+        self,
+        env_key: str,
+        region: Optional[str] = None,
+        env_variables: Optional[Dict[str, Any]] = None,
+    ) -> AsyncEnv:
         if ":" in env_key:
             env_key_part, version = env_key.split(":", 1)
             if (
@@ -210,14 +220,23 @@ class AsyncFleet:
             version = None
 
         request = InstanceRequest(
-            env_key=env_key_part, version=version, region=region, env_variables=env_variables, created_from="sdk"
+            env_key=env_key_part,
+            version=version,
+            region=region,
+            env_variables=env_variables,
+            created_from="sdk",
         )
-        region_base_url = REGION_BASE_URL.get(region)
+
+        # Only use region-specific base URL if no custom base URL is set
+        base_url = None
+        if region and self.client.base_url == GLOBAL_BASE_URL:
+            base_url = REGION_BASE_URL.get(region)
+
         response = await self.client.request(
             "POST",
             "/v1/env/instances",
             json=request.model_dump(exclude_none=True),
-            base_url=region_base_url,
+            base_url=base_url,
         )
 
         instance = AsyncEnv(client=self.client, **response.json())
@@ -308,11 +327,11 @@ class AsyncFleet:
         return task
 
     async def load_tasks(
-        self, 
+        self,
         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]:
         """Load tasks for the authenticated team, with optional filtering.
 
@@ -498,7 +517,7 @@ class AsyncFleet:
         """
         from ..tasks import verifier_from_string
         from .verifiers.verifier import AsyncVerifierFunction
-        
+
         # Use verifier_from_string to create the verifier
         verifier_func = verifier_from_string(
             verifier_func=verifier_code,
@@ -506,7 +525,7 @@ class AsyncFleet:
             verifier_key=verifier_key,
             sha256=verifier_sha,
         )
-        
+
         # Store the original verifier code for reference
         verifier_func._verifier_code = verifier_code
 

{fleet_python-0.2.37 → fleet_python-0.2.39}/fleet/client.py

@@ -44,7 +44,12 @@ from .instance import (
     ResetResponse,
     ExecuteFunctionResponse,
 )
-from .config import DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT, REGION_BASE_URL
+from .config import (
+    DEFAULT_MAX_RETRIES,
+    DEFAULT_TIMEOUT,
+    REGION_BASE_URL,
+    GLOBAL_BASE_URL,
+)
 from .instance.base import default_httpx_client
 from .instance.client import ValidatorType
 from .resources.base import Resource
@@ -196,7 +201,12 @@ class Fleet:
         response = self.client.request("GET", f"/v1/env/{env_key}")
         return EnvironmentModel(**response.json())
 
-    def make(self, env_key: str, region: Optional[str] = None, env_variables: Optional[Dict[str, Any]] = None) -> SyncEnv:
+    def make(
+        self,
+        env_key: str,
+        region: Optional[str] = None,
+        env_variables: Optional[Dict[str, Any]] = None,
+    ) -> SyncEnv:
         if ":" in env_key:
             env_key_part, version = env_key.split(":", 1)
             if (
@@ -210,14 +220,23 @@ class Fleet:
             version = None
 
         request = InstanceRequest(
-            env_key=env_key_part, version=version, region=region, env_variables=env_variables, created_from="sdk"
+            env_key=env_key_part,
+            version=version,
+            region=region,
+            env_variables=env_variables,
+            created_from="sdk",
         )
-        region_base_url = REGION_BASE_URL.get(region)
+
+        # Only use region-specific base URL if no custom base URL is set
+        base_url = None
+        if region and self.client.base_url == GLOBAL_BASE_URL:
+            base_url = REGION_BASE_URL.get(region)
+
         response = self.client.request(
             "POST",
             "/v1/env/instances",
             json=request.model_dump(exclude_none=True),
-            base_url=region_base_url,
+            base_url=base_url,
         )
 
         instance = SyncEnv(client=self.client, **response.json())
@@ -254,9 +273,7 @@ class Fleet:
     def execute_verifier_remote(
         self, bundle_data: bytes, args: tuple, kwargs: dict, timeout: Optional[int] = 30
     ) -> VerifiersExecuteResponse:
-        return _execute_verifier_remote(
-            self.client, bundle_data, args, kwargs, timeout
-        )
+        return _execute_verifier_remote(self.client, bundle_data, args, kwargs, timeout)
 
     def delete(self, instance_id: str) -> InstanceResponse:
         return _delete_instance(self.client, instance_id)
@@ -267,9 +284,7 @@ class Fleet:
 
         return self.load_task_array_from_string(tasks_data)
 
-    def load_task_array_from_string(
-        self, serialized_tasks: List[Dict]
-    ) -> List[Task]:
+    def load_task_array_from_string(self, serialized_tasks: List[Dict]) -> List[Task]:
         tasks = []
 
         json_tasks = json.loads(serialized_tasks)
@@ -308,11 +323,11 @@ class Fleet:
         return task
 
     def load_tasks(
-        self, 
+        self,
         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]:
         """Load tasks for the authenticated team, with optional filtering.
 
@@ -498,7 +513,7 @@ class Fleet:
         """
         from .tasks import verifier_from_string
         from .verifiers import SyncVerifierFunction
-        
+
         # Use verifier_from_string to create the verifier
         verifier_func = verifier_from_string(
             verifier_func=verifier_code,
@@ -506,7 +521,7 @@ class Fleet:
             verifier_key=verifier_key,
             sha256=verifier_sha,
         )
-        
+
         # Store the original verifier code for reference
         verifier_func._verifier_code = verifier_code
 

{fleet_python-0.2.37 → fleet_python-0.2.39}/fleet/tasks.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import re
+import asyncio
 from datetime import datetime
 from typing import Any, Dict, Optional, List
 from uuid import UUID
@@ -73,7 +74,12 @@ class Task(BaseModel):
         if self.verifier:
             import inspect
 
-            result = self.verifier.remote(env, *args, **kwargs)
+            # 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)
 
             # If the result is a coroutine, we need to run it
             if inspect.iscoroutine(result):
@@ -144,19 +150,23 @@ def verifier_from_string(
     try:
         import inspect
         from .verifiers import verifier, SyncVerifierFunction
-        from fleet.verifiers.code import TASK_SUCCESSFUL_SCORE, TASK_FAILED_SCORE
-        from fleet.verifiers.db import IgnoreConfig
+        from .verifiers.code import TASK_SUCCESSFUL_SCORE, TASK_FAILED_SCORE
+        from .verifiers.db import IgnoreConfig
         
-        # Create a local namespace for executing the code
-        local_namespace = {
+        # 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
-        }
+        })
+        
+        # Create a local namespace for executing the code
+        local_namespace = {}
         
         # Execute the verifier code in the namespace
-        exec(verifier_func, globals(), local_namespace)
+        exec(verifier_func, exec_globals, local_namespace)
         
         # Find the function that was defined
         func_obj = None
@@ -168,8 +178,30 @@ def verifier_from_string(
         if func_obj is None:
             raise ValueError("No function found in verifier code")
         
-        # Create an AsyncVerifierFunction instance
-        verifier_instance = SyncVerifierFunction(func_obj, verifier_key, verifier_id)
+        # 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)
         
         # Store additional metadata
         verifier_instance._verifier_code = verifier_func

{fleet_python-0.2.37 → fleet_python-0.2.39}/fleet_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.37
+Version: 0.2.39
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0
@@ -12,12 +12,11 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.0

{fleet_python-0.2.37 → fleet_python-0.2.39}/pyproject.toml

@@ -4,20 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fleet-python"
-version = "0.2.37"
+version = "0.2.39"
 description = "Python SDK for Fleet environments"
 authors = [
     {name = "Fleet AI", email = "nic@fleet.so"},
 ]
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = {text = "Apache-2.0"}
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -59,21 +58,21 @@ where = ["."]
 
 [tool.black]
 line-length = 88
-target-version = ['py38']
+target-version = ['py39']
 
 [tool.isort]
 profile = "black"
 line_length = 88
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 strict = true
 warn_return_any = true
 warn_unused_configs = true
 
 [tool.ruff]
 line-length = 88
-target-version = "py38"
+target-version = "py39"
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"