tests

Author: mohammedahmed18

code_to_optimize/code_directories/nested_module_root/pyproject.toml

@@ -0,0 +1,8 @@
+[tool.codeflash]
+# All paths are relative to this pyproject.toml's directory.
+module-root = "src/app"
+tests-root = "tests"
+test-framework = "pytest"
+ignore-paths = []
+disable-telemetry = true
+formatter-cmds = ["disabled"]

code_to_optimize/code_directories/nested_module_root/src/app/main.py

@@ -0,0 +1,10 @@
+def sorter(arr):
+    print("codeflash stdout: Sorting list")
+    for i in range(len(arr)):
+        for j in range(len(arr) - 1):
+            if arr[j] > arr[j + 1]:
+                temp = arr[j]
+                arr[j] = arr[j + 1]
+                arr[j + 1] = temp
+    print(f"result: {arr}")
+    return arr

codeflash/optimization/optimizer.py

@@ -451,43 +451,41 @@ def mirror_paths_for_worktree_mode(self, worktree_dir: Path) -> None:
         original_test_cfg = copy.deepcopy(self.test_cfg)
         self.original_args_and_test_cfg = (original_args, original_test_cfg)
 
-        original_module_root = original_args.module_root
         original_git_root = git_root_dir()
 
-        # mutate project_root
-        relative_project_root = original_args.project_root.relative_to(original_git_root)
-        # this will be the same as the original project root but in the worktree
-        new_project_root = worktree_dir / relative_project_root
-        self.args.project_root = new_project_root
-        self.test_cfg.project_root_path = new_project_root
-
-        # mutate module_root
-        relative_module_root = original_module_root.relative_to(original_git_root)
-        self.args.module_root = worktree_dir / relative_module_root
-
-        # mute target file
-        relative_optimized_file = original_args.file.relative_to(original_git_root) if original_args.file else None
-        if relative_optimized_file is not None:
-            self.args.file = worktree_dir / relative_optimized_file
-
-        # mutate tests root
-        relative_tests_root = original_test_cfg.tests_root.relative_to(original_git_root)
-        new_tests_root = worktree_dir / relative_tests_root
-        self.args.tests_root = new_tests_root
-        self.test_cfg.tests_root = new_tests_root
-
-        # mutate tests project root
-        relative_tests_project_root = original_args.test_project_root.relative_to(original_git_root)
-        self.args.test_project_root = worktree_dir / relative_tests_project_root
-        self.test_cfg.tests_project_rootdir = worktree_dir / relative_tests_project_root
-
-        # mutate benchmarks root
-        relative_benchmarks_root = (
-            original_args.benchmarks_root.relative_to(original_git_root) if original_args.benchmarks_root else None
+        # mirror project_root
+        self.args.project_root = mirror_path(self.args.project_root, original_git_root, worktree_dir)
+        self.test_cfg.project_root_path = mirror_path(self.test_cfg.project_root_path, original_git_root, worktree_dir)
+
+        # mirror module_root
+        self.args.module_root = mirror_path(self.args.module_root, original_git_root, worktree_dir)
+
+        # mirror target file
+        if self.args.file:
+            self.args.file = mirror_path(self.args.file, original_git_root, worktree_dir)
+
+        # mirror tests root
+        self.args.tests_root = mirror_path(self.args.tests_root, original_git_root, worktree_dir)
+        self.test_cfg.tests_root = mirror_path(self.test_cfg.tests_root, original_git_root, worktree_dir)
+
+        # mirror tests project root
+        self.args.test_project_root = mirror_path(self.args.test_project_root, original_git_root, worktree_dir)
+        self.test_cfg.tests_project_rootdir = mirror_path(
+            self.test_cfg.tests_project_rootdir, original_git_root, worktree_dir
         )
-        if relative_benchmarks_root:
-            self.args.benchmarks_root = worktree_dir / relative_benchmarks_root
-            self.test_cfg.benchmark_tests_root = worktree_dir / relative_benchmarks_root
+
+        # mirror benchmarks root paths
+        if self.args.benchmarks_root:
+            self.args.benchmarks_root = mirror_path(self.args.benchmarks_root, original_git_root, worktree_dir)
+        if self.test_cfg.benchmark_tests_root:
+            self.test_cfg.benchmark_tests_root = mirror_path(
+                self.test_cfg.benchmark_tests_root, original_git_root, worktree_dir
+            )
+
+
+def mirror_path(path: Path, src_root: Path, dest_root: Path) -> Path:
+    relative_path = path.relative_to(src_root)
+    return dest_root / relative_path
 
 
 def run_with_args(args: Namespace) -> None:

tests/test_worktree.py

@@ -0,0 +1,65 @@
+from argparse import Namespace
+from pathlib import Path
+
+import pytest
+from codeflash.cli_cmds.cli import process_pyproject_config
+from codeflash.optimization.optimizer import Optimizer
+
+
+def test_mirror_paths_for_worktree_mode(monkeypatch: pytest.MonkeyPatch):
+    repo_root = Path(__file__).resolve().parent.parent
+    project_root = repo_root / "code_to_optimize" / "code_directories" / "nested_module_root"
+
+    monkeypatch.setattr("codeflash.optimization.optimizer.git_root_dir", lambda: project_root)
+
+    args = Namespace()
+    args.benchmark = False
+    args.benchmarks_root = None
+
+    args.config_file = project_root / "pyproject.toml"
+    args.file = project_root / "src" / "app" / "main.py"
+    args.worktree = True
+
+    new_args = process_pyproject_config(args)
+
+    optimizer = Optimizer(new_args)
+
+    worktree_dir = repo_root / "worktree"
+    optimizer.mirror_paths_for_worktree_mode(worktree_dir)
+
+    assert optimizer.args.project_root == worktree_dir / "src"
+    assert optimizer.args.test_project_root == worktree_dir
+    assert optimizer.args.module_root == worktree_dir / "src" / "app"
+    assert optimizer.args.tests_root == worktree_dir / "tests"
+    assert optimizer.args.file == worktree_dir / "src" / "app" / "main.py"
+
+    assert optimizer.test_cfg.tests_root == worktree_dir / "tests"
+    assert optimizer.test_cfg.project_root_path == worktree_dir / "src" # same as project_root
+    assert optimizer.test_cfg.tests_project_rootdir == worktree_dir # same as test_project_root
+
+    # test on our repo
+    monkeypatch.setattr("codeflash.optimization.optimizer.git_root_dir", lambda: repo_root)
+    args = Namespace()
+    args.benchmark = False
+    args.benchmarks_root = None
+
+    args.config_file = repo_root / "pyproject.toml"
+    args.file = repo_root / "codeflash/optimization/optimizer.py"
+    args.worktree = True
+
+    new_args = process_pyproject_config(args)
+
+    optimizer = Optimizer(new_args)
+
+    worktree_dir = repo_root / "worktree"
+    optimizer.mirror_paths_for_worktree_mode(worktree_dir)
+
+    assert optimizer.args.project_root == worktree_dir
+    assert optimizer.args.test_project_root == worktree_dir
+    assert optimizer.args.module_root == worktree_dir / "codeflash"
+    assert optimizer.args.tests_root == worktree_dir / "tests"
+    assert optimizer.args.file == worktree_dir / "codeflash/optimization/optimizer.py"
+
+    assert optimizer.test_cfg.tests_root == worktree_dir / "tests"
+    assert optimizer.test_cfg.project_root_path == worktree_dir # same as project_root
+    assert optimizer.test_cfg.tests_project_rootdir == worktree_dir # same as test_project_root