refactoring

Author: aseembits93

codeflash/code_utils/env_utils.py

@@ -2,9 +2,23 @@
 from functools import lru_cache
 from typing import Optional
 
+import click
+
 from codeflash.cli_cmds.console import logger
 from codeflash.code_utils.shell_utils import read_api_key_from_shell_config
+from codeflash.verification.test_runner import execute_test_subprocess
+
 
+def check_formatter_installed(formatter_cmds: list[str]) -> bool:
+    cmd_parts = formatter_cmds[0].split(" ")
+    if "black" in cmd_parts or "ruff" in cmd_parts:
+        formatter = cmd_parts[0]
+        try:
+            execute_test_subprocess([formatter])
+        except (FileNotFoundError, NotADirectoryError):
+            click.echo(f"⚠️ Formatter not found: {formatter}, please ensure it is installed")
+            return False
+    return True
 
 @lru_cache(maxsize=1)
 def get_codeflash_api_key() -> str:

codeflash/optimization/optimizer.py

@@ -2,15 +2,12 @@
 
 import ast
 import os
-import sys
 import tempfile
 import time
 from collections import defaultdict
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-import click
-
 from codeflash.api.aiservice import AiServiceClient, LocalAiServiceClient
 from codeflash.benchmarking.instrument_codeflash_trace import instrument_codeflash_trace_decorator
 from codeflash.benchmarking.plugin.plugin import CodeFlashBenchmarkPlugin
@@ -28,7 +25,6 @@
 from codeflash.models.models import BenchmarkKey, ValidCode
 from codeflash.optimization.function_optimizer import FunctionOptimizer
 from codeflash.telemetry.posthog_cf import ph
-from codeflash.verification.test_runner import execute_test_subprocess
 from codeflash.verification.verification_utils import TestConfig
 
 if TYPE_CHECKING:
@@ -80,6 +76,7 @@ def create_function_optimizer(
         )
 
     def run(self) -> None:
+<<<<<<< Updated upstream
         if self.args.formatter_cmds[0].startswith("black") or self.args.formatter_cmds[0].startswith("ruff"):
             formatter = self.args.formatter_cmds[0].split(" ")[0]
             try:
@@ -88,11 +85,15 @@ def run(self) -> None:
                 click.echo(f"⚠️ Formatter not found: {formatter}, please ensure it is installed. Exiting...")
                 sys.exit(1)
 
+=======
+>>>>>>> Stashed changes
         ph("cli-optimize-run-start")
         logger.info("Running optimizer.")
         console.rule()
         if not env_utils.ensure_codeflash_api_key():
             return
+        if not env_utils.check_formatter_installed():
+            return
         function_optimizer = None
         file_to_funcs_to_optimize: dict[Path, list[FunctionToOptimize]]
         num_optimizable_functions: int