Merge branch 'main' into windows-fixes

Author: KRRT7

.github/workflows/codeflash-optimize.yaml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   optimize:
-    name: Optimize new code in this PR
+    name: Optimize new Python code
     if: ${{ github.actor != 'codeflash-ai[bot]' }}
     runs-on: ubuntu-latest
     env:
@@ -22,23 +22,24 @@ jobs:
       CODEFLASH_PR_NUMBER: ${{ github.event.number }}
       COLUMNS: 110
     steps:
-      - uses: actions/checkout@v4
+      - name: 🛎️ Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up Python 3.11 for CLI
+      - name: 🐍 Set up Python 3.11 for CLI
         uses: astral-sh/setup-uv@v5
         with:
           python-version: 3.11.6
 
-      - name: Install dependencies (CLI)
+      - name: 📦 Install dependencies (CLI)
         run: |
           uv tool install poetry
           uv venv
           source .venv/bin/activate
           poetry install --with dev
 
-      - name: Run Codeflash to optimize code
+      - name: ⚡️Codeflash Optimization
         id: optimize_code
         run: |
           source .venv/bin/activate

codeflash/cli_cmds/cmd_init.py

@@ -73,7 +73,7 @@ def init_codeflash() -> None:
 
         install_github_app()
 
-        install_github_actions()
+        install_github_actions(override_formatter_check=True)
 
         click.echo(
             f"{LF}"
@@ -362,9 +362,9 @@ def check_for_toml_or_setup_file() -> str | None:
     return cast(str, project_name)
 
 
-def install_github_actions() -> None:
+def install_github_actions(override_formatter_check: bool=False) -> None:
     try:
-        config, config_file_path = parse_config_file()
+        config, config_file_path = parse_config_file(override_formatter_check=override_formatter_check)
 
         ph("cli-github-actions-install-started")
         try:
@@ -504,11 +504,11 @@ def get_dependency_manager_installation_string(dep_manager: DependencyManager) -
     py_version = sys.version_info
     python_version_string = f"'{py_version.major}.{py_version.minor}'"
     if dep_manager == DependencyManager.UV:
-        return """name: Setup UV
+        return """name: 🐍 Setup UV
         uses: astral-sh/setup-uv@v4
         with:
           enable-cache: true"""
-    return f"""name: Set up Python
+    return f"""name: 🐍 Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: {python_version_string}"""

codeflash/cli_cmds/console.py

@@ -27,7 +27,7 @@
 )
 
 logger = logging.getLogger("rich")
