tidy up

Author: KRRT7

codeflash/code_utils/env_utils.py

@@ -2,6 +2,8 @@
 
 import json
 import os
+import shlex
+import shutil
 import tempfile
 from functools import lru_cache
 from pathlib import Path
@@ -14,21 +16,41 @@
 
 
 def check_formatter_installed(formatter_cmds: list[str], exit_on_failure: bool = True) -> bool:  # noqa
-    return_code = True
-    if formatter_cmds[0] == "disabled":
-        return return_code
+    if not formatter_cmds or formatter_cmds[0] == "disabled":
+        return True
+
+    first_cmd = formatter_cmds[0]
+    cmd_tokens = shlex.split(first_cmd) if isinstance(first_cmd, str) else [first_cmd]
+
+    if not cmd_tokens:
+        return True
+
+    exe_name = cmd_tokens[0]
+    command_str = " ".join(formatter_cmds).replace(" $file", "")
+
+    if shutil.which(exe_name) is None:
+        logger.error(
+            f"Could not find formatter: {command_str}\n"
+            f"Please install it or update 'formatter-cmds' in your codeflash configuration"
+        )
+        return False
+
     tmp_code = """print("hello world")"""
-    with tempfile.TemporaryDirectory() as tmpdir:
-        tmp_file = Path(tmpdir) / "test_codeflash_formatter.py"
-        tmp_file.write_text(tmp_code, encoding="utf-8")
-        try:
-            format_code(formatter_cmds, tmp_file, print_status=False, exit_on_failure=exit_on_failure)
-        except Exception:
-            exit_with_message(
-                "⚠️ Codeflash requires a code formatter to be installed in your environment, but none was found. Please install a supported formatter, verify the formatter-cmds in your codeflash pyproject.toml config and try again.",
-                error_on_exit=True,
-            )
-        return return_code
+    try:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmp_file = Path(tmpdir) / "test_codeflash_formatter.py"
+            tmp_file.write_text(tmp_code, encoding="utf-8")
+            format_code(formatter_cmds, tmp_file, print_status=False, exit_on_failure=False)
+            return True
+    except FileNotFoundError:
+        logger.error(
+            f"Could not find formatter: {command_str}\n"
+            f"Please install it or update 'formatter-cmds' in your codeflash configuration"
+        )
+        return False
+    except Exception as e:
+        logger.error(f"Formatter failed to run: {command_str}\nError: {e}")
+        return False
 
 
 @lru_cache(maxsize=1)
@@ -138,4 +160,4 @@ def is_ci() -> bool:
 def is_pr_draft() -> bool:
     """Check if the PR is draft. in the github action context."""
     event = get_cached_gh_event_data()
-    return bool(event.get("pull_request", {}).get("draft", False))
+    return bool(event.get("pull_request", {}).get("draft", False))

codeflash/verification/hypothesis_testing.py

@@ -138,7 +138,7 @@ def generate_hypothesis_tests(
             qualified_function_path = get_qualified_function_path(
                 function_to_optimize.file_path, args.project_root, function_to_optimize.qualified_name
             )
-            logger.info(f"command: hypothesis write {function_to_optimize.file_path.stem}")
+            logger.info(f"command: hypothesis write {qualified_function_path}")
 
             hypothesis_result = subprocess.run(
                 ["hypothesis", "write", qualified_function_path],
@@ -182,8 +182,9 @@ def visit_FunctionDef(self, node):  # noqa: ANN001, ANN202
             unparsed = ast.unparse(modified_tree)
 
             hypothesis_test_suite_code = format_code(
-                make_hypothesis_tests_deterministic(remove_functions_with_only_any_type(unparsed)),
+                args.formatter_cmds,
                 function_to_optimize.file_path,
+                optimized_code=make_hypothesis_tests_deterministic(remove_functions_with_only_any_type(unparsed)),
             )
             with hypothesis_path.open("w", encoding="utf-8") as f:
                 f.write(hypothesis_test_suite_code)