truss 0.11.6rc1__py3-none-any.whl → 0.11.6rc101__py3-none-any.whl

truss/cli/train/core.py

@@ -458,6 +458,7 @@ def _get_all_train_init_example_options(
 def _get_train_init_example_info(
     repo_id: str = "ml-cookbook",
     examples_subdir: str = "examples",
+    training_subdir: str = "training",
     example_name: Optional[str] = None,
     token: Optional[str] = None,
 ) -> list[Dict[str, str]]:
@@ -471,6 +472,7 @@ def _get_train_init_example_info(
 
     url = f"https://api.github.com/repos/basetenlabs/{repo_id}/contents/{examples_subdir}/{example_name}"
 
+    console.print(f"Attempting to retrieve example info from: {url}")
     try:
         response = requests.get(url, headers=headers)
         response.raise_for_status()
@@ -478,6 +480,8 @@ def _get_train_init_example_info(
         items = response.json()
         if not isinstance(items, list):
             items = [items]
+        # return only training subdirectory info for example
+        items = [item for item in items if item["name"] == training_subdir]
         return items
 
     except requests.exceptions.HTTPError as e:

truss/contexts/image_builder/serving_image_builder.py

@@ -785,9 +785,6 @@ class ServingImageBuilder(ImageBuilder):
         )
 
         non_root_user = os.getenv("BT_USE_NON_ROOT_USER", False)
-        enable_model_container_admin_commands = os.getenv(
-            "BT_ENABLE_MODEL_CONTAINER_ADMIN_CMDS"
-        )
         dockerfile_contents = dockerfile_template.render(
             should_install_server_requirements=should_install_server_requirements,
             base_image_name_and_tag=base_image_name_and_tag,
@@ -822,7 +819,6 @@ class ServingImageBuilder(ImageBuilder):
             use_local_src=config.use_local_src,
             passthrough_environment_variables=passthrough_environment_variables,
             non_root_user=non_root_user,
-            enable_model_container_admin_commands=enable_model_container_admin_commands,
             **FILENAME_CONSTANTS_MAP,
         )
         # Consolidate repeated empty lines to single empty lines.

truss/templates/base.Dockerfile.jinja

@@ -1,4 +1,5 @@
 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)' %}
@@ -13,9 +14,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 }}
+ENV HOME=${HOME:-/home/{{ app_username }}}
+{%- else %}
+{# This is the default, but we use this variable later so ... setting it here too.#}
+ENV HOME=${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 }}
@@ -26,16 +32,6 @@ RUN useradd -u {{ app_user_uid }} -ms /bin/bash {{ app_username }}
 {#- at the very beginning, set non-interactive mode for apt #}
 ENV DEBIAN_FRONTEND=noninteractive
 
-{# If non-root user is enabled and model container admin commands are enabled, install sudo #}
-{# to allow the non-root user to install packages. #}
-{%- if non_root_user and enable_model_container_admin_commands %}
-RUN apt update && apt install -y sudo
-{%- set allowed_admin_commands = ["/usr/bin/apt install *", "/usr/bin/apt update"] %}
-RUN echo "Defaults:{{ app_username }} passwd_tries=0\n{{ app_username }} ALL=(root) NOPASSWD: {{ allowed_admin_commands | join(", ") }}" > /etc/sudoers.d/app-packages
-RUN chmod 0440 /etc/sudoers.d/app-packages
-{#- optional but good practice: check if the sudoers file is valid #}
-RUN visudo -c
-{%- endif %} {#- endif non_root_user and enable_model_container_admin_commands #}
 
 {%- set UV_VERSION = "0.7.19" %}
 {#

truss/templates/server/truss_server.py

@@ -182,6 +182,12 @@ class BasetenEndpoints:
         """
         Executes a predictive endpoint
         """
+        request_id = request.headers.get("x-baseten-request-id")
+
+        logging.debug(
+            f"Request received - {request.method} {method.__name__} "
+            f", Request ID: {request_id}"
+        )
         self.check_healthy()
         trace_ctx = otel_propagate.extract(request.headers) or None
         # This is the top-level span in the truss-server, so we set the context here.
@@ -464,6 +470,8 @@ class TrussServer:
             if self._config["runtime"].get("enable_debug_logs", False)
             else "INFO"
         )
+
+        logging.info(f"Starting truss server with log level {log_level}")
         extra_kwargs = {}
         # We don't pass these if not set, to not override the default.
         if (

truss/templates/server.Dockerfile.jinja

@@ -64,12 +64,7 @@ RUN {% for secret,path in config.build.secret_to_path_mapping.items() %} --mount
 
 {# Copy data before code for better caching #}
 {%- if data_dir_exists %}
-{# If non-root user is enabled, copy data to the app home directory with the correct ownership #}
-{%- if non_root_user %}
 COPY --chown={{ default_owner }} ./{{ config.data_dir }} ${APP_HOME}/data
-{%- else %}
-COPY ./{{ config.data_dir }} ${APP_HOME}/data
-{%- endif %} {#- endif non_root_user #}
 {%- endif %} {#- endif data_dir_exists #}
 
 {%- if model_cache_v2 %}

truss/tests/cli/train/test_train_init.py

@@ -160,7 +160,7 @@ class TestGetTrainInitExampleInfo:
     """Test cases for _get_train_init_example_info function"""
 
     @patch("requests.get")
-    def test_successful_request_without_token(self, mock_get):
+    def test_request_without_token(self, mock_get):
         """Test successful API call without authentication token"""
         # Arrange
         mock_response = Mock()
@@ -179,12 +179,32 @@ class TestGetTrainInitExampleInfo:
             "https://api.github.com/repos/basetenlabs/ml-cookbook/contents/examples/test_example",
             headers={},
         )
-        assert len(result) == 2
-        assert result[0]["name"] == "file1.py"
-        assert result[1]["name"] == "file2.py"
+        assert len(result) == 0  # No training subdir in mock response
 
     @patch("requests.get")
-    def test_successful_request_with_token(self, mock_get):
+    def test_successful_request_without_token(self, mock_get):
+        """Test successful API call without authentication token"""
+        # Arrange
+        mock_response = Mock()
+        mock_response.json.return_value = [
+            {"name": "training", "path": "git_path_1", "type": "dir"},
+            {"name": "file2.py", "type": "file"},
+        ]
+        mock_response.raise_for_status.return_value = None
+        mock_get.return_value = mock_response
+
+        # Act
+        result = _get_train_init_example_info(example_name="test_example")
+
+        # Assert
+        mock_get.assert_called_once_with(
+            "https://api.github.com/repos/basetenlabs/ml-cookbook/contents/examples/test_example",
+            headers={},
+        )
+        assert len(result) == 1  # One training subdir in mock response
+
+    @patch("requests.get")
+    def test_request_with_token(self, mock_get):
         """Test successful API call with authentication token"""
         # Arrange
         mock_response = Mock()
@@ -202,7 +222,7 @@ class TestGetTrainInitExampleInfo:
             "https://api.github.com/repos/basetenlabs/ml-cookbook/contents/examples/test_example",
             headers={"Authorization": "token test_token"},
         )
-        assert len(result) == 1
+        assert len(result) == 0  # No training subdir in mock response
 
     @patch("requests.get")
     def test_custom_repo_and_subdir(self, mock_get):
@@ -226,22 +246,6 @@ class TestGetTrainInitExampleInfo:
             headers={},
         )
 
-    @patch("requests.get")
-    def test_single_item_response(self, mock_get):
-        """Test when API returns a single item instead of a list"""
-        # Arrange
-        mock_response = Mock()
-        mock_response.json.return_value = {"name": "single_file.py", "type": "file"}
-        mock_response.raise_for_status.return_value = None
-        mock_get.return_value = mock_response
-
-        # Act
-        result = _get_train_init_example_info(example_name="test_example")
-
-        # Assert
-        assert len(result) == 1
-        assert result[0]["name"] == "single_file.py"
-
     @patch("requests.get")
     @patch("click.echo")
     def test_404_error_returns_empty_list(self, mock_echo, mock_get):

truss/tests/test_data/server.Dockerfile

@@ -1,7 +1,8 @@
 ARG PYVERSION=py39
+ARG HOME
 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=${HOME:-/root}
 ENV APP_HOME=/app
 RUN mkdir -p ${APP_HOME} /control
 RUN useradd -u 60000 -ms /bin/bash app
@@ -30,7 +31,7 @@ RUN UV_HTTP_TIMEOUT=${UV_HTTP_TIMEOUT:-300} uv pip install --index-strategy unsa
 COPY --chown= ./requirements.txt requirements.txt
 RUN UV_HTTP_TIMEOUT=${UV_HTTP_TIMEOUT:-300} uv pip install --index-strategy unsafe-best-match --python /usr/local/bin/python3 -r requirements.txt --no-cache-dir
 WORKDIR $APP_HOME
-COPY ./data ${APP_HOME}/data
+COPY --chown= ./data ${APP_HOME}/data
 COPY --chown= ./server ${APP_HOME}
 COPY --chown= ./config.yaml ${APP_HOME}/config.yaml
 COPY --chown= ./model ${APP_HOME}/model

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.6rc1.dist-info → truss-0.11.6rc101.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ truss/cli/logs/model_log_watcher.py,sha256=NACcP-wkcaroYa2Cb9BZC7Yr0554WZa_FSM2L
 truss/cli/logs/training_log_watcher.py,sha256=r6HRqrLnz-PiKTUXiDYYxg4ZnP8vYcXlEX1YmgHhzlo,1173
 truss/cli/logs/utils.py,sha256=z-U_FG4BUzdZLbE3BnXb4DZQ0zt3LSZ3PiQpLaDuc3o,1031
 truss/cli/train/common.py,sha256=xTR41U5FeSndXfNBBHF9wF5XwZH1sOIVFlv-XHjsKIU,1547
-truss/cli/train/core.py,sha256=4vPnREmaJh8R_rlwR0_H5NRaXhdyY2g07w11uab-9qw,25908
+truss/cli/train/core.py,sha256=Xyl0SgCXIyvoQJLnkIvX6R2gWUVyeDiFHLB1caWJZjs,26154
 truss/cli/train/deploy_from_checkpoint_config.yml,sha256=mktaVrfhN8Kjx1UveC4xr-gTW-kjwbHvq6bx_LpO-Wg,371
 truss/cli/train/deploy_from_checkpoint_config_whisper.yml,sha256=6GbOorYC8ml0UyOUvuBpFO_fuYtYE646JqsalR-D4oY,406
 truss/cli/train/metrics_watcher.py,sha256=smz-zrEsBj_-wJHI0pAZ-EAPrvfCWzq1eQjGiFNM-Mk,12755
@@ -36,7 +36,7 @@ truss/contexts/docker_build_setup.py,sha256=cF4ExZgtYvrWxvyCAaUZUvV_DB_7__MqVomU
 truss/contexts/truss_context.py,sha256=uS6L-ACHxNk0BsJwESOHh1lA0OGGw0pb33aFKGsASj4,436
 truss/contexts/image_builder/cache_warmer.py,sha256=TGMV1Mh87n2e_dSowH0sf0rZhZraDOR-LVapZL3a5r8,7377
 truss/contexts/image_builder/image_builder.py,sha256=IuRgDeeoHVLzIkJvKtX3807eeqEyaroCs_KWDcIHZUg,1461
-truss/contexts/image_builder/serving_image_builder.py,sha256=ywPV6qsItc7FgxAvgVq1ktQdtFAAQ6tyy5nzwO6pBaA,33647
+truss/contexts/image_builder/serving_image_builder.py,sha256=n6MTHMZsANSTGXPfkKDJ1Ch4fEc6HIjbOXA_1B9zt9Q,33438
 truss/contexts/image_builder/util.py,sha256=y2-CjUKv0XV-0w2sr1fUCflysDJLsoU4oPp6tvvoFnk,1203
 truss/contexts/local_loader/docker_build_emulator.py,sha256=3n0eIlJblz_sldh4AN8AHQDyfjQGdYyld5FabBdd9wE,3563
 truss/contexts/local_loader/dockerfile_parser.py,sha256=GoRJ0Af_3ILyLhjovK5lrCGn1rMxz6W3l681ro17ZzI,1344
@@ -66,12 +66,12 @@ 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=93UgFjjDzmRILsWjvQBMcWuHY2j-HlP8pkCLmvZz_0o,5098
 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=f81E1X621fGJhGyCQzRgZAQW4qDkiZXnJOH4sUzBAEo,7291
+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/endpoints.py,sha256=VQ1lvZjFvR091yRkiFdvXw1Q7PiNGXT9rJwY7_sX6yg,11828
@@ -97,7 +97,7 @@ truss/templates/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 truss/templates/server/main.py,sha256=kWXrdD8z8IpamyWxc8qcvd5ck9gM1Kz2QH5qHJCnmOQ,222
 truss/templates/server/model_wrapper.py,sha256=k75VVISwwlsx5EGb82UZsu8kCM_i6Yi3-Hd0-Kpm1yo,42055
 truss/templates/server/requirements.txt,sha256=lhJYYExWE1IdBlYYFW-kmfmuKZTWyIg1TNyoWIIuuDg,780
-truss/templates/server/truss_server.py,sha256=noXfGJMsKIhgF4oI_8LC1UHkcx8Vg8nGSITZJ_bkRFQ,19598
+truss/templates/server/truss_server.py,sha256=e19dGJnuO1oro6TpTZu2z91STOLHaid0aZgQyhUok1s,19884
 truss/templates/server/common/__init__.py,sha256=qHIqr68L5Tn4mV6S-PbORpcuJ4jmtBR8aCuRTIWDvNo,85
 truss/templates/server/common/errors.py,sha256=My0P6-Y7imVTICIhazHT0vlSu3XJDH7As06OyVzu4Do,8589
 truss/templates/server/common/patches.py,sha256=uEOzvDnXsHOkTSa8zygGYuR4GHhrFNVHNQc5peJcwvo,1393
@@ -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
@@ -144,7 +144,7 @@ truss/tests/cli/test_cli.py,sha256=yfbVS5u1hnAmmA8mJ539vj3lhH-JVGUvC4Q_Mbort44,7
 truss/tests/cli/train/test_cache_view.py,sha256=aVRCh3atRpFbJqyYgq7N-vAW0DiKMftQ7ajUqO2ClOg,22606
 truss/tests/cli/train/test_deploy_checkpoints.py,sha256=lDk88uAUPYatJ30JKVVtJDdXv_zWNk1nxXFyUH6IVGw,44800
 truss/tests/cli/train/test_train_cli_core.py,sha256=vzYfxKdwoa3NaFMrVZbSg5qOoLXivMvZXN1ClQirGTQ,16148
-truss/tests/cli/train/test_train_init.py,sha256=pv8BfyLlVG0QtdowTziITjKa_OE1KigatmAGx8XSZrM,17238
+truss/tests/cli/train/test_train_init.py,sha256=SRAZvvD5-PWYlpHHek2MftYTA4I3ZHi7gniHl2fYV98,17464
 truss/tests/cli/train/resources/test_deploy_from_checkpoint_config.yml,sha256=GF7r9l0KaeXiUYCPSBpeMPd2QG6PeWWyI12NdbqLOgc,1930
 truss/tests/contexts/image_builder/test_serving_image_builder.py,sha256=16niCXZnuxFHXYQw2vPFZ8svSZafkH5DT0Gx3Z9Xdd8,22377
 truss/tests/contexts/local_loader/test_load_local.py,sha256=D1qMH2IpYA2j5009v50QMgUnKdeOsX15ndkwXe10a4E,801
@@ -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=beeeOlOoEWGe1nP5IZYKmDeMJc7KRuN5PdOj7rSEiKE,1962
+truss/tests/test_data/server.Dockerfile,sha256=64M9aAB-Ar5Yl0k9r5WFxVb-4iUShm_OR1w9pKJfDgg,1985
 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.6rc1.dist-info/METADATA,sha256=0HhYjVZUCL_-tTTPOf5I4ihkHdH2apkHemb9f2exVD0,6680
-truss-0.11.6rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.6rc1.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.6rc1.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.6rc1.dist-info/RECORD,,
+truss_train/restore_from_checkpoint.py,sha256=8hdPm-WSgkt74HDPjvCjZMBpvA9MwtoYsxVjOoa7BaM,1176
+truss-0.11.6rc101.dist-info/METADATA,sha256=l0391m_ptDQh-8Z7va3wwkZafcK6-h0zQrSmuZo0RB4,6682
+truss-0.11.6rc101.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.6rc101.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.6rc101.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.6rc101.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(