-
+logging.getLogger('parso').setLevel(logging.WARNING)
 
 def paneled_text(
     text: str, panel_args: dict[str, str | bool] | None = None, text_args: dict[str, str] | None = None

codeflash/cli_cmds/workflows/codeflash-optimize.yaml

@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   optimize:
-    name: Optimize new Python code in this PR
+    name: Optimize new Python code
     # Don't run codeflash on codeflash-ai[bot] commits, prevent duplicate optimizations
     if: ${{ github.actor != 'codeflash-ai[bot]' }}
     runs-on: ubuntu-latest
@@ -24,11 +24,12 @@ jobs:
       CODEFLASH_PR_NUMBER: ${{ github.event.number }}
     {{ working_directory }}
     steps:
-      - uses: actions/checkout@v4
+      - name: 🛎️ Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - {{ setup_python_dependency_manager }}
-      - name: Install Project Dependencies
+      - name: 📦 Install Dependencies
         run: {{ install_dependencies_command }}
-      - name: Run Codeflash to optimize code
+      - name: ⚡️Codeflash Optimization
         run: {{ codeflash_command }}

codeflash/code_utils/config_parser.py

@@ -31,7 +31,7 @@ def find_pyproject_toml(config_file: Path | None = None) -> Path:
     raise ValueError(msg)
 
 
-def parse_config_file(config_file_path: Path | None = None) -> tuple[dict[str, Any], Path]:
+def parse_config_file(config_file_path: Path | None = None, override_formatter_check: bool=False) -> tuple[dict[str, Any], Path]:
     config_file_path = find_pyproject_toml(config_file_path)
     try:
         with config_file_path.open("rb") as f:
@@ -85,10 +85,12 @@ def parse_config_file(config_file_path: Path | None = None) -> tuple[dict[str, A
         "In pyproject.toml, Codeflash only supports the 'test-framework' as pytest and unittest."
     )
     if len(config["formatter-cmds"]) > 0:
-        assert config["formatter-cmds"][0] != "your-formatter $file", (
-            "The formatter command is not set correctly in pyproject.toml. Please set the "
-            "formatter command in the 'formatter-cmds' key. More info - https://docs.codeflash.ai/configuration"
-        )
+        #see if this is happening during Github actions setup
+        if not override_formatter_check:
+            assert config["formatter-cmds"][0] != "your-formatter $file", (
+                "The formatter command is not set correctly in pyproject.toml. Please set the "
+                "formatter command in the 'formatter-cmds' key. More info - https://docs.codeflash.ai/configuration"
+            )
     for key in list(config.keys()):
         if "-" in key:
             config[key.replace("-", "_")] = config[key]

codeflash/code_utils/instrument_existing_tests.py

@@ -9,8 +9,7 @@
 from codeflash.cli_cmds.console import logger
 from codeflash.code_utils.code_utils import get_run_tmp_file, module_name_from_file_path
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
-from codeflash.models.models import FunctionParent, TestingMode
-from codeflash.verification.test_results import VerificationType
+from codeflash.models.models import FunctionParent, TestingMode, VerificationType
 
 if TYPE_CHECKING:
     from collections.abc import Iterable

codeflash/discovery/discover_unit_tests.py

@@ -16,8 +16,7 @@
 from codeflash.cli_cmds.console import console, logger
 from codeflash.code_utils.code_utils import get_run_tmp_file, module_name_from_file_path
 from codeflash.code_utils.compat import SAFE_SYS_EXECUTABLE
-from codeflash.models.models import CodePosition, FunctionCalledInTest, TestsInFile
-from codeflash.verification.test_results import TestType
+from codeflash.models.models import CodePosition, FunctionCalledInTest, TestsInFile, TestType
 
 if TYPE_CHECKING:
     from codeflash.verification.verification_utils import TestConfig

codeflash/discovery/pytest_new_process_discovery.py

@@ -16,6 +16,11 @@ def pytest_collection_finish(self, session) -> None:
         collected_tests.extend(session.items)
         pytest_rootdir = session.config.rootdir
 
+    def pytest_collection_modifyitems(config, items):
+        skip_benchmark = pytest.mark.skip(reason="Skipping benchmark tests")
+        for item in items:
+            if "benchmark" in item.fixturenames:
+                item.add_marker(skip_benchmark)
 
 def parse_pytest_collection_results(pytest_tests: list[Any]) -> list[dict[str, str]]:
     test_results = []
@@ -34,7 +39,7 @@ def parse_pytest_collection_results(pytest_tests: list[Any]) -> list[dict[str, s
 
     try:
         exitcode = pytest.main(
-            [tests_root, "-pno:logging", "--collect-only", "-m", "not skip"], plugins=[PytestCollectionPlugin()]
+            [tests_root, "-p no:logging", "--collect-only", "-m", "not skip",], plugins=[PytestCollectionPlugin()]
         )
     except Exception as e:  # noqa: BLE001
         print(f"Failed to collect tests: {e!s}")  # noqa: T201

codeflash/github/PrComment.py

@@ -4,7 +4,7 @@
 from pydantic.dataclasses import dataclass
 
 from codeflash.code_utils.time_utils import humanize_runtime
-from codeflash.verification.test_results import TestResults
+from codeflash.models.models import TestResults
 
 
 @dataclass(frozen=True, config={"arbitrary_types_allowed": True})