truss 0.11.12rc513__tar.gz → 0.11.12rc514__tar.gz

{truss-0.11.12rc513 → truss-0.11.12rc514}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.12rc513
+Version: 0.11.12rc514
 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.12rc513 → truss-0.11.12rc514}/pyproject.toml

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

{truss-0.11.12rc513 → truss-0.11.12rc514}/truss/base/constants.py

@@ -49,6 +49,7 @@ FILENAME_CONSTANTS_MAP = {
 }
 
 SERVER_DOCKERFILE_TEMPLATE_NAME = "server.Dockerfile.jinja"
+NO_BUILD_DOCKERFILE_TEMPLATE_NAME = "no_build.Dockerfile.jinja"
 MODEL_DOCKERFILE_NAME = "Dockerfile"
 MODEL_CACHE_PATH = pathlib.Path("/app/model_cache")
 README_TEMPLATE_NAME = "README.md.jinja"

{truss-0.11.12rc513 → truss-0.11.12rc514}/truss/base/truss_config.py

@@ -547,12 +547,12 @@ class DockerServer(custom_types.ConfigModel):
     readiness_endpoint: str
     liveness_endpoint: str
     run_as_user_id: Optional[int] = None
-    as_is: Optional[bool] = None
+    no_build: Optional[bool] = None
 
     @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")
+        if not self.no_build and self.start_command is None:
+            raise ValueError("start_command is required when no_build is not true")
         return self
 
 

{truss-0.11.12rc513 → truss-0.11.12rc514}/truss/contexts/image_builder/serving_image_builder.py

@@ -32,6 +32,7 @@ from truss.base.constants import (
     FILENAME_CONSTANTS_MAP,
     MODEL_CACHE_PATH,
     MODEL_DOCKERFILE_NAME,
+    NO_BUILD_DOCKERFILE_TEMPLATE_NAME,
     REQUIREMENTS_TXT_FILENAME,
     SERVER_CODE_DIR,
     SERVER_DOCKERFILE_TEMPLATE_NAME,
@@ -577,7 +578,10 @@ class ServingImageBuilder(ImageBuilder):
                 else:
                     self.prepare_trtllm_decoder_build_dir(build_dir=build_dir)
 
-        if config.docker_server is not None and config.docker_server.as_is is not True:
+        if (
+            config.docker_server is not None
+            and config.docker_server.no_build is not True
+        ):
             self._copy_into_build_dir(
                 TEMPLATES_DIR / "docker_server_requirements.txt",
                 build_dir,
@@ -750,27 +754,21 @@ class ServingImageBuilder(ImageBuilder):
         build_commands: List[str],
     ):
         config = self._spec.config
-        ff_as_is = os.getenv("BT_AS_IS_DEPLOYMENT", False)
-        # 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"\nCOPY --chown={user_id}:{user_id} ./bptr-manifest /static-bptr/static-bptr-manifest.json"
-            docker_file_path = build_dir / MODEL_DOCKERFILE_NAME
-            docker_file_path.write_text(dockerfile_contents)
-            return
 
         data_dir = build_dir / config.data_dir
         model_dir = build_dir / config.model_module_dir
         bundled_packages_dir = build_dir / config.bundled_packages_dir
-        dockerfile_template = read_template_from_fs(
-            TEMPLATES_DIR, SERVER_DOCKERFILE_TEMPLATE_NAME
-        )
+
+        # Note: no-build deployment template doesn't use most of the template variables,
+        # because it tries to run the base image as-is to the extent possible.
+        if config.docker_server and config.docker_server.no_build:
+            dockerfile_template = read_template_from_fs(
+                TEMPLATES_DIR, NO_BUILD_DOCKERFILE_TEMPLATE_NAME
+            )
+        else:
+            dockerfile_template = read_template_from_fs(
+                TEMPLATES_DIR, SERVER_DOCKERFILE_TEMPLATE_NAME
+            )
         python_version = truss_config.to_dotted_python_version(config.python_version)
         if config.base_image:
             base_image_name_and_tag = config.base_image.image

truss-0.11.12rc514/truss/templates/no_build.Dockerfile.jinja

@@ -0,0 +1 @@
+FROM {{ config.base_image.image }}