updates

Author: dasarchan

codeflash/api/cfapi.py

@@ -3,6 +3,7 @@
 import json
 import os
 import sys
+import git
 from functools import lru_cache
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, List
@@ -13,8 +14,8 @@
 
 from codeflash.cli_cmds.console import console, logger
 from codeflash.code_utils.env_utils import ensure_codeflash_api_key, get_codeflash_api_key, get_pr_number
-from codeflash.code_utils.git_utils import get_repo_owner_and_name
 from codeflash.version import __version__
+from codeflash.code_utils.git_utils import get_repo_owner_and_name
 
 if TYPE_CHECKING:
     from requests import Response
@@ -203,16 +204,27 @@ def is_function_being_optimized_again(owner: str, repo: str, pr_number: int, cod
     response.raise_for_status()
     return response.json()
 
-def add_code_context_hash(owner: str, repo: str, pr_number: int, code_context_hash: str) -> Response:
+def add_code_context_hash( code_context_hash: str):
     """Add code context to the DB cache"""
-    response = make_cfapi_request(
-        "/add-code-hash",
-        "POST",
-        {
-            "owner": owner,
-            "repo": repo,
-            "pr_number": pr_number,
-            "code_context_hash": code_context_hash
-        }
-    )
-    return response
+    pr_number = get_pr_number()
+    if pr_number is None:
+        return
+    try:
+        owner, repo = get_repo_owner_and_name()
+        pr_number = get_pr_number()
+    except git.exc.InvalidGitRepositoryError:
+        return
+
+
+    if owner and repo and pr_number is not None:
+        make_cfapi_request(
+            "/add-code-hash",
+            "POST",
+            {
+                "owner": owner,
+                "repo": repo,
+                "pr_number": pr_number,
+                "code_context_hash": code_context_hash
+            }
+        )
+

codeflash/discovery/functions_to_optimize.py

@@ -159,6 +159,7 @@ def get_code_context_hash(self) -> str:
 
             # Extract the function's code content
             lines = file_content.splitlines()
+            print("starting and ending line ", self.starting_line, self.ending_line)
             if self.starting_line is not None and self.ending_line is not None:
                 # Use line numbers if available (1-indexed to 0-indexed)
                 function_content = "\n".join(lines[self.starting_line - 1 : self.ending_line])
@@ -460,7 +461,7 @@ def inspect_top_level_functions_or_methods(
     )
 
 
-def check_optimization_status(functions_by_file: dict[Path, list[FunctionToOptimize]]) -> list[tuple[str, str]]:
+def check_optimization_status(functions_by_file: dict[Path, list[FunctionToOptimize]], project_root_path: Path) -> set[tuple[str, str]]:
     """Check which functions have already been optimized and filter them out.
 
     This function calls the optimization API to:
@@ -497,22 +498,21 @@ def check_optimization_status(functions_by_file: dict[Path, list[FunctionToOptim
         for func in functions:
             func_hash = func.get_code_context_hash()
             # Use a unique path identifier that includes function info
-            path_key = f"{file_path}:{func.qualified_name}"
-            code_contexts[path_key] = func_hash
-            path_to_function_map[path_key] = (file_path, func)
+            code_contexts.append({"file_path": Path(file_path).relative_to(project_root_path),
+                                  "function_name": func.qualified_name, "code_hash": func_hash})
 
     if not code_contexts:
-        return {}, 0
+        return set(tuple())
 
     try:
         result = is_function_being_optimized_again(owner, repo, pr_number, code_contexts)
-        already_optimized_paths: list[tuple[str, str]] = result.get("already_optimized_paths", [])
-        return already_optimized_paths
+        already_optimized_paths: list[tuple[str, str]] = result.get("already_optimized_tuples", [])
+        return set(( project_root_path / Path(path[0]), path[1]) for path in already_optimized_paths)
 
     except Exception as e:
         logger.warning(f"Failed to check optimization status: {e}")
         # Return all functions if API call fails
-        return []
+        return set(tuple())
 
 
 def filter_functions(
@@ -625,6 +625,7 @@ def filter_functions(
             f"{already_optimized_count} already optimized function{'s' if already_optimized_count != 1 else ''}": already_optimized_count,
             f"{blocklist_funcs_removed_count} function{'s' if blocklist_funcs_removed_count != 1 else ''} as previously optimized": blocklist_funcs_removed_count,
             f"{previous_checkpoint_functions_removed_count} function{'s' if previous_checkpoint_functions_removed_count != 1 else ''} skipped from checkpoint": previous_checkpoint_functions_removed_count,
+            f"{already_optimized_paths_removed_count} function{'s' if already_optimized_paths_removed_count != 1 else ''} as previously attempted optimization": already_optimized_paths_removed_count,
         }
         log_string = "\n".join([k for k, v in log_info.items() if v > 0])
         if log_string:

codeflash/optimization/function_optimizer.py

@@ -375,17 +375,8 @@ def optimize_function(self) -> Result[BestOptimization, str]:  # noqa: PLR0911
                 self.log_successful_optimization(explanation, generated_tests, exp_type)
 
         # Add function to code context hash if in gh actions
-        try:
-            repository = git.Repo(Path.cwd(), search_parent_directories=True)
-            owner, repo = get_repo_owner_and_name(repository)
-        except git.exc.InvalidGitRepositoryError:
-            logger.warning("No git repository found")
-            owner, repo = None, None
-        pr_number = get_pr_number()
-
-        if owner and repo and pr_number is not None:
-            code_context_hash = self.function_to_optimize.get_code_context_hash()
-            add_code_context_hash(owner, repo, pr_number, code_context_hash)
+
+        add_code_context_hash(self.function_to_optimize.get_code_context_hash())
 
         if self.args.override_fixtures:
             restore_conftest(original_conftest_content)