chutes 0.5.4rc0__py3-none-any.whl → 0.5.4rc2__py3-none-any.whl

chutes/_version.py

@@ -1 +1 @@
-version = "0.5.4.rc0"
+version = "0.5.4.rc2"

chutes/cfsv_wrapper.py

@@ -15,7 +15,7 @@ class CFSVWrapper:
         self.lib.cfsv_challenge.argtypes = [
             ctypes.c_char_p,  # base_path
             ctypes.c_char_p,  # salt
-            ctypes.c_int,     # sparse
+            ctypes.c_int,  # sparse
             ctypes.c_char_p,  # index_file
             ctypes.c_char_p,  # exclude_path
             ctypes.c_char_p,  # result_buf
@@ -30,6 +30,13 @@ class CFSVWrapper:
         ]
         self.lib.cfsv_sizetest.restype = ctypes.c_int
 
+        # cfsv_cleanup_bytecode(base_path, index_file)
+        self.lib.cfsv_cleanup_bytecode.argtypes = [
+            ctypes.c_char_p,  # base_path
+            ctypes.c_char_p,  # index_file
+        ]
+        self.lib.cfsv_cleanup_bytecode.restype = ctypes.c_int
+
         # cfsv_version()
         self.lib.cfsv_version.argtypes = []
         self.lib.cfsv_version.restype = ctypes.c_char_p
@@ -70,6 +77,23 @@ class CFSVWrapper:
             return result_buf.value.decode("utf-8")
         return None
 
