truss 0.11.9rc4__tar.gz → 0.11.9rc6__tar.gz

{truss-0.11.9rc4 → truss-0.11.9rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.9rc4
+Version: 0.11.9rc6
 Summary: A seamless bridge from model development to model delivery
 Project-URL: Repository, https://github.com/basetenlabs/truss
 Project-URL: Homepage, https://truss.baseten.co

{truss-0.11.9rc4 → truss-0.11.9rc6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.9rc4"
+version = "0.11.9rc6"
 description = "A seamless bridge from model development to model delivery"
 authors = [
     { name = "Pankaj Gupta", email = "no-reply@baseten.co" },

{truss-0.11.9rc4 → truss-0.11.9rc6}/truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import shutil
 import subprocess
 from pathlib import Path
 from typing import Optional
@@ -41,12 +42,21 @@ class ModelContainerPatchApplier:
             self._inference_server_home / ".." / self._truss_config.bundled_packages_dir
         ).resolve()
         self._data_dir = self._inference_server_home / self._truss_config.data_dir
-        self._python_executable = os.environ.get("PYTHON_EXECUTABLE", "python3")
         self._app_logger = app_logger
         self._uv_path_cached = None
         if uv_path is not None:
             self._uv_path_cached = uv_path
 
+        self._python_executable = self._get_python_executable()
+
+    def _get_python_executable(self) -> str:
+        # NB(nikhil): `uv` requires the full path to the python interpreter for patching
+        # python modules. We expect PYTHON_EXECUTABLE to exist in all development images, but
+        # we fallback to python3 as a default.
+        python_executable = os.environ.get("PYTHON_EXECUTABLE", "python3")
+        full_executable_path = shutil.which(python_executable)
+        return full_executable_path or python_executable
+
     def __call__(self, patch: Patch, inf_env: dict):
         self._app_logger.debug(f"Applying patch {patch.to_dict()}")
         if isinstance(patch.body, ModelCodePatch):
@@ -101,7 +111,6 @@ class ModelContainerPatchApplier:
                     "pip",
                     "uninstall",
                     python_requirement_patch.requirement,
-                    "--yes",
                     "--python",
                     self._python_executable,
                 ],
@@ -167,14 +176,8 @@ class ModelContainerPatchApplier:
 
 
 def _identify_uv_path() -> str:
-    candidate_paths: list[Path] = [
-        Path.home() / ".local" / "bin" / "uv",
-        Path("/usr/local/bin/uv"),
-        Path.home() / ".cargo" / "bin" / "uv",
-    ]
-
-    for path in candidate_paths:
-        if path.exists():
-            return str(path)
+    uv_path = shutil.which("uv")
+    if not uv_path:
+        raise RuntimeError("Unable to find `uv`, make sure it's installed.")
 
-    raise RuntimeError("Unable to find `uv, make sure it's installed.")
+    return uv_path