Merge branch 'main' into generated-tests-markdown

Author: aseembits93

.github/workflows/e2e-init-optimization.yaml

@@ -19,7 +19,7 @@ jobs:
       COLUMNS: 110
       MAX_RETRIES: 3
       RETRY_DELAY: 5
-      EXPECTED_IMPROVEMENT_PCT: 30
+      EXPECTED_IMPROVEMENT_PCT: 10
       CODEFLASH_END_TO_END: 1
     steps:
       - name: 🛎️ Checkout

.github/workflows/e2e-topological-sort.yaml

@@ -1,4 +1,4 @@
-name: E2E - Topological Sort
+name: E2E - Topological Sort (Worktree)
 
 on:
   pull_request:
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  topological-sort-optimization:
+  topological-sort-worktree-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
     environment: ${{ (github.event_name == 'workflow_dispatch' || (contains(toJSON(github.event.pull_request.files.*.filename), '.github/workflows/') && github.event.pull_request.user.login != 'misrasaurabh1' && github.event.pull_request.user.login != 'KRRT7')) && 'external-trusted-contributors' || '' }}
     runs-on: ubuntu-latest
@@ -90,4 +90,4 @@ jobs:
       - name: Run Codeflash to optimize code
         id: optimize_code
         run: |
-          uv run python tests/scripts/end_to_end_test_topological_sort.py
+          uv run python tests/scripts/end_to_end_test_topological_sort_worktree.py

.github/workflows/unit-tests.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
@@ -28,5 +28,9 @@ jobs:
       - name: install dependencies
         run: uv sync
 
+      - name: Install test-only dependencies (Python 3.13)
+        if: matrix.python-version == '3.13'
+        run: uv sync --group tests
+
       - name: Unit tests
-        run: uv run pytest tests/
+        run: uv run pytest tests/

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)})
@@ -509,7 +509,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)})
@@ -535,7 +535,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],
@@ -547,8 +547,9 @@ def get_optimization_impact(
         replay_tests: str,
         root_dir: Path,
         concolic_tests: str,  # noqa: ARG002
+        calling_fn_details: 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
@@ -561,10 +562,11 @@ def get_optimization_impact(
         replay_tests: str -> replay test table
         root_dir: Path -> path of git directory
         concolic_tests: str -> concolic_tests (not used)
+        calling_fn_details: str -> filenames and definitions of functions which call the function_to_optimize
 
         Returns:
         -------
-        - 'high' or 'low' optimization impact
+        - 'high', 'medium' or 'low' optimization review
 
         """
         diff_str = "\n".join(
@@ -580,7 +582,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,
@@ -595,22 +597,23 @@ def get_optimization_impact(
             "optimized_runtime": humanize_runtime(explanation.best_runtime_ns),
             "original_runtime": humanize_runtime(explanation.original_runtime_ns),
             "codeflash_version": codeflash_version,
+            "calling_fn_details": calling_fn_details,
         }
         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=120)
         except requests.exceptions.RequestException as e:
             logger.exception(f"Error generating optimization refinements: {e}")
             ph("cli-optimize-error-caught", {"error": str(e)})
             return ""
 
         if response.status_code == 200:
-            return cast("str", response.json()["impact"])
+            return cast("str", response.json()["review"])
         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 ""

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(
@@ -130,6 +132,7 @@ def suggest_changes(
     coverage_message: str,
     replay_tests: str = "",
     concolic_tests: str = "",
+    optimization_review: str = "",
 ) -> Response:
     """Suggest changes to a pull request.
 
@@ -155,6 +158,7 @@ def suggest_changes(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
+        "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)
 
@@ -171,6 +175,7 @@ def create_pr(
     coverage_message: str,
     replay_tests: str = "",
     concolic_tests: str = "",
+    optimization_review: str = "",
 ) -> Response:
     """Create a pull request, targeting the specified branch. (usually 'main').
 
@@ -195,6 +200,7 @@ def create_pr(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
+        "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)
 
@@ -210,6 +216,7 @@ def create_staging(
     replay_tests: str,
     concolic_tests: str,
     root_dir: Path,
+    optimization_review: str = "",
 ) -> Response:
     """Create a staging pull request, targeting the specified branch. (usually 'staging').
 
@@ -250,6 +257,7 @@ def create_staging(
         "coverage_message": coverage_message,
         "replayTests": replay_tests,
         "concolicTests": concolic_tests,
+        "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/benchmarking/instrument_codeflash_trace.py

@@ -2,9 +2,10 @@
 
 from typing import TYPE_CHECKING, Optional, Union
 
-import isort
 import libcst as cst
 
+from codeflash.code_utils.formatter import sort_imports
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -107,7 +108,7 @@ def instrument_codeflash_trace_decorator(file_to_funcs_to_optimize: dict[Path, l
         original_code = file_path.read_text(encoding="utf-8")
         new_code = add_codeflash_decorator_to_code(original_code, functions_to_optimize)
         # Modify the code
-        modified_code = isort.code(code=new_code, float_to_top=True)
+        modified_code = sort_imports(code=new_code, float_to_top=True)
 
         # Write the modified code back to the file
         file_path.write_text(modified_code, encoding="utf-8")

codeflash/benchmarking/replay_test.py

@@ -6,9 +6,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-import isort
-
 from codeflash.cli_cmds.console import logger
+from codeflash.code_utils.formatter import sort_imports
 from codeflash.discovery.functions_to_optimize import inspect_top_level_functions_or_methods
 from codeflash.verification.verification_utils import get_test_file_path
 
@@ -299,7 +298,7 @@ def generate_replay_test(
                 test_framework=test_framework,
                 max_run_count=max_run_count,
             )
-            test_code = isort.code(test_code)
+            test_code = sort_imports(code=test_code)
             output_file = get_test_file_path(
                 test_dir=Path(output_dir), function_name=benchmark_module_path, test_type="replay"
             )

codeflash/cli_cmds/cli.py

@@ -8,6 +8,7 @@
 from codeflash.cli_cmds.cli_common import apologize_and_exit
 from codeflash.cli_cmds.cmd_init import init_codeflash, install_github_actions
 from codeflash.cli_cmds.console import logger
+from codeflash.cli_cmds.extension import install_vscode_extension
 from codeflash.code_utils import env_utils
 from codeflash.code_utils.code_utils import exit_with_message
 from codeflash.code_utils.config_parser import parse_config_file
@@ -22,6 +23,8 @@ def parse_args() -> Namespace:
     init_parser = subparsers.add_parser("init", help="Initialize Codeflash for a Python project.")
     init_parser.set_defaults(func=init_codeflash)
 
+    subparsers.add_parser("vscode-install", help="Install the Codeflash VSCode extension")
+
     init_actions_parser = subparsers.add_parser("init-actions", help="Initialize GitHub Actions workflow")
     init_actions_parser.set_defaults(func=install_github_actions)
 
@@ -122,9 +125,15 @@ def process_and_validate_cmd_args(args: Namespace) -> Namespace:
         logging_config.set_level(logging.DEBUG, echo_setting=not is_init)
     else:
         logging_config.set_level(logging.INFO, echo_setting=not is_init)
+
     if args.version:
         logger.info(f"Codeflash version {version}")
         sys.exit()
+
+    if args.command == "vscode-install":
+        install_vscode_extension()
+        sys.exit()
+
     if not check_running_in_git_repo(module_root=args.module_root):
         if not confirm_proceeding_with_no_git_repo():
             exit_with_message("No git repository detected and user aborted run. Exiting...", error_on_exit=True)