Fix an issue with pycache ignore for live reload (#273)

Author: pankajroark

pyproject.toml

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

truss/patch/calc_patch.py

@@ -134,14 +134,22 @@ def _calc_changed_paths(
     """
     TODO(pankaj) add support for directory creation in patch
     """
-    unignored_paths = _calc_unignored_paths(root, ignore_patterns)
+    root_relative_new_paths = set(
+        (str(path.relative_to(root)) for path in root.glob("**/*"))
+    )
+    unignored_new_paths = _calc_unignored_paths(
+        root, root_relative_new_paths, ignore_patterns
+    )
     previous_root_relative_paths = set(previous_root_path_content_hashes.keys())
+    unignored_prev_paths = _calc_unignored_paths(
+        root, previous_root_relative_paths, ignore_patterns
+    )
 
-    added_paths = unignored_paths - previous_root_relative_paths
-    removed_paths = previous_root_relative_paths - unignored_paths
+    added_paths = unignored_new_paths - unignored_prev_paths
+    removed_paths = unignored_prev_paths - unignored_new_paths
 
     updated_paths = set()
-    common_paths = unignored_paths.intersection(previous_root_relative_paths)
+    common_paths = unignored_new_paths.intersection(unignored_prev_paths)
     for path in common_paths:
         full_path: Path = root / path
         if full_path.is_file():
@@ -158,7 +166,9 @@ def _calc_changed_paths(
 
 
 def _calc_unignored_paths(
-    root: Path, ignore_patterns: Optional[List[str]] = None
+    root: Path,
+    root_relative_paths: Set[str],
+    ignore_patterns: Optional[List[str]] = None,
 ) -> Set[str]:
     root_relative_ignored_paths = set()
     if ignore_patterns is not None:
@@ -168,9 +178,6 @@ def _calc_unignored_paths(
             )
             root_relative_ignored_paths.update(ignored_paths_for_pattern)
 
-    root_relative_paths = set(
-        (str(path.relative_to(root)) for path in root.glob("**/*"))
-    )
     return root_relative_paths - root_relative_ignored_paths
 
 

truss/tests/patch/test_calc_patch.py

@@ -119,6 +119,23 @@ def test_calc_truss_ignore_pycache(custom_model_truss_dir: Path):
     assert len(patches) == 0
 
 
+def test_calc_truss_ignore_pycache_existing(custom_model_truss_dir: Path):
+    # If __pycache__ existed before and there are no changes, there should be no
+    # patches.
+    top_pycache_path = custom_model_truss_dir / "__pycache__"
+    top_pycache_path.mkdir()
+    (top_pycache_path / "bla.pyc").touch()
+    model_pycache_path = custom_model_truss_dir / "model" / "__pycache__"
+    model_pycache_path.mkdir()
+    (model_pycache_path / "foo.pyo").touch()
+    sign = calc_truss_signature(custom_model_truss_dir)
+    patches = calc_truss_patch(
+        custom_model_truss_dir,
+        sign,
+    )
+    assert len(patches) == 0
+
+
 def test_calc_truss_ignore_changes_outside_patch_relevant_dirs(
     custom_model_truss_dir: Path,
 ):