truss 0.11.2rc505__tar.gz → 0.11.4__tar.gz

{truss-0.11.2rc505 → truss-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.2rc505
+Version: 0.11.4
 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.2rc505 → truss-0.11.4}/pyproject.toml

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

{truss-0.11.2rc505 → truss-0.11.4}/truss/api/__init__.py

@@ -64,6 +64,7 @@ def push(
     environment: Optional[str] = None,
     progress_bar: Optional[Type["progress.Progress"]] = None,
     include_git_info: bool = False,
+    preserve_env_instance_type: bool = True,
 ) -> definitions.ModelDeployment:
     """
     Pushes a Truss to Baseten.
@@ -88,6 +89,9 @@ def push(
         include_git_info: Whether to attach git versioning info (sha, branch, tag) to
           deployments made from within a git repo. If set to True in `.trussrc`, it
           will always be attached.
+        preserve_env_instance_type: When pushing a truss to an environment, whether to use the resources
+          specified in the truss config to resolve the instance type or preserve the instance type
+          configured in the specified environment.
 
     Returns:
         The newly created ModelDeployment.
@@ -130,6 +134,7 @@ def push(
         environment=environment,
         progress_bar=progress_bar,
         include_git_info=include_git_info,
+        preserve_env_instance_type=preserve_env_instance_type,
     )  # type: ignore
 
     return definitions.ModelDeployment(cast(BasetenService, service))

{truss-0.11.2rc505 → truss-0.11.4}/truss/remote/baseten/api.py

@@ -6,6 +6,7 @@ import requests
 
 from truss.remote.baseten import custom_types as b10_types
 from truss.remote.baseten.auth import ApiKey, AuthService
+from truss.remote.baseten.custom_types import APIKeyCategory
 from truss.remote.baseten.error import ApiError
 from truss.remote.baseten.rest_client import RestAPIClient
 from truss.remote.baseten.utils.transfer import base64_encoded_json_str
@@ -560,6 +561,13 @@ class BasetenApi:
     def get_all_secrets(self) -> Any:
         return self._rest_api_client.get("v1/secrets")
 
+    # NOTE(Tyron): `name` is required because all official
+    # Baseten API keys should have a descriptive name.
+    def create_api_key(self, api_key_type: APIKeyCategory, name: str) -> Any:
+        return self._rest_api_client.post(
+            "v1/api_keys", body={"type": api_key_type.value, "name": name}
+        )
+
     def upsert_training_project(self, training_project):
         resp_json = self._rest_api_client.post(
             "v1/training_projects",

{truss-0.11.2rc505 → truss-0.11.4}/truss/remote/baseten/custom_types.py

@@ -155,3 +155,10 @@ class GetCacheSummaryResponseV1(pydantic.BaseModel):
     file_summaries: list[FileSummary] = pydantic.Field(
         description="List of files in the cache"
     )
+
+
+class APIKeyCategory(Enum):
+    PERSONAL = "PERSONAL"
+    WORKSPACE_MANAGE_ALL = "WORKSPACE_MANAGE_ALL"
+    WORKSPACE_EXPORT_METRICS = "WORKSPACE_EXPORT_METRICS"
+    WORKSPACE_INVOKE = "WORKSPACE_INVOKE"

{truss-0.11.2rc505 → truss-0.11.4}/truss/templates/control/requirements.txt

@@ -7,6 +7,7 @@ python-json-logger>=2.0.2
 tenacity>=8.1.0
  # To avoid divergence, this should follow the latest release.
 truss==0.11.1
-uvicorn>=0.24.0
+# NB(nikhil): Uvicorn 0.36.0 has breaking changes for the event loop, so we pin to a lower version.
+uvicorn>=0.24.0,<0.36.0
 uvloop>=0.19.0
 websockets>=10.0

{truss-0.11.2rc505 → truss-0.11.4}/truss/templates/server/requirements.txt

@@ -19,6 +19,7 @@ python-json-logger>=2.0.2
 pyyaml>=6.0.0
 requests>=2.31.0
 truss-transfer==0.0.30
-uvicorn>=0.24.0
+# NB(nikhil): Uvicorn 0.36.0 has breaking changes for the event loop, so we pin to a lower version.
+uvicorn>=0.24.0,<0.36.0
 uvloop>=0.19.0
 websockets>=10.0

{truss-0.11.2rc505 → truss-0.11.4}/truss/tests/patch/test_calc_patch.py

@@ -16,7 +16,6 @@ from truss.templates.control.control.helpers.custom_types import (
     Patch,
     PatchType,
     PythonRequirementPatch,
-    SystemPackagePatch,
 )
 from truss.truss_handle.patch.calc_patch import (
     _calc_python_requirements_patches,
@@ -736,45 +735,33 @@ def test_calc_config_patches_add_remove_env_var(custom_model_truss_dir: Path):
     ]
 
 
-def test_calc_config_patches_add_system_package(custom_model_truss_dir: Path):
-    patches = _apply_config_change_and_calc_patches(
-        custom_model_truss_dir, lambda config: config.system_packages.append("curl")
-    )
-    # System package changes no longer generate separate patches - only config patches
-    # System packages will require full rebuild instead of patching
-    assert len(patches) == 1
-    assert patches == [
-        Patch(
-            type=PatchType.CONFIG,
-            body=ConfigPatch(
-                action=Action.UPDATE,
-                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-            ),
-        ),
-    ]
+def test_system_package_changes_make_truss_unpatchable_add(
+    custom_model_truss_dir: Path,
+):
+    # System package changes should raise a ValueError indicating full rebuild required
+    with pytest.raises(
+        ValueError, match="System package changes detected - full rebuild required"
+    ):
+        _apply_config_change_and_calc_patches(
+            custom_model_truss_dir, lambda config: config.system_packages.append("curl")
+        )
 
 
-def test_calc_config_patches_remove_system_package(custom_model_truss_dir: Path):
-    patches = _apply_config_change_and_calc_patches(
-        custom_model_truss_dir,
-        config_pre_op=lambda config: config.system_packages.append("curl"),
-        config_op=lambda config: config.system_packages.clear(),
-    )
-    # System package changes no longer generate separate patches - only config patches
-    # System packages will require full rebuild instead of patching
-    assert len(patches) == 1
-    assert patches == [
-        Patch(
-            type=PatchType.CONFIG,
-            body=ConfigPatch(
-                action=Action.UPDATE,
-                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-            ),
-        ),
-    ]
+def test_system_package_changes_make_truss_unpatchable_remove(
+    custom_model_truss_dir: Path,
+):
+    # System package changes should raise a ValueError indicating full rebuild required
+    with pytest.raises(
+        ValueError, match="System package changes detected - full rebuild required"
+    ):
+        _apply_config_change_and_calc_patches(
+            custom_model_truss_dir,
+            config_pre_op=lambda config: config.system_packages.append("curl"),
+            config_op=lambda config: config.system_packages.clear(),
+        )
 
 
-def test_calc_config_patches_add_and_remove_system_package(
+def test_system_package_changes_make_truss_unpatchable_modify(
     custom_model_truss_dir: Path,
 ):
     def config_pre_op(config: TrussConfig):
@@ -783,21 +770,13 @@ def test_calc_config_patches_add_and_remove_system_package(
     def config_op(config: TrussConfig):
         config.system_packages = ["curl", "libsnd"]
 
-    patches = _apply_config_change_and_calc_patches(
-        custom_model_truss_dir, config_pre_op=config_pre_op, config_op=config_op
-    )
-    # System package changes no longer generate separate patches - only config patches
-    # System packages will require full rebuild instead of patching
-    assert len(patches) == 1
-    assert patches == [
-        Patch(
-            type=PatchType.CONFIG,
-            body=ConfigPatch(
-                action=Action.UPDATE,
-                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-            ),
-        ),
-    ]
+    # System package changes should raise a ValueError indicating full rebuild required
+    with pytest.raises(
+        ValueError, match="System package changes detected - full rebuild required"
+    ):
+        _apply_config_change_and_calc_patches(
+            custom_model_truss_dir, config_pre_op=config_pre_op, config_op=config_op
+        )
 
 
 def test_calc_config_patches_toggle_apply_library_patches(custom_model_truss_dir: Path):

{truss-0.11.2rc505 → truss-0.11.4}/truss/tests/test_control_truss_patching.py

@@ -145,7 +145,6 @@ def test_control_truss_python_sys_req_patch(
         th.remove_python_requirement(req)
         return th.docker_predict([1], tag=tag, binary=binary, local_port=None)
 
-
     with ensure_kill_all():
         th.docker_predict([1], tag=tag, binary=binary, local_port=None)
         orig_num_truss_images = len(th.get_all_docker_images())
@@ -162,7 +161,6 @@ def test_control_truss_python_sys_req_patch(
         verify_python_requirement_not_installed_on_container(container, python_req)
 
 
-
 @pytest.mark.integration
 @pytest.mark.parametrize(
     "binary, python_version",

{truss-0.11.2rc505 → truss-0.11.4}/truss/truss_handle/patch/calc_patch.py

@@ -18,7 +18,6 @@ from truss.templates.control.control.helpers.custom_types import (
     Patch,
     PatchType,
     PythonRequirementPatch,
-    SystemPackagePatch,
 )
 from truss.templates.control.control.helpers.truss_patch.requirement_name_identifier import (
     RequirementMeta,
@@ -423,13 +422,17 @@ def _calc_python_requirements_patches(
 def _calc_system_packages_patches(
     prev_config: TrussConfig, new_config: TrussConfig
 ) -> List[Patch]:
-    """Calculate patch based on changes to system packates.
+    """Calculate patch based on changes to system packages.
 
-    System package patches are no longer supported, so this always returns an empty list.
-    Changes to system packages will require a full rebuild instead of patching.
+    System package patches are no longer supported, so this function
+    raises an exception if any system package changes are detected.
     """
-    # System package patches are no longer supported - return empty list
-    # This will cause any system package changes to be handled by full rebuild
+    prev_pkgs = system_packages_set(prev_config.system_packages)
+    new_pkgs = system_packages_set(new_config.system_packages)
+
+    if prev_pkgs != new_pkgs:
+        raise ValueError("System package changes detected - full rebuild required")
+
     return []
 
 

{truss-0.11.2rc505 → truss-0.11.4}/truss-chains/truss_chains/deployment/code_gen.py

@@ -764,13 +764,13 @@ def _gen_truss_config(
             config.external_package_dirs.append(ext_dir.abs_path)
     config.use_local_src = use_local_src
 
-    if public_types._BASETEN_API_SECRET_NAME not in config.secrets:
-        config.secrets[public_types._BASETEN_API_SECRET_NAME] = (
+    if public_types.CHAIN_API_KEY_SECRET_NAME not in config.secrets:
+        config.secrets[public_types.CHAIN_API_KEY_SECRET_NAME] = (
             public_types.SECRET_DUMMY
         )
     else:
         logging.info(
-            f"Chains automatically add {public_types._BASETEN_API_SECRET_NAME} "
+            f"Chains automatically add {public_types.CHAIN_API_KEY_SECRET_NAME} "
             "to secrets - no need to manually add it."
         )
     config.model_cache = truss_config.ModelCache(assets.cached)

{truss-0.11.2rc505 → truss-0.11.4}/truss-chains/truss_chains/deployment/deployment_client.py

@@ -303,7 +303,7 @@ def _push_service_docker(
     options: private_types.PushOptionsLocalDocker,
 ) -> str:
     th = truss_handle.TrussHandle(truss_dir)
-    th.add_secret(public_types._BASETEN_API_SECRET_NAME, options.baseten_chain_api_key)
+    th.add_secret(public_types.CHAIN_API_KEY_SECRET_NAME, options.baseten_chain_api_key)
     container = th.docker_run(
         local_port=None,
         detach=True,
@@ -536,14 +536,21 @@ def _create_baseten_chain(
 def _create_chains_secret_if_missing(remote_provider: b10_remote.BasetenRemote) -> None:
     secrets_info = remote_provider.api.get_all_secrets()
     secret_names = {sec["name"] for sec in secrets_info["secrets"]}
-    if public_types._BASETEN_API_SECRET_NAME not in secret_names:
+
+    if public_types.CHAIN_API_KEY_SECRET_NAME not in secret_names:
         logging.info(
             "It seems you are using chains for the first time, since there "
-            f"is no `{public_types._BASETEN_API_SECRET_NAME}` secret on baseten. "
+            f"is no `{public_types.CHAIN_API_KEY_SECRET_NAME}` secret on baseten. "
             "Creating secret automatically."
         )
+
+        workspace_api_key = remote_provider.api.create_api_key(
+            api_key_type=b10_types.APIKeyCategory.WORKSPACE_INVOKE,
+            name=public_types.CHAIN_API_KEY_NAME,
+        )["api_key"]
+
         remote_provider.api.upsert_secret(
-            public_types._BASETEN_API_SECRET_NAME, remote_provider.api.auth_token.value
+            public_types.CHAIN_API_KEY_SECRET_NAME, workspace_api_key
         )
 
 

{truss-0.11.2rc505 → truss-0.11.4}/truss-chains/truss_chains/public_types.py

@@ -28,7 +28,12 @@ DEFAULT_CONCURRENCY_LIMIT = 300
 CpuCountT = Literal["cpu_count"]
 CPU_COUNT: CpuCountT = "cpu_count"
 
-_BASETEN_API_SECRET_NAME = "baseten_chain_api_key"
+
+# NOTE(Tyron): This is a secret that points to an API key value.
+CHAIN_API_KEY_SECRET_NAME = "baseten_chain_api_key"
+
+# NOTE(Tyron): This is the actual API key pointed to by the above secret.
+CHAIN_API_KEY_NAME = "baseten-chain-api-key"
 
 _K = TypeVar("_K", contravariant=True)
 _V = TypeVar("_V", covariant=True)
@@ -738,14 +743,14 @@ class DeploymentContext(custom_types.SafeModelNonSerializable):
             )
         error_msg = (
             "For using chains, it is required to setup a an API key with name "
-            f"`{_BASETEN_API_SECRET_NAME}` on Baseten to allow chain Chainlet to "
+            f"`{CHAIN_API_KEY_SECRET_NAME}` on Baseten to allow chain Chainlet to "
             "call other Chainlets. For local execution, secrets can be provided "
             "to `run_local`."
         )
-        if _BASETEN_API_SECRET_NAME not in self.secrets:
+        if CHAIN_API_KEY_SECRET_NAME not in self.secrets:
             raise MissingDependencyError(error_msg)
 
-        api_key = self.secrets[_BASETEN_API_SECRET_NAME]
+        api_key = self.secrets[CHAIN_API_KEY_SECRET_NAME]
         if api_key == SECRET_DUMMY:
             raise MissingDependencyError(
                 f"{error_msg}. Retrieved dummy value of `{api_key}`."