truss 0.11.12rc508__py3-none-any.whl → 0.11.12rc510__py3-none-any.whl

truss/base/truss_config.py

@@ -552,9 +552,7 @@ class DockerServer(custom_types.ConfigModel):
     @pydantic.model_validator(mode="after")
     def _validate_start_command(self) -> "DockerServer":
         if not self.as_is and self.start_command is None:
-            raise ValueError(
-                "start_command is required when as_is is not true"
-            )
+            raise ValueError("start_command is required when as_is is not true")
         return self
 
 

truss/contexts/image_builder/serving_image_builder.py

@@ -754,6 +754,14 @@ class ServingImageBuilder(ImageBuilder):
         # Escape hatch for as-is deployments
         if ff_as_is and config.docker_server and config.docker_server.as_is:
             dockerfile_contents = f"FROM {config.base_image.image}"
+            # Add COPY for bptr-manifest if model_cache v2 is enabled
+            if config.model_cache and config.model_cache.is_v2:
+                if config.docker_server and config.docker_server.run_as_user_id:
+                    user_id = config.docker_server.run_as_user_id
+                else:
+                    user_id = 60000
+                # dockerfile_contents += f"\nENV APP_HOME=$HOME"
+                dockerfile_contents += f"\nCOPY --chown={user_id}:{user_id} ./bptr-manifest $HOME/bptr-manifest"
             docker_file_path = build_dir / MODEL_DOCKERFILE_NAME
             docker_file_path.write_text(dockerfile_contents)
             return

truss/templates/shared/lazy_data_resolver.py

@@ -1,5 +1,6 @@
 import atexit
 import logging
+import os
 import time
 from functools import lru_cache
 from pathlib import Path
@@ -13,6 +14,10 @@ LAZY_DATA_RESOLVER_PATH = [
     Path("/static-bptr/static-bptr-manifest.json"),
 ]
 
