Merge branch 'main' into fix/cicular-imports-in-helper-context

Author: misrasaurabh1

codeflash.code-workspace

@@ -10,13 +10,16 @@
         }
     ],
     "settings": {
-        "python.defaultInterpreterPath": "~/miniforge3/envs/codeflash312/bin/python",
         "python.terminal.activateEnvironment": true,
         "python.testing.pytestEnabled": true,
-        "python.testing.pytestArgs": ["tests/", "-vv"],
+        "python.testing.pytestArgs": [
+            "tests/",
+            "-vv",
+            "--ignore",
+            "tests/benchmarks/"
+        ],
     },
     "launch": {
-        "version": "0.2.0",
         "configurations": [
             {
                 "name": "bubble_sort",
@@ -62,19 +65,26 @@
                 },
             },
             {
-                "name": "bubble_sort --file bubble_sort.py (MBR)",
+                "name": "run codeflash in custom directory",
                 "type": "debugpy",
                 "request": "launch",
                 "program": "${workspaceFolder:codeflash}/codeflash/main.py",
                 "args": [
                     "--all",
                 ],
-                "cwd": "/Users/krrt7/Desktop/work/my-best-repo",
+                "cwd": "${input:chooseCwd}",
                 "console": "integratedTerminal",
                 "env": {
                     "PYTHONUNBUFFERED": "1"
-                },
+                }
+            }
+        ],
+        "inputs": [
+            {
+                "id": "chooseCwd",
+                "type": "promptString",
+                "description": "Enter the working directory for codeflash",
             }
         ]
-    }
+    },
 }

codeflash/api/aiservice.py

@@ -10,7 +10,7 @@
 from pydantic.json import pydantic_encoder
 
 from codeflash.cli_cmds.console import console, logger
-from codeflash.code_utils.env_utils import get_codeflash_api_key
+from codeflash.code_utils.env_utils import get_codeflash_api_key, is_LSP_enabled
 from codeflash.code_utils.git_utils import get_last_commit_author_if_pr_exists, get_repo_owner_and_name
 from codeflash.models.models import OptimizedCandidate
 from codeflash.telemetry.posthog_cf import ph
@@ -182,6 +182,7 @@ def optimize_python_code_line_profiler(  # noqa: D417
             "python_version": platform.python_version(),
             "experiment_metadata": experiment_metadata,
             "codeflash_version": codeflash_version,
+            "lsp_mode": is_LSP_enabled(),
         }
 
         logger.info("Generating optimized candidates…")

codeflash/code_utils/env_utils.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any, Optional
 
-from codeflash.cli_cmds.console import logger
+from codeflash.cli_cmds.console import console, logger
 from codeflash.code_utils.code_utils import exit_with_message
 from codeflash.code_utils.formatter import format_code
 from codeflash.code_utils.shell_utils import read_api_key_from_shell_config
@@ -110,3 +110,8 @@ def get_cached_gh_event_data() -> dict[str, Any] | None:
         return None
     with Path(event_path).open() as f:
         return json.load(f)  # type: ignore  # noqa
+
+
+@lru_cache(maxsize=1)
+def is_LSP_enabled() -> bool:
+    return console.quiet

codeflash/lsp/server.py

@@ -52,5 +52,6 @@ def initialize_optimizer(self, config_file: Path) -> None:
 
         args = parse_args()
         args.config_file = config_file
+        args.no_pr = True  # LSP server should not create PRs
         args = process_pyproject_config(args)
         self.optimizer = Optimizer(args)

codeflash/optimization/optimizer.py

@@ -12,6 +12,7 @@
 from codeflash.api.aiservice import AiServiceClient, LocalAiServiceClient
 from codeflash.cli_cmds.console import console, logger, progress_bar
 from codeflash.code_utils import env_utils
+from codeflash.code_utils.code_utils import cleanup_paths
 from codeflash.code_utils.env_utils import get_pr_number
 from codeflash.either import is_successful
 from codeflash.models.models import ValidCode
@@ -248,10 +249,10 @@ def run(self) -> None:
             return
         if not env_utils.check_formatter_installed(self.args.formatter_cmds):
             return
-
         if self.args.no_draft and is_pr_draft():
             logger.warning("PR is in draft mode, skipping optimization")
             return
+        cleanup_paths(Optimizer.find_leftover_instrumented_test_files(self.test_cfg.tests_root))
 
         function_optimizer = None
         file_to_funcs_to_optimize, num_optimizable_functions = self.get_optimizable_functions()
@@ -326,9 +327,27 @@ def run(self) -> None:
 
             self.cleanup_temporary_paths()
 
-    def cleanup_temporary_paths(self) -> None:
-        from codeflash.code_utils.code_utils import cleanup_paths
+    @staticmethod
+    def find_leftover_instrumented_test_files(test_root: Path) -> list[Path]:
+        """Search for all paths within the test_root that match the following patterns.
 
+        - 'test.*__perf_test_{0,1}.py'
+        - 'test_.*__unit_test_{0,1}.py'
+        - 'test_.*__perfinstrumented.py'
+        - 'test_.*__perfonlyinstrumented.py'
+        Returns a list of matching file paths.
+        """
+        import re
+
+        pattern = re.compile(
+            r"(?:test.*__perf_test_\d?\.py|test_.*__unit_test_\d?\.py|test_.*__perfinstrumented\.py|test_.*__perfonlyinstrumented\.py)$"
+        )
+
+        return [
+            file_path for file_path in test_root.rglob("*") if file_path.is_file() and pattern.match(file_path.name)
+        ]
+
+    def cleanup_temporary_paths(self) -> None:
         if self.current_function_optimizer:
             self.current_function_optimizer.cleanup_generated_files()
 

codeflash/verification/concolic_testing.py

@@ -10,6 +10,7 @@
 from codeflash.cli_cmds.console import console, logger
 from codeflash.code_utils.compat import SAFE_SYS_EXECUTABLE
 from codeflash.code_utils.concolic_utils import clean_concolic_tests
+from codeflash.code_utils.env_utils import is_LSP_enabled
 from codeflash.code_utils.static_analysis import has_typed_parameters
 from codeflash.discovery.discover_unit_tests import discover_unit_tests
 from codeflash.telemetry.posthog_cf import ph
@@ -28,6 +29,11 @@ def generate_concolic_tests(
     start_time = time.perf_counter()
     function_to_concolic_tests = {}
     concolic_test_suite_code = ""
+
+    if is_LSP_enabled():
+        logger.debug("Skipping concolic test generation in LSP mode")
+        return function_to_concolic_tests, concolic_test_suite_code
+
     if (
         test_cfg.concolic_test_root_dir
         and isinstance(function_to_optimize_ast, (ast.FunctionDef, ast.AsyncFunctionDef))
@@ -43,7 +49,7 @@ def generate_concolic_tests(
                     "crosshair",
                     "cover",
                     "--example_output_format=pytest",
-                    "--per_condition_timeout=64",
+                    "--per_condition_timeout=20",
                     ".".join(
                         [
                             function_to_optimize.file_path.relative_to(args.project_root)