fix precommit later

Author: aseembits93

codeflash/api/aiservice.py

@@ -532,7 +532,7 @@ def generate_regression_tests(  # noqa: D417
             ph("cli-testgen-error-response", {"response_status_code": response.status_code, "error": response.text})
             return None
 
-    def get_optimization_impact(
+    def get_optimization_review(
         self,
         original_code: dict[Path, str],
         new_code: dict[Path, str],
@@ -546,7 +546,7 @@ def get_optimization_impact(
         concolic_tests: str,  # noqa: ARG002
         calling_fn_details: str,
     ) -> tuple[str, str]:
-        """Compute the optimization impact of current Pull Request.
+        """Compute the optimization review of current Pull Request.
 
         Args:
         original_code: dict -> data structure mapping file paths to function definition for original code
@@ -563,7 +563,7 @@ def get_optimization_impact(
 
         Returns:
         -------
-        - 'high' or 'low' optimization impact
+        - 'high', 'medium' or 'low' optimization review
 
         """
         diff_str = "\n".join(
@@ -579,7 +579,7 @@ def get_optimization_impact(
             ]
         )
         code_diff = f"```diff\n{diff_str}\n```"
-        logger.info("!lsp|Computing Optimization Impact…")
+        logger.info("!lsp|Computing Optimization Review…")
         payload = {
             "code_diff": code_diff,
             "explanation": explanation.raw_explanation_message,
@@ -597,19 +597,19 @@ def get_optimization_impact(
         }
         console.rule()
         try:
-            response = self.make_ai_service_request("/optimization_impact", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/optimization_review", payload=payload, timeout=600)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimization refinements: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})
             return ("", str(e))
 
         if response.status_code == 200:
-            return (cast("str", response.json()["impact"]), cast("str", response.json()["impact_explanation"]))
+            return (cast("str", response.json()["review"]), cast("str", response.json()["review_explanation"]))
         try:
             error = cast("str", response.json()["error"])
         except Exception:
             error = response.text
-        logger.error(f"Error generating impact candidates: {response.status_code} - {error}")
+        logger.error(f"Error generating optimization review: {response.status_code} - {error}")
         ph("cli-optimize-error-response", {"response_status_code": response.status_code, "error": error})
         console.rule()
         return ("", error)

codeflash/api/cfapi.py

@@ -130,7 +130,7 @@ def suggest_changes(
     coverage_message: str,
     replay_tests: str = "",
     concolic_tests: str = "",
-    optimization_impact: str = "",
+    optimization_review: str = "",
 ) -> Response:
     """Suggest changes to a pull request.
 
@@ -156,7 +156,7 @@ def suggest_changes(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_impact,
+        "optimizationImpact": optimization_review,  # impact keyword left for legacy reasons, touches js/ts code
     }
     return make_cfapi_request(endpoint="/suggest-pr-changes", method="POST", payload=payload)
 
@@ -173,7 +173,7 @@ def create_pr(
     coverage_message: str,
     replay_tests: str = "",
     concolic_tests: str = "",
-    optimization_impact: str = "",
+    optimization_review: str = "",
 ) -> Response:
     """Create a pull request, targeting the specified branch. (usually 'main').
 
@@ -198,7 +198,7 @@ def create_pr(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_impact,
+        "optimizationImpact": optimization_review,  # Impact keyword left for legacy reasons, it touches js/ts codebase
     }
     return make_cfapi_request(endpoint="/create-pr", method="POST", payload=payload)
 
@@ -214,7 +214,7 @@ def create_staging(
     replay_tests: str,
     concolic_tests: str,
     root_dir: Path,
-    optimization_impact: str = "",
+    optimization_review: str = "",
 ) -> Response:
     """Create a staging pull request, targeting the specified branch. (usually 'staging').
 
@@ -255,7 +255,7 @@ def create_staging(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_impact,
+        "optimizationImpact": optimization_review,  # Impact keyword left for legacy reasons, it touches js/ts codebase
     }
 
     return make_cfapi_request(endpoint="/create-staging", method="POST", payload=payload)

codeflash/code_utils/code_extractor.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import ast
-import time
 from dataclasses import dataclass
 from itertools import chain
 from pathlib import Path
@@ -14,7 +13,7 @@
 from libcst.helpers import calculate_module_and_package
 
 from codeflash.cli_cmds.console import logger
-from codeflash.code_utils.config_consts import MAX_CONTEXT_LEN_IMPACT, TIME_LIMIT_FOR_OPT_IMPACT
+from codeflash.code_utils.config_consts import MAX_CONTEXT_LEN_REVIEW
 from codeflash.models.models import CodePosition, FunctionParent
 
 if TYPE_CHECKING:
@@ -42,7 +41,7 @@ def visit_FunctionDef(self, node: cst.FunctionDef) -> Optional[bool]:  # noqa: A
     def leave_FunctionDef(self, original_node: cst.FunctionDef) -> None:  # noqa: ARG002
         self.scope_depth -= 1
 
-    def visit_ClassDef(self, node: cst.ClassDef) -> Optional[bool]:
+    def visit_ClassDef(self, node: cst.ClassDef) -> Optional[bool]:  # noqa: ARG002
         self.scope_depth += 1
         return True
 
@@ -86,7 +85,7 @@ def __init__(self, new_assignments: dict[str, cst.Assign], new_assignment_order:
     def visit_FunctionDef(self, node: cst.FunctionDef) -> None:  # noqa: ARG002
         self.scope_depth += 1
 
-    def leave_FunctionDef(self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef) -> cst.FunctionDef:
+    def leave_FunctionDef(self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef) -> cst.FunctionDef:  # noqa: ARG002
         self.scope_depth -= 1
         return updated_node
 
@@ -100,7 +99,7 @@ def leave_ClassDef(self, original_node: cst.ClassDef, updated_node: cst.ClassDef
     def visit_If(self, node: cst.If) -> None:  # noqa: ARG002
         self.if_else_depth += 1
 
-    def leave_If(self, original_node: cst.If, updated_node: cst.If) -> cst.If:
+    def leave_If(self, original_node: cst.If, updated_node: cst.If) -> cst.If:  # noqa: ARG002
         self.if_else_depth -= 1
         return updated_node
 
@@ -148,7 +147,7 @@ def _find_insertion_index(self, updated_node: cst.Module) -> int:
 
         return insert_index
 
-    def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:
+    def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:  # noqa: ARG002
         # Add any new assignments that weren't in the original file
         new_statements = list(updated_node.body)
 
@@ -192,20 +191,20 @@ def __init__(self) -> None:
         self.global_statements = []
         self.in_function_or_class = False
 
-    def visit_ClassDef(self, node: cst.ClassDef) -> bool:
+    def visit_ClassDef(self, node: cst.ClassDef) -> bool:  # noqa: ARG002
         # Don't visit inside classes
         self.in_function_or_class = True
         return False
 
-    def leave_ClassDef(self, original_node: cst.ClassDef) -> None:
+    def leave_ClassDef(self, original_node: cst.ClassDef) -> None:  # noqa: ARG002
         self.in_function_or_class = False
 
-    def visit_FunctionDef(self, node: cst.FunctionDef) -> bool:
+    def visit_FunctionDef(self, node: cst.FunctionDef) -> bool:  # noqa: ARG002
         # Don't visit inside functions
         self.in_function_or_class = True
         return False
 
-    def leave_FunctionDef(self, original_node: cst.FunctionDef) -> None:
+    def leave_FunctionDef(self, original_node: cst.FunctionDef) -> None:  # noqa: ARG002
         self.in_function_or_class = False
 
     def visit_SimpleStatementLine(self, node: cst.SimpleStatementLine) -> None:
@@ -286,16 +285,16 @@ def visit_Module(self, node: cst.Module) -> None:
         self.depth = 0
         self._collect_imports_from_block(node)
 
-    def visit_FunctionDef(self, node: cst.FunctionDef) -> None:
+    def visit_FunctionDef(self, node: cst.FunctionDef) -> None:  # noqa: ARG002
         self.depth += 1
 
-    def leave_FunctionDef(self, node: cst.FunctionDef) -> None:
+    def leave_FunctionDef(self, node: cst.FunctionDef) -> None:  # noqa: ARG002
         self.depth -= 1
 
-    def visit_ClassDef(self, node: cst.ClassDef) -> None:
+    def visit_ClassDef(self, node: cst.ClassDef) -> None:  # noqa: ARG002
         self.depth += 1
 
-    def leave_ClassDef(self, node: cst.ClassDef) -> None:
+    def leave_ClassDef(self, node: cst.ClassDef) -> None:  # noqa: ARG002
         self.depth -= 1
 
     def visit_If(self, node: cst.If) -> None:
@@ -329,7 +328,7 @@ def leave_SimpleStatementLine(
 
         return cst.Module(body=[updated_node])
 
-    def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:
+    def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:  # noqa: ARG002
         # If there were no imports, add at the beginning of the module
         if self.last_import_line == 0 and not self.inserted:
             updated_body = list(updated_node.body)
@@ -1058,13 +1057,10 @@ def find_function_calls(source_code: str, target_function_name: str, target_file
 def find_occurances(
     qualified_name: str, file_path: str, fn_matches: list[Path], project_root: Path, tests_root: Path
 ) -> list[str]:  # max chars for context
-    start_time = time.time()
     context_len = 0
     fn_call_context = ""
     for cur_file in fn_matches:
-        if time.time() - start_time > TIME_LIMIT_FOR_OPT_IMPACT:
-            break
-        if context_len > MAX_CONTEXT_LEN_IMPACT:
+        if context_len > MAX_CONTEXT_LEN_REVIEW:
             break
         cur_file_path = Path(cur_file)
         # exclude references in tests
@@ -1151,7 +1147,7 @@ def get_fn_references_jedi(
         return []
 
 
-def get_opt_impact_metrics(
+def get_opt_review_metrics(
     source_code: str, file_path: Path, qualified_name: str, project_root: Path, tests_root: Path
 ) -> str:
     try:

codeflash/code_utils/config_consts.py

@@ -35,5 +35,4 @@
 N_TESTS_TO_GENERATE_EFFECTIVE = N_TESTS_TO_GENERATE_LSP if _IS_LSP_ENABLED else N_TESTS_TO_GENERATE
 TOTAL_LOOPING_TIME_EFFECTIVE = TOTAL_LOOPING_TIME_LSP if _IS_LSP_ENABLED else TOTAL_LOOPING_TIME
 
-MAX_CONTEXT_LEN_IMPACT = 1000
-TIME_LIMIT_FOR_OPT_IMPACT = 10  # in sec
+MAX_CONTEXT_LEN_REVIEW = 1000

codeflash/models/models.py

@@ -31,13 +31,6 @@
 from codeflash.verification.comparator import comparator
 
 
-@dataclass
-class ImpactMetrics:
-    cyclomatic_complexity: Optional[int] = None
-    cyclomatic_complexity_rating: Optional[str] = None
-    calling_fns: Optional[str] = None
-
-
 @dataclass(frozen=True)
 class AIServiceRefinerRequest:
     optimization_id: str

codeflash/optimization/function_optimizer.py

@@ -23,7 +23,7 @@
 from codeflash.benchmarking.utils import process_benchmark_data
 from codeflash.cli_cmds.console import code_print, console, logger, lsp_log, progress_bar
 from codeflash.code_utils import env_utils
-from codeflash.code_utils.code_extractor import get_opt_impact_metrics
+from codeflash.code_utils.code_extractor import get_opt_review_metrics
 from codeflash.code_utils.code_replacer import (
     add_custom_marker_to_all_tests,
     modify_autouse_fixture,
@@ -1461,36 +1461,21 @@ def process_review(
 
         if raise_pr or staging_review:
             data["root_dir"] = git_root_dir()
-            calling_fn_details = get_opt_impact_metrics(
+            calling_fn_details = get_opt_review_metrics(
                 self.function_to_optimize_source_code,
                 self.function_to_optimize.file_path,
                 self.function_to_optimize.qualified_name,
                 self.project_root,
                 self.test_cfg.tests_root,
             )
-            opt_impact_response = ""
+            opt_review_response = ""
             try:
-                opt_impact_response = self.aiservice_client.get_optimization_impact(
+                opt_review_response = self.aiservice_client.get_optimization_review(
                     **data, calling_fn_details=calling_fn_details
                 )
             except Exception as e:
-                logger.debug(f"optimization impact response failed, investigate {e}")
-            data["optimization_impact"] = opt_impact_response[0]
-            new_explanation_with_opt_explanation = Explanation(
-                raw_explanation_message=f"Impact: {opt_impact_response[0]}\n Impact_explanation: {opt_impact_response[1]} END OF IMPACT EXPLANATION\nCALLING CONTEXT \n{calling_fn_details}\nEND OF CALLING CONTEXT\n"
-                + new_explanation.raw_explanation_message,
-                winning_behavior_test_results=explanation.winning_behavior_test_results,
-                winning_benchmarking_test_results=explanation.winning_benchmarking_test_results,
-                original_runtime_ns=explanation.original_runtime_ns,
-                best_runtime_ns=explanation.best_runtime_ns,
-                function_name=explanation.function_name,
-                file_path=explanation.file_path,
-                benchmark_details=explanation.benchmark_details,
-                original_async_throughput=explanation.original_async_throughput,
-                best_async_throughput=explanation.best_async_throughput,
-            )
-            best_optimization.explanation_v2 = new_explanation_with_opt_explanation.explanation_message()
-            data["explanation"] = new_explanation_with_opt_explanation
+                logger.debug(f"optimization review response failed, investigate {e}")
+            data["optimization_review_response"] = opt_review_response[0]
         if raise_pr and not staging_review:
             data["git_remote"] = self.args.git_remote
             check_create_pr(**data)

codeflash/result/create_pr.py

@@ -185,7 +185,7 @@ def check_create_pr(
     concolic_tests: str,
     root_dir: Path,
     git_remote: Optional[str] = None,
-    optimization_impact: str = "",
+    optimization_review: str = "",
 ) -> None:
     pr_number: Optional[int] = env_utils.get_pr_number()
     git_repo = git.Repo(search_parent_directories=True)
@@ -227,7 +227,7 @@ def check_create_pr(
             coverage_message=coverage_message,
             replay_tests=replay_tests,
             concolic_tests=concolic_tests,
-            optimization_impact=optimization_impact,
+            optimization_review=optimization_review,
         )
         if response.ok:
             logger.info(f"Suggestions were successfully made to PR #{pr_number}")
@@ -277,7 +277,7 @@ def check_create_pr(
             coverage_message=coverage_message,
             replay_tests=replay_tests,
             concolic_tests=concolic_tests,
-            optimization_impact=optimization_impact,
+            optimization_review=optimization_review,
         )
         if response.ok:
             pr_id = response.text

pyproject.toml

@@ -44,7 +44,6 @@ dependencies = [
     "pygls>=1.3.1",
     "codeflash-benchmark",
     "filelock",
-    "radon", #for code complexity metrics
 ]
 
 [project.urls]