chutes 0.5.2rc9__py3-none-any.whl → 0.5.2rc10__py3-none-any.whl

chutes/_version.py

@@ -1 +1 @@
-version = "0.5.2.rc9"
+version = "0.5.2.rc10"

chutes/cfsv_wrapper.py

@@ -1,6 +1,7 @@
 import os
 import ctypes
 import asyncio
+from functools import lru_cache
 from fastapi import Request
 
 
@@ -99,7 +100,10 @@ class CFSVWrapper:
         return None
 
 
-CFSV = CFSVWrapper()
+@lru_cache(maxsize=1)
+def get_cfsv():
+    """Lazily initialize CFSV wrapper (only works on Linux)."""
+    return CFSVWrapper()
 
 
 async def handle_challenge(request: Request):
@@ -109,7 +113,7 @@ async def handle_challenge(request: Request):
     exclude_path = request.state.decrypted.get("exclude_path", "/app/chute.py")
     result = await loop.run_in_executor(
         None,
-        CFSV.challenge,
+        get_cfsv().challenge,
         salt,
         mode,
         "/",
@@ -125,7 +129,7 @@ async def handle_sizetest(request: Request):
     size_gib = request.state.decrypted.get("size_gib", 10)
     result = await loop.run_in_executor(
         None,
-        CFSV.sizetest,
+        get_cfsv().sizetest,
         test_dir,
         size_gib,
     )
@@ -133,4 +137,4 @@ async def handle_sizetest(request: Request):
 
 
 async def handle_version(request: Request):
-    return {"result": CFSV.version()}
+    return {"result": get_cfsv().version()}

chutes/entrypoint/run.py

@@ -46,14 +46,13 @@ from chutes.entrypoint._shared import (
 from chutes.entrypoint.ssh import setup_ssh_access
 from chutes.chute import ChutePack, Job
 from chutes.util.context import is_local
-from chutes.cfsv_wrapper import CFSVWrapper
+from chutes.cfsv_wrapper import get_cfsv
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import padding
 
 
 RUNINT_PATH = os.path.join(os.path.dirname(__file__), "..", "chutes-runint.so")
-CFSV_PATH = os.path.join(os.path.dirname(__file__), "..", "chutes-cfsv.so")
 
 
 class _ConnStats:
@@ -592,11 +591,6 @@ async def check_connectivity(request: Request) -> dict[str, Any]:
         }
 
 
-@lru_cache(maxsize=1)
-def get_cfsv_ref():
-    return CFSVWrapper(lib_path=CFSV_PATH)
-
-
 async def generate_filesystem_hash(salt: str, exclude_file: str, mode: str = "full"):
     """
     Generate a hash of the filesystem, in either sparse or full mode.
@@ -605,7 +599,7 @@ async def generate_filesystem_hash(salt: str, exclude_file: str, mode: str = "fu
         f"Running filesystem verification challenge in {mode=} using {salt=} excluding {exclude_file}"
     )
     loop = asyncio.get_event_loop()
-    cfsv = get_cfsv_ref()
+    cfsv = get_cfsv()
     fsv_hash = await loop.run_in_executor(
         None,
         cfsv.challenge,
@@ -969,7 +963,7 @@ async def _gather_devices_and_initialize(
     disk_gb = token_data.get("disk_gb", 10)
     logger.info(f"Checking disk space availability: {disk_gb}GB required")
     try:
-        cfsv = get_cfsv_ref()
+        cfsv = get_cfsv()
         if not cfsv.sizetest("/tmp", disk_gb):
             logger.error("Disk space check failed")
             raise Exception(f"Insufficient disk space: {disk_gb}GB required in /tmp")

{chutes-0.5.2rc9.dist-info → chutes-0.5.2rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chutes
-Version: 0.5.2rc9
+Version: 0.5.2rc10
 Summary: Chutes development kit and CLI.
 Home-page: https://github.com/rayonlabs/chutes
 Author: Jon Durbin

{chutes-0.5.2rc9.dist-info → chutes-0.5.2rc10.dist-info}/RECORD

@@ -1,9 +1,9 @@
 chutes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chutes/_version.py,sha256=y_-w3Ob17ky5cD46Cx-O1Pw78VCPbvH5RIEdSFRrFXE,22
+chutes/_version.py,sha256=13g4-aUp9sRrVO-TYslqufUj--hkUNGb9fWQGhrYYXw,23
 chutes/cfsv,sha256=vkR_q3qB0hkD8Knv8rqqrb4A29y1muHW2-eNYZiuI-g,892932
 chutes/cfsv_v2,sha256=fa8-WFqaNeD-BXcCayUjCvR0NNizcc6Ewd6vNmFjPc0,893296
 chutes/cfsv_v3,sha256=Eg6Knim8qg_ig7y6zs238aLF2z1L3saLHtmUp2I-mZE,1197128
-chutes/cfsv_wrapper.py,sha256=rRCp5MlvW4-BcUiP6jd5qkw4hfGfYimkwZTfoqnWeyg,4030
+chutes/cfsv_wrapper.py,sha256=qpzUuGkpt_8JDpUbSKvw06y_uFYYqAZ2LDsLZPGFwjY,4186
 chutes/chutes-cfsv.so,sha256=fhglG-e1AvK8-0EpUtX3zEVdhdvjCkT559yTVqH8G9U,38896
 chutes/chutes-inspecto.so,sha256=ywWZXE5VDUFgnLD2NSAsQJLXSlbWkB5jZFCVEKTZDv4,2309920
 chutes/chutes-logintercept.so,sha256=3mYyj1_3Vc5g_2MLrEJPqnB5UiFMVkYy8Tw37BlRwDM,22424
@@ -37,7 +37,7 @@ chutes/entrypoint/logger.py,sha256=MGfKmxni_4daAwFWb7JcSBDXTpmBJE8guACz2uYY6fE,9
 chutes/entrypoint/login.py,sha256=9d_MzS3ZQ884d4NAc8JGwvyNR6SaUazrpseOTAIhWNU,6076
 chutes/entrypoint/register.py,sha256=jHwZphEZCLpF4BRXT7iaieBZOvmpByCz25UQd804Kp0,9080
 chutes/entrypoint/report.py,sha256=-AeUFF8DFoaL14C8lAfVqd97aDH7fLDCzxZo-COYINg,1949
-chutes/entrypoint/run.py,sha256=33-RzPysOpWAInCjKEjoNY77Gjk-qCstuWZ-N48orsQ,59632
+chutes/entrypoint/run.py,sha256=Z6YWjQ470xtfQAJByqqQL1rvL-0D4byWe4TRzZTjUJo,59458
 chutes/entrypoint/secret.py,sha256=_mtBXm_YL-nDg9XWmg2S4gGU_OdNBub_zb6jpLV7458,1581
 chutes/entrypoint/share.py,sha256=_1yIdIMwK5khxNZ8WApTRXx1htMi_dg1_VV7j1IVUjs,1532
 chutes/entrypoint/ssh.py,sha256=ryBRL_-bREyYpV_cZAhhZBFyIgvdWsNIIRwnM_sX41g,2285
@@ -73,9 +73,9 @@ chutes/util/context.py,sha256=_dHVEM6S6CYwgaxrA0yZCplSDA2HuiyNOmedSsyiDWA,355
 chutes/util/hf.py,sha256=2XKSqvy0j0QROZ5NagXf3JHyb1uk-NEL34E44ZhjF14,7083
 chutes/util/schema.py,sha256=b0NX-hWhc0FKnWD6FObBmQxINrJDFNocKsbGJn79D-8,6699
 chutes/util/user.py,sha256=WBx6vyw0P32wJ2GFYMjO5oQJPA3jn_XsyRglNJx0PhY,423
-chutes-0.5.2rc9.dist-info/LICENSE,sha256=9qFhoY0O1XdKOczAAc7vcveZzk32-a0Wq2_diH_hAD8,1067
-chutes-0.5.2rc9.dist-info/METADATA,sha256=bg-FwtxJv2FXYcMbfi_9U77GkY-oaaFt0Ue5n0iRGW4,18789
-chutes-0.5.2rc9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chutes-0.5.2rc9.dist-info/entry_points.txt,sha256=93PU_dKxEGA1hCGaabvRXO9WpyFgon6eqT4wIN91YAU,42
-chutes-0.5.2rc9.dist-info/top_level.txt,sha256=oRxU-Kvd5BhaNbBQtqZCp9uzY0FrMBocoL0Q6kokxzA,7
-chutes-0.5.2rc9.dist-info/RECORD,,
+chutes-0.5.2rc10.dist-info/LICENSE,sha256=9qFhoY0O1XdKOczAAc7vcveZzk32-a0Wq2_diH_hAD8,1067
+chutes-0.5.2rc10.dist-info/METADATA,sha256=12eiBRjcBc65wR0ZlAKO4NYOBSqTKrd974nBoveh45s,18790
+chutes-0.5.2rc10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chutes-0.5.2rc10.dist-info/entry_points.txt,sha256=93PU_dKxEGA1hCGaabvRXO9WpyFgon6eqT4wIN91YAU,42
+chutes-0.5.2rc10.dist-info/top_level.txt,sha256=oRxU-Kvd5BhaNbBQtqZCp9uzY0FrMBocoL0Q6kokxzA,7
+chutes-0.5.2rc10.dist-info/RECORD,,