wip

Author: Codeflash Bot

codeflash/code_utils/formatter.py

@@ -96,18 +96,19 @@ def is_diff_line(line: str) -> bool:
     return len(diff_lines)
 
 
-def format_generated_code(generated_test_source: str, formatter_cmds: Union[list[str], None] = None) -> str:
-    formatter_name = formatter_cmds[0].lower() if formatter_cmds else "disabled"
-    if formatter_name == "disabled":
-        return re.sub(r"\n{2,}", "\n\n", generated_test_source)
-    # try running formatter, if nothing changes (could be due to formatting failing or no actual formatting needed)
-    original_temp, test_dir_str, exit_on_failure = None, None, True
-    formatted_temp, formatted_code, changed = apply_formatter_cmds(
-        formatter_cmds, original_temp, test_dir_str, print_status=False, exit_on_failure=exit_on_failure
-    )
-    if not changed:
-        return re.sub(r"\n{2,}", "\n\n", formatted_code)
-    return formatted_code
+def format_generated_code(generated_test_source: str) -> str:
+    return re.sub(r"\n{2,}", "\n\n", generated_test_source)
+    # formatter_name = formatter_cmds[0].lower() if formatter_cmds else "disabled"
+    # if formatter_name == "disabled":
+    #     return re.sub(r"\n{2,}", "\n\n", generated_test_source)
+    # # try running formatter, if nothing changes (could be due to formatting failing or no actual formatting needed)
+    # original_temp, test_dir_str, exit_on_failure = None, None, True
+    # formatted_temp, formatted_code, changed = apply_formatter_cmds(
+    #     formatter_cmds, original_temp, test_dir_str, print_status=False, exit_on_failure=exit_on_failure
+    # )
+    # if not changed:
+    #     return re.sub(r"\n{2,}", "\n\n", formatted_code)
+    # return formatted_code
 
 
 def format_code(

codeflash/optimization/function_optimizer.py

@@ -55,7 +55,7 @@
     remove_functions_from_generated_tests,
 )
 from codeflash.code_utils.env_utils import get_pr_number
-from codeflash.code_utils.formatter import format_code, sort_imports
+from codeflash.code_utils.formatter import format_code, format_generated_code, sort_imports
 from codeflash.code_utils.git_utils import git_root_dir
 from codeflash.code_utils.instrument_existing_tests import inject_profiling_into_existing_test
 from codeflash.code_utils.line_profile_utils import add_decorator_imports
@@ -1413,11 +1413,13 @@ def process_review(
 
         generated_tests_str = ""
         for test in generated_tests.generated_tests:
-            generated_tests_str += f"```python\n{test.generated_original_test_source}\n```"
+            formatted_generated_test = format_generated_code(test.generated_original_test_source)
+            generated_tests_str += f"```python\n{formatted_generated_test}\n```"
             generated_tests_str += "\n\n"
 
         if concolic_test_str:
-            generated_tests_str += f"```python\n{concolic_test_str}\n```\n\n"
+            formatted_generated_test = format_generated_code(concolic_test_str)
+            generated_tests_str += f"```python\n{formatted_generated_test}\n```\n\n"
 
         existing_tests, replay_tests, concolic_tests = existing_tests_source_for(
             self.function_to_optimize.qualified_name_with_modules_from_root(self.project_root),