truss 0.11.5rc501__tar.gz → 0.11.5rc510__tar.gz

{truss-0.11.5rc501 → truss-0.11.5rc510}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.5rc501
+Version: 0.11.5rc510
 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.5rc501 → truss-0.11.5rc510}/pyproject.toml

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

{truss-0.11.5rc501 → truss-0.11.5rc510}/truss/templates/base.Dockerfile.jinja

@@ -1,5 +1,4 @@
 ARG PYVERSION={{ config.python_version }}
-ARG HOME
 FROM {{ base_image_name_and_tag }} AS truss_server
 
 {%- set python_exec_path = config.base_image.python_executable_path or '$(which python3)' %}
@@ -17,10 +16,10 @@ ENV PYTHON_EXECUTABLE="{{ python_executable }}"
 {%- if non_root_user %}
 {# The non-root user's home directory. #}
 {# uv will use $HOME to install packages. #}
-ENV HOME=${HOME:-/home/{{ app_username }}}
+ENV HOME=/home/{{ app_username }}
 {%- else %}
 {# This is the default, but we use this variable later so ... setting it here too.#}
-ENV HOME=${HOME:-/root}
+ENV HOME=/root
 {%- endif %} {#- endif non_root_user #}
 {# Directory containing inference server code. #}
 ENV APP_HOME=/{{ app_username }}

{truss-0.11.5rc501 → truss-0.11.5rc510}/truss/templates/control/control/application.py

@@ -57,10 +57,11 @@ def create_app(base_config: Dict):
         base_url=f"http://localhost:{app_state.inference_server_port}", limits=limits
     )
 
-    pip_path = getattr(app_state, "pip_path", None)
+    # Get inference server's Python executable
+    inference_server_python = app_state.inference_server_process_args[0]
 
     patch_applier = ModelContainerPatchApplier(
-        Path(app_state.inference_server_home), app_logger, pip_path
+        Path(app_state.inference_server_home), app_logger, inference_server_python
     )
 
     oversee_inference_server = getattr(app_state, "oversee_inference_server", True)

{truss-0.11.5rc501 → truss-0.11.5rc510}/truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py

@@ -30,7 +30,7 @@ class ModelContainerPatchApplier:
         self,
         inference_server_home: Path,
         app_logger: logging.Logger,
-        pip_path: Optional[str] = None,  # Only meant for testing
+        inference_server_python: Optional[str] = None,  # Python executable for inference server
     ) -> None:
         self._inference_server_home = inference_server_home
         self._model_module_dir = (
@@ -41,9 +41,8 @@ class ModelContainerPatchApplier:
         ).resolve()
         self._data_dir = self._inference_server_home / self._truss_config.data_dir
         self._app_logger = app_logger
+        self._inference_server_python = inference_server_python
         self._pip_path_cached = None
-        if pip_path is not None:
-            self._pip_path_cached = "pip"
 
     def __call__(self, patch: Patch, inf_env: dict):
         self._app_logger.debug(f"Applying patch {patch.to_dict()}")
@@ -78,10 +77,17 @@ class ModelContainerPatchApplier:
     def _truss_config(self) -> TrussConfig:
         return TrussConfig.from_yaml(self._inference_server_home / "config.yaml")
 
+    def _derive_pip_from_inference_server_python(self, python_path: str) -> str:
+        python_executable = Path(python_path)
+        pip_candidate = python_executable.parent / "pip"        
+        if pip_candidate.exists():
+            return str(pip_candidate)
+        raise RuntimeError(f"Unable to find pip for Python executable: {python_path}")
+
     @property
     def _pip_path(self) -> str:
         if self._pip_path_cached is None:
-            self._pip_path_cached = _identify_pip_path()
+            self._pip_path_cached = self._derive_pip_from_inference_server_python(self._inference_server_python)
         return self._pip_path_cached
 
     def _apply_python_requirement_patch(
@@ -158,11 +164,3 @@ class ModelContainerPatchApplier:
             raise ValueError(f"Unknown patch action {action}")
 
 
-def _identify_pip_path() -> str:
-    if Path("/usr/local/bin/pip3").exists():
-        return "/usr/local/bin/pip3"
-
-    if Path("/usr/local/bin/pip").exists():
-        return "/usr/local/bin/pip"
-
-    raise RuntimeError("Unable to find pip, make sure it's installed.")

{truss-0.11.5rc501 → truss-0.11.5rc510}/truss/tests/test_data/server.Dockerfile

@@ -1,7 +1,7 @@
 ARG PYVERSION=py39
 FROM baseten/truss-server-base:3.9-v0.4.3 AS truss_server
 ENV PYTHON_EXECUTABLE="/usr/local/bin/python3"
-ENV HOME=${HOME:-/root}
+ENV HOME=/root
 ENV APP_HOME=/app
 RUN mkdir -p ${APP_HOME} /control
 RUN useradd -u 60000 -ms /bin/bash app