truss 0.11.13rc1__tar.gz → 0.11.13rc2__tar.gz

{truss-0.11.13rc1 → truss-0.11.13rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.13rc1
+Version: 0.11.13rc2
 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
@@ -37,7 +37,7 @@ Requires-Dist: rich<14,>=13.4.2
 Requires-Dist: ruff>=0.4.8
 Requires-Dist: tenacity>=8.0.1
 Requires-Dist: tomlkit>=0.13.2
-Requires-Dist: truss-transfer<0.0.36,>=0.0.32
+Requires-Dist: truss-transfer<0.0.40,>=0.0.36
 Requires-Dist: watchfiles<0.20,>=0.19.0
 Description-Content-Type: text/markdown
 

{truss-0.11.13rc1 → truss-0.11.13rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.13rc1"
+version = "0.11.13rc2"
 description = "A seamless bridge from model development to model delivery"
 authors = [
     { name = "Pankaj Gupta", email = "no-reply@baseten.co" },
@@ -43,7 +43,7 @@ dependencies = [
     "ruff>=0.4.8",
     "tenacity>=8.0.1",
     "watchfiles>=0.19.0,<0.20",
-    "truss-transfer>=0.0.32,<0.0.36",
+    "truss-transfer>=0.0.36,<0.0.40",
 ]
 
 [project.urls]

{truss-0.11.13rc1 → truss-0.11.13rc2}/truss/templates/server/requirements.txt

@@ -18,7 +18,7 @@ psutil>=5.9.4
 python-json-logger>=2.0.2
 pyyaml>=6.0.0
 requests>=2.31.0
-truss-transfer==0.0.34
+truss-transfer==0.0.37
 uvicorn>=0.24.0
 uvloop>=0.19.0
 websockets>=10.0

{truss-0.11.13rc1 → truss-0.11.13rc2}/truss/templates/server.Dockerfile.jinja

@@ -56,6 +56,12 @@ RUN mkdir -p {{ dst.parent }}; curl -L "{{ url }}" -o {{ dst }}
 {% endfor %} {#- endfor external_data_files #}
 {%- endif %} {#- endif external_data_files #}
 
+{%- if build_commands %}
+{% for command in build_commands %}
+RUN {% for secret,path in config.build.secret_to_path_mapping.items() %} --mount=type=secret,id={{ secret }},target={{ path }}{%- endfor %} {{ command }}
+{% endfor %} {#- endfor build_commands #}
+{%- endif %} {#- endif build_commands #}
+
 {# Copy data before code for better caching #}
 {%- if data_dir_exists %}
 COPY --chown={{ default_owner }} ./{{ config.data_dir }} ${APP_HOME}/data
@@ -63,7 +69,7 @@ COPY --chown={{ default_owner }} ./{{ config.data_dir }} ${APP_HOME}/data
 
 {%- if model_cache_v2 %}
 {# 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.11.12rc0/truss-transfer-cli-v0.11.12rc0-linux-x86_64-unknown-linux-musl
+RUN curl -sSL --fail --retry 5 --retry-delay 2 -o /usr/local/bin/truss-transfer-cli https://github.com/basetenlabs/truss/releases/download/v0.11.12rc4/truss-transfer-cli-v0.11.12rc4-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}}"
@@ -95,12 +101,6 @@ COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/mod
 {% endblock %} {#- endblock app_copy #}
 
 {% block run %}
-{%- if build_commands %}
-{% for command in build_commands %}
-RUN {% for secret,path in config.build.secret_to_path_mapping.items() %} --mount=type=secret,id={{ secret }},target={{ path }}{%- endfor %} {{ command }}
-{% endfor %} {#- endfor build_commands #}
-{%- endif %} {#- endif build_commands #}
-
 {# 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 %}

{truss-0.11.13rc1 → truss-0.11.13rc2}/truss/templates/shared/lazy_data_resolver.py

@@ -1,11 +1,67 @@
 import atexit
+import json
 import logging
 import time
+from dataclasses import dataclass
 from functools import lru_cache
 from pathlib import Path
 from threading import Lock, Thread
 from typing import Optional, Union
 
+
+@dataclass(frozen=True)
+class FileDownloadMetric:
+    file_name: str
+    file_size_bytes: int
+    download_time_secs: float
+    download_speed_mb_s: float
+
+
+@dataclass(frozen=True)
+class TrussTransferStats:
+    total_manifest_size_bytes: int
+    total_download_time_secs: float
+    total_aggregated_mb_s: Optional[float]
+    file_downloads: list[FileDownloadMetric]
+    b10fs_read_speed_mbps: Optional[float]
+    b10fs_decision_to_use: bool
+    b10fs_enabled: bool
+    b10fs_hot_starts_files: int
+    b10fs_hot_starts_bytes: int
+    b10fs_cold_starts_files: int
+    b10fs_cold_starts_bytes: int
+    success: bool
+    timestamp: int
+
+    @classmethod
+    def from_json_file(cls, path: Path) -> Optional["TrussTransferStats"]:
+        if not path.exists():
+            return None
+        try:
+            with open(path) as f:
+                data = json.load(f)
+            file_downloads = [
+                FileDownloadMetric(**fd) for fd in data.get("file_downloads", [])
+            ]
+            return cls(
+                total_manifest_size_bytes=data["total_manifest_size_bytes"],
+                total_download_time_secs=data["total_download_time_secs"],
+                total_aggregated_mb_s=data.get("total_aggregated_mb_s"),
+                file_downloads=file_downloads,
+                b10fs_read_speed_mbps=data.get("b10fs_read_speed_mbps"),
+                b10fs_decision_to_use=data["b10fs_decision_to_use"],
+                b10fs_enabled=data["b10fs_enabled"],
+                b10fs_hot_starts_files=data["b10fs_hot_starts_files"],
+                b10fs_hot_starts_bytes=data["b10fs_hot_starts_bytes"],
+                b10fs_cold_starts_files=data["b10fs_cold_starts_files"],
+                b10fs_cold_starts_bytes=data["b10fs_cold_starts_bytes"],
+                success=data["success"],
+                timestamp=data["timestamp"],
+            )
+        except Exception:
+            return None
+
+
 LAZY_DATA_RESOLVER_PATH = [
     # synced with pub static LAZY_DATA_RESOLVER_PATHS: &[&str]
     Path("/bptr/bptr-manifest"),
@@ -137,6 +193,14 @@ class LazyDataResolverV2:
                     f"Error occurred while fetching data: {result}"
                 ) from result
             if log_stats and result:
+                # TODO: instument the stats, which are written to /tmp/truss_transfer_stats.json
+                # also add fetch time, and blocking time
+                # TrussTransferStats
+                stats = TrussTransferStats.from_json_file(
+                    Path("/tmp/truss_transfer_stats.json")
+                )
+                if stats is None:
+                    self.logger.info(f"model_cache: {stats}")
                 self.logger.info(
                     f"model_cache: Fetch took {time.time() - self._start_time:.2f} seconds, of which {time.time() - start_lock:.2f} seconds were spent blocking."
                 )

{truss-0.11.13rc1 → truss-0.11.13rc2}/truss/tests/conftest.py

@@ -700,15 +700,6 @@ def helpers():
     return Helpers()
 
 
-@pytest.fixture
-def test_editable_external_pkg(test_data_path, tmp_path):
-    truss_dir = test_data_path / "test_editable_external_pkg"
-    parent_dir = test_data_path / "test_editable_external_pkg_parent"
-    shutil.copytree(truss_dir, tmp_path / "test_editable_external_pkg")
-    shutil.copytree(parent_dir, tmp_path / "test_editable_external_pkg_parent")
-    return tmp_path / "test_editable_external_pkg"
-
-
 def _build_truss_fs(truss_dir: Path, tmp_path: Path) -> Path:
     truss_fs = tmp_path / "truss_fs"
     truss_fs.mkdir()

{truss-0.11.13rc1 → truss-0.11.13rc2}/truss/tests/test_truss_handle.py

@@ -12,9 +12,6 @@ from truss.base.constants import SUPPORTED_PYTHON_VERSIONS
 from truss.base.custom_types import Example
 from truss.base.errors import ContainerIsDownError, ContainerNotFoundError
 from truss.base.truss_config import map_local_to_supported_python_version
-from truss.contexts.image_builder.serving_image_builder import (
-    ServingImageBuilderContext,
-)
 from truss.contexts.image_builder.util import TRUSS_BASE_IMAGE_VERSION_TAG
 from truss.local.local_config_handler import LocalConfigHandler
 from truss.templates.control.control.helpers.custom_types import (
@@ -483,27 +480,6 @@ def test_build_commands(test_data_path):
         assert r1 == {"predictions": [1, 2]}
 
 
-def test_build_commands_in_run_block_order(test_data_path, tmp_path):
-    truss_dir = test_data_path / "test_editable_external_pkg"
-    build_dir = tmp_path / "build_dir"
-    image_builder = ServingImageBuilderContext.run(truss_dir)
-    image_builder.prepare_image_build_dir(build_dir)
-    dockerfile = (build_dir / "Dockerfile").read_text()
-
-    cmd_idx = dockerfile.find("uv pip install --system -e /packages/local_pkg")
-    if cmd_idx == -1:
-        cmd_idx = dockerfile.find("uv pip install -e /packages/local_pkg")
-    if cmd_idx == -1:
-        cmd_idx = dockerfile.find("pip install -e /packages/local_pkg")
-    assert cmd_idx != -1
-
-    entry_idx = dockerfile.find("ENTRYPOINT ")
-    user_idx = dockerfile.find("\nUSER ")
-    if user_idx != -1:
-        assert cmd_idx < user_idx
-    assert cmd_idx < entry_idx
-
-
 @pytest.mark.integration
 def test_build_commands_failure(test_data_path):
     truss_dir = test_data_path / "test_build_commands_failure"
@@ -872,21 +848,3 @@ def test_config_verbose(custom_model_truss_dir_with_pre_and_post):
     th.live_reload()
     new_config["live_reload"] = True
     assert new_config == th.spec.config.to_dict(verbose=False)
-
-
-@pytest.mark.integration
-def test_editable_external_package_install_and_predict(test_editable_external_pkg):
-    th = TrussHandle(test_editable_external_pkg)
-    # Ensure standard inference server flow for this test
-    th.live_reload(False)
-    tag = "test-editable-ext-pkg:0.0.1"
-    with ensure_kill_all():
-        container = th.docker_run(tag=tag, local_port=None)
-        try:
-            verify_python_requirement_installed_on_container(container, "local-pkg")
-        finally:
-            Docker.client().kill(container)
-
-    with ensure_kill_all():
-        result = th.docker_predict([1], tag=tag, local_port=None)
-        assert result == {"predictions": [42]}

truss-0.11.13rc1/truss/tests/test_data/test_editable_external_pkg/config.yaml

@@ -1,5 +0,0 @@
-external_package_dirs:
-- ../test_editable_external_pkg_parent
-
-build_commands:
-- uv pip install --system -e /packages/local_pkg

truss-0.11.13rc1/truss/tests/test_data/test_editable_external_pkg/model/model.py

@@ -1,6 +0,0 @@
-import local_pkg
-
-
-class Model:
-    def predict(self, request):
-        return {"predictions": [local_pkg.VALUE]}

truss-0.11.13rc1/truss/tests/test_data/test_editable_external_pkg_parent/local_pkg/pyproject.toml

@@ -1,10 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "local-pkg"
-version = "0.0.1"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/local_pkg"]

truss-0.11.13rc1/truss/tests/test_data/test_editable_external_pkg_parent/local_pkg/src/local_pkg/__init__.py

@@ -1 +0,0 @@
-VALUE = 42