truss 0.11.5rc500__py3-none-any.whl → 0.11.5rc510__py3-none-any.whl

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,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.5rc500.dist-info → truss-0.11.5rc510.dist-info}/METADATA

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

@@ -73,7 +73,7 @@ truss/templates/copy_cache_files.Dockerfile.jinja,sha256=Os5zFdYLZ_AfCRGq4RcpVTO
 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=BkZ98XqIGqmnmbBq3RJiccfBWPu7azwawLeKK66G8xs,6605
 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
@@ -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.5rc500.dist-info/METADATA,sha256=I4vLatyrJc70Gqt_GEaXXsos9gdNOG9ugQg4momlGAI,6682
-truss-0.11.5rc500.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.5rc500.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.5rc500.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.5rc500.dist-info/RECORD,,
+truss-0.11.5rc510.dist-info/METADATA,sha256=frL66XxBktCNbkVKO6fQQQAVhwJ62iRoUaKo5nvKwq8,6682
+truss-0.11.5rc510.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.5rc510.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.5rc510.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.5rc510.dist-info/RECORD,,