update

Author: nanjiangwill

agent/agent_utils.py

@@ -192,10 +192,11 @@ def _find_files_to_edit(base_dir: str, src_dir: str, test_dir: str) -> list[str]
     return files
 
 
-def ignore_cycles(graph: dict):
+def ignore_cycles(graph: dict) -> list[str]:
+    """Ignore the cycles in the graph."""
     ts = TopologicalSorter(graph)
     try:
-        return list(set(ts.static_order()))
+        return list(ts.static_order())
     except CycleError as e:
         # print(f"Cycle detected: {e.args[1]}")
         # You can either break the cycle by modifying the graph or handle it as needed.
@@ -231,7 +232,7 @@ def get_target_edit_files(
     reference_commit: str,
 ) -> list[str]:
     """Find the files with functions with the pass statement."""
-    target_dir = local_repo.working_dir
+    target_dir = str(local_repo.working_dir)
     files = _find_files_to_edit(target_dir, src_dir, test_dir)
     filtered_files = []
     for file_path in files:
@@ -241,10 +242,8 @@ def get_target_edit_files(
                 continue
             if "    pass" in content:
                 filtered_files.append(file_path)
-
     # Change to reference commit to get the correct dependencies
     local_repo.git.checkout(reference_commit)
-
     topological_sort_files = topological_sort_based_on_dependencies(filtered_files)
     if len(topological_sort_files) != len(filtered_files):
         if len(topological_sort_files) < len(filtered_files):

agent/run_agent.py

@@ -87,8 +87,8 @@ def run_agent_for_repo(
 
     # in cases where the latest commit of branch is not commit 0
     # set it back to commit 0
-    latest_commit = local_repo.commit(branch)
-    if latest_commit.hexsha != example["base_commit"] and override_previous_changes:
+    latest_commit = str(local_repo.commit(branch))
+    if latest_commit != example["base_commit"] and override_previous_changes:
         local_repo.git.reset("--hard", example["base_commit"])
 
     target_edit_files = get_target_edit_files(

agent/run_agent_test.py

@@ -1,7 +1,5 @@
 import os
 import yaml
-import multiprocessing
-from tqdm import tqdm
 from datasets import load_dataset
 from git import Repo
 from agent.agent_utils import (
@@ -13,7 +11,7 @@
     read_yaml_config,
 )
 from agent.agents import AiderAgents
-from typing import Optional, Type, cast
+from typing import Optional, Type
 from types import TracebackType
 from agent.class_types import AgentConfig
 from commit0.harness.constants import SPLIT
@@ -89,7 +87,11 @@ def run_agent_for_repo(
 
     # get target files to edit and test files to run
     target_edit_files = get_target_edit_files(
-        local_repo, example["src_dir"], example["test"]["test_dir"], latest_commit, example["reference_commit"]
+        local_repo,
+        example["src_dir"],
+        example["test"]["test_dir"],
+        latest_commit,
+        example["reference_commit"],
     )
     print(target_edit_files)
     return