+# Add fallback for as-is deployments if HOME is set
+if os.environ.get("HOME"):
+    LAZY_DATA_RESOLVER_PATH.append(Path(os.environ.get("HOME")) / "bptr-manifest")
+
 MISSING_COLLECTION_MESSAGE = """model_cache: Data was not collected. Missing lazy_data_resolver.block_until_download_complete().
 This is a potential bug by the user implementation of model.py when using model_cache.
 We need you to call the block_until_download_complete() method during __init__ or load() method of your model.
@@ -48,7 +53,18 @@ class LazyDataResolverV2:
         self._lock = Lock()
         self._start_time = time.time()
         self.logger = logger or logging.getLogger(__name__)
-        self._is_collected_by_user = not self.bptr_exists()
+        
+        # Debug logging for bptr manifest detection
+        self.logger.info(f"LazyDataResolverV2: Checking for bptr manifest in paths: {LAZY_DATA_RESOLVER_PATH}")
+        bptr_found = self.bptr_exists()
+        self.logger.info(f"LazyDataResolverV2: bptr_exists() = {bptr_found}")
+        if bptr_found:
+            for path in LAZY_DATA_RESOLVER_PATH:
+                if path.exists():
+                    self.logger.info(f"LazyDataResolverV2: Found bptr manifest at {path}")
+                    break
+        
+        self._is_collected_by_user = not bptr_found
         thread = Thread(target=self._prefetch_in_thread, daemon=True)
         thread.start()
 
@@ -92,13 +108,24 @@ class LazyDataResolverV2:
     def _fetch(self) -> Union[str, Exception]:
         """cached and locked method to fetch the data."""
         if not self.bptr_exists():
+            self.logger.info("LazyDataResolverV2: No bptr manifest found, skipping download")
             return ""  # no data to resolve
-        import truss_transfer
+        
+        self.logger.info("LazyDataResolverV2: bptr manifest found, attempting to import truss_transfer")
+        try:
+            import truss_transfer
+            self.logger.info("LazyDataResolverV2: truss_transfer imported successfully")
+        except ImportError as e:
+            self.logger.error(f"LazyDataResolverV2: Failed to import truss_transfer: {e}")
+            return e
 
         try:
-            return truss_transfer.lazy_data_resolve(str(self._data_dir))
+            self.logger.info(f"LazyDataResolverV2: Calling truss_transfer.lazy_data_resolve with data_dir: {self._data_dir}")
+            result = truss_transfer.lazy_data_resolve(str(self._data_dir))
+            self.logger.info(f"LazyDataResolverV2: truss_transfer.lazy_data_resolve completed successfully")
+            return result
         except Exception as e:
-            self.logger.error(f"Error occurred while fetching data: {e}")
+            self.logger.error(f"LazyDataResolverV2: Error occurred while fetching data: {e}")
             return e
 
     def raise_if_not_collected(self):

{truss-0.11.12rc508.dist-info → truss-0.11.12rc510.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.12rc508
+Version: 0.11.12rc510
 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.12rc508.dist-info → truss-0.11.12rc510.dist-info}/RECORD

@@ -6,7 +6,7 @@ truss/base/constants.py,sha256=sExArdnuGg83z83XMgaQ4b8SS3V_j_bJEpOATDGJzpE,3600
 truss/base/custom_types.py,sha256=FUSIT2lPOQb6gfg6IzT63YBV8r8L6NIZ0D74Fp3e_jQ,2835
 truss/base/errors.py,sha256=zDVLEvseTChdPP0oNhBBQCtQUtZJUaof5zeWMIjqz6o,691
 truss/base/trt_llm_config.py,sha256=81ZZxRQF3o29HLCX6nlXtPwALejcdns6c4mbrExwASk,32958
-truss/base/truss_config.py,sha256=8nu5OjOF99hvfdUsalNo8xt9rRrq2j089f9JkhrZnjk,28437
+truss/base/truss_config.py,sha256=UW7WM-2KGGRsHTezoth29ty95oMcZIolO-sUxNI7YvM,28407
 truss/base/truss_spec.py,sha256=jFVF79CXoEEspl2kXBAPyi-rwISReIGTdobGpaIhwJw,5979
 truss/cli/chains_commands.py,sha256=Kpa5mCg6URAJQE2ZmZfVQFhjBHEitKT28tKiW0H6XAI,17406
 truss/cli/cli.py,sha256=PaMkuwXZflkU7sa1tEoT_Zmy-iBkEZs1m4IVqcieaeo,30367
@@ -36,7 +36,7 @@ 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=fTg3fPtcYCn73KEqrWGJAj51a6sB1ZLI_4KeTXl5oZ4,33876
+truss/contexts/image_builder/serving_image_builder.py,sha256=ZLaTnw3vFplhq2K1j62qswnHkNRUfj54-56mEua0XxI,34393
 truss/contexts/image_builder/util.py,sha256=y2-CjUKv0XV-0w2sr1fUCflysDJLsoU4oPp6tvvoFnk,1203
 truss/contexts/local_loader/docker_build_emulator.py,sha256=3n0eIlJblz_sldh4AN8AHQDyfjQGdYyld5FabBdd9wE,3563
 truss/contexts/local_loader/dockerfile_parser.py,sha256=GoRJ0Af_3ILyLhjovK5lrCGn1rMxz6W3l681ro17ZzI,1344
@@ -107,7 +107,7 @@ truss/templates/server/common/tracing.py,sha256=XSTXNoRtV8vXwveJoX3H32go0JKnLmzn
 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
-truss/templates/shared/lazy_data_resolver.py,sha256=SMw3L24R_UkNXuL0fO-AN02rUTHfy0Aiz3JTyS0PAEc,5978
+truss/templates/shared/lazy_data_resolver.py,sha256=zRsGRF62NQUWtYkqkKx3A-F0912mN3ug6Dorkh2iJzs,7408
 truss/templates/shared/log_config.py,sha256=l9udyu4VKHZePlfK9LQEd5TOUUodPuehypsXRSUL4Ac,5411
 truss/templates/shared/secrets_resolver.py,sha256=3prDe3Q06NTmUEe7KCW-W4TD1CzGck9lpDG789209z4,2110
 truss/templates/shared/serialization.py,sha256=_WC_2PPkRi-MdTwxwjG8LKQptnHi4sANfpOlKWevqWc,3736
@@ -370,8 +370,8 @@ truss_train/deployment.py,sha256=lWWANSuzBWu2M4oK4qD7n-oVR1JKdmw2Pn5BJQHg-Ck,307
 truss_train/loader.py,sha256=0o66EjBaHc2YY4syxxHVR4ordJWs13lNXnKjKq2wq0U,1630
 truss_train/public_api.py,sha256=9N_NstiUlmBuLUwH_fNG_1x7OhGCytZLNvqKXBlStrM,1220
 truss_train/restore_from_checkpoint.py,sha256=8hdPm-WSgkt74HDPjvCjZMBpvA9MwtoYsxVjOoa7BaM,1176
-truss-0.11.12rc508.dist-info/METADATA,sha256=VMRtE0XoGKjilkrEG_8_Dwi7ek9ZqgIFTPqcfbD-ltE,6683
-truss-0.11.12rc508.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.12rc508.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.12rc508.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.12rc508.dist-info/RECORD,,
+truss-0.11.12rc510.dist-info/METADATA,sha256=Uwsbuea-zCQ1ovv465WHZP4s6ys9pLr18dWUwOdS9NI,6683
+truss-0.11.12rc510.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.12rc510.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.12rc510.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.12rc510.dist-info/RECORD,,