Merge pull request #1221 from basetenlabs/bump-version-0.9.47

Release 0.9.47

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truss"
-version = "0.9.46"
+version = "0.9.47"
 description = "A seamless bridge from model development to model delivery"
 license = "MIT"
 readme = "README.md"

truss/config/trt_llm.py

@@ -57,9 +57,9 @@ class CheckpointRepository(BaseModel):
     repo: str
 
 
-class TrussTRTLLMBatchSchedulerPolicy(Enum):
-    MAX_UTILIZATION = 0
-    GUARANTEED_NO_EVICT = 1
+class TrussTRTLLMBatchSchedulerPolicy(str, Enum):
+    MAX_UTILIZATION = "max_utilization"
+    GUARANTEED_NO_EVICT = "guaranteed_no_evict"
 
 
 class TrussTRTLLMBuildConfiguration(BaseModel):
@@ -86,6 +86,7 @@ class TrussTRTLLMBuildConfiguration(BaseModel):
     batch_scheduler_policy: TrussTRTLLMBatchSchedulerPolicy = (
         TrussTRTLLMBatchSchedulerPolicy.GUARANTEED_NO_EVICT
     )
+    default_max_tokens: Optional[int] = None
 
     @validator("max_beam_width")
     def check_max_beam_width(cls, v: int):

truss/constants.py

@@ -108,7 +108,7 @@
 
 TRTLLM_BASE_IMAGE = "baseten/briton-server:v0.13.0_v0.0.15"
 TRTLLM_PYTHON_EXECUTABLE = "/usr/bin/python3"
-BASE_TRTLLM_REQUIREMENTS = ["briton==0.3.2"]
+BASE_TRTLLM_REQUIREMENTS = ["briton==0.3.6"]
 AUDIO_MODEL_TRTLLM_REQUIREMENTS = [
     "--extra-index-url https://pypi.nvidia.com",
     "tensorrt_cu12_bindings==10.2.0.post1",

truss/remote/baseten/core.py

@@ -11,7 +11,7 @@
 from truss.remote.baseten.utils.tar import create_tar_with_progress_bar
 from truss.remote.baseten.utils.transfer import multipart_upload_boto3
 from truss.truss_handle import TrussHandle
-from truss.util.path import load_trussignore_patterns
+from truss.util.path import load_trussignore_patterns_from_truss_dir
 
 logger = logging.getLogger(__name__)
 
@@ -201,11 +201,7 @@ def archive_truss(truss_handle: TrussHandle) -> IO:
     truss_dir = truss_handle._spec.truss_dir
 
     # check for a truss_ignore file and read the ignore patterns if it exists
-    truss_ignore_file = truss_dir / ".truss_ignore"
-    if truss_ignore_file.exists():
-        ignore_patterns = load_trussignore_patterns(truss_ignore_file=truss_ignore_file)
-    else:
-        ignore_patterns = load_trussignore_patterns()
+    ignore_patterns = load_trussignore_patterns_from_truss_dir(truss_dir)
 
     try:
         temp_file = create_tar_with_progress_bar(truss_dir, ignore_patterns)

truss/remote/baseten/remote.py

@@ -37,7 +37,7 @@
 from truss.remote.truss_remote import TrussRemote
 from truss.truss_config import ModelServer
 from truss.truss_handle import TrussHandle
-from truss.util.path import is_ignored, load_trussignore_patterns
+from truss.util.path import is_ignored, load_trussignore_patterns_from_truss_dir
 from watchfiles import watch
 
 
@@ -289,7 +289,7 @@ def sync_truss_to_dev_version_by_name(
             )
 
         watch_path = Path(target_directory)
-        truss_ignore_patterns = load_trussignore_patterns()
+        truss_ignore_patterns = load_trussignore_patterns_from_truss_dir(watch_path)
 
         def watch_filter(_, path):
             return not is_ignored(

truss/util/path.py

@@ -11,7 +11,8 @@
 
 # .truss_ignore is a fixed file in the Truss library that is used to specify files
 # that should be ignored when copying a directory tree such as .git directory.
-FIXED_TRUSS_IGNORE_PATH = Path(__file__).parent / ".truss_ignore"
+TRUSS_IGNORE_FILENAME = ".truss_ignore"
+FIXED_TRUSS_IGNORE_PATH = Path(__file__).parent / TRUSS_IGNORE_FILENAME
 
 
 def copy_tree_path(src: Path, dest: Path, ignore_patterns: List[str] = []) -> None:
@@ -84,6 +85,14 @@ def build_truss_target_directory(stub: str) -> Path:
     return target_directory_path
 
 
+def load_trussignore_patterns_from_truss_dir(truss_dir: Path) -> List[str]:
+    truss_ignore_file = truss_dir / TRUSS_IGNORE_FILENAME
+    if truss_ignore_file.exists():
+        return load_trussignore_patterns(truss_ignore_file)
+    # default to the truss-defined ignore patterns
+    return load_trussignore_patterns()
+
+
 def load_trussignore_patterns(
     truss_ignore_file: Path = FIXED_TRUSS_IGNORE_PATH,
 ) -> List[str]: