truss 0.11.2rc504__py3-none-any.whl → 0.11.3__py3-none-any.whl

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/templates/control/control/helpers/truss_patch/model_container_patch_applier.py

@@ -54,7 +54,9 @@ class ModelContainerPatchApplier:
             py_req_patch: PythonRequirementPatch = patch.body
             self._apply_python_requirement_patch(py_req_patch)
         elif isinstance(patch.body, SystemPackagePatch):
-            raise UnsupportedPatch("System package patches are not supported for model container, please push truss again instead")
+            raise UnsupportedPatch(
+                "System package patches are not supported for model container, please run truss push again"
+            )
         elif isinstance(patch.body, ConfigPatch):
             config_patch: ConfigPatch = patch.body
             self._apply_config_patch(config_patch)
@@ -113,7 +115,6 @@ class ModelContainerPatchApplier:
         else:
             raise ValueError(f"Unknown python requirement patch action {action}")
 
-
     def _apply_config_patch(self, config_patch: ConfigPatch):
         self._app_logger.debug(f"Applying config patch {config_patch.to_dict()}")
         TrussConfig.from_dict(config_patch.config).write_to_yaml_file(

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,49 +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")
-    )
-    assert len(patches) == 2
-    assert patches == [
-        Patch(
-            type=PatchType.CONFIG,
-            body=ConfigPatch(
-                action=Action.UPDATE,
-                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-            ),
-        ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.ADD, package="curl"),
-        ),
-    ]
+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(),
-    )
-    assert len(patches) == 2
-    assert patches == [
-        Patch(
-            type=PatchType.CONFIG,
-            body=ConfigPatch(
-                action=Action.UPDATE,
-                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-            ),
-        ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.REMOVE, package="curl"),
-        ),
-    ]
+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):
@@ -787,29 +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
-    )
-    assert len(patches) == 3
-    assert patches[0] == Patch(
-        type=PatchType.CONFIG,
-        body=ConfigPatch(
-            action=Action.UPDATE,
-            config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
-        ),
-    )
-    patches = patches[1:]
-    patches.sort(key=lambda patch: patch.body.package)
-    assert patches == [
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.REMOVE, package="jq"),
-        ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.ADD, package="libsnd"),
-        ),
-    ]
+    # 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/tests/test_control_truss_patching.py

@@ -9,8 +9,6 @@ from truss.tests.test_testing_utilities_for_other_tests import ensure_kill_all
 from truss.tests.test_truss_handle import (
     verify_python_requirement_installed_on_container,
     verify_python_requirement_not_installed_on_container,
-    verify_system_package_installed_on_container,
-    verify_system_requirement_not_installed_on_container,
 )
 from truss.truss_handle.truss_gatherer import calc_shadow_truss_dirname
 from truss.truss_handle.truss_handle import TrussHandle
@@ -147,14 +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)
 
