Merge branch 'main' into small-fixes

Author: KRRT7

codeflash/cli_cmds/cli.py

@@ -249,25 +249,29 @@ def project_root_from_module_root(module_root: Path, pyproject_file_path: Path)
 
 
 def handle_optimize_all_arg_parsing(args: Namespace) -> Namespace:
-    if hasattr(args, "all"):
-        import git
-
-        from codeflash.code_utils.git_utils import check_and_push_branch, get_repo_owner_and_name
-        from codeflash.code_utils.github_utils import require_github_app_or_exit
-
-        # Ensure that the user can actually open PRs on the repo.
-        try:
-            git_repo = git.Repo(search_parent_directories=True)
-        except git.exc.InvalidGitRepositoryError:
-            logger.exception(
-                "I couldn't find a git repository in the current directory. "
-                "I need a git repository to run --all and open PRs for optimizations. Exiting..."
-            )
-            apologize_and_exit()
-        if not args.no_pr and not check_and_push_branch(git_repo, git_remote=args.git_remote):
-            exit_with_message("Branch is not pushed...", error_on_exit=True)
-        owner, repo = get_repo_owner_and_name(git_repo)
-        if not args.no_pr:
+    if hasattr(args, "all") or (hasattr(args, "file") and args.file):
+        no_pr = getattr(args, "no_pr", False)
+
+        if not no_pr:
+            import git
+
+            from codeflash.code_utils.git_utils import check_and_push_branch, get_repo_owner_and_name
+            from codeflash.code_utils.github_utils import require_github_app_or_exit
+
+            # Ensure that the user can actually open PRs on the repo.
+            try:
+                git_repo = git.Repo(search_parent_directories=True)
+            except git.exc.InvalidGitRepositoryError:
+                mode = "--all" if hasattr(args, "all") else "--file"
+                logger.exception(
+                    f"I couldn't find a git repository in the current directory. "
+                    f"I need a git repository to run {mode} and open PRs for optimizations. Exiting..."
+                )
+                apologize_and_exit()
+            git_remote = getattr(args, "git_remote", None)
+            if not check_and_push_branch(git_repo, git_remote=git_remote):
+                exit_with_message("Branch is not pushed...", error_on_exit=True)
+            owner, repo = get_repo_owner_and_name(git_repo)
             require_github_app_or_exit(owner, repo)
     if not hasattr(args, "all"):
         args.all = None

codeflash/code_utils/instrument_existing_tests.py

@@ -684,27 +684,6 @@ def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
                     )
 
 
