fleet-python 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

fleet/verifiers/parse.py

@@ -0,0 +1,143 @@
+import re
+
+
+def extract_function_name(function_code: str) -> str | None:
+    """
+    Extract function name from Python function code.
+    
+    Handles both regular functions (def) and async functions (async def).
+    
+    Args:
+        function_code: Python function code as a string
+        
+    Returns:
+        The function name if found, None otherwise
+    """
+    # Pattern to match both def and async def functions
+    # Handles various formatting styles and type annotations
+    pattern = r'(?:async\s+)?def\s+(\w+)\s*\('
+    
+    match = re.search(pattern, function_code)
+    if match:
+        return match.group(1)
+    
+    return None
+
+
+def convert_verifier_string(verifier_str: str) -> str:
+    """
+    Convert a verifier function string from the old format (env: Environment) 
+    to the new format (before: DatabaseSnapshot, after: DatabaseSnapshot).
+    
+    Args:
+        verifier_str: The original verifier function as a string
+        
+    Returns:
+        The converted verifier function string
+    """
+    # First, handle escaped newlines in the input
+    verifier_str = verifier_str.replace('\\n', '\n')
+    
+    # Extract function name, docstring, and body
+    # More flexible pattern that accepts both int and float return types
+    func_pattern = r'def\s+(\w+)\s*\(\s*env(?:\s*:\s*Environment)?\s*,?\s*final_answer(?:\s*:\s*str\s*\|\s*None)?\s*(?:=\s*None)?\s*\)\s*->\s*(?:float|int):\s*\n((?:\s*""".*?"""\s*\n)?)(.*)'
+    match = re.match(func_pattern, verifier_str.strip(), re.DOTALL)
+    
+    if not match:
+        # Try with multiline pattern
+        func_pattern_multiline = r'def\s+(\w+)\s*\(\s*\n?\s*env(?:\s*:\s*Environment)?\s*,?\s*\n?\s*final_answer(?:\s*:\s*str\s*\|\s*None)?\s*(?:=\s*None)?\s*\n?\s*\)\s*->\s*(?:float|int):\s*\n((?:\s*""".*?"""\s*\n)?)(.*)'
+        match = re.match(func_pattern_multiline, verifier_str.strip(), re.DOTALL)
+        
+        if not match:
+            raise ValueError("Could not parse verifier function. Expected format: def function_name(env: Environment, final_answer: str | None = None) -> float/int:")
+    
+    func_name = match.group(1)
+    docstring = match.group(2).strip()
+    body = match.group(3)
+    
+    # Find all unique env.db() calls
+    db_calls = re.findall(r'env\.db\("(\w+)"\)', body)
+    unique_db_names = list(dict.fromkeys(db_calls))  # Remove duplicates while preserving order
+    
+    # Build the new function
+    new_func = f'''def {func_name}(
+    before: DatabaseSnapshot, after: DatabaseSnapshot, transcript: str | None = None
+) -> int:
+    class Environment:
+        def db(self, name: str) -> DatabaseSnapshot:'''
+    
+    # Build the db method based on found database names
+    if unique_db_names:
+        conditions = []
+        for db_name in unique_db_names:
+            if db_name == "seed":
+                conditions.append('before if name == "seed"')
+            elif db_name == "current":
+                conditions.append('after')
+            else:
+                # Handle other database names if needed
+                conditions.append(f'None  # Handle "{db_name}"')
+        
+        if len(conditions) == 2 and "seed" in unique_db_names and "current" in unique_db_names:
+            new_func += f'''
+            return before if name == "seed" else after'''
+        else:
+            # More complex mapping if needed
+            new_func += f'''
+            if name == "seed":
+                return before
+            elif name == "current":
+                return after
+            else:
+                raise ValueError(f"Unknown database name: {{name}}")'''
+    else:
+        new_func += '''
+            return before if name == "seed" else after'''
+    
+    new_func += '''
+
+        @property
+        def instance(self):
+            return self
+        
+        def load(self):
+            pass
+
+    def verifier(env: Environment, final_answer: str | None = None) -> float:'''
+    
+    if docstring:
+        new_func += f'\n        {docstring}'
+    
+    # First, find the minimum indentation in the body (excluding empty lines)
+    body_lines = body.splitlines()
+    min_indent = float('inf')
+    for line in body_lines:
+        if line.strip():  # Non-empty line
+            indent_len = len(line) - len(line.lstrip())
+            min_indent = min(min_indent, indent_len)
+    
+    # If we didn't find any non-empty lines, set min_indent to 0
+    if min_indent == float('inf'):
+        min_indent = 0
+    
+    # Now strip the minimum indentation and re-indent to 8 spaces
+    if body_lines:
+        indented_lines = []
+        for line in body_lines:
+            if line.strip():  # Non-empty line
+                # Remove the minimum indentation and add 8 spaces
+                stripped_line = line[min_indent:] if len(line) > min_indent else line.lstrip()
+                indented_lines.append('        ' + stripped_line)
+            else:  # Empty line
+                indented_lines.append('')
+        
+        indented_body = '\n'.join(indented_lines)
+        new_func += f'\n{indented_body}'
+    
+    # Add the return statement
+    new_func += '\n\n    return verifier(Environment(), transcript)'
+
+    # Replace TASK_FAILED_SCORE with 0 in the function string
+    new_func = new_func.replace('TASK_FAILED_SCORE', '0')
+
+    return new_func

fleet/verifiers/verifier.py

@@ -9,14 +9,12 @@ that verifiers operate within an environment context.
 
 import functools
 import uuid
-import asyncio
 import logging
 import hashlib
-import inspect
-from typing import Any, Callable, Dict, Optional, List, TypeVar, Set, Union
+from typing import Any, Callable, Dict, Optional, List, TypeVar, Set
 
 from .bundler import FunctionBundler
-from ..client import Environment
+from ..client import SyncEnv
 
 logger = logging.getLogger(__name__)
 
@@ -44,7 +42,6 @@ class SyncVerifierFunction:
     ):
         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()
@@ -65,11 +62,11 @@ class SyncVerifierFunction:
                 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}")
+            logger.debug(f"Created bundle for {self.key} with SHA: {self._bundle_sha}")
         
         return self._bundle_data, self._bundle_sha
     
-    def _check_bundle_status(self, env: Environment) -> 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()
         
@@ -93,7 +90,7 @@ class SyncVerifierFunction:
         logger.info(f"Bundle {bundle_sha[:8]}... needs to be uploaded")
         return bundle_sha, True  # Upload needed
     
-    def __call__(self, env: Environment, *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:
@@ -118,15 +115,15 @@ class SyncVerifierFunction:
                     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}")
+            logger.error(f"Error in verifier {self.key}: {e}")
             # Return error score 0
             return 0.0
     
-    def remote(self, env: Environment, *args, **kwargs) -> float:
+    def remote(self, env: SyncEnv, *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. "
+                f"Async verifier '{self.key}' cannot be executed remotely. "
                 "The remote execution environment only supports synchronous functions. "
                 "Please provide a synchronous version of your verifier."
             )
@@ -223,7 +220,7 @@ Remote traceback:
         except:
             raise RuntimeError(full_message)
     
-    def _get_env_id(self, env: Environment) -> 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'):
@@ -298,4 +295,4 @@ def verifier(
             verifier_uuid
         )
     
-    return decorator 
+    return decorator

{fleet_python-0.2.20.dist-info → fleet_python-0.2.22.dist-info}/METADATA

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

{fleet_python-0.2.20.dist-info → fleet_python-0.2.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 examples/diff_example.py,sha256=zXEPFC-_Ap_uEihf0Shs5R7W7Pq1I5i_Y_KC-TYxyQw,5643
-examples/dsl_example.py,sha256=tYHfSyuyhJUSL-nKDhMA4hgZgDVNQkF5RRJLof6H_WY,7163
+examples/dsl_example.py,sha256=ApdJ8Dj4ZSHyE04M6pMFhWoACdkuvUSVKfEymSPs9Oc,7190
 examples/example.py,sha256=SAz5iPxca8n9MvnHVoWHI7GCaTgJwkegX78rMutF9gE,1082
 examples/example_action_log.py,sha256=XrLqFNS8hD-K6nKVSohYi6oJkYotLCZJYJsGSbHuqEc,627
 examples/example_client.py,sha256=70HKEhz_Gb79YcvKQauCPdS08AAwjo9unt2dh1jN_Oo,1030
@@ -15,53 +15,55 @@ examples/openai_example.py,sha256=I2vk_SJN9BkSRQCYRJfbtGJ-HJ2xzQj-lOjwqmLos5M,82
 examples/openai_simple_example.py,sha256=I42ytIwv0INgDO39pp1MOQSqsJz2YYH8GeNNBaUtq3A,1748
 examples/query_builder_example.py,sha256=Q3lUBETHpu1aS2FXAO79ADYqCxOjMMMZNgCcFVapiII,3918
 examples/quickstart.py,sha256=1VT39IRRhemsJgxi0O0gprdpcw7HB4pYO97GAYagIcg,3788
-fleet/__init__.py,sha256=9EsG068VCTqCCyBA2jw8IMLw4_oFkWLhtY394CtjEgM,2234
+fleet/__init__.py,sha256=m_Y_HYmMPWfWzUgt-jvm1ZP9kLeRlhy3sjNb0IDMWME,2284
 fleet/base.py,sha256=0yYuMN0lBkrfTTZBt5NQp5112xWgziuWEk4GuHJB1wE,9189
-fleet/client.py,sha256=HrHkxQMk9_2GsyG7_edauKets3xySglCUuXW3WtXmTE,28263
+fleet/client.py,sha256=SDrq3gfmbAa-F-wmewHN7PyoUc2SWKy2DdaYmJHx1dk,11591
 fleet/config.py,sha256=zd19st83NJdW9DdOq7Irpc0x-iUnMad0JOtAr_nD5DM,273
 fleet/exceptions.py,sha256=fUmPwWhnT8SR97lYsRq0kLHQHKtSh2eJS0VQ2caSzEI,5055
-fleet/models.py,sha256=YMHFAgBF4OqoAOv-arHze3bPDDZ5DAzb3CXhVLF6pPw,9019
-fleet/tasks.py,sha256=w-0vVGfEuCWRHMEJ73SN141J7Lz2pD_0v-nNG4TyJTU,1645
+fleet/models.py,sha256=gH3hpQM5awRqagSGPIsjOleB8AdFND8E4s9ZkZc5c_0,11372
+fleet/tasks.py,sha256=Zxz1qAq4C7MT1ZuqIeGp6gf6RCAYSkFDQtm6Je5UEk4,1644
 fleet/types.py,sha256=eXeI8BFmiU5hln0PVvJbUZs7BSjl6wSqAtN9zaJT6yY,652
 fleet/_async/__init__.py,sha256=AJWCnuo7XKja4yBb8fK2wX7ntciLXQrpzdRHwjTRP6M,62
 fleet/_async/base.py,sha256=s0rYOtXsMJeitOvpa-Oh8ciLV226p_TIPp3fplzWvV4,9209
-fleet/_async/client.py,sha256=yyNawgGro2sfFh0ok7DtbjnyxaBGrHg9RtTFEISvwdE,10581
+fleet/_async/client.py,sha256=jByARVSmtsOS9Qlukwij_exPzIQW5TBMtIGKnLqlF00,11924
 fleet/_async/exceptions.py,sha256=fUmPwWhnT8SR97lYsRq0kLHQHKtSh2eJS0VQ2caSzEI,5055
+fleet/_async/models.py,sha256=gH3hpQM5awRqagSGPIsjOleB8AdFND8E4s9ZkZc5c_0,11372
 fleet/_async/tasks.py,sha256=w-0vVGfEuCWRHMEJ73SN141J7Lz2pD_0v-nNG4TyJTU,1645
 fleet/_async/env/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fleet/_async/env/client.py,sha256=PQGKcvnVTr3o2KNsgQM7ZBqaCjimv-wEn-XiYGm44Ko,753
 fleet/_async/instance/__init__.py,sha256=PtmJq8J8bh0SOQ2V55QURz5GJfobozwtQoqhaOk3_tI,515
 fleet/_async/instance/base.py,sha256=3qUBuUR8OVS36LzdP6KyZzngtwPKYO09HoY6Ekxp-KA,1625
-fleet/_async/instance/client.py,sha256=5fd_ABdlpmWIrDrOVnSs2XUUoXwcfvrV1LflLd7sqjw,5760
+fleet/_async/instance/client.py,sha256=2ZNoBxRJXDQc8fohCLy_RNo-wmuUKXzJo5RZQeCQnkQ,6069
 fleet/_async/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fleet/_async/resources/base.py,sha256=ZFx2I9L7px-Z8LvbPUZJtbtajpqUn1yS1NFbZZutP9Q,668
 fleet/_async/resources/browser.py,sha256=oldoSiymJ1lJkADhpUG81ViOBDNyppX1jSoEwe9-W94,1369
-fleet/_async/resources/sqlite.py,sha256=d1wRLUIPIrKO6YaRaq3luPPQW_SjyRG1RJI67unu9jM,26633
+fleet/_async/resources/sqlite.py,sha256=DvDLRI5dJ7_v4WkHw-Zday1M_FQUdzAqUCy9FtfOY8w,26636
 fleet/_async/verifiers/__init__.py,sha256=Z2Ic77mw6-mhF5CmVrucmDnAGSTAtiejR_eZjTjPPA0,447
 fleet/_async/verifiers/bundler.py,sha256=A4yR3wBOcVZYFAv87CD58QlJn6L4QXeilrasnVm8n74,26185
-fleet/_async/verifiers/verifier.py,sha256=ImrpduuEZFEvBeiKBxGN-cHXNLz6hWJGipVM90qfjdA,12242
+fleet/_async/verifiers/verifier.py,sha256=fhy1bs_n0Ki2xDtisZI86McIZ09-v5WUFo5tZCBRsvA,12153
 fleet/env/__init__.py,sha256=yYk657kVDnMWYbuPS_2o0kpVC99AYD85o5WG1jCaWSY,531
-fleet/env/client.py,sha256=HwJ-xCg3oZMJ48nP9_EaHk4Rao-na9myPX9X5JxYMbo,644
+fleet/env/client.py,sha256=pG5S1ylDN0pqUGQtRqayDSnYI7ZVpCFvTbtC4LuMRts,628
 fleet/instance/__init__.py,sha256=-Anms7Vw_FO8VBIvwnAnq4rQjwl_XNfAS-i7bypHMow,478
 fleet/instance/base.py,sha256=OYqzBwZFfTX9wlBGSG5gljqj98NbiJeKIfFJ3uj5I4s,1587
-fleet/instance/client.py,sha256=TgW2aGloF9qj_jloZQBKd62rRsrbBKPD7FmXXDdHBJU,5944
+fleet/instance/client.py,sha256=4x-3IZZNwlK02OJLKp7mhSymRgXk8NToRCDU3ZuDnJ0,5891
 fleet/instance/models.py,sha256=ZTiue0YOuhuwX8jYfJAoCzGfqjLqqXRLqK1LVFhq6rQ,4183
 fleet/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fleet/resources/base.py,sha256=203gD54NP1IvjuSqFo-f7FvrkhtjChggtzrxJK7xf2E,667
-fleet/resources/browser.py,sha256=OEqfNYPAptANza0T8K7UEn6nI7JnzlCICFMW8r2r83Q,1367
+fleet/resources/browser.py,sha256=hRNM0YMsVQUAraZGNi_B-KXxLpuddy4ntoEDFSw7czU,1295
 fleet/resources/mcp.py,sha256=lDMyY4pMC3Khwp2Wycc6Ds6KeLAUOgHkDnmztuAnXm8,1872
-fleet/resources/sqlite.py,sha256=oaDeH0fWw94HPJk4EC-FSb08zv-wwicYqm9iSwbHzig,46280
-fleet/verifiers/__init__.py,sha256=-dm2x0wC8UbfGcMCbPtjb0-LospGUhD-S3Pm4oha6BY,445
+fleet/resources/sqlite.py,sha256=FeAykW7T0Pol7ckDLCtcjJDHDTI7y9ilWp7fnw4tuM8,26266
+fleet/verifiers/__init__.py,sha256=9sRqYEjPN-EGMhytkw0Q68vay7azmpY9TvkBJQ3_8Os,489
 fleet/verifiers/bundler.py,sha256=A4yR3wBOcVZYFAv87CD58QlJn6L4QXeilrasnVm8n74,26185
 fleet/verifiers/code.py,sha256=EOi6ES8Zdzlm9iybRFaJmz9t2W4Ulo2wrCdbEBqxzbc,47
 fleet/verifiers/db.py,sha256=tssmvJjDHuBIy8qlL_P5-UdmEFUw2DZcqLsWZ8ot3Xw,27766
 fleet/verifiers/decorator.py,sha256=Q-KHhicnIYFwX7FX_VZguzNfu8ZslqNUeWxcS2CwNVY,3386
+fleet/verifiers/parse.py,sha256=FYbzgX86dLAxoAZ3jXfu6zRPlNxgzjTkhO3yxMC0hZ4,5261
 fleet/verifiers/sql_differ.py,sha256=dmiGCFXVMEMbAX519OjhVqgA8ZvhnvdmC1BVpL7QCF0,6490
-fleet/verifiers/verifier.py,sha256=C5L24M7VBHWKaWlryC1EdW1g7keZBGzVSjgXC_SlpXA,12205
-fleet_python-0.2.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fleet/verifiers/verifier.py,sha256=-iEnLi4BOpqMV8tJgSPcTi_mGWM3vMJiAYTmaJolo2c,12080
+fleet_python-0.2.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 scripts/fix_sync_imports.py,sha256=BIQfnaOoQ7bwR1c-pDqH9ifN47W1bwL7OafWVXZNkuA,4368
 scripts/unasync.py,sha256=--Fmaae47o-dZ1HYgX1c3Nvi-rMjcFymTRlJcWWnmpw,725
-fleet_python-0.2.20.dist-info/METADATA,sha256=wIh4xvnKfS40EBPWcJbl9206egZ0xZVTt3Zcq1fRKb8,3297
-fleet_python-0.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fleet_python-0.2.20.dist-info/top_level.txt,sha256=_3DSmTohvSDf3AIP_BYfGzhwO1ECFwuzg83X-wHCx3Y,23
-fleet_python-0.2.20.dist-info/RECORD,,
+fleet_python-0.2.22.dist-info/METADATA,sha256=jktRiagpdxi-xyw-RiDk4csZI9FagVeJ1t3eTJQN9uU,3297
+fleet_python-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fleet_python-0.2.22.dist-info/top_level.txt,sha256=_3DSmTohvSDf3AIP_BYfGzhwO1ECFwuzg83X-wHCx3Y,23
+fleet_python-0.2.22.dist-info/RECORD,,