module_name traverse up and cleanup prints

Author: KRRT7

codeflash/benchmarking/plugin/plugin.py

@@ -53,7 +53,6 @@ def setup(self, trace_path: str, project_root: str) -> None:
             raise
 
     def write_benchmark_timings(self) -> None:
-        print("XXX ATTEMPTING TO WRITE THE BENCHMARK TIMINGS")
         if not self.benchmark_timings:
             return  # No data to write
 
@@ -96,7 +95,6 @@ def get_function_benchmark_timings(trace_path: Path) -> dict[str, dict[Benchmark
 
         """
         # Initialize the result dictionary
-        print("XXX ATTEMPTING get_function_benchmark_timings")
         result = {}
 
         # Connect to the SQLite database
@@ -156,7 +154,6 @@ def get_benchmark_timings(trace_path: Path) -> dict[BenchmarkKey, int]:
 
         """
         # Initialize the result dictionary
-        print("XXX ATTEMPTING get_benchmark_timings")
         result = {}
         overhead_by_benchmark = {}
 
@@ -190,7 +187,6 @@ def get_benchmark_timings(trace_path: Path) -> dict[BenchmarkKey, int]:
 
                 # Create the benchmark key (file::function::line)
                 benchmark_key = BenchmarkKey(module_path=benchmark_file, function_name=benchmark_func)
-                print(f"XXX Processing benchmark: {benchmark_key}")
                 # Subtract overhead from total time
                 overhead = overhead_by_benchmark.get(benchmark_key, 0)
                 result[benchmark_key] = time_ns - overhead
@@ -246,11 +242,9 @@ def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item
     class Benchmark:  # noqa: D106
         def __init__(self, request: pytest.FixtureRequest) -> None:
             self.request = request
-            print("XXX INITIALIZING THE BENCHMARK")
 
         def __call__(self, func, *args, **kwargs):  # type: ignore  # noqa: ANN001, ANN002, ANN003, ANN204, PGH003
             """Handle both direct function calls and decorator usage."""
-            print("XXX CALLED THE BENCHMARK")
             if args or kwargs:
                 # Used as benchmark(func, *args, **kwargs)
                 return self._run_benchmark(func, *args, **kwargs)
@@ -264,10 +258,10 @@ def wrapped_func(*args, **kwargs):  # noqa: ANN002, ANN003, ANN202
 
         def _run_benchmark(self, func, *args, **kwargs):  # noqa: ANN001, ANN002, ANN003, ANN202
             """Actual benchmark implementation."""
-            print("XXX RUNNING THE BENCHMARK!!")
             benchmark_module_path = module_name_from_file_path(
-                Path(str(self.request.node.fspath)), Path(codeflash_benchmark_plugin.project_root)
+                Path(str(self.request.node.fspath)), Path(codeflash_benchmark_plugin.project_root), traverse_up=True
             )
+
             benchmark_function_name = self.request.node.name
             line_number = int(str(sys._getframe(2).f_lineno))  # 2 frames up in the call stack  # noqa: SLF001
             # Set env vars
@@ -299,7 +293,6 @@ def benchmark(request: pytest.FixtureRequest) -> object:
         """Fixture to provide the benchmark functionality."""
         if not request.config.getoption("--codeflash-trace"):
             return None
-        print("XXX BENCHMARK PLUGIN INITIATED")
         return CodeFlashBenchmarkPlugin.Benchmark(request)
 
 

codeflash/code_utils/code_utils.py

@@ -109,9 +109,21 @@ def get_qualified_name(module_name: str, full_qualified_name: str) -> str:
     return full_qualified_name[len(module_name) + 1 :]
 
 
-def module_name_from_file_path(file_path: Path, project_root_path: Path) -> str:
-    relative_path = file_path.relative_to(project_root_path)
-    return relative_path.with_suffix("").as_posix().replace("/", ".")
+def module_name_from_file_path(file_path: Path, project_root_path: Path, *, traverse_up: bool = True) -> str:
+    try:
+        relative_path = file_path.relative_to(project_root_path)
+        return relative_path.with_suffix("").as_posix().replace("/", ".")
+    except ValueError:
+        if traverse_up:
+            parent = file_path.parent
+            while parent not in (project_root_path, parent.parent):
+                try:
+                    relative_path = file_path.relative_to(parent)
+                    return relative_path.with_suffix("").as_posix().replace("/", ".")
+                except ValueError:
+                    parent = parent.parent
+        msg = f"File {file_path} is not within the project root {project_root_path}."
+        raise ValueError(msg)  # noqa: B904
 
 
 def file_path_from_module_name(module_name: str, project_root_path: Path) -> Path: