truss 0.10.13__py3-none-any.whl → 0.11.1rc2__py3-none-any.whl

truss/cli/train/core.py

@@ -1,4 +1,5 @@
 import json
+import os
 import tarfile
 import tempfile
 from dataclasses import dataclass
@@ -16,6 +17,11 @@ from truss.cli.train.metrics_watcher import MetricsWatcher
 from truss.cli.train.types import PrepareCheckpointArgs, PrepareCheckpointResult
 from truss.cli.utils import common as cli_common
 from truss.cli.utils.output import console
+from truss.remote.baseten.custom_types import (
+    FileSummary,
+    FileSummaryWithTotalSize,
+    GetCacheSummaryResponseV1,
+)
 from truss.remote.baseten.remote import BasetenRemote
 from truss_train import loader
 from truss_train.definitions import DeployCheckpointsConfig
@@ -446,6 +452,44 @@ def fetch_project_by_name_or_id(
         raise click.ClickException(f"Error fetching project: {str(e)}")
 
 
+def create_file_summary_with_directory_sizes(
+    files: list[FileSummary],
+) -> list[FileSummaryWithTotalSize]:
+    directory_sizes = calculate_directory_sizes(files)
+    return [
+        FileSummaryWithTotalSize(
+            file_summary=file_info,
+            total_size=directory_sizes.get(file_info.path, file_info.size_bytes),
+        )
+        for file_info in files
+    ]
+
+
+def calculate_directory_sizes(
+    files: list[FileSummary], max_depth: int = 100
+) -> dict[str, int]:
+    directory_sizes = {}
+
+    for file_info in files:
+        if file_info.file_type == "directory":
+            directory_sizes[file_info.path] = 0
+
+    for file_info in files:
+        current_path = file_info.path
+        for i in range(max_depth):
+            if current_path is None:
+                break
+            if current_path in directory_sizes:
+                directory_sizes[current_path] += file_info.size_bytes
+            # Move to parent directory
+            parent = os.path.dirname(current_path)
+            if parent == current_path:  # Reached root
+                break
+            current_path = parent
+
+    return directory_sizes
+
+
 def view_cache_summary(
     remote_provider: BasetenRemote,
     project_id: str,
@@ -454,12 +498,14 @@ def view_cache_summary(
 ):
     """View cache summary for a training project."""
     try:
-        cache_data = remote_provider.api.get_cache_summary(project_id)
+        raw_cache_data = remote_provider.api.get_cache_summary(project_id)
 
-        if not cache_data:
+        if not raw_cache_data:
             console.print("No cache summary found for this project.", style="yellow")
             return
 
+        cache_data = GetCacheSummaryResponseV1.model_validate(raw_cache_data)
+
         table = rich.table.Table(title=f"Cache summary for project: {project_id}")
         table.add_column("File Path", style="cyan")
         table.add_column("Size", style="green")
@@ -467,58 +513,48 @@ def view_cache_summary(
         table.add_column("Type")
         table.add_column("Permissions", style="magenta")
 
-        files = cache_data.get("file_summaries", [])
+        files = cache_data.file_summaries
         if not files:
             console.print("No files found in cache.", style="yellow")
             return
 
-        reverse = order == SORT_ORDER_DESC
+        files_with_total_sizes = create_file_summary_with_directory_sizes(files)
 
-        if sort_by == SORT_BY_FILEPATH:
-            files.sort(key=lambda x: x.get("path", ""), reverse=reverse)
-        elif sort_by == SORT_BY_SIZE:
-            files.sort(key=lambda x: x.get("size_bytes", 0), reverse=reverse)
-        elif sort_by == SORT_BY_MODIFIED:
-            files.sort(key=lambda x: x.get("modified", ""), reverse=reverse)
-        elif sort_by == SORT_BY_TYPE:
-            files.sort(key=lambda x: x.get("file_type", ""), reverse=reverse)
-        elif sort_by == SORT_BY_PERMISSIONS:
-            files.sort(key=lambda x: x.get("permissions", ""), reverse=reverse)
-
-        total_size = 0
-        for file_info in files:
-            total_size += file_info.get("size_bytes", 0)
+        reverse = order == SORT_ORDER_DESC
+        sort_key = _get_sort_key(sort_by)
+        files_with_total_sizes.sort(key=sort_key, reverse=reverse)
 
+        total_size = sum(
+            file_info.file_summary.size_bytes for file_info in files_with_total_sizes
+        )
         total_size_str = common.format_bytes_to_human_readable(total_size)
 
         console.print(
-            f"📅 Cache captured at: {cache_data.get('timestamp', 'Unknown')}",
-            style="bold blue",
+            f"📅 Cache captured at: {cache_data.timestamp}", style="bold blue"
         )
+        console.print(f"📁 Project ID: {cache_data.project_id}", style="bold blue")
+        console.print()
         console.print(
-            f"📁 Project ID: {cache_data.get('project_id', 'Unknown')}",
-            style="bold blue",
+            f"📊 Total files: {len(files_with_total_sizes)}", style="bold green"
         )
-        console.print()
-        console.print(f"📊 Total files: {len(files)}", style="bold green")
         console.print(f"💾 Total size: {total_size_str}", style="bold green")
         console.print()
 
-        for file_info in files:
-            size_bytes = file_info.get("size_bytes", 0)
+        for file_info in files_with_total_sizes:
+            total_size = file_info.total_size
 
-            size_str = cli_common.format_bytes_to_human_readable(int(size_bytes))
+            size_str = cli_common.format_bytes_to_human_readable(int(total_size))
 
             modified_str = cli_common.format_localized_time(
-                file_info.get("modified", "Unknown")
+                file_info.file_summary.modified
             )
 
             table.add_row(
-                file_info.get("path", "Unknown"),
+                file_info.file_summary.path,
                 size_str,
                 modified_str,
-                file_info.get("file_type", "Unknown"),
-                file_info.get("permissions", "Unknown"),
+                file_info.file_summary.file_type or "Unknown",
+                file_info.file_summary.permissions or "Unknown",
             )
 
         console.print(table)
@@ -528,6 +564,21 @@ def view_cache_summary(
         raise
 
 
+def _get_sort_key(sort_by: str) -> Callable[[FileSummaryWithTotalSize], Any]:
+    if sort_by == SORT_BY_FILEPATH:
+        return lambda x: x.file_summary.path
+    elif sort_by == SORT_BY_SIZE:
+        return lambda x: x.total_size
+    elif sort_by == SORT_BY_MODIFIED:
+        return lambda x: x.file_summary.modified
+    elif sort_by == SORT_BY_TYPE:
+        return lambda x: x.file_summary.file_type or ""
+    elif sort_by == SORT_BY_PERMISSIONS:
+        return lambda x: x.file_summary.permissions or ""
+    else:
+        raise ValueError(f"Invalid --sort argument: {sort_by}")
+
+
 def view_cache_summary_by_project(
     remote_provider: BasetenRemote,
     project_identifier: str,

truss/contexts/image_builder/serving_image_builder.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import logging
+import os
 import re
 import shutil
 from abc import ABC, abstractmethod
@@ -783,6 +784,10 @@ class ServingImageBuilder(ImageBuilder):
             config
         )
 
+        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,
@@ -816,6 +821,8 @@ class ServingImageBuilder(ImageBuilder):
             build_commands=build_commands,
             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/contexts/local_loader/docker_build_emulator.py

@@ -1,3 +1,4 @@
+import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Dict, List
@@ -31,12 +32,32 @@ class DockerBuildEmulator:
         self._context_dir = context_dir
 
     def run(self, fs_root_dir: Path) -> DockerBuildEmulatorResult:
-        def _resolve_env(key: str) -> str:
-            if key.startswith("$"):
-                key = key.replace("$", "", 1)
-                v = result.env[key]
-                return v
-            return key
+        def _resolve_env(in_value: str) -> str:
+            # Valid environment variable name pattern
+            var_name_pattern = r"[A-Za-z_][A-Za-z0-9_]*"
+
+            # Handle ${VAR} syntax
+            def replace_braced_var(match):
+                var_name = match.group(1)
+                return result.env.get(
+                    var_name, match.group(0)
+                )  # Return original if not found
+
+            # Handle $VAR syntax (word boundary ensures we don't match parts of other vars)
+            def replace_simple_var(match):
+                var_name = match.group(1)
+                return result.env.get(
+                    var_name, match.group(0)
+                )  # Return original if not found
+
+            # Replace ${VAR} patterns first, using % substitution to avoid additional braces noise with f-strings
+            value = re.sub(
+                r"\$\{(%s)\}" % var_name_pattern, replace_braced_var, in_value
+            )
+            # Then replace remaining $VAR patterns (only at word boundaries)
+            value = re.sub(r"\$(%s)\b" % var_name_pattern, replace_simple_var, value)
+
+            return value
 
         def _resolve_values(keys: List[str]) -> List[str]:
             return list(map(_resolve_env, keys))
@@ -53,11 +74,14 @@ class DockerBuildEmulator:
             if cmd.instruction == DockerInstruction.ENTRYPOINT:
                 result.entrypoint = list(values)
             if cmd.instruction == DockerInstruction.COPY:
+                # Filter out --chown flags
+                filtered_values = [v for v in values if not v.startswith("--chown")]
+
                 # NB(nikhil): Skip COPY commands with --from flag (multi-stage builds)
-                if len(values) != 2:
+                if len(filtered_values) != 2:
                     continue
 
-                src, dst = values
+                src, dst = filtered_values
                 src = src.replace("./", "", 1)
                 dst = dst.replace("/", "", 1)
                 copy_tree_or_file(self._context_dir / src, fs_root_dir / dst)

truss/remote/baseten/custom_types.py

@@ -138,6 +138,13 @@ class FileSummary(pydantic.BaseModel):
     )
 
 
+class FileSummaryWithTotalSize(pydantic.BaseModel):
+    file_summary: FileSummary
+    total_size: int = pydantic.Field(
+        description="Total size of the file and all its subdirectories"
+    )
+
+
 class GetCacheSummaryResponseV1(pydantic.BaseModel):
     """Response for getting cache summary."""
 

truss/templates/base.Dockerfile.jinja

@@ -8,6 +8,35 @@ FROM {{ base_image_name_and_tag }} AS truss_server
 {%- set python_executable = config.base_image.python_executable_path or 'python3' %}
 ENV PYTHON_EXECUTABLE="{{ python_executable }}"
 
+{%- set app_username = "app" %}  {# needed later for USER directive#}
+{% block user_setup %}
+{%- set app_user_uid = 60000 %}
+{%- set control_server_dir = "/control" %}
+{%- set default_owner = "root:root" %}
+{# The non-root user's home directory. #}
+{# uv will use $HOME to install packages. #}
+ENV HOME=/home/{{ app_username }}
+{# Directory containing inference server code. #}
+ENV APP_HOME=/{{ app_username }}
+RUN mkdir -p ${APP_HOME} {{ control_server_dir }}
+{# Create a non-root user to run model containers. #}
+RUN useradd -u {{ app_user_uid }} -ms /bin/bash {{ app_username }}
+{% endblock %} {#- endblock user_setup #}
+
+{#- 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" %}
 {#
 NB(nikhil): We use a semi-complex uv installation command across the board:
@@ -39,7 +68,8 @@ RUN if ! command -v uv >/dev/null 2>&1; then \
     command -v curl >/dev/null 2>&1 || (apt update && apt install -y curl) && \
     curl -LsSf --retry 5 --retry-delay 5 https://astral.sh/uv/{{ UV_VERSION }}/install.sh | sh; \
 fi
-ENV PATH="/root/.local/bin:$PATH"
+{# Add the user's local bin to the path, used by uv. #}
+ENV PATH=${PATH}:${HOME}/.local/bin
 {% endblock %}
 
 {% block base_image_patch %}
@@ -57,7 +87,7 @@ RUN {{ sys_pip_install_command }} install mkl
 
 {% block install_system_requirements %}
     {%- if should_install_system_requirements %}
-COPY ./{{ system_packages_filename }} {{ system_packages_filename }}
+COPY --chown={{ default_owner }} ./{{ system_packages_filename }} {{ system_packages_filename }}
 RUN apt-get update && apt-get install --yes --no-install-recommends $(cat {{ system_packages_filename }}) \
     && apt-get autoremove -y \
     && apt-get clean -y \
@@ -68,11 +98,11 @@ RUN apt-get update && apt-get install --yes --no-install-recommends $(cat {{ sys
 
 {% block install_requirements %}
     {%- if should_install_user_requirements_file %}
-COPY ./{{ user_supplied_requirements_filename }} {{ user_supplied_requirements_filename }}
+COPY --chown={{ default_owner }} ./{{ user_supplied_requirements_filename }} {{ user_supplied_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ user_supplied_requirements_filename }} --no-cache-dir
     {%- endif %}
     {%- if should_install_requirements %}
-COPY ./{{ config_requirements_filename }} {{ config_requirements_filename }}
+COPY --chown={{ default_owner }} ./{{ config_requirements_filename }} {{ config_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ config_requirements_filename }} --no-cache-dir
 {%- endif %}
 {% endblock %}
@@ -80,7 +110,6 @@ RUN {{ sys_pip_install_command }} -r {{ config_requirements_filename }} --no-cac
 
 
 {%- if not config.docker_server %}
-ENV APP_HOME="/app"
 WORKDIR $APP_HOME
 {%- endif %}
 
@@ -90,7 +119,7 @@ WORKDIR $APP_HOME
 
 {% block bundled_packages_copy %}
     {%- if bundled_packages_dir_exists %}
-COPY ./{{ config.bundled_packages_dir }} /packages
+COPY --chown={{ default_owner }} ./{{ config.bundled_packages_dir }} /packages
 {%- endif %}
 {% endblock %}
 

truss/templates/cache.Dockerfile.jinja

@@ -1,20 +1,21 @@
 FROM python:3.11-slim AS cache_warmer
 
-RUN mkdir -p /app/model_cache
-WORKDIR /app
+ENV APP_HOME=/app
+RUN mkdir -p ${APP_HOME}/model_cache
+WORKDIR ${APP_HOME}
 
 {% if hf_access_token %}
 ENV HUGGING_FACE_HUB_TOKEN="{{hf_access_token}}"
 {% endif %}
 
 RUN apt-get -y update; apt-get -y install curl; curl -s https://baseten-public.s3.us-west-2.amazonaws.com/bin/b10cp-5fe8dc7da-linux-amd64 -o /app/b10cp; chmod +x /app/b10cp
-ENV B10CP_PATH_TRUSS="/app/b10cp"
-COPY ./cache_requirements.txt /app/cache_requirements.txt
-RUN pip install -r /app/cache_requirements.txt --no-cache-dir && rm -rf /root/.cache/pip
-COPY ./cache_warmer.py /cache_warmer.py
+ENV B10CP_PATH_TRUSS="${APP_HOME}/b10cp"
+COPY --chown={{ default_owner }} ./cache_requirements.txt ${APP_HOME}/cache_requirements.txt
+RUN pip install -r ${APP_HOME}/cache_requirements.txt --no-cache-dir && rm -rf /root/.cache/pip
+COPY --chown={{ default_owner }} ./cache_warmer.py /cache_warmer.py
 
 {% for credential in credentials_to_cache  %}
-COPY ./{{credential}} /app/{{credential}}
+COPY ./{{credential}} ${APP_HOME}/{{credential}}
 {% endfor %}
 
 {% for repo, hf_dir in models.items() %}

truss/templates/copy_cache_files.Dockerfile.jinja

@@ -1,3 +1,3 @@
 {% for file in cached_files %}
-COPY --from=cache_warmer {{file.source}} {{file.dst}}
+COPY --chown={{ default_owner }} --from=cache_warmer {{file.source}} {{file.dst}}
 {% endfor %}

truss/templates/docker_server/supervisord.conf.jinja

@@ -1,4 +1,5 @@
 [supervisord]
+pidfile=/tmp/supervisord.pid ; Set PID file location to /tmp to be writable by the non-root user
 nodaemon=true                ; Run supervisord in the foreground (useful for containers)
 logfile=/dev/null            ; Disable logging to file (send logs to /dev/null)
 logfile_maxbytes=0           ; No size limit on logfile (since logging is disabled)

truss/templates/server/common/tracing.py

@@ -6,7 +6,6 @@ import pathlib
 import time
 from typing import Iterator, List, Optional, Sequence
 
-import opentelemetry.exporter.otlp.proto.http.trace_exporter as oltp_exporter
 import opentelemetry.sdk.resources as resources
 import opentelemetry.sdk.trace as sdk_trace
 import opentelemetry.sdk.trace.export as trace_export
@@ -16,7 +15,6 @@ from shared import secrets_resolver
 logger = logging.getLogger(__name__)
 
 ATTR_NAME_DURATION = "duration_sec"
-OTEL_EXPORTER_OTLP_ENDPOINT = "OTEL_EXPORTER_OTLP_ENDPOINT"
 # Writing trace data to a file is only intended for testing / debugging.
 OTEL_TRACING_NDJSON_FILE = "OTEL_TRACING_NDJSON_FILE"
 # Exporting trace data to a public honeycomb instance (not our cluster collector)
@@ -67,13 +65,6 @@ def get_truss_tracer(secrets: secrets_resolver.Secrets, config) -> trace.Tracer:
         return _truss_tracer
 
     span_processors: List[sdk_trace.SpanProcessor] = []
-    if otlp_endpoint := os.getenv(OTEL_EXPORTER_OTLP_ENDPOINT):
-        if enable_tracing_data:
-            logger.info(f"Exporting trace data to {OTEL_EXPORTER_OTLP_ENDPOINT}.")
-        otlp_exporter = oltp_exporter.OTLPSpanExporter(endpoint=otlp_endpoint)
-        otlp_processor = sdk_trace.export.BatchSpanProcessor(otlp_exporter)
-        span_processors.append(otlp_processor)
-
     if tracing_log_file := os.getenv(OTEL_TRACING_NDJSON_FILE):
         if enable_tracing_data:
             logger.info(f"Exporting trace data to file `{tracing_log_file}`.")
@@ -81,21 +72,6 @@ def get_truss_tracer(secrets: secrets_resolver.Secrets, config) -> trace.Tracer:
         file_processor = sdk_trace.export.SimpleSpanProcessor(json_file_exporter)
         span_processors.append(file_processor)
 
-    if (
-        honeycomb_dataset := os.getenv(HONEYCOMB_DATASET)
-    ) and HONEYCOMB_API_KEY in secrets:
-        honeycomb_api_key = secrets[HONEYCOMB_API_KEY]
-        logger.info("Exporting trace data to honeycomb.")
-        honeycomb_exporter = oltp_exporter.OTLPSpanExporter(
-            endpoint="https://api.honeycomb.io/v1/traces",
-            headers={
-                "x-honeycomb-team": honeycomb_api_key,
-                "x-honeycomb-dataset": honeycomb_dataset,
-            },
-        )
-        honeycomb_processor = sdk_trace.export.BatchSpanProcessor(honeycomb_exporter)
-        span_processors.append(honeycomb_processor)
-
     if span_processors and enable_tracing_data:
         logger.info("Instantiating truss tracer.")
         resource = resources.Resource.create({resources.SERVICE_NAME: "truss-server"})

truss/templates/server.Dockerfile.jinja

@@ -11,7 +11,6 @@
 {% if config.base_image %}
     {%- if not config.docker_server %}
 ENV PYTHONUNBUFFERED="True"
-ENV DEBIAN_FRONTEND="noninteractive"
 
 {# Install common dependencies #}
 RUN apt update && \
@@ -20,7 +19,7 @@ RUN apt update && \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
-COPY ./{{ base_server_requirements_filename }} {{ base_server_requirements_filename }}
+COPY --chown={{ default_owner }} ./{{ base_server_requirements_filename }} {{ base_server_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ base_server_requirements_filename }} --no-cache-dir
     {%- endif %} {#- endif not config.docker_server #}
 
@@ -38,7 +37,7 @@ RUN ln -sf {{ config.base_image.python_executable_path }} /usr/local/bin/python
 
 {% block install_requirements %}
     {%- if should_install_server_requirements %}
-COPY ./{{ server_requirements_filename }} {{ server_requirements_filename }}
+COPY --chown={{ default_owner }} ./{{ server_requirements_filename }} {{ server_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ server_requirements_filename }} --no-cache-dir
     {%- endif %} {#- endif should_install_server_requirements #}
 {{ super() }}
@@ -47,7 +46,7 @@ RUN {{ sys_pip_install_command }} -r {{ server_requirements_filename }} --no-cac
 
 {% block app_copy %}
 {%- if model_cache_v1 %}
-# Copy data before code for better caching
+{# Copy data before code for better caching #}
 {%- include "copy_cache_files.Dockerfile.jinja" -%}
 {%- endif %} {#- endif model_cache_v1 #}
 
@@ -65,47 +64,55 @@ RUN {% for secret,path in config.build.secret_to_path_mapping.items() %} --mount
 
 {# Copy data before code for better caching #}
 {%- if data_dir_exists %}
-COPY ./{{ config.data_dir }} /app/data
+COPY --chown={{ default_owner }} ./{{ config.data_dir }} ${APP_HOME}/data
 {%- endif %} {#- endif data_dir_exists #}
 
 {%- if model_cache_v2 %}
-# v0.0.9, keep synced with server_requirements.txt
+{# v0.0.9, keep synced with server_requirements.txt #}
 RUN curl -sSL --fail --retry 5 --retry-delay 2 -o /usr/local/bin/truss-transfer-cli https://github.com/basetenlabs/truss/releases/download/v0.10.11rc1/truss-transfer-cli-v0.10.11rc1-linux-x86_64-unknown-linux-musl
 RUN chmod +x /usr/local/bin/truss-transfer-cli
 RUN mkdir /static-bptr
 RUN echo "hash {{model_cache_hash}}"
-COPY ./bptr-manifest /static-bptr/static-bptr-manifest.json
+COPY --chown={{ default_owner }} ./bptr-manifest /static-bptr/static-bptr-manifest.json
 {%- endif %} {#- endif model_cache_v2 #}
 
 {%- if not config.docker_server %}
-COPY ./server /app
+COPY --chown={{ default_owner }} ./server ${APP_HOME}
 {%- endif %} {#- endif not config.docker_server #}
 
 {%- if use_local_src %}
 {# This path takes precedence over site-packages. #}
-COPY ./truss_chains /app/truss_chains
-COPY ./truss /app/truss
+COPY --chown={{ default_owner }} ./truss_chains ${APP_HOME}/truss_chains
+COPY --chown={{ default_owner }} ./truss ${APP_HOME}/truss
 {%- endif %} {#- endif use_local_src #}
 
-COPY ./config.yaml /app/config.yaml
+COPY --chown={{ default_owner }} ./config.yaml ${APP_HOME}/config.yaml
 {%- if requires_live_reload %}
 RUN uv python install {{ control_python_version }}
 RUN uv venv /control/.env --python {{ control_python_version }}
 
-COPY ./control /control
+COPY --chown={{ default_owner }} ./control /control
 RUN uv pip install -r /control/requirements.txt --python /control/.env/bin/python --no-cache-dir
 {%- endif %} {#- endif requires_live_reload #}
 
 {%- if model_dir_exists %}
-COPY ./{{ config.model_module_dir }} /app/model
+COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/model
 {%- endif %} {#- endif model_dir_exists #}
 {% endblock %} {#- endblock app_copy #}
 
 {% block run %}
+{# Macro to change ownership of directories and switch to regular user #}
+{%- macro chown_and_switch_to_regular_user_if_enabled(additional_chown_dirs=[]) -%}
+{%- if non_root_user %}
+RUN chown -R {{ app_username }}:{{ app_username }} {% for dir in additional_chown_dirs %}{{ dir }} {% endfor %}${HOME} ${APP_HOME}
+USER {{ app_username }}
+{%- endif %} {#- endif non_root_user #}
+{%- endmacro -%}
+
     {%- if config.docker_server %}
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
         curl nginx && rm -rf /var/lib/apt/lists/*
-COPY ./docker_server_requirements.txt /app/docker_server_requirements.txt
+COPY --chown={{ default_owner }} ./docker_server_requirements.txt ${APP_HOME}/docker_server_requirements.txt
 
 {# NB(nikhil): Use the same python version for custom server proxy as the control server, for consistency. #}
 RUN uv python install {{ control_python_version }}
@@ -113,23 +120,30 @@ RUN uv venv /docker_server/.venv --python {{ control_python_version }}
 RUN uv pip install --python /docker_server/.venv/bin/python -r /app/docker_server_requirements.txt --no-cache-dir
 {% set proxy_config_path = "/etc/nginx/conf.d/proxy.conf" %}
 {% set supervisor_config_path = "/etc/supervisor/supervisord.conf" %}
-{% set supervisor_log_dir = "/var/log/supervisor" %}
 {% set supervisor_server_url = "http://localhost:8080" %}
-COPY ./proxy.conf {{ proxy_config_path }}
-RUN mkdir -p {{ supervisor_log_dir }}
-COPY supervisord.conf {{ supervisor_config_path }}
+COPY --chown={{ default_owner }} ./proxy.conf {{ proxy_config_path }}
+COPY --chown={{ default_owner }} ./supervisord.conf {{ supervisor_config_path }}
 ENV SUPERVISOR_SERVER_URL="{{ supervisor_server_url }}"
 ENV SERVER_START_CMD="/docker_server/.venv/bin/supervisord -c {{ supervisor_config_path }}"
+{#- default configuration uses port 80, which requires root privileges, so we remove it #}
+RUN rm -f /etc/nginx/sites-enabled/default
+{#- nginx writes to /var/lib/nginx, /var/log/nginx, and /run directories #}
+{{ chown_and_switch_to_regular_user_if_enabled(["/var/lib/nginx", "/var/log/nginx", "/run"]) }}
 ENTRYPOINT ["/docker_server/.venv/bin/supervisord", "-c", "{{ supervisor_config_path }}"]
+
     {%- elif requires_live_reload %} {#- elif requires_live_reload #}
 ENV HASH_TRUSS="{{ truss_hash }}"
 ENV CONTROL_SERVER_PORT="8080"
 ENV INFERENCE_SERVER_PORT="8090"
 ENV SERVER_START_CMD="/control/.env/bin/python /control/control/server.py"
+{{ chown_and_switch_to_regular_user_if_enabled() }}
 ENTRYPOINT ["/control/.env/bin/python", "/control/control/server.py"]
+
     {%- else %} {#- else (default inference server) #}
 ENV INFERENCE_SERVER_PORT="8080"
 ENV SERVER_START_CMD="{{ python_executable }} /app/main.py"
+{{ chown_and_switch_to_regular_user_if_enabled() }}
 ENTRYPOINT ["{{ python_executable }}", "/app/main.py"]
     {%- endif %} {#- endif config.docker_server / live_reload #}
+
 {% endblock %} {#- endblock run #}

truss/tests/cli/train/test_train_cli_core.py

@@ -1,6 +1,11 @@
 from unittest.mock import Mock, patch
 
-from truss.cli.train.core import view_training_job_metrics
+from truss.cli.train.core import (
+    calculate_directory_sizes,
+    create_file_summary_with_directory_sizes,
+    view_training_job_metrics,
+)
+from truss.remote.baseten.custom_types import FileSummary
 
 
 @patch("truss.cli.train.metrics_watcher.time.sleep")
@@ -189,3 +194,251 @@ def test_view_training_job_metrics(time_sleep, capfd):
     out, err = capfd.readouterr()
     assert "Training job completed successfully" in out
     assert "Error fetching metrics" not in out
+
+
+def test_calculate_directory_sizes():
+    """Test calculate_directory_sizes function with various file structures."""
+    # Create test files with a nested directory structure
+    files = [
+        FileSummary(
+            path="/root",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        FileSummary(
+            path="/root/file1.txt",
+            size_bytes=100,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        FileSummary(
+            path="/root/subdir",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        FileSummary(
+            path="/root/subdir/file2.txt",
+            size_bytes=200,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        FileSummary(
+            path="/root/subdir/file3.txt",
+            size_bytes=300,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        FileSummary(
+            path="/root/other_file.txt",
+            size_bytes=50,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+    ]
+
+    result = calculate_directory_sizes(files)
+
+    # Check that directory sizes are calculated correctly
+    assert result["/root/subdir"] == 500  # 200 + 300
+    assert result["/root"] == 650  # 100 + 200 + 300 + 50
+
+    # Check that files are not included in the result (only directories)
+    assert "/root/file1.txt" not in result
+    assert "/root/subdir/file2.txt" not in result
+    assert "/root/subdir/file3.txt" not in result
+    assert "/root/other_file.txt" not in result
+
+
+def test_calculate_directory_sizes_empty_list():
+    """Test calculate_directory_sizes with empty file list."""
+    result = calculate_directory_sizes([])
+    assert result == {}
+
+
+def test_calculate_directory_sizes_no_directories():
+    """Test calculate_directory_sizes with only files (no directories)."""
+    files = [
+        FileSummary(
+            path="/file1.txt",
+            size_bytes=100,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        FileSummary(
+            path="/file2.txt",
+            size_bytes=200,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+    ]
+
+    result = calculate_directory_sizes(files)
+    assert result == {}
+
+
+def test_create_file_summary_with_directory_sizes():
+    """Test create_file_summary_with_directory_sizes function."""
+    files = [
+        FileSummary(
+            path="/root",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        FileSummary(
+            path="/root/file1.txt",
+            size_bytes=100,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        FileSummary(
+            path="/root/subdir",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        FileSummary(
+            path="/root/subdir/file2.txt",
+            size_bytes=200,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+    ]
+
+    result = create_file_summary_with_directory_sizes(files)
+
+    # Check that we get the correct number of FileSummaryWithTotalSize objects
+    assert len(result) == 4
+
+    # Check that files have their original size as total_size
+    file1_summary = next(f for f in result if f.file_summary.path == "/root/file1.txt")
+    assert file1_summary.total_size == 100
+
+    file2_summary = next(
+        f for f in result if f.file_summary.path == "/root/subdir/file2.txt"
+    )
+    assert file2_summary.total_size == 200
+
+    # Check that directories have calculated total sizes
+    subdir_summary = next(f for f in result if f.file_summary.path == "/root/subdir")
+    assert subdir_summary.total_size == 200  # Only file2.txt
+
+    root_summary = next(f for f in result if f.file_summary.path == "/root")
+    assert root_summary.total_size == 300  # file1.txt + file2.txt
+
+
+def test_create_file_summary_with_directory_sizes_empty_list():
+    """Test create_file_summary_with_directory_sizes with empty file list."""
+    result = create_file_summary_with_directory_sizes([])
+    assert result == []
+
+
+def test_calculate_directory_sizes_max_depth():
+    """Test that calculate_directory_sizes respects the max_depth parameter.
+
+    The max_depth parameter controls how many parent directories up from each file
+    the algorithm will traverse to add the file's size to parent directories.
+    """
+    # Create a deep directory structure: /root/level1/level2/level3/level4/level5/file.txt
+    files = [
+        # Root directory
+        FileSummary(
+            path="/root",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # Level 1 directory
+        FileSummary(
+            path="/root/level1",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # Level 2 directory
+        FileSummary(
+            path="/root/level1/level2",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # Level 3 directory
+        FileSummary(
+            path="/root/level1/level2/level3",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # Level 4 directory
+        FileSummary(
+            path="/root/level1/level2/level3/level4",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # Level 5 directory
+        FileSummary(
+            path="/root/level1/level2/level3/level4/level5",
+            size_bytes=0,
+            modified="2023-01-01T00:00:00Z",
+            file_type="directory",
+            permissions="drwxr-xr-x",
+        ),
+        # File at level 1
+        FileSummary(
+            path="/root/level1/file1.txt",
+            size_bytes=100,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        # File at level 2
+        FileSummary(
+            path="/root/level1/level2/file2.txt",
+            size_bytes=200,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+        # File at level 3
+        FileSummary(
+            path="/root/level1/level2/level3/file3.txt",
+            size_bytes=300,
+            modified="2023-01-01T00:00:00Z",
+            file_type="file",
+            permissions="-rw-r--r--",
+        ),
+    ]
+
+    result_depth_0 = calculate_directory_sizes(files, max_depth=0)
+    assert result_depth_0["/root"] == 0
+    assert result_depth_0["/root/level1"] == 0
+    assert result_depth_0["/root/level1/level2"] == 0
+    assert result_depth_0["/root/level1/level2/level3"] == 0
+
+    # ensure that we stop early if the max depth is reached
+    result_depth_2 = calculate_directory_sizes(files, max_depth=2)
+
+    assert result_depth_2["/root"] == 0
+    assert result_depth_2["/root/level1"] == 100  # file1.txt only
+    assert result_depth_2["/root/level1/level2"] == 200  # file2.txt only
+    assert result_depth_2["/root/level1/level2/level3"] == 300  # file3.txt only

truss/tests/contexts/image_builder/test_serving_image_builder.py

@@ -466,7 +466,7 @@ def test_model_cache_dockerfile_v2(test_data_path):
             print(gen_docker_file)
             assert "truss-transfer" in gen_docker_file
             assert (
-                "COPY ./bptr-manifest /static-bptr/static-bptr-manifest.json"
+                "COPY --chown= ./bptr-manifest /static-bptr/static-bptr-manifest.json"
                 in gen_docker_file
             ), "bptr-manifest copy not found in Dockerfile"
             assert "cache_warmer.py" not in gen_docker_file

truss/tests/templates/control/control/test_server_integration.py

@@ -21,6 +21,54 @@ from prometheus_client.parser import text_string_to_metric_families
 PATCH_PING_MAX_DELAY_SECS = 3
 
 
+def _start_truss_server(
+    stdout_capture_file_path: str,
+    truss_control_container_fs: Path,
+    with_patch_ping_flow: bool,
+    patch_ping_server_port: int,
+    ctrl_port: int,
+    inf_port: int,
+):
+    """Module-level function to avoid pickling issues with multiprocessing."""
+    if with_patch_ping_flow:
+        os.environ["PATCH_PING_URL_TRUSS"] = (
+            f"http://localhost:{patch_ping_server_port}"
+        )
+    sys.stdout = open(stdout_capture_file_path, "w")
+    app_path = truss_control_container_fs / "app"
+    sys.path.append(str(app_path))
+    control_path = truss_control_container_fs / "control" / "control"
+    sys.path.append(str(control_path))
+
+    from server import ControlServer
+
+    control_server = ControlServer(
+        python_executable_path=sys.executable,
+        inf_serv_home=str(app_path),
+        control_server_port=ctrl_port,
+        inference_server_port=inf_port,
+    )
+    control_server.run()
+
+
+def _start_patch_ping_server(patch_ping_server_port: int):
+    """Module-level function to avoid pickling issues with multiprocessing."""
+    import json
+    import random
+    import time
+    from http.server import BaseHTTPRequestHandler, HTTPServer
+
+    class Handler(BaseHTTPRequestHandler):
+        def do_POST(self):
+            time.sleep(random.uniform(0, PATCH_PING_MAX_DELAY_SECS))
+            self.send_response(200)
+            self.end_headers()
+            self.wfile.write(bytes(json.dumps({"is_current": True}), encoding="utf-8"))
+
+    httpd = HTTPServer(("localhost", patch_ping_server_port), Handler)
+    httpd.serve_forever()
+
+
 @dataclass
 class ControlServerDetails:
     control_server_process: Process
@@ -270,51 +318,24 @@ def _configured_control_server(
     inf_port = ctrl_port + 1
     patch_ping_server_port = ctrl_port + 2
 
-    def start_truss_server(stdout_capture_file_path):
-        if with_patch_ping_flow:
-            os.environ["PATCH_PING_URL_TRUSS"] = (
-                f"http://localhost:{patch_ping_server_port}"
-            )
-        sys.stdout = open(stdout_capture_file_path, "w")
-        app_path = truss_control_container_fs / "app"
-        sys.path.append(str(app_path))
-        control_path = truss_control_container_fs / "control" / "control"
-        sys.path.append(str(control_path))
-
-        from server import ControlServer
-
-        control_server = ControlServer(
-            python_executable_path=sys.executable,
-            inf_serv_home=str(app_path),
-            control_server_port=ctrl_port,
-            inference_server_port=inf_port,
-        )
-        control_server.run()
-
-    def start_patch_ping_server():
-        import json
-        import random
-        import time
-        from http.server import BaseHTTPRequestHandler, HTTPServer
-
-        class Handler(BaseHTTPRequestHandler):
-            def do_POST(self):
-                time.sleep(random.uniform(0, PATCH_PING_MAX_DELAY_SECS))
-                self.send_response(200)
-                self.end_headers()
-                self.wfile.write(
-                    bytes(json.dumps({"is_current": True}), encoding="utf-8")
-                )
-
-        httpd = HTTPServer(("localhost", patch_ping_server_port), Handler)
-        httpd.serve_forever()
-
     stdout_capture_file = tempfile.NamedTemporaryFile()
-    subproc = Process(target=start_truss_server, args=(stdout_capture_file.name,))
+    subproc = Process(
+        target=_start_truss_server,
+        args=(
+            stdout_capture_file.name,
+            truss_control_container_fs,
+            with_patch_ping_flow,
+            patch_ping_server_port,
+            ctrl_port,
+            inf_port,
+        ),
+    )
     subproc.start()
     proc_id = subproc.pid
     if with_patch_ping_flow:
-        patch_ping_server_proc = Process(target=start_patch_ping_server)
+        patch_ping_server_proc = Process(
+            target=_start_patch_ping_server, args=(patch_ping_server_port,)
+        )
         patch_ping_server_proc.start()
     try:
         time.sleep(2.0)

truss/tests/templates/server/test_truss_server.py

@@ -10,23 +10,30 @@ from pathlib import Path
 import pytest
 
 
-@pytest.mark.integration
-def test_truss_server_termination(truss_container_fs):
-    port = 10123
+def _start_truss_server(
+    stdout_capture_file_path: str, truss_container_fs: Path, port: int
+):
+    """Module-level function to avoid pickling issues with multiprocessing."""
+    sys.stdout = open(stdout_capture_file_path, "w")
+    app_path = truss_container_fs / "app"
+    sys.path.append(str(app_path))
+    os.chdir(app_path)
+
+    from truss_server import TrussServer
 
-    def start_truss_server(stdout_capture_file_path):
-        sys.stdout = open(stdout_capture_file_path, "w")
-        app_path = truss_container_fs / "app"
-        sys.path.append(str(app_path))
-        os.chdir(app_path)
+    server = TrussServer(http_port=port, config_or_path=app_path / "config.yaml")
+    server.start()
 
-        from truss_server import TrussServer
 
-        server = TrussServer(http_port=port, config_or_path=app_path / "config.yaml")
-        server.start()
+@pytest.mark.integration
+def test_truss_server_termination(truss_container_fs):
+    port = 10123
 
     stdout_capture_file = tempfile.NamedTemporaryFile()
-    subproc = Process(target=start_truss_server, args=(stdout_capture_file.name,))
+    subproc = Process(
+        target=_start_truss_server,
+        args=(stdout_capture_file.name, truss_container_fs, port),
+    )
     subproc.start()
     proc_id = subproc.pid
     time.sleep(2.0)

truss/tests/test_data/server.Dockerfile

@@ -1,6 +1,11 @@
 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 APP_HOME=/app
+RUN mkdir -p ${APP_HOME} /control
+RUN useradd -u 60000 -ms /bin/bash app
+ENV DEBIAN_FRONTEND=noninteractive
 RUN grep -w 'ID=debian\|ID_LIKE=debian' /etc/os-release || { echo "ERROR: Supplied base image is not a debian image"; exit 1; }
 RUN /usr/local/bin/python3 -c "import sys; \
     sys.exit(0) \
@@ -13,25 +18,23 @@ RUN if ! command -v uv >/dev/null 2>&1; then \
     command -v curl >/dev/null 2>&1 || (apt update && apt install -y curl) && \
     curl -LsSf --retry 5 --retry-delay 5 https://astral.sh/uv/0.7.19/install.sh | sh; \
 fi
-ENV PATH="/root/.local/bin:$PATH"
+ENV PATH=${PATH}:${HOME}/.local/bin
 ENV PYTHONUNBUFFERED="True"
-ENV DEBIAN_FRONTEND="noninteractive"
 RUN apt update && \
     apt install -y bash build-essential git curl ca-certificates \
     && apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
-COPY ./base_server_requirements.txt base_server_requirements.txt
+COPY --chown= ./base_server_requirements.txt base_server_requirements.txt
 RUN UV_HTTP_TIMEOUT=${UV_HTTP_TIMEOUT:-300} uv pip install --index-strategy unsafe-best-match --python /usr/local/bin/python3 -r base_server_requirements.txt --no-cache-dir
-COPY ./requirements.txt requirements.txt
+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
-ENV APP_HOME="/app"
 WORKDIR $APP_HOME
-COPY ./data /app/data
-COPY ./server /app
-COPY ./config.yaml /app/config.yaml
-COPY ./model /app/model
-COPY ./packages /packages
+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
+COPY --chown= ./packages /packages
 ENV INFERENCE_SERVER_PORT="8080"
 ENV SERVER_START_CMD="/usr/local/bin/python3 /app/main.py"
 ENTRYPOINT ["/usr/local/bin/python3", "/app/main.py"]

truss/tests/test_model_inference.py

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

{truss-0.10.13.dist-info → truss-0.11.1rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.10.13
+Version: 0.11.1rc2
 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.10.13.dist-info → truss-0.11.1rc2.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=gfFRqxCxGsanbMNgJBJ0WFqVxZm4SwOEM2iyLS3K8Ns,18687
+truss/cli/train/core.py,sha256=dAmetxKqSc4bQPnVS_8WLfNsw1L7vLT2tU02BVwRPgc,20206
 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,9 +36,9 @@ 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=FH5HPnrr9_OomN5WplsyUrGGETe9ld6h3q9JCpvB6FY,33322
+truss/contexts/image_builder/serving_image_builder.py,sha256=ywPV6qsItc7FgxAvgVq1ktQdtFAAQ6tyy5nzwO6pBaA,33647
 truss/contexts/image_builder/util.py,sha256=y2-CjUKv0XV-0w2sr1fUCflysDJLsoU4oPp6tvvoFnk,1203
-truss/contexts/local_loader/docker_build_emulator.py,sha256=rmf7I28zksSmHjwvJMx2rIa6xK4KeR5fBm5YFth_fQg,2464
+truss/contexts/local_loader/docker_build_emulator.py,sha256=3n0eIlJblz_sldh4AN8AHQDyfjQGdYyld5FabBdd9wE,3563
 truss/contexts/local_loader/dockerfile_parser.py,sha256=GoRJ0Af_3ILyLhjovK5lrCGn1rMxz6W3l681ro17ZzI,1344
 truss/contexts/local_loader/load_model_local.py,sha256=7XoIjjDi9-PilI5VUgGbTn4ucxFbQF6eQ-SsIcchtcM,1867
 truss/contexts/local_loader/truss_module_loader.py,sha256=OtewX72XljkA0MPqqf9iPIqvUhG6HwP6q-IpQfm143o,5710
@@ -55,7 +55,7 @@ truss/remote/baseten/__init__.py,sha256=XNqJW1zyp143XQc6-7XVwsUA_Q_ZJv_ausn1_Oht
 truss/remote/baseten/api.py,sha256=lJOt2i3tu0ZeCh4B_-hpfpjcZKgTHVnkxraooK7TUHw,24699
 truss/remote/baseten/auth.py,sha256=tI7s6cI2EZgzpMIzrdbILHyGwiHDnmoKf_JBhJXT55E,776
 truss/remote/baseten/core.py,sha256=uxtmBI9RAVHu1glIEJb5Q4ccJYLeZM1Cp5Svb9W68Yw,21965
-truss/remote/baseten/custom_types.py,sha256=gUG7EkTeXzqcqznbKxz1SGTtHavNKGm1UoTFiln3LmQ,4309
+truss/remote/baseten/custom_types.py,sha256=1OfbZwT-n7mrYQ4ygfWuvOnENedZ4L6zOSFMAhBAVqI,4509
 truss/remote/baseten/error.py,sha256=3TNTwwPqZnr4NRd9Sl6SfLUQR2fz9l6akDPpOntTpzA,578
 truss/remote/baseten/remote.py,sha256=Se8AES5mk8jxa8S9fN2DSG7wnsaV7ftRjJ4Uwc_w_S0,22544
 truss/remote/baseten/rest_client.py,sha256=_t3CWsWARt2u0C0fDsF4rtvkkHe-lH7KXoPxWXAkKd4,1185
@@ -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=vFAJH1lC9jg90-076H2DCmkXUAlpseitIN6c4UwagxA,4020
-truss/templates/cache.Dockerfile.jinja,sha256=LhsVP9F3BATKQGkgya_YT4v6ABTUkpy-Jb3N36zsw10,1030
+truss/templates/base.Dockerfile.jinja,sha256=irked6fWbiZ4tMkhR3zi3njpaaI9bANVqq7PTjp_Tmc,5610
+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=arHldnuclt7vUFHyRz6vus5NGMDkIofm-1RU37A0xZM,98
+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=TK4P5y8SPV7Mfy0dX8_u10SiGP5PdGcKj5fKrKk575A,5996
+truss/templates/server.Dockerfile.jinja,sha256=CUYnF_hgxPGq2re7__0UPWlwzOHMoFkxp6NVKi3U16s,7071
 truss/templates/control/requirements.txt,sha256=Kk0tYID7trPk5gwX38Wrt2-YGWZAXFJCJRcqJ8ZzCjc,251
 truss/templates/control/control/application.py,sha256=jYeta6hWe1SkfLL3W4IDmdYjg3ZuKqI_UagWYs5RB_E,3793
 truss/templates/control/control/endpoints.py,sha256=FM-sgao7I3gMoUTasM3Xq_g2LDoJQe75JxIoaQxzeNo,10031
@@ -92,7 +92,7 @@ truss/templates/custom/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 truss/templates/custom/model/model.py,sha256=J04rLxK09Pwt2F4GoKOLKL-H-CqZUdYIM-PL2CE9PoE,1079
 truss/templates/custom_python_dx/my_model.py,sha256=NG75mQ6wxzB1BYUemDFZvRLBET-UrzuUK4FuHjqI29U,910
 truss/templates/docker_server/proxy.conf.jinja,sha256=Lg-PcZzKflG85exZKHNgW_I6r0mATV8AtOIBaE40-RM,1669
-truss/templates/docker_server/supervisord.conf.jinja,sha256=CoaSLv0Lr8t1tS_q102IFufNX2lWrlbCHJLjMhYjOwM,1711
+truss/templates/docker_server/supervisord.conf.jinja,sha256=dd37fwZE--cutrvOUCqEyJQQQhlp61H2IUs2huKWsSk,1808
 truss/templates/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/templates/server/main.py,sha256=kWXrdD8z8IpamyWxc8qcvd5ck9gM1Kz2QH5qHJCnmOQ,222
 truss/templates/server/model_wrapper.py,sha256=k75VVISwwlsx5EGb82UZsu8kCM_i6Yi3-Hd0-Kpm1yo,42055
@@ -103,7 +103,7 @@ truss/templates/server/common/errors.py,sha256=qWeZlmNI8ZGbZbOIp_mtS6IKvUFIzhj3Q
 truss/templates/server/common/patches.py,sha256=uEOzvDnXsHOkTSa8zygGYuR4GHhrFNVHNQc5peJcwvo,1393
 truss/templates/server/common/retry.py,sha256=dtz6yvwLoY0i55FnxECz57zEOKjAhGMYvvM-k9jiR9c,624
 truss/templates/server/common/schema.py,sha256=WLFtVyEKmk4whg5_gk6Gt1vOD6wM5fWKLb4zNuD0bkw,6042
-truss/templates/server/common/tracing.py,sha256=XSTXNoRtV8vXwveJoX3H32go0JKnLmznZ2TtrVzIe4M,5967
+truss/templates/server/common/tracing.py,sha256=TDokphTO0O-b0xZLkkDMU6Z_JIsaZA0aimL6UIQB5eI,4808
 truss/templates/server/common/patches/whisper/patch.py,sha256=kDECQ-wmEpeAZFhUTQP457ofueeMsm7DgNy9tqinhJQ,2383
 truss/templates/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/templates/shared/dynamic_config_resolver.py,sha256=75s42NFhQI5jL7BqlJH_UkuQS7ptbtFh13f2nh6X5Wo,920
@@ -132,7 +132,7 @@ truss/tests/test_context_builder_image.py,sha256=fVZNJSzZNiWa7Dr1X_VhhMJtyJ5HzsL
 truss/tests/test_control_truss_patching.py,sha256=lbMuAjLbkeDRLxUxXHWr41BZyhZKHQYoMnbJSj3dqrc,15390
 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=gL_uIFbeMoJqSe0vwUEhRN9fB4p3Q2mT1YejFMSekaU,76119
+truss/tests/test_model_inference.py,sha256=9QfPMa1kjxvKCWg5XKocjwcpfDkKB7pWd8bn4hIkshk,76213
 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
@@ -141,9 +141,9 @@ truss/tests/test_util.py,sha256=hs1bNMkXKEdoPRx4Nw-NAEdoibR92OubZuADGmbiYsQ,1344
 truss/tests/cli/test_cli.py,sha256=yfbVS5u1hnAmmA8mJ539vj3lhH-JVGUvC4Q_Mbort44,787
 truss/tests/cli/train/test_cache_view.py,sha256=aVRCh3atRpFbJqyYgq7N-vAW0DiKMftQ7ajUqO2ClOg,22606
 truss/tests/cli/train/test_deploy_checkpoints.py,sha256=wQZ3DPLPAyXE3iaQiyHJTBO15v_gXN44eDk1StYkKmM,44764
-truss/tests/cli/train/test_train_cli_core.py,sha256=T1Xa6-NRk2nTJGX6sXaA8x4qCwL3Ini72PBI2gW7rYM,7879
+truss/tests/cli/train/test_train_cli_core.py,sha256=vzYfxKdwoa3NaFMrVZbSg5qOoLXivMvZXN1ClQirGTQ,16148
 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=iJA7nxcLXhBmyjhLIKeN64ql0OI_R53l-qSt3SsENV8,22368
+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
 truss/tests/contexts/local_loader/test_truss_module_finder.py,sha256=oN1K2lg3ATHY5yOVUTfQIaSqusTF9I2wFaYaTSo5-O4,5342
 truss/tests/local/test_local_config_handler.py,sha256=aLvcOyfppskA2MziVLy_kMcagjxMpO4mjar9zxUN6g0,2245
@@ -163,7 +163,7 @@ truss/tests/remote/baseten/test_remote.py,sha256=y1qSPL1t7dBeYI3xMFn436fttG7wkYd
 truss/tests/remote/baseten/test_service.py,sha256=ufZbtQlBNIzFCxRt_iE-APLpWbVw_3ViUpSh6H9W5nU,1945
 truss/tests/templates/control/control/test_endpoints.py,sha256=tGU3w8zOKC8LfWGdhp-TlV7E603KXg2xGwpqDdf8Pnw,3385
 truss/tests/templates/control/control/test_server.py,sha256=r1O3VEK9eoIL2-cg8nYLXYct_H3jf5rGp1wLT1KBdeA,9488
-truss/tests/templates/control/control/test_server_integration.py,sha256=dWtYuieUT4wrV0FIn-9R6FHNs0qyqXy6TAxrFI_gLgw,11400
+truss/tests/templates/control/control/test_server_integration.py,sha256=EdDY3nLzjrRCJ5LI5yZsNCEImSRkxTL7Rn9mGnK67zA,11837
 truss/tests/templates/control/control/helpers/test_context_managers.py,sha256=3LoonRaKu_UvhaWs1eNmEQCZq-iJ3aIjI0Mn4amC8Bw,283
 truss/tests/templates/control/control/helpers/test_model_container_patch_applier.py,sha256=jhPgExGFF42iuWPM9ry93dnpF765d-CGTCIhbswK0hk,5730
 truss/tests/templates/control/control/helpers/test_requirement_name_identifier.py,sha256=kPYrAb97BtN8Wm0Hofw7iJ412Tew2xHgiteKtXVoC5A,2980
@@ -172,7 +172,7 @@ truss/tests/templates/core/server/test_lazy_data_resolver_v2.py,sha256=xZNMhfhHa
 truss/tests/templates/core/server/test_secrets_resolver.py,sha256=qFHZEKs9t2Gj9JBJKB8xLbIjCgBpIUoNanQ3l5RBoRM,1550
 truss/tests/templates/server/test_model_wrapper.py,sha256=1has4G3wiHd1g4JzDunJCMkT2r6LFUSIt4HaP5PVx5A,9406
 truss/tests/templates/server/test_schema.py,sha256=HfaPGIm8u39qSvfzUwk4Ymtvq38JBczRUlmSYZS8X5I,9527
-truss/tests/templates/server/test_truss_server.py,sha256=AYDF6NjJNarT7h5Ok7M3URV8jVxoDl1LNJZYkeBTgrk,1522
+truss/tests/templates/server/test_truss_server.py,sha256=iNc_JZ5Pobtj41d_uhlBUv3UdBI0dWpKtZYuG_X_5QU,1668
 truss/tests/templates/server/common/test_retry.py,sha256=-7yw0DvDXhCntNhFbTP1liWQQhlbQmZAA4AUW1VFsu0,2039
 truss/tests/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/tests/test_data/auto-mpg.data,sha256=SLgw4R_u5VclJfjxaR3bnTjT17cGPtzY_KZywqXhfY0,30286
@@ -181,7 +181,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=7DZ9RjgxQ7gWI9_BeDSdwZezjum4dT8NoCaiB_A5ZXI,1790
+truss/tests/test_data/server.Dockerfile,sha256=auEgFqfrnTk6k3XZL3A1CqPd_Hnu_0TYtVuwrJv2eHU,1971
 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
@@ -364,8 +364,8 @@ truss_train/definitions.py,sha256=V985HhY4rdXL10DZxpFEpze9ScxzWErMht4WwaPknGU,67
 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-0.10.13.dist-info/METADATA,sha256=47EEkDwEv7QkXOh2Po5d32bbzDQHnp0c7iTco3jbQFY,6670
-truss-0.10.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.10.13.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.10.13.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.10.13.dist-info/RECORD,,
+truss-0.11.1rc2.dist-info/METADATA,sha256=-QNAojZwEkUwM3B6Jo9KIbVMpBstsTCKx-qR1S_MFJM,6672
+truss-0.11.1rc2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.1rc2.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.1rc2.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.1rc2.dist-info/RECORD,,