truss 0.11.2rc504__tar.gz → 0.11.2rc505__tar.gz

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

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

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

{truss-0.11.2rc504 → truss-0.11.2rc505}/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-0.11.2rc504 → truss-0.11.2rc505}/truss/tests/patch/test_calc_patch.py

@@ -740,7 +740,9 @@ 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
+    # 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,
@@ -749,10 +751,6 @@ def test_calc_config_patches_add_system_package(custom_model_truss_dir: Path):
                 config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
             ),
         ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.ADD, package="curl"),
-        ),
     ]
 
 
@@ -762,7 +760,9 @@ def test_calc_config_patches_remove_system_package(custom_model_truss_dir: Path)
         config_pre_op=lambda config: config.system_packages.append("curl"),
         config_op=lambda config: config.system_packages.clear(),
     )
-    assert len(patches) == 2
+    # 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,
@@ -771,10 +771,6 @@ def test_calc_config_patches_remove_system_package(custom_model_truss_dir: Path)
                 config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
             ),
         ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.REMOVE, package="curl"),
-        ),
     ]
 
 
@@ -790,24 +786,16 @@ def test_calc_config_patches_add_and_remove_system_package(
     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)
+    # 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.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.REMOVE, package="jq"),
-        ),
-        Patch(
-            type=PatchType.SYSTEM_PACKAGE,
-            body=SystemPackagePatch(action=Action.ADD, package="libsnd"),
+            type=PatchType.CONFIG,
+            body=ConfigPatch(
+                action=Action.UPDATE,
+                config=yaml.safe_load((custom_model_truss_dir / "config.yaml").open()),
+            ),
         ),
     ]
 

{truss-0.11.2rc504 → truss-0.11.2rc505}/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,13 +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)
@@ -170,14 +161,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

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

@@ -425,20 +425,12 @@ def _calc_system_packages_patches(
 ) -> List[Patch]:
     """Calculate patch based on changes to system packates.
 
-    Empty list means no relevant differences found.
+    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.
     """
-    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))
-
-    return patches
+    # System package patches are no longer supported - return empty list
+    # This will cause any system package changes to be handled by full rebuild
+    return []
 
 
 def _mk_config_patch(action: Action, config: dict) -> Patch:
@@ -471,13 +463,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))