Merge branch 'main' into cf-842

Author: aseembits93

codeflash/cli_cmds/cmd_init.py

@@ -1005,6 +1005,8 @@ def get_formatter_cmds(formatter: str) -> list[str]:
         return ["your-formatter $file"]
     if formatter in {"don't use a formatter", "disabled"}:
         return ["disabled"]
+    if " && " in formatter:
+        return formatter.split(" && ")
     return [formatter]
 
 

codeflash/lsp/beta.py

@@ -205,11 +205,25 @@ def get_config_suggestions(_params: any) -> dict[str, any]:
     test_framework_suggestions, default_test_framework = get_suggestions(CommonSections.test_framework)
     formatter_suggestions, default_formatter = get_suggestions(CommonSections.formatter_cmds)
     get_valid_subdirs.cache_clear()
+
+    configured_module_root = Path(server.args.module_root).relative_to(Path.cwd()) if server.args.module_root else None
+    configured_tests_root = Path(server.args.tests_root).relative_to(Path.cwd()) if server.args.tests_root else None
+    configured_test_framework = server.args.test_framework if server.args.test_framework else None
+
+    configured_formatter = ""
+    if isinstance(server.args.formatter_cmds, list):
+        configured_formatter = " && ".join([cmd.strip() for cmd in server.args.formatter_cmds])
+    elif isinstance(server.args.formatter_cmds, str):
+        configured_formatter = server.args.formatter_cmds.strip()
+
     return {
-        "module_root": {"choices": module_root_suggestions, "default": default_module_root},
-        "tests_root": {"choices": tests_root_suggestions, "default": default_tests_root},
-        "test_framework": {"choices": test_framework_suggestions, "default": default_test_framework},
-        "formatter_cmds": {"choices": formatter_suggestions, "default": default_formatter},
+        "module_root": {"choices": module_root_suggestions, "default": configured_module_root or default_module_root},
+        "tests_root": {"choices": tests_root_suggestions, "default": configured_tests_root or default_tests_root},
+        "test_framework": {
+            "choices": test_framework_suggestions,
+            "default": configured_test_framework or default_test_framework,
+        },
+        "formatter_cmds": {"choices": formatter_suggestions, "default": configured_formatter or default_formatter},
     }
 
 

codeflash/models/models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections import defaultdict
+from collections import Counter, defaultdict
 from typing import TYPE_CHECKING
 
 from rich.tree import Tree
@@ -675,6 +675,16 @@ def total_passed_runtime(self) -> int:
             [min(usable_runtime_data) for _, usable_runtime_data in self.usable_runtime_data_by_test_case().items()]
         )
 
+    def file_to_no_of_tests(self, test_functions_to_remove: list[str]) -> Counter[Path]:
+        map_gen_test_file_to_no_of_tests = Counter()
+        for gen_test_result in self.test_results:
+            if (
+                gen_test_result.test_type == TestType.GENERATED_REGRESSION
+                and gen_test_result.id.test_function_name not in test_functions_to_remove
+            ):
+                map_gen_test_file_to_no_of_tests[gen_test_result.file_name] += 1
+        return map_gen_test_file_to_no_of_tests
+
     def __iter__(self) -> Iterator[FunctionTestInvocation]:
         return iter(self.test_results)
 

codeflash/optimization/function_optimizer.py

@@ -1402,6 +1402,9 @@ def process_review(
         generated_tests = remove_functions_from_generated_tests(
             generated_tests=generated_tests, test_functions_to_remove=test_functions_to_remove
         )
+        map_gen_test_file_to_no_of_tests = original_code_baseline.behavior_test_results.file_to_no_of_tests(
+            test_functions_to_remove
+        )
 
         original_runtime_by_test = original_code_baseline.benchmarking_test_results.usable_runtime_data_by_test_case()
         optimized_runtime_by_test = (
@@ -1414,11 +1417,12 @@ def process_review(
 
         generated_tests_str = ""
         for test in generated_tests.generated_tests:
-            formatted_generated_test = format_generated_code(
-                test.generated_original_test_source, self.args.formatter_cmds
-            )
-            generated_tests_str += f"```python\n{formatted_generated_test}\n```"
-            generated_tests_str += "\n\n"
+            if map_gen_test_file_to_no_of_tests[test.behavior_file_path] > 0:
+                formatted_generated_test = format_generated_code(
+                    test.generated_original_test_source, self.args.formatter_cmds
+                )
+                generated_tests_str += f"```python\n{formatted_generated_test}\n```"
+                generated_tests_str += "\n\n"
 
         if concolic_test_str:
             formatted_generated_test = format_generated_code(concolic_test_str, self.args.formatter_cmds)
@@ -1540,7 +1544,7 @@ def process_review(
                 trace_id=self.function_trace_id, is_optimization_found=best_optimization is not None
             )
 
-        # If worktree mode, do not revert code and helpers,, otherwise we would have an empty diff when writing the patch in the lsp
+        # If worktree mode, do not revert code and helpers, otherwise we would have an empty diff when writing the patch in the lsp
         if self.args.worktree:
             return