truss 0.11.12rc501__tar.gz → 0.11.13rc2__tar.gz

{truss-0.11.12rc501 → truss-0.11.13rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.12rc501
+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.37,>=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.12rc501 → truss-0.11.13rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.12rc501"
+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.37",
+    "truss-transfer>=0.0.36,<0.0.40",
 ]
 
 [project.urls]

{truss-0.11.12rc501 → 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.36
+truss-transfer==0.0.37
 uvicorn>=0.24.0
 uvloop>=0.19.0
 websockets>=10.0

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

@@ -104,8 +104,6 @@ COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/mod
 {# 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 %}
-{% set packages_dir = "/packages" %}
-RUN mkdir -p {{ packages_dir }}
 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 #}

{truss-0.11.12rc501 → 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."
                 )