truss 0.11.9rc500__tar.gz → 0.11.9rc501__tar.gz

{truss-0.11.9rc500 → truss-0.11.9rc501}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.9rc500
+Version: 0.11.9rc501
 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.9rc500 → truss-0.11.9rc501}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.9rc500"
+version = "0.11.9rc501"
 description = "A seamless bridge from model development to model delivery"
 authors = [
     { name = "Pankaj Gupta", email = "no-reply@baseten.co" },

{truss-0.11.9rc500 → truss-0.11.9rc501}/truss/cli/logs/base_watcher.py

@@ -17,9 +17,7 @@ class LogWatcher(ABC):
     # NB(nikhil): we add buffer for clock skew, so this helps us detect duplicates.
     # TODO(nikhil): clean up hashes so this doesn't grow indefinitely.
     _log_hashes: set[str] = set()
-
-    _last_poll_time_ms: Optional[int] = None
-    _last_log_time_ms: Optional[int] = None
+    _last_poll_time: Optional[int] = None
 
     def __init__(self, api: BasetenApi):
         self.api = api
@@ -28,54 +26,37 @@ class LogWatcher(ABC):
         log_str = f"{log.timestamp}-{log.message}-{log.replica}"
         return hashlib.sha256(log_str.encode("utf-8")).hexdigest()
 
-    def get_start_epoch_ms(self, now_ms: int) -> Optional[int]:
-        if self._last_poll_time_ms:
-            return self._last_poll_time_ms - CLOCK_SKEW_BUFFER_MS
-
-        return None
+    def _poll(self) -> Iterator[ParsedLog]:
+        start_epoch: Optional[int] = None
+        now = int(time.time() * 1000)
+        if self._last_poll_time is not None:
+            start_epoch = self._last_poll_time - CLOCK_SKEW_BUFFER_MS
 
-    def fetch_and_parse_logs(
-        self, start_epoch_millis: Optional[int], end_epoch_millis: Optional[int]
-    ) -> Iterator[ParsedLog]:
         api_logs = self.fetch_logs(
-            start_epoch_millis=start_epoch_millis, end_epoch_millis=end_epoch_millis
+            start_epoch_millis=start_epoch, end_epoch_millis=now + CLOCK_SKEW_BUFFER_MS
         )
 
         parsed_logs = parse_logs(api_logs)
-
         for log in parsed_logs:
-            if (h := self._hash_log(log)) not in self._log_hashes:
+            h = self._hash_log(log)
+            if h not in self._log_hashes:
                 self._log_hashes.add(h)
-
                 yield log
 
-    def poll(self) -> Iterator[ParsedLog]:
-        now_ms = int(time.time() * 1000)
-        start_epoch_ms = self.get_start_epoch_ms(now_ms)
-
-        for log in self.fetch_and_parse_logs(
-            start_epoch_millis=start_epoch_ms,
-            end_epoch_millis=now_ms + CLOCK_SKEW_BUFFER_MS,
-        ):
-            yield log
-
-            epoch_ns = int(log.timestamp)
-            self._last_log_time_ms = int(epoch_ns / 1e6)
-
-        self._last_poll_time_ms = now_ms
+        self._last_poll_time = now
 
     def watch(self) -> Iterator[ParsedLog]:
         self.before_polling()
         with console.status("Polling logs", spinner="aesthetic"):
             while True:
-                for log in self.poll():
+                for log in self._poll():
                     yield log
                 if self._log_hashes:
                     break
                 time.sleep(POLL_INTERVAL_SEC)
 
             while self.should_poll_again():
-                for log in self.poll():
+                for log in self._poll():
                     yield log
                 time.sleep(POLL_INTERVAL_SEC)
                 self.post_poll()

{truss-0.11.9rc500 → truss-0.11.9rc501}/truss/cli/logs/model_log_watcher.py

@@ -1,12 +1,9 @@
-from functools import cached_property
 from typing import Any, List, Optional
 
 from truss.cli.logs.base_watcher import LogWatcher
 from truss.remote.baseten.api import BasetenApi
 from truss.remote.baseten.utils.status import MODEL_RUNNING_STATES
 
-MAX_LOOK_BACK_MS = 1000 * 60 * 60  # 1 hour.
-
 
 class ModelDeploymentLogWatcher(LogWatcher):
     _model_id: str
@@ -28,31 +25,11 @@ class ModelDeploymentLogWatcher(LogWatcher):
             self._model_id, self._deployment_id, start_epoch_millis, end_epoch_millis
         )
 