-def instrument_source_module_with_async_decorators(
-    source_path: Path, function_to_optimize: FunctionToOptimize, mode: TestingMode = TestingMode.BEHAVIOR
-) -> tuple[bool, str | None]:
-    if not function_to_optimize.is_async:
-        return False, None
-
-    try:
-        with source_path.open(encoding="utf8") as f:
-            source_code = f.read()
-
-        modified_code, decorator_added = add_async_decorator_to_function(source_code, function_to_optimize, mode)
-
-        if decorator_added:
-            return True, modified_code
-
-    except Exception:
-        return False, None
-    else:
-        return False, None
-
-
 def inject_async_profiling_into_existing_test(
     test_path: Path,
     call_positions: list[CodePosition],
@@ -1288,25 +1267,29 @@ def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> c
 
 
 def add_async_decorator_to_function(
-    source_code: str, function: FunctionToOptimize, mode: TestingMode = TestingMode.BEHAVIOR
-) -> tuple[str, bool]:
-    """Add async decorator to an async function definition.
+    source_path: Path, function: FunctionToOptimize, mode: TestingMode = TestingMode.BEHAVIOR
+) -> bool:
+    """Add async decorator to an async function definition and write back to file.
 
     Args:
     ----
-        source_code: The source code to modify.
+        source_path: Path to the source file to modify in-place.
         function: The FunctionToOptimize object representing the target async function.
         mode: The testing mode to determine which decorator to apply.
 
     Returns:
     -------
-        Tuple of (modified_source_code, was_decorator_added).
+        Boolean indicating whether the decorator was successfully added.
 
     """
     if not function.is_async:
-        return source_code, False
+        return False
 
     try:
+        # Read source code
+        with source_path.open(encoding="utf8") as f:
+            source_code = f.read()
+
         module = cst.parse_module(source_code)
 
         # Add the decorator to the function
@@ -1318,10 +1301,17 @@ def add_async_decorator_to_function(
             import_transformer = AsyncDecoratorImportAdder(mode)
             module = module.visit(import_transformer)
 
-        return sort_imports(code=module.code, float_to_top=True), decorator_transformer.added_decorator
+        modified_code = sort_imports(code=module.code, float_to_top=True)
     except Exception as e:
         logger.exception(f"Error adding async decorator to function {function.qualified_name}: {e}")
-        return source_code, False
+        return False
+    else:
+        if decorator_transformer.added_decorator:
+            with source_path.open("w", encoding="utf8") as f:
+                f.write(modified_code)
+            logger.debug(f"Applied async {mode.value} instrumentation to {source_path}")
+            return True
+        return False
 
 
 def create_instrumented_source_module_path(source_path: Path, temp_dir: Path) -> Path:

codeflash/context/unused_definition_remover.py

@@ -469,22 +469,32 @@ def remove_unused_definitions_by_function_names(code: str, qualified_function_na
         qualified_function_names: Set of function names to keep. For methods, use format 'classname.methodname'
 
     """
-    module = cst.parse_module(code)
-    # Collect all definitions (top level classes, variables or function)
-    definitions = collect_top_level_definitions(module)
+    try:
+        module = cst.parse_module(code)
+    except Exception as e:
+        logger.debug(f"Failed to parse code with libcst: {type(e).__name__}: {e}")
+        return code
 
-    # Collect dependencies between definitions using the visitor pattern
-    dependency_collector = DependencyCollector(definitions)
-    module.visit(dependency_collector)
+    try:
+        # Collect all definitions (top level classes, variables or function)
+        definitions = collect_top_level_definitions(module)
 
-    # Mark definitions used by specified functions, and their dependencies recursively
-    usage_marker = QualifiedFunctionUsageMarker(definitions, qualified_function_names)
-    usage_marker.mark_used_definitions()
+        # Collect dependencies between definitions using the visitor pattern
+        dependency_collector = DependencyCollector(definitions)
+        module.visit(dependency_collector)
 
-    # Apply the recursive removal transformation
-    modified_module, _ = remove_unused_definitions_recursively(module, definitions)
+        # Mark definitions used by specified functions, and their dependencies recursively
+        usage_marker = QualifiedFunctionUsageMarker(definitions, qualified_function_names)
+        usage_marker.mark_used_definitions()
 
-    return modified_module.code if modified_module else ""
+        # Apply the recursive removal transformation
+        modified_module, _ = remove_unused_definitions_recursively(module, definitions)
+
+        return modified_module.code if modified_module else ""  # noqa: TRY300
+    except Exception as e:
+        # If any other error occurs during processing, return the original code
+        logger.debug(f"Error processing code to remove unused definitions: {type(e).__name__}: {e}")
+        return code
 
 
 def print_definitions(definitions: dict[str, UsageInfo]) -> None:

codeflash/github/PrComment.py

@@ -21,15 +21,17 @@ class PrComment:
     winning_behavior_test_results: TestResults
     winning_benchmarking_test_results: TestResults
     benchmark_details: Optional[list[BenchmarkDetail]] = None
+    original_async_throughput: Optional[int] = None
+    best_async_throughput: Optional[int] = None
 
-    def to_json(self) -> dict[str, Union[dict[str, dict[str, int]], int, str, Optional[list[BenchmarkDetail]]]]:
+    def to_json(self) -> dict[str, Union[str, int, dict[str, dict[str, int]], list[BenchmarkDetail], None]]:
         report_table = {
             test_type.to_name(): result
             for test_type, result in self.winning_behavior_test_results.get_test_pass_fail_report_by_type().items()
             if test_type.to_name()
         }
 
-        return {
+        result: dict[str, Union[str, int, dict[str, dict[str, int]], list[BenchmarkDetail], None]] = {
             "optimization_explanation": self.optimization_explanation,
             "best_runtime": humanize_runtime(self.best_runtime),
             "original_runtime": humanize_runtime(self.original_runtime),
@@ -42,6 +44,12 @@ def to_json(self) -> dict[str, Union[dict[str, dict[str, int]], int, str, Option
             "benchmark_details": self.benchmark_details if self.benchmark_details else None,
         }
 
+        if self.original_async_throughput is not None and self.best_async_throughput is not None:
+            result["original_async_throughput"] = str(self.original_async_throughput)
+            result["best_async_throughput"] = str(self.best_async_throughput)
+
+        return result
+
 
 class FileDiffContent(BaseModel):
     oldContent: str  # noqa: N815