truss 0.11.5rc501__tar.gz → 0.11.6rc100__tar.gz

{truss-0.11.5rc501 → truss-0.11.6rc100}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.5rc501"
+version = "0.11.6rc100"
 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.6rc100}/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-0.11.5rc501 → truss-0.11.6rc100}/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-0.11.5rc501 → truss-0.11.6rc100}/truss/templates/base.Dockerfile.jinja

@@ -32,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-0.11.5rc501 → truss-0.11.6rc100}/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.

{truss-0.11.5rc501 → truss-0.11.6rc100}/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-0.11.5rc501 → truss-0.11.6rc100}/truss/tests/test_data/server.Dockerfile

@@ -1,4 +1,5 @@
 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:-/root}