-    def get_start_epoch_ms(self, now_ms: int) -> Optional[int]:
-        # NOTE(Tyron): If there can be multiple replicas,
-        # we can't use a timestamp cursor to poll for logs.
-        if not self._is_development:
-            return super().get_start_epoch_ms(now_ms)
-
-        # Cursor logic.
-
-        if self._last_log_time_ms:
-            return max(self._last_log_time_ms, now_ms - MAX_LOOK_BACK_MS)
-
-        return None
-
     def should_poll_again(self) -> bool:
         return self._current_status in MODEL_RUNNING_STATES
 
-    def _get_deployment(self) -> Any:
-        return self.api.get_deployment(self._model_id, self._deployment_id)
-
     def _get_current_status(self) -> str:
-        return self._get_deployment()["status"]
-
-    @cached_property
-    def _is_development(self) -> bool:
-        return self._get_deployment()["is_development"]
+        return self.api.get_deployment(self._model_id, self._deployment_id)["status"]
 
     def post_poll(self) -> None:
         self._current_status = self._get_current_status()

{truss-0.11.9rc500 → truss-0.11.9rc501}/truss/contexts/image_builder/serving_image_builder.py

@@ -784,7 +784,16 @@ class ServingImageBuilder(ImageBuilder):
             config
         )
 
+        # Debug: Print the actual values
+        non_root_user_env = os.getenv("BT_USE_NON_ROOT_USER")
+        print(f"DEBUG: BT_USE_NON_ROOT_USER env var value: {repr(non_root_user_env)}")
+        print(f"DEBUG: BT_USE_NON_ROOT_USER type: {type(non_root_user_env)}")
+        
         non_root_user = os.getenv("BT_USE_NON_ROOT_USER", False)
+        print(f"DEBUG: non_root_user value: {repr(non_root_user)}")
+        print(f"DEBUG: non_root_user type: {type(non_root_user)}")
+        print(f"DEBUG: non_root_user truthiness: {bool(non_root_user)}")
+        
         dockerfile_contents = dockerfile_template.render(
             should_install_server_requirements=should_install_server_requirements,
             base_image_name_and_tag=base_image_name_and_tag,

{truss-0.11.9rc500 → truss-0.11.9rc501}/truss/templates/control/control/application.py

@@ -84,9 +84,10 @@ def create_app(base_config: Dict):
         base_url=f"http://localhost:{app_state.inference_server_port}", limits=limits
     )
 
-    uv_path = getattr(app_state, "uv_path", None)
+    pip_path = getattr(app_state, "pip_path", None)
+
     patch_applier = ModelContainerPatchApplier(
-        Path(app_state.inference_server_home), app_logger, uv_path
+        Path(app_state.inference_server_home), app_logger, pip_path
     )
 
     oversee_inference_server = getattr(app_state, "oversee_inference_server", True)

{truss-0.11.9rc500 → truss-0.11.9rc501}/truss/tests/templates/control/control/test_server.py

@@ -53,7 +53,7 @@ def app(truss_container_fs, truss_original_hash, ports):
                 "control_server_port": ports["control_server_port"],
                 "inference_server_port": ports["inference_server_port"],
                 "oversee_inference_server": False,
-                "uv_path": "uv",
+                "pip_path": "pip",
             }
         )
         inference_server_controller = control_app.state.inference_server_controller