+    def cleanup_bytecode(self, base_path="/", index_file="/etc/chutesfs.index"):
+        """
+        Remove rogue .pyc and injectable files not present in the verified index.
+
+        Args:
+            base_path: Root path to scan (default: "/")
+            index_file: Path to encrypted index file (default: "/etc/chutesfs.index")
+
+        Returns:
+            True on success, False on failure
+        """
+        ret = self.lib.cfsv_cleanup_bytecode(
+            base_path.encode() if isinstance(base_path, str) else base_path,
+            index_file.encode() if isinstance(index_file, str) else index_file,
+        )
+        return ret == 0
+
     def sizetest(self, test_dir, size_gib):
         """
         Test filesystem capacity and integrity.

chutes/chute/template/embedding.py

@@ -185,7 +185,6 @@ def build_embedding_chute(
 
         pooler_config = {
             "pooling_type": pooling_type,
-            "normalize": True,
         }
         if enable_chunked_processing:
             pooler_config["enable_chunked_processing"] = True
@@ -214,6 +213,7 @@ def build_embedding_chute(
             raise ValueError("You may not override api key!")
 
         env = os.environ.copy()
+        env["PYTHONDONTWRITEBYTECODE"] = "1"
         if enable_chunked_processing:
             env["VLLM_ENABLE_CHUNKED_PROCESSING"] = "true"
 

chutes/chute/template/helpers.py

@@ -58,9 +58,9 @@ async def prompt_one(
             headers=headers,
         ) as resp:
             if require_status:
-                assert (
-                    resp.status == require_status
-                ), f"Expected to receive status code {require_status}, received {resp.status}"
+                assert resp.status == require_status, (
+                    f"Expected to receive status code {require_status}, received {resp.status}"
+                )
                 return await resp.json()
             if resp.status == 200:
                 result = await resp.json()

chutes/chute/template/sglang.py

@@ -330,9 +330,9 @@ def build_sglang_chute(
         # Set torch inductor, flashinfer, etc., cache directories.
         set_default_cache_dirs(download_path)
         os.environ["TRANSFORMERS_OFFLINE"] = "1"
-        env["HF_HUB_OFFLINE"] = "1"
-        env["SGL_MODEL_NAME"] = self.name
-        env["SGL_REVISION"] = revision
+        os.environ["HF_HUB_OFFLINE"] = "1"
+        os.environ["SGL_MODEL_NAME"] = self.name
+        os.environ["SGL_REVISION"] = revision
 
         # Reset torch.
         torch.cuda.empty_cache()
@@ -359,9 +359,9 @@ def build_sglang_chute(
         parts = command.split()
         display_cmd = startup_command.replace(api_key, "*" * len(api_key))
         logger.info(f"Launching SGLang with command: {display_cmd}")
-        self._sglang_process = subprocess.Popen(
-            parts, text=True, stderr=subprocess.STDOUT, env=os.environ.copy()
-        )
+        env = os.environ.copy()
+        env["PYTHONDONTWRITEBYTECODE"] = "1"
+        self._sglang_process = subprocess.Popen(parts, text=True, stderr=subprocess.STDOUT, env=env)
 
         server_ready = asyncio.Event()
         self._monitor_task = asyncio.create_task(

chutes/chute/template/vllm.py

@@ -372,6 +372,7 @@ def build_vllm_chute(
             raise ValueError("You may not override api key!")
 
         env = os.environ.copy()
+        env["PYTHONDONTWRITEBYTECODE"] = "1"
         env["HF_HUB_OFFLINE"] = "1"
         env["SGL_MODEL_NAME"] = self.name
         env["SGL_REVISION"] = revision

chutes/entrypoint/run.py

@@ -1108,6 +1108,33 @@ def run_chute(
                 logger.error(f"Must be PID 1 (container entrypoint), but got PID {os.getpid()}")
                 sys.exit(137)
 
+        # Clean up any bytecode not found in the original image.  Probably mainly
+        # irrelevant since we disable precompiled bytecode use anyways, but worth
+        # as a sanity check/safeguard.
+        if not dev:
+            logger.info("Running bytecode cleanup...")
+            try:
+                from chutes.cfsv_wrapper import get_cfsv
+
+                cfsv = get_cfsv()
+                if not cfsv.cleanup_bytecode("/", "/etc/chutesfs.index"):
+                    logger.error("Bytecode cleanup failed")
+                    sys.exit(137)
+                logger.info("Bytecode cleanup completed")
+            except Exception as e:
+                logger.error(f"Bytecode cleanup error: {e}")
+                sys.exit(137)
+
+        # Prevent the bytecode use from here onwards.
+        sys.dont_write_bytecode = True
+        os.environ["PYTHONDONTWRITEBYTECODE"] = "1"
+
+        # And other sneaky tampering methods.
+        os.environ["PYTHONNOUSERSITE"] = "1"
+        if "PYTHONSTARTUP" in os.environ:
+            logger.warning(f"Clearing PYTHONSTARTUP: {os.environ['PYTHONSTARTUP']}")
+            del os.environ["PYTHONSTARTUP"]
+
         # Generate inspecto hash.
         token = get_launch_token()
         token_data = get_launch_token_data()

chutes/image/directive/add.py

@@ -105,7 +105,9 @@ class ADD(BaseDirective):
                 for path in positive_patterns
                 if path not in negative_patterns and os.path.abspath(path).startswith(build_dir)
             ]
-            assert self._build_context, f"No (accessible) source paths matched provided pattern '{positive_patterns}' trying to add {source}"
+            assert self._build_context, (
+                f"No (accessible) source paths matched provided pattern '{positive_patterns}' trying to add {source}"
+            )
 
         # Destination within the image.
         arguments.append(dest)

{chutes-0.5.4rc0.dist-info → chutes-0.5.4rc2.dist-info}/METADATA

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

{chutes-0.5.4rc0.dist-info → chutes-0.5.4rc2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 chutes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chutes/_version.py,sha256=CCgrqe2UcuerFtOjmqBwBZp3sVECC6KtjTAK3ndIhyk,22
+chutes/_version.py,sha256=HcQEphyu2SYjKhiw3ARBOfhdnv8PZsayWyYOH7LGjdc,22
 chutes/cfsv,sha256=vkR_q3qB0hkD8Knv8rqqrb4A29y1muHW2-eNYZiuI-g,892932
 chutes/cfsv_v2,sha256=fa8-WFqaNeD-BXcCayUjCvR0NNizcc6Ewd6vNmFjPc0,893296
-chutes/cfsv_v3,sha256=aIe3rnM3-g416Ry7eMyDXDOJkLZPxW_EjKJDwh7BMGc,1198496
-chutes/cfsv_wrapper.py,sha256=qpzUuGkpt_8JDpUbSKvw06y_uFYYqAZ2LDsLZPGFwjY,4186
-chutes/chutes-cfsv.so,sha256=YxF2VhOHfehz0RuoQwxRGNl6xRmw4fNfYYEoHtap6qc,38896
+chutes/cfsv_v3,sha256=abhs7mRAgXnpJzV-LhOlJZ4g1RCjM792sbtyfn3rdvk,1199884
+chutes/cfsv_wrapper.py,sha256=b6EJ6xSJbxHzEvXpJY-0qxJcpc2OSu0NDnOQ3YKfQxg,5094
+chutes/chutes-cfsv.so,sha256=sRG-iKVSIjfydVq3Z2IKcbgoX5vUs9lWpu6LcY3xcSM,47088
 chutes/chutes-inspecto.so,sha256=ywWZXE5VDUFgnLD2NSAsQJLXSlbWkB5jZFCVEKTZDv4,2309920
 chutes/chutes-logintercept.so,sha256=3mYyj1_3Vc5g_2MLrEJPqnB5UiFMVkYy8Tw37BlRwDM,22424
 chutes/chutes-netnanny.so,sha256=1ZQn-Vdd8Lp8CV5dC6p5sz7u1gGrgtX4rDSejY2t2ec,179624
@@ -23,10 +23,10 @@ chutes/chute/job.py,sha256=8t4ODHCLaOod93u2Jh8wn0uP6ZxNM-ccdXbv7H0r_vE,10164
 chutes/chute/node_selector.py,sha256=QclqaA_-xmhG4utPJLe9nFz0hr6hXy-_fxPjX9BuCsQ,318
 chutes/chute/template/__init__.py,sha256=At21W3ESSMC7c9uW1XPNeG_8ac90GNIE4glrduO-6_s,70
 chutes/chute/template/diffusion.py,sha256=UI__t3Oz4U3vp_nL2jVpG8vWP_zjb_rBlPLk8WlLbjY,11089
-chutes/chute/template/embedding.py,sha256=wszGXe4Aviu05mzXhI6L9L__BUw5Aa4-JUu9a7eMv8k,9646
-chutes/chute/template/helpers.py,sha256=QNvciAuX2-3QQgBQt1C3Z9_liS3ur4jyJ4rNrOjnK4g,6500
-chutes/chute/template/sglang.py,sha256=x9OOpGW_PG_OlFT2qCP8fuLZ6GDfSIpmELLJXqZlMP0,14826
-chutes/chute/template/vllm.py,sha256=wXb3ngu8MAjwfFxB5K1I66qLz3Lz1hRXZJ3KrHaM27c,16247
+chutes/chute/template/embedding.py,sha256=JnNiED-mz55XkTIgS06KKIXU5K57bmn2EFAicXDXLUI,9660
+chutes/chute/template/helpers.py,sha256=oqDLaPhaL40-3_XSTVFsFquWkc2Ph3lyWYCWOgv1LHo,6500
+chutes/chute/template/sglang.py,sha256=WKgh1vWZigtjqsoGczCRrXZ5ngIzYJCF7izljQOxfGU,14888
+chutes/chute/template/vllm.py,sha256=OsK-YG09pecESe6xg38WkGsgeMK5eC5pujHJfmAkme8,16292
 chutes/entrypoint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chutes/entrypoint/_shared.py,sha256=NiD3fK51TKYK2ZH_bj20VpMeV5E2rMy1o9ak39jgYVE,7056
 chutes/entrypoint/api_key.py,sha256=hFHEjzjCP7RU8Ec_XTo9GVxJVCvlYM6lQAM4FYlTV7g,4206
@@ -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=yf1_3VHW0Xka8kHB5-dqVY0XoltarniFHfdjYLsRDx8,60611
+chutes/entrypoint/run.py,sha256=ClulYQ2LpUNrGgtkitLM0siUgWpq2bwbqPKtJXRq_W4,61760
 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
@@ -49,7 +49,7 @@ chutes/envdump/__init__.py,sha256=DHofdObdvKRYQfP_c04VgV7a6fPfcrl3xY1w7Bj2OOk,40
 chutes/envdump/envdump.so,sha256=e69MR3LLv0VVWsakVm4F6TtZ-Jedhvo8Tn7QMLyXMds,802920
 chutes/image/__init__.py,sha256=UEJFNsTp9AwiowXgs07oarDCXx20D6rk7ZzRSYr-BUQ,6340
 chutes/image/directive/__init__.py,sha256=Cm91_m6T6XR8w9NdV1SIpK87HgKJUKVh87pac2llZy4,682
-chutes/image/directive/add.py,sha256=c2iD4ull3rExGQqFzp_nZhtf5aW-QjReOx1w1sIs3r8,4011
+chutes/image/directive/add.py,sha256=AWtBiGqMl841hGBc4cazWARa93fFDFzS2XQXsMR_2vc,4043
 chutes/image/directive/apt.py,sha256=ijv581wz6Gey3fI7jsKJ-ON1qUFUrN0d38Fp0tAXPHQ,1853
 chutes/image/directive/base_image.py,sha256=WxBwDVt8fSi4tmSkNuOpkT1x7Nb5rcNTOE2IwulhRf4,635
 chutes/image/directive/entrypoint.py,sha256=1EaMUZhXh8nezcyDG49HouAzsl5Utij9wEtR4oGMC9I,557
@@ -73,9 +73,9 @@ chutes/util/context.py,sha256=_dHVEM6S6CYwgaxrA0yZCplSDA2HuiyNOmedSsyiDWA,355
 chutes/util/hf.py,sha256=oEw0Z8pWDd_KUZhefF6iLE_5Ikig2AydrPSd6I1lEBM,14262
 chutes/util/schema.py,sha256=b0NX-hWhc0FKnWD6FObBmQxINrJDFNocKsbGJn79D-8,6699
 chutes/util/user.py,sha256=WBx6vyw0P32wJ2GFYMjO5oQJPA3jn_XsyRglNJx0PhY,423
-chutes-0.5.4rc0.dist-info/LICENSE,sha256=9qFhoY0O1XdKOczAAc7vcveZzk32-a0Wq2_diH_hAD8,1067
-chutes-0.5.4rc0.dist-info/METADATA,sha256=4FT_EC_-nGT76_GoDyOQ6aLWp8axF4lqiWS5_YGLQ74,18789
-chutes-0.5.4rc0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chutes-0.5.4rc0.dist-info/entry_points.txt,sha256=93PU_dKxEGA1hCGaabvRXO9WpyFgon6eqT4wIN91YAU,42
-chutes-0.5.4rc0.dist-info/top_level.txt,sha256=oRxU-Kvd5BhaNbBQtqZCp9uzY0FrMBocoL0Q6kokxzA,7
-chutes-0.5.4rc0.dist-info/RECORD,,
+chutes-0.5.4rc2.dist-info/LICENSE,sha256=9qFhoY0O1XdKOczAAc7vcveZzk32-a0Wq2_diH_hAD8,1067
+chutes-0.5.4rc2.dist-info/METADATA,sha256=R0Lyje5OddXMYKI8svSbFJtO-O2GMksFOJo5r4aFaw8,18789
+chutes-0.5.4rc2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chutes-0.5.4rc2.dist-info/entry_points.txt,sha256=93PU_dKxEGA1hCGaabvRXO9WpyFgon6eqT4wIN91YAU,42
+chutes-0.5.4rc2.dist-info/top_level.txt,sha256=oRxU-Kvd5BhaNbBQtqZCp9uzY0FrMBocoL0Q6kokxzA,7
+chutes-0.5.4rc2.dist-info/RECORD,,