truss 0.11.5rc501__py3-none-any.whl → 0.11.5rc511__py3-none-any.whl

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/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/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,19 @@ 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)
+        # Resolve symlinks to get the actual executable path
+        python_executable = python_executable.resolve()
+        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 +166,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/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

{truss-0.11.5rc501.dist-info → truss-0.11.5rc511.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.5rc501
+Version: 0.11.5rc511
 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.dist-info → truss-0.11.5rc511.dist-info}/RECORD

@@ -66,14 +66,14 @@ truss/remote/baseten/utils/time.py,sha256=Ry9GMjYnbIGYVIGwtmv4V8ljWjvdcaCf5NOQzl
 truss/remote/baseten/utils/transfer.py,sha256=d3VptuQb6M1nyS6kz0BAfeOYDLkMKUjatJXpY-mp-As,1548
 truss/templates/README.md.jinja,sha256=N7CJdyldZuJamj5jLh47le0hFBdu9irVsTBqoxhPNPQ,2476
 truss/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truss/templates/base.Dockerfile.jinja,sha256=GH4Pu8EAezoolWT7qhB5NlQ_N5tm-2LuC8WcZAx4dhc,5813
+truss/templates/base.Dockerfile.jinja,sha256=FG-RJ1ulMOF7VXWrDsBNQHhOUgaBKOISsUv8LEjPaGQ,5786
 truss/templates/cache.Dockerfile.jinja,sha256=1qZqDo1phrcqi-Vwol-VafYJkADsBbQWU6huQ-_1x00,1146
 truss/templates/cache_requirements.txt,sha256=xoPoJ-OVnf1z6oq_RVM3vCr3ionByyqMLj7wGs61nUs,87
 truss/templates/copy_cache_files.Dockerfile.jinja,sha256=Os5zFdYLZ_AfCRGq4RcpVTObOTwL7zvmwYcvOzd_Zqo,126
 truss/templates/docker_server_requirements.txt,sha256=PyhOPKAmKW1N2vLvTfLMwsEtuGpoRrbWuNo7tT6v2Mc,18
 truss/templates/server.Dockerfile.jinja,sha256=CUYnF_hgxPGq2re7__0UPWlwzOHMoFkxp6NVKi3U16s,7071
 truss/templates/control/requirements.txt,sha256=nqqNmlTwFeV8sV4fqwItwzzd_egADBP_e-cEopXBJ4k,358
-truss/templates/control/control/application.py,sha256=jYeta6hWe1SkfLL3W4IDmdYjg3ZuKqI_UagWYs5RB_E,3793
+truss/templates/control/control/application.py,sha256=bR4dd6PLokveyFBd2DVvyn_GEi65xz4K3Bl9gBq4m0E,3876
 truss/templates/control/control/endpoints.py,sha256=VQ1lvZjFvR091yRkiFdvXw1Q7PiNGXT9rJwY7_sX6yg,11828
 truss/templates/control/control/server.py,sha256=R4Y219i1dcz0kkksN8obLoX-YXWGo9iW1igindyG50c,3128
 truss/templates/control/control/helpers/context_managers.py,sha256=W6dyFgLBhPa5meqrOb3w_phMtKfaJI-GhwUfpiycDc8,413
@@ -84,7 +84,7 @@ truss/templates/control/control/helpers/inference_server_process_controller.py,s
 truss/templates/control/control/helpers/inference_server_starter.py,sha256=Fz2Puijro6Cc5cvTsAqOveNJbBQR_ARYJXl4lvETJ8Y,2633
 truss/templates/control/control/helpers/truss_patch/__init__.py,sha256=CXZdUV_ylqLTJrKuFpvSnUT6PUFrZrMF2y6jiHbdaKU,998
 truss/templates/control/control/helpers/truss_patch/model_code_patch_applier.py,sha256=LTIIADLz0wRn7V49j64dU1U7Hbta9YLde3pb5YZWvzQ,2001
-truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py,sha256=uiZvKhLa_rpr_N67NpApgA-XVrBFLXraZlikSOFDDOw,6445
+truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py,sha256=Np3-kLXnh2rgXk1Nfwim11DWTkUjZ7gcrtA-icYQqMk,6722
 truss/templates/control/control/helpers/truss_patch/requirement_name_identifier.py,sha256=CL3KEAj4B3ApMQShd7TI5umXVbazLZY5StrNlwHwWtc,1995
 truss/templates/control/control/helpers/truss_patch/system_packages.py,sha256=IYh1CVU_kooAvtSGXKQDDWnNdOhlv7ENWagsL1wvhgw,208
 truss/templates/custom/examples.yaml,sha256=2UcCtEdavImWmiCtj31ckBlAKVOwNMC5AwMIIznKDag,48
@@ -184,7 +184,7 @@ truss/tests/test_data/pima-indians-diabetes.csv,sha256=BvW3ws17ymhv2k-S6rX2Hn_2Q
 truss/tests/test_data/readme_int_example.md,sha256=fuHvpLtdkJy1f4NAR_djotVBdzusHYNXc-Fwh588XAE,1586
 truss/tests/test_data/readme_no_example.md,sha256=T2CzFMRvICXeX3_5XbFoqhHchcHGot-xM7izx34B3aQ,1607
 truss/tests/test_data/readme_str_example.md,sha256=fP4pvMqgLdIapaOf_BgRiV0H7pw4so0RNxrlq5lbROE,1726
-truss/tests/test_data/server.Dockerfile,sha256=EdJKGqEztRXOzXec021BBH7C4rV4QEDGqD357s0IPZU,1976
+truss/tests/test_data/server.Dockerfile,sha256=DfULN7NEyQuhJcwjUAZbEnXYgadjST3815cu4CMQ2RU,1967
 truss/tests/test_data/annotated_types_truss/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/tests/test_data/annotated_types_truss/config.yaml,sha256=B-ZyyjLLqtxGfXj2tkH68Hy7NOMB_coYvoWyWom61g0,147
 truss/tests/test_data/annotated_types_truss/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -368,8 +368,8 @@ truss_train/deployment.py,sha256=lWWANSuzBWu2M4oK4qD7n-oVR1JKdmw2Pn5BJQHg-Ck,307
 truss_train/loader.py,sha256=0o66EjBaHc2YY4syxxHVR4ordJWs13lNXnKjKq2wq0U,1630
 truss_train/public_api.py,sha256=9N_NstiUlmBuLUwH_fNG_1x7OhGCytZLNvqKXBlStrM,1220
 truss_train/restore_from_checkpoint.py,sha256=8hdPm-WSgkt74HDPjvCjZMBpvA9MwtoYsxVjOoa7BaM,1176
-truss-0.11.5rc501.dist-info/METADATA,sha256=o6fjTFC_junPHCRvoSsJUFNaqEHbWMMKRpwLMyUbju8,6682
-truss-0.11.5rc501.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.5rc501.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.5rc501.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.5rc501.dist-info/RECORD,,
+truss-0.11.5rc511.dist-info/METADATA,sha256=SHv0KiJnhaojxWyuHKA5xYIj4La8QNvNMo06taE90-c,6682
+truss-0.11.5rc511.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.5rc511.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.5rc511.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.5rc511.dist-info/RECORD,,