Merge branch 'main' into lsp/task-execution-context

Author: mohammedahmed18

codeflash/LICENSE

@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             CodeFlash Inc.
-Licensed Work:        Codeflash Client version 0.17.x
+Licensed Work:        Codeflash Client version 0.18.x
                       The Licensed Work is (c) 2024 CodeFlash Inc.
 
 Additional Use Grant: None. Production use of the Licensed Work is only permitted
@@ -13,7 +13,7 @@ Additional Use Grant: None. Production use of the Licensed Work is only permitte
                       Platform. Please visit codeflash.ai for further
                       information.
 
-Change Date:          2029-09-23
+Change Date:          2029-10-21
 
 Change License:       MIT
 

codeflash/api/aiservice.py

@@ -144,7 +144,7 @@ def optimize_python_code(  # noqa: D417
         logger.info("!lsp|Generating optimized candidates…")
         console.rule()
         try:
-            response = self.make_ai_service_request("/optimize", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/optimize", payload=payload, timeout=60)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimized candidates: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})
@@ -209,7 +209,7 @@ def optimize_python_code_line_profiler(  # noqa: D417
             console.rule()
             return []
         try:
-            response = self.make_ai_service_request("/optimize-line-profiler", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/optimize-line-profiler", payload=payload, timeout=60)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimized candidates: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})
@@ -261,7 +261,7 @@ def optimize_python_code_refinement(self, request: list[AIServiceRefinerRequest]
         logger.debug(f"Refining {len(request)} optimizations…")
         console.rule()
         try:
-            response = self.make_ai_service_request("/refinement", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/refinement", payload=payload, timeout=120)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimization refinements: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})
@@ -506,7 +506,7 @@ def generate_regression_tests(  # noqa: D417
             "is_async": function_to_optimize.is_async,
         }
         try:
-            response = self.make_ai_service_request("/testgen", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/testgen", payload=payload, timeout=90)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating tests: {e}")
             ph("cli-testgen-error-caught", {"error": str(e)})
@@ -597,7 +597,7 @@ def get_optimization_review(
         }
         console.rule()
         try:
-            response = self.make_ai_service_request("/optimization_review", payload=payload, timeout=600)
+            response = self.make_ai_service_request("/optimization_review", payload=payload, timeout=120)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimization refinements: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})

codeflash/api/cfapi.py

@@ -28,10 +28,12 @@
 
 if os.environ.get("CODEFLASH_CFAPI_SERVER", "prod").lower() == "local":
     CFAPI_BASE_URL = "http://localhost:3001"
+    CFWEBAPP_BASE_URL = "http://localhost:3000"
     logger.info(f"Using local CF API at {CFAPI_BASE_URL}.")
     console.rule()
 else:
     CFAPI_BASE_URL = "https://app.codeflash.ai"
+    CFWEBAPP_BASE_URL = "https://app.codeflash.ai"
 
 
 def make_cfapi_request(
@@ -156,7 +158,7 @@ def suggest_changes(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_review,  # impact keyword left for legacy reasons, touches js/ts code
+        "optimizationReview": optimization_review,  # impact keyword left for legacy reasons, touches js/ts code
     }
     return make_cfapi_request(endpoint="/suggest-pr-changes", method="POST", payload=payload)
 
@@ -198,7 +200,7 @@ def create_pr(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_review,  # Impact keyword left for legacy reasons, it touches js/ts codebase
+        "optimizationReview": optimization_review,  # Impact keyword left for legacy reasons, it touches js/ts codebase
     }
     return make_cfapi_request(endpoint="/create-pr", method="POST", payload=payload)
 
@@ -255,7 +257,7 @@ def create_staging(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
-        "optimizationImpact": optimization_review,  # Impact keyword left for legacy reasons, it touches js/ts codebase
+        "optimizationReview": 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/context/unused_definition_remover.py

@@ -679,7 +679,7 @@ def detect_unused_helper_functions(
         imported_names_map = _analyze_imports_in_optimized_code(optimized_ast, code_context)
 
         # Extract all function calls in the entrypoint function
-        called_function_names = set()
+        called_function_names = {function_to_optimize.function_name}
         for node in ast.walk(entrypoint_function_ast):
             if isinstance(node, ast.Call):
                 if isinstance(node.func, ast.Name):

codeflash/optimization/function_optimizer.py

@@ -19,7 +19,7 @@
 from rich.tree import Tree
 
 from codeflash.api.aiservice import AiServiceClient, AIServiceRefinerRequest, LocalAiServiceClient
-from codeflash.api.cfapi import CFAPI_BASE_URL, add_code_context_hash, create_staging, mark_optimization_success
+from codeflash.api.cfapi import CFWEBAPP_BASE_URL, add_code_context_hash, create_staging, mark_optimization_success
 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
@@ -1458,7 +1458,7 @@ def process_review(
 
         raise_pr = not self.args.no_pr
         staging_review = self.args.staging_review
-
+        opt_review_response = ""
         if raise_pr or staging_review:
             data["root_dir"] = git_root_dir()
             calling_fn_details = get_opt_review_metrics(
@@ -1468,21 +1468,21 @@ def process_review(
                 self.project_root,
                 self.test_cfg.tests_root,
             )
-            opt_review_response = ""
             try:
                 opt_review_response = self.aiservice_client.get_optimization_review(
                     **data, calling_fn_details=calling_fn_details
                 )
             except Exception as e:
                 logger.debug(f"optimization review response failed, investigate {e}")
             data["optimization_review"] = opt_review_response
-        if raise_pr and not staging_review:
+        if raise_pr and not staging_review and opt_review_response != "low":
             data["git_remote"] = self.args.git_remote
             check_create_pr(**data)
         elif staging_review:
             response = create_staging(**data)
             if response.status_code == 200:
-                staging_url = f"{CFAPI_BASE_URL}/review-optimizations/{self.function_trace_id[:-4] + exp_type if self.experiment_id else self.function_trace_id}"
+                trace_id = self.function_trace_id[:-4] + exp_type if self.experiment_id else self.function_trace_id
+                staging_url = f"{CFWEBAPP_BASE_URL}/review-optimizations/{trace_id}"
                 console.print(
                     Panel(
                         f"[bold green]✅ Staging created:[/bold green]\n[link={staging_url}]{staging_url}[/link]",

codeflash/version.py

@@ -1,2 +1,2 @@
 # These version placeholders will be replaced by uv-dynamic-versioning during build.
-__version__ = "0.17.3"
+__version__ = "0.18.1"

tests/test_unused_helper_revert.py

@@ -1959,6 +1959,73 @@ async def async_entrypoint(n):
         shutil.rmtree(temp_dir, ignore_errors=True)
 
 
+def test_recursive_helper_function_not_detected_as_unused():
+    """Test that recursive helper functions are NOT incorrectly detected as unused."""
+    temp_dir = Path(tempfile.mkdtemp())
+
+    try:
+        # Main file with recursive helper function
+        main_file = temp_dir / "main.py"
+        main_file.write_text("""
+def gcd_recursive(a: int, b: int) -> int:
+    \"\"\"Calculate greatest common divisor using Euclidean algorithm with recursion.\"\"\"
+    if b == 0:
+        return a
+    return gcd_recursive(b, a % b)
+""")
+
+        # Optimized version that still uses the recursive helper
+        optimized_code = """
+```python:main.py
+def gcd_recursive(a: int, b: int) -> int:
+    \"\"\"Calculate greatest common divisor using Euclidean algorithm with recursion.\"\"\"
+    if b == 0:
+        return a
+    return gcd_recursive(b, a % b)
+```
+"""
+
+        # Create test config
+        test_cfg = TestConfig(
+            tests_root=temp_dir / "tests",
+            tests_project_rootdir=temp_dir,
+            project_root_path=temp_dir,
+            test_framework="pytest",
+            pytest_cmd="pytest",
+        )
+
+        # Create FunctionToOptimize instance
+        function_to_optimize = FunctionToOptimize(
+            file_path=main_file, function_name="gcd_recursive", parents=[]
+        )
+
+        # Create function optimizer
+        optimizer = FunctionOptimizer(
+            function_to_optimize=function_to_optimize,
+            test_cfg=test_cfg,
+            function_to_optimize_source_code=main_file.read_text(),
+        )
+
+        # Get original code context
+        ctx_result = optimizer.get_code_optimization_context()
+        assert ctx_result.is_successful(), f"Failed to get context: {ctx_result.failure()}"
+
+        code_context = ctx_result.unwrap()
+
+        # Test unused helper detection
+        unused_helpers = detect_unused_helper_functions(optimizer.function_to_optimize, code_context, CodeStringsMarkdown.parse_markdown_code(optimized_code))
+
+        # Should NOT detect gcd_recursive as unused
+        unused_names = {uh.qualified_name for uh in unused_helpers}
+
+        assert "gcd_recursive" not in unused_names, f"Recursive function gcd_recursive should NOT be detected as unused, but got unused: {unused_names}"
+
+    finally:
+        # Cleanup
+        import shutil
+        shutil.rmtree(temp_dir, ignore_errors=True)
+
+
 def test_async_generators_and_coroutines():
     """Test detection with async generators and coroutines."""
     temp_dir = Path(tempfile.mkdtemp())