-    def predict_with_system_requirement_added(pkg):
-        th.add_system_package(pkg)
-        return th.docker_predict([1], tag=tag, binary=binary, local_port=None)
-
-    def predict_with_system_requirement_removed(pkg):
-        th.remove_system_package(pkg)
-        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())
@@ -170,15 +160,6 @@ def test_control_truss_python_sys_req_patch(
         assert current_num_docker_images(th) == orig_num_truss_images
         verify_python_requirement_not_installed_on_container(container, python_req)
 
-        system_pkg = "jq"
-        predict_with_system_requirement_added(system_pkg)
-        assert current_num_docker_images(th) == orig_num_truss_images
-        verify_system_package_installed_on_container(container, system_pkg)
-
-        predict_with_system_requirement_removed(system_pkg)
-        assert current_num_docker_images(th) == orig_num_truss_images
-        verify_system_requirement_not_installed_on_container(container, system_pkg)
-
 
 @pytest.mark.integration
 @pytest.mark.parametrize(

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,22 +422,18 @@ 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.
 
-    Empty list means no relevant differences found.
+    System package patches are no longer supported, so this function
+    raises an exception if any system package changes are detected.
     """
-    patches = []
     prev_pkgs = system_packages_set(prev_config.system_packages)
     new_pkgs = system_packages_set(new_config.system_packages)
-    removed_pkgs = prev_pkgs.difference(new_pkgs)
-    for removed_pkg in removed_pkgs:
-        patches.append(_mk_system_package_patch(Action.REMOVE, removed_pkg))
 
-    added_pkgs = new_pkgs.difference(prev_pkgs)
-    for added_pkg in added_pkgs:
-        patches.append(_mk_system_package_patch(Action.ADD, added_pkg))
+    if prev_pkgs != new_pkgs:
+        raise ValueError("System package changes detected - full rebuild required")
 
-    return patches
+    return []
 
 
 def _mk_config_patch(action: Action, config: dict) -> Patch:
@@ -471,13 +466,6 @@ def _mk_python_requirement_patch(action: Action, requirement: str) -> Patch:
     )
 
 
-def _mk_system_package_patch(action: Action, package: str) -> Patch:
-    return Patch(
-        type=PatchType.SYSTEM_PACKAGE,
-        body=SystemPackagePatch(action=action, package=package),
-    )
-
-
 def _relative_to(path: str, relative_to_path: str):
     return str(Path(path).relative_to(relative_to_path))
 

{truss-0.11.2rc504.dist-info → truss-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.2rc504
+Version: 0.11.3
 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.2rc504.dist-info → truss-0.11.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 truss/__init__.py,sha256=CoUcP6vx_pocyemRmpbCPlndkHhdMkABAlr0ZXVuPCk,1163
-truss/api/__init__.py,sha256=spBAa_m1pItiid97iDLKPmumgAkSirPkv-E8RWMZyOk,5090
+truss/api/__init__.py,sha256=5GTE2rlupet-beaawUr0FPyDPEJ9UyBTUpJmCE3RGfc,5453
 truss/api/definitions.py,sha256=QAaIBqL59Q-R7HtLcXcoeCIWBN2HqOzApdFX0PpCq2s,1604
 truss/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/base/constants.py,sha256=sExArdnuGg83z83XMgaQ4b8SS3V_j_bJEpOATDGJzpE,3600
@@ -84,7 +84,7 @@ truss/templates/control/control/helpers/inference_server_process_controller.py,s
 truss/templates/control/control/helpers/inference_server_starter.py,sha256=Fz2Puijro6Cc5cvTsAqOveNJbBQR_ARYJXl4lvETJ8Y,2633
 truss/templates/control/control/helpers/truss_patch/__init__.py,sha256=CXZdUV_ylqLTJrKuFpvSnUT6PUFrZrMF2y6jiHbdaKU,998
 truss/templates/control/control/helpers/truss_patch/model_code_patch_applier.py,sha256=LTIIADLz0wRn7V49j64dU1U7Hbta9YLde3pb5YZWvzQ,2001
-truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py,sha256=rxJzXwNmrr_2FOM9gZSE3TDbV-Bpwz67fv1dcMsQ9EE,6420
+truss/templates/control/control/helpers/truss_patch/model_container_patch_applier.py,sha256=uiZvKhLa_rpr_N67NpApgA-XVrBFLXraZlikSOFDDOw,6445
 truss/templates/control/control/helpers/truss_patch/requirement_name_identifier.py,sha256=CL3KEAj4B3ApMQShd7TI5umXVbazLZY5StrNlwHwWtc,1995
 truss/templates/control/control/helpers/truss_patch/system_packages.py,sha256=IYh1CVU_kooAvtSGXKQDDWnNdOhlv7ENWagsL1wvhgw,208
 truss/templates/custom/examples.yaml,sha256=2UcCtEdavImWmiCtj31ckBlAKVOwNMC5AwMIIznKDag,48
@@ -131,7 +131,7 @@ truss/tests/helpers.py,sha256=DKnUGzmt-k4IN_wSnlAXbVYCiEt58xFzFmmuCDSQ0dg,555
 truss/tests/test_build.py,sha256=Wq4sM9tmZFVTCN3YljvOcn04Kkj-L-41Tlw0DKQ8Z7c,709
 truss/tests/test_config.py,sha256=AVpVCL_XHYXKSGHzwecrh7BAJlB_Wr5AUlnnwMqWM98,30559
 truss/tests/test_context_builder_image.py,sha256=fVZNJSzZNiWa7Dr1X_VhhMJtyJ5HzsLaPglOr6NV2CA,1105
-truss/tests/test_control_truss_patching.py,sha256=lbMuAjLbkeDRLxUxXHWr41BZyhZKHQYoMnbJSj3dqrc,15390
+truss/tests/test_control_truss_patching.py,sha256=qQOUfyF1MorZ_obOvPJK9utI4HUAzgT6YBS-fo90TEw,14497
 truss/tests/test_custom_server.py,sha256=GP2qMgnqxJMPRtfEciqbhBcG0_JUK7gNL7nrXPGrSLg,1305
 truss/tests/test_docker.py,sha256=3RI6jEC9CVQsKj83s_gOBl3EkdOaov-KEX4IihfMJW4,523
 truss/tests/test_model_inference.py,sha256=9QfPMa1kjxvKCWg5XKocjwcpfDkKB7pWd8bn4hIkshk,76213
@@ -150,7 +150,7 @@ truss/tests/contexts/image_builder/test_serving_image_builder.py,sha256=16niCXZn
 truss/tests/contexts/local_loader/test_load_local.py,sha256=D1qMH2IpYA2j5009v50QMgUnKdeOsX15ndkwXe10a4E,801
 truss/tests/contexts/local_loader/test_truss_module_finder.py,sha256=oN1K2lg3ATHY5yOVUTfQIaSqusTF9I2wFaYaTSo5-O4,5342
 truss/tests/local/test_local_config_handler.py,sha256=aLvcOyfppskA2MziVLy_kMcagjxMpO4mjar9zxUN6g0,2245
-truss/tests/patch/test_calc_patch.py,sha256=GBPvIwIQ12fgYwqiHn7BUzAO5693-AX5R4upwGqfdB8,31960
+truss/tests/patch/test_calc_patch.py,sha256=ClvrkNvxc5-bclXZUnqCis0bS1he2vbxn3DIcrR1WuU,31082
 truss/tests/patch/test_dir_signature.py,sha256=HnG9Cyqt86YagYkY-jurSf36yYP2oM7PQvfb_d5T2mY,1033
 truss/tests/patch/test_hash.py,sha256=VsGAllNP653rmyrvPYBRY1gEc0gTpLl38tAhjXFUGGM,5997
 truss/tests/patch/test_signature.py,sha256=vdAy5dbIqTEWLZVpO6szTGdNTRZgE8PtABGuhPP0Y6s,728
@@ -325,7 +325,7 @@ truss/truss_handle/readme_generator.py,sha256=B4XbGwUjzMNOr71DWNAL8kCu5_ZHq7YOM8
 truss/truss_handle/truss_gatherer.py,sha256=Xysl_UnCVhehPfZeHa8p7WFp94ENqh-VVpbuqnCui3A,2870
 truss/truss_handle/truss_handle.py,sha256=WF2MQSly9DQ1SoAvqfi87Ulu4llTadpXoncsDjpL79E,40886
 truss/truss_handle/patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truss/truss_handle/patch/calc_patch.py,sha256=Qyk1QmacK4jy9Ia8-93L8VtAWJhw15z22DdZUkBKlys,18334
+truss/truss_handle/patch/calc_patch.py,sha256=_-cBKRiRgleqn7vtqG53Ta18zTE0BWTAQEgFeKCUtK4,17971
 truss/truss_handle/patch/constants.py,sha256=pCEi5Pwi8Rnqthrr3VEsWL9EP1P1VV1T8DEYuitHLmc,139
 truss/truss_handle/patch/custom_types.py,sha256=QklzhgLD_PpvNvNYQCvujAd16eYEaDGfLA1scxk6zsA,3481
 truss/truss_handle/patch/dir_signature.py,sha256=UCdZCzXkI-l-ae0I0pdmB2bavB9qzhhOKYXyLnDFQZY,921
@@ -368,8 +368,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=KmJuTUVpvtvlkEClcmllxAF2TKgbp-FuzfblfGh06XA,1239
-truss-0.11.2rc504.dist-info/METADATA,sha256=kmeypQ9CmBsHrPE-nB0Xw7DYTGCirhsQIW6wbP9yiSU,6674
-truss-0.11.2rc504.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.2rc504.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.2rc504.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.2rc504.dist-info/RECORD,,
+truss-0.11.3.dist-info/METADATA,sha256=tzcaX0tJ3oM9TfBC0FGlbh3No2PfcyBO4Yfg3IPMkKE,6669
+truss-0.11.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.3.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.3.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.3.dist-info/RECORD,,