wip

Author: aseembits93

codeflash/code_utils/code_utils.py

@@ -19,6 +19,8 @@
 
 ImportErrorPattern = re.compile(r"ModuleNotFoundError.*$", re.MULTILINE)
 
+BLACKLIST_ADDOPTS = ("benchmark", "sugar", "codespeed", "cov", "profile", "junitxml")
+
 
 def unified_diff_strings(code1: str, code2: str, fromfile: str = "original", tofile: str = "modified") -> str:
     """Return the unified diff between two code strings as a single string.
@@ -84,6 +86,7 @@ def create_rank_dictionary_compact(int_array: list[int]) -> dict[int, int]:
 @contextmanager
 def custom_addopts() -> None:
     pyproject_file = find_pyproject_toml()
+    # closest_config_files = get_all_closest_config_files()
     original_content = None
     non_blacklist_plugin_args = ""
 
@@ -97,9 +100,16 @@ def custom_addopts() -> None:
             original_addopts = data.get("tool", {}).get("pytest", {}).get("ini_options", {}).get("addopts", "")
             # nothing to do if no addopts present
             if original_addopts != "" and isinstance(original_addopts, list):
-                original_addopts = [x.strip() for x in original_addopts]
-                non_blacklist_plugin_args = re.sub(r"-n(?: +|=)\S+", "", " ".join(original_addopts)).split(" ")
-                non_blacklist_plugin_args = [x for x in non_blacklist_plugin_args if x != ""]
+                non_blacklist_plugin_args = []
+                for opt in original_addopts:
+                    opt_stripped = opt.strip().lstrip("-")
+                    # Filter out -n/--numprocesses and blacklisted options
+                    if opt_stripped.startswith(("n=", "numprocesses=")) or any(
+                        opt_stripped.startswith(b) for b in BLACKLIST_ADDOPTS
+                    ):
+                        continue
+                    non_blacklist_plugin_args.append(opt)
+
                 if non_blacklist_plugin_args != original_addopts:
                     data["tool"]["pytest"]["ini_options"]["addopts"] = non_blacklist_plugin_args
                     # Write modified file

codeflash/code_utils/config_parser.py

@@ -5,6 +5,8 @@
 
 import tomlkit
 
+ALL_CONFIG_FILES = {}  # map path to closest config file
+
 
 def find_pyproject_toml(config_file: Path | None = None) -> Path:
     # Find the pyproject.toml file on the root of the project
@@ -31,6 +33,35 @@ def find_pyproject_toml(config_file: Path | None = None) -> Path:
     raise ValueError(msg)
 
 
+def get_all_closest_config_files() -> list[Path]:
+    all_closest_config_files = []
+    for file_type in ["pyproject.toml", "pytest.ini", ".pytest.ini", "tox.ini", "setup.cfg"]:
+        closest_config_file = find_closest_config_file(file_type)
+        if closest_config_file:
+            all_closest_config_files.append(closest_config_file)
+    return all_closest_config_files
+
+
+def find_closest_config_file(file_type: str) -> Path:
+    # Find the closest pyproject.toml, pytest.ini, tox.ini, or setup.cfg file on the root of the project
+    dir_path = Path.cwd()
+    cur_path = dir_path
+    if cur_path in ALL_CONFIG_FILES and file_type in ALL_CONFIG_FILES[cur_path]:
+        return ALL_CONFIG_FILES[cur_path][file_type]
+    while dir_path != dir_path.parent:
+        config_file = dir_path / file_type
+        if config_file.exists():
+            if cur_path not in ALL_CONFIG_FILES:
+                ALL_CONFIG_FILES[cur_path] = {}
+            ALL_CONFIG_FILES[cur_path][file_type] = config_file
+            return config_file
+        # Search for pyproject.toml in the parent directories
+        dir_path = dir_path.parent
+    msg = f"Could not find pyproject.toml in the current directory {Path.cwd()} or any of the parent directories. Please create it by running `codeflash init`, or pass the path to pyproject.toml with the --config-file argument."
+
+    raise ValueError(msg)
+
+
 def find_conftest_files(test_paths: list[Path]) -> list[Path]:
     list_of_conftest_files = set()
     for test_path in test_paths: