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

truss/templates/base.Dockerfile.jinja

@@ -13,9 +13,14 @@ ENV PYTHON_EXECUTABLE="{{ python_executable }}"
 {%- set app_user_uid = 60000 %}
 {%- set control_server_dir = "/control" %}
 {%- set default_owner = "root:root" %}
+{%- if non_root_user %}
 {# The non-root user's home directory. #}
 {# uv will use $HOME to install packages. #}
 ENV HOME=/home/{{ app_username }}
+{%- else %}
+{# This is the default, but we use this variable later so ... setting it here too.#}
+ENV HOME=/root
+{%- endif %} {#- endif non_root_user #}
 {# Directory containing inference server code. #}
 ENV APP_HOME=/{{ app_username }}
 RUN mkdir -p ${APP_HOME} {{ control_server_dir }}

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/app
+ENV HOME=/root
 ENV APP_HOME=/app
 RUN mkdir -p ${APP_HOME} /control
 RUN useradd -u 60000 -ms /bin/bash app

truss/tests/test_model_inference.py

@@ -990,8 +990,8 @@ def test_is_healthy_returns_503_on_load_failure():
                 # when the model goes down, this will throw an exception
                 break
         diff = container.diff()
-        # the crash file is written to the app user's home directory
-        crash_file_path = "/home/app/inference_server_crashed.txt"
+        # the crash file is written to the user's home directory
+        crash_file_path = "/root/inference_server_crashed.txt"
         assert crash_file_path in diff
         assert diff[crash_file_path] == "A"
 

{truss-0.11.5rc3.dist-info → truss-0.11.5rc500.dist-info}/METADATA

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

@@ -66,7 +66,7 @@ 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=irked6fWbiZ4tMkhR3zi3njpaaI9bANVqq7PTjp_Tmc,5610
+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
@@ -134,7 +134,7 @@ truss/tests/test_context_builder_image.py,sha256=fVZNJSzZNiWa7Dr1X_VhhMJtyJ5HzsL
 truss/tests/test_control_truss_patching.py,sha256=qQOUfyF1MorZ_obOvPJK9utI4HUAzgT6YBS-fo90TEw,14497
 truss/tests/test_custom_server.py,sha256=GP2qMgnqxJMPRtfEciqbhBcG0_JUK7gNL7nrXPGrSLg,1305
 truss/tests/test_docker.py,sha256=3RI6jEC9CVQsKj83s_gOBl3EkdOaov-KEX4IihfMJW4,523
-truss/tests/test_model_inference.py,sha256=9QfPMa1kjxvKCWg5XKocjwcpfDkKB7pWd8bn4hIkshk,76213
+truss/tests/test_model_inference.py,sha256=Q8mgNDNbwAUi7AQTgmyK-QrYuksuARDczYndTh56fKk,76205
 truss/tests/test_model_schema.py,sha256=Bw28CZ4D0JQOkYdBQJZvgryeW0TRn7Axketp5kvZ_t4,14219
 truss/tests/test_testing_utilities_for_other_tests.py,sha256=YqIKflnd_BUMYaDBSkX76RWiWGWM_UlC2IoT4NngMqE,3048
 truss/tests/test_truss_gatherer.py,sha256=bn288OEkC49YY0mhly4cAl410ktZPfElNdWwZy82WfA,1261
@@ -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=auEgFqfrnTk6k3XZL3A1CqPd_Hnu_0TYtVuwrJv2eHU,1971
+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
@@ -363,13 +363,13 @@ truss_chains/remote_chainlet/model_skeleton.py,sha256=8ZReLOO2MLcdg7bNZ61C-6j-e6
 truss_chains/remote_chainlet/stub.py,sha256=Y2gDUzMY9WRaQNHIz-o4dfLUfFyYV9dUhIRQcfgrY8g,17209
 truss_chains/remote_chainlet/utils.py,sha256=Zn3GZRvK8f65WUa-qa-8uPFZ2pD7ukRFxbLOvT-BL0Q,24063
 truss_train/__init__.py,sha256=A3MzRPMInZfmzLvPpZI7gdKgshAVCw6bwhU-6JYU2zs,939
-truss_train/definitions.py,sha256=3wVxkxMtHlcc-hb2umtj74FjA9TjenfiPTX7EQSh6zw,8245
+truss_train/definitions.py,sha256=TGoeG86aG76wt3h3giufg1rfm9K0W8y9bDJSITe76Aw,8209
 truss_train/deployment.py,sha256=lWWANSuzBWu2M4oK4qD7n-oVR1JKdmw2Pn5BJQHg-Ck,3074
 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=KmJuTUVpvtvlkEClcmllxAF2TKgbp-FuzfblfGh06XA,1239
-truss-0.11.5rc3.dist-info/METADATA,sha256=BY6gO5l_-pw7F9229-PJhGjzh_icBCBoLA6XiKOVA0s,6680
-truss-0.11.5rc3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.5rc3.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.5rc3.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.5rc3.dist-info/RECORD,,
+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_train/definitions.py

@@ -3,7 +3,7 @@ from abc import ABC
 from typing import Dict, List, Literal, Optional, Union
 
 import pydantic
-from pydantic import field_validator, model_validator
+from pydantic import ValidationError, field_validator, model_validator
 
 from truss.base import constants, custom_types, truss_config
 
@@ -68,8 +68,7 @@ class _BasetenLatestCheckpoint(_CheckpointBase):
 
 class _BasetenNamedCheckpoint(_CheckpointBase):
     checkpoint_name: str
-    job_id: Optional[str]
-    project_name: Optional[str]
+    job_id: str
     typ: Literal["baseten_named_checkpoint"] = "baseten_named_checkpoint"
 
 
@@ -78,18 +77,15 @@ class BasetenCheckpoint:
     def from_latest_checkpoint(
         project_name: Optional[str] = None, job_id: Optional[str] = None
     ) -> _BasetenLatestCheckpoint:
+        if not job_id and not project_name:
+            raise ValidationError("job_id or project_name is required")
         return _BasetenLatestCheckpoint(project_name=project_name, job_id=job_id)
 
     @classmethod
     def from_named_checkpoint(
-        cls,
-        checkpoint_name: str,
-        project_name: Optional[str] = None,
-        job_id: Optional[str] = None,
+        cls, checkpoint_name: str, job_id: str
     ) -> _BasetenNamedCheckpoint:
-        return _BasetenNamedCheckpoint(
-            checkpoint_name=checkpoint_name, project_name=project_name, job_id=job_id
-        )
+        return _BasetenNamedCheckpoint(checkpoint_name=checkpoint_name, job_id=job_id)
 
 
 class LoadCheckpointConfig(custom_types.SafeModelNoExtra):

truss_train/restore_from_checkpoint.py

@@ -18,9 +18,7 @@ load_most_recent_checkpoint = BasetenCheckpoint.from_latest_checkpoint(
 )
 
 load_from_named_checkpoint = BasetenCheckpoint.from_named_checkpoint(
-    checkpoint_name="checkpoint-24",
-    project_name="first-project",  # Optional
-    job_id="lqz4pw4",  # Optional
+    checkpoint_name="checkpoint-24", job_id="lqz4pw4"
 )
 
 load_checkpoint_config = LoadCheckpointConfig(