wip

Author: aseembits93

codeflash/cli_cmds/cmd_init.py

@@ -34,7 +34,7 @@
     from argparse import Namespace
 
 CODEFLASH_LOGO: str = (
-    f"{LF}"  # noqa: ISC003
+    f"{LF}"
     r"                   _          ___  _               _     " + f"{LF}"
     r"                  | |        / __)| |             | |    " + f"{LF}"
     r"  ____   ___    _ | |  ____ | |__ | |  ____   ___ | | _  " + f"{LF}"
@@ -723,11 +723,16 @@ def configure_pyproject_toml(setup_info: SetupInfo) -> None:
         formatter_cmds.append("disabled")
     check_formatter_installed(formatter_cmds, exit_on_failure=False)
     codeflash_section["formatter-cmds"] = formatter_cmds
+    codeflash_section["override-fixtures"] = False  # don't override fixtures by default, let the user decide
     # Add the 'codeflash' section, ensuring 'tool' section exists
     tool_section = pyproject_data.get("tool", tomlkit.table())
     tool_section["codeflash"] = codeflash_section
     pyproject_data["tool"] = tool_section
-
+    if "tool.pytest.ini_options" not in pyproject_data:
+        pyproject_data["tool.pytest.ini_options"] = {}
+    if "markers" not in pyproject_data["tool.pytest.ini_options"]:
+        pyproject_data["tool.pytest.ini_options"]["markers"] = []
+    pyproject_data["tool.pytest.ini_options"]["markers"].append("codeflash_no_autouse")
     with toml_path.open("w", encoding="utf8") as pyproject_file:
         pyproject_file.write(tomlkit.dumps(pyproject_data))
     click.echo(f"✅ Added Codeflash configuration to {toml_path}")

codeflash/code_utils/code_replacer.py

@@ -9,6 +9,7 @@
 
 from codeflash.cli_cmds.console import logger
 from codeflash.code_utils.code_extractor import add_global_assignments, add_needed_imports_from_module
+from codeflash.code_utils.config_parser import find_conftest_files
 from codeflash.models.models import FunctionParent
 
 if TYPE_CHECKING:
@@ -37,7 +38,13 @@ def modify_autouse_fixture():
     # find fixutre definition in conftetst.py (the one closest to the test)
     # get fixtures present in override-fixtures in pyproject.toml
     # add if marker closest return
-    autousetransformer
+    conftest_files = find_conftest_files()
+    for cf_file in conftest_files:
+        #iterate over all functions in the file
+        # if function has autouse fixture, modify function to bypass with custom marker
+        pass
+
+#reuse line profiler utils to add decorator and import to test fns
 
 
 class OptimFunctionCollector(cst.CSTVisitor):

codeflash/code_utils/code_utils.py

@@ -13,7 +13,7 @@
 import tomlkit
 
 from codeflash.cli_cmds.console import logger
-from codeflash.code_utils.config_parser import find_conftest, find_pyproject_toml
+from codeflash.code_utils.config_parser import find_pyproject_toml
 
 ImportErrorPattern = re.compile(r"ModuleNotFoundError.*$", re.MULTILINE)
 
@@ -87,64 +87,6 @@ def add_addopts_to_pyproject() -> None:
             f.write(original_content)
 
 
-@contextmanager
-def add_override_fixtures_to_pyproject() -> None:
-    pyproject_file = find_pyproject_toml()
-    try:
-        # Read original file
-        if pyproject_file.exists():
-            with Path.open(pyproject_file, encoding="utf-8") as f:
-                original_content = f.read()
-                data = tomlkit.parse(original_content)
-            # Backup original markers
-            original_fixtures = data.get("tool", {}).get("codeflash", {}).get("override-fixtures", [])
-            original_fixtures.append("please_put_your_fixtures_here")
-            data["tool"]["pytest"]["override-fixtures"]["markers"] = list(original_fixtures)
-            with Path.open(pyproject_file, "w", encoding="utf-8") as f:
-                f.write(tomlkit.dumps(data))
-        yield
-    finally:
-        with Path.open(pyproject_file, "w", encoding="utf-8") as f:
-            f.write(original_content)
-
-
-@contextmanager
-def add_custom_markers_to_pyproject() -> None:
-    pyproject_file = find_pyproject_toml()
-    try:
-        # Read original file
-        if pyproject_file.exists():
-            with Path.open(pyproject_file, encoding="utf-8") as f:
-                original_content = f.read()
-                data = tomlkit.parse(original_content)
-            # Backup original markers
-            original_markers = data.get("tool", {}).get("pytest", {}).get("ini_options", {}).get("markers", [])
-            original_markers.append("codeflash_no_autouse")
-            data["tool"]["pytest"]["ini_options"]["markers"] = list(original_markers)
-            with Path.open(pyproject_file, "w", encoding="utf-8") as f:
-                f.write(tomlkit.dumps(data))
-        yield
-    finally:
-        with Path.open(pyproject_file, "w", encoding="utf-8") as f:
-            f.write(original_content)
-
-
-@contextmanager
-def rename_conftest(tests_path: Path) -> None:
-    conftest_file = find_conftest(tests_path)
-    tmp_conftest_file = None
-    try:
-        # Rename original file
-        if conftest_file:
-            tmp_conftest_file = Path(str(conftest_file) + ".tmp")
-            conftest_file.rename(tmp_conftest_file)
-        yield
-    finally:
-        # Restore original file
-        if conftest_file:
-            tmp_conftest_file.rename(conftest_file)
-
-
 def encoded_tokens_len(s: str) -> int:
     """Return the approximate length of the encoded tokens.
 

codeflash/code_utils/config_parser.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Union
+from typing import Any
 
 import tomlkit
 
@@ -31,17 +31,18 @@ def find_pyproject_toml(config_file: Path | None = None) -> Path:
     raise ValueError(msg)
 
 
-def find_conftest(tests_path: Path) -> Union[Path, None]:
+def find_conftest_files(tests_path: Path) -> list[Path]:
     # Find the conftest file on the root of the project
     dir_path = Path.cwd()
     cur_path = tests_path
+    list_of_conftest_files = []
     while cur_path != dir_path:
         config_file = cur_path / "conftest.py"
         if config_file.exists():
-            return config_file
+            list_of_conftest_files.append(config_file)
         # Search for conftest.py in the parent directories
         cur_path = cur_path.parent
-    return None
+    return list_of_conftest_files
 
 
 def parse_config_file(

codeflash/discovery/discover_unit_tests.py

@@ -23,7 +23,6 @@
     custom_addopts,
     get_run_tmp_file,
     module_name_from_file_path,
-    rename_conftest,
 )
 from codeflash.code_utils.compat import SAFE_SYS_EXECUTABLE, codeflash_cache_db
 from codeflash.models.models import CodePosition, FunctionCalledInTest, TestsInFile, TestType
@@ -157,7 +156,7 @@ def discover_tests_pytest(
     project_root = cfg.project_root_path
 
     tmp_pickle_path = get_run_tmp_file("collected_tests.pkl")
-    with custom_addopts(), rename_conftest(tests_root):
+    with custom_addopts():
         result = subprocess.run(
             [
                 SAFE_SYS_EXECUTABLE,

codeflash/verification/test_runner.py

@@ -53,7 +53,6 @@ def run_behavioral_tests(
                 )
             else:
                 test_files.append(str(file.instrumented_behavior_file_path))
-        test_files = ['/Users/codeflash/Downloads/codeflash-dev/codeflash/code_to_optimize/tests/pytest/test_bubble_sort__perfinstrumented.py']
         pytest_cmd_list = (
             shlex.split(f"{SAFE_SYS_EXECUTABLE} -m pytest", posix=IS_POSIX)
             if pytest_cmd == "pytest"

pyproject.toml

@@ -238,12 +238,6 @@ formatter-cmds = [
     "uvx ruff check --exit-zero --fix $file",
     "uvx ruff format $file",
 ]
-override-fixtures = ["fixture1"] #autouse fixtures present in conftest.py which have to be disabled during test execution
-
-[tool.pytest.ini_options]
-markers = [
-    "no_autouse"
-]
 
 
 [build-system]