update no rich file

Author: nanjiangwill

agent/agents.py

@@ -24,6 +24,22 @@ def handle_logging(logging_name: str, log_file: Path) -> None:
 class AgentReturn(ABC):
     def __init__(self, log_file: Path):
         self.log_file = log_file
+        self.last_cost = 0.0
+
+
+class Agents(ABC):
+    def __init__(self, max_iteration: int):
+        self.max_iteration = max_iteration
+
+    @abstractmethod
+    def run(self) -> AgentReturn:
+        """Start agent"""
+        raise NotImplementedError
+
+
+class AiderReturn(AgentReturn):
+    def __init__(self, log_file: Path):
+        super().__init__(log_file)
         self.last_cost = self.get_money_cost()
 
     def get_money_cost(self) -> float:
@@ -40,16 +56,6 @@ def get_money_cost(self) -> float:
         return last_cost
 
 
-class Agents(ABC):
-    def __init__(self, max_iteration: int):
-        self.max_iteration = max_iteration
-
-    @abstractmethod
-    def run(self) -> AgentReturn:
-        """Start agent"""
-        raise NotImplementedError
-
-
 class AiderAgents(Agents):
     def __init__(self, max_iteration: int, model_name: str):
         super().__init__(max_iteration)
@@ -86,10 +92,6 @@ def run(
             level=logging.INFO,
             format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
         )
-
-        with open(log_file, "a") as f:
-            f.write(message)
-
         # Redirect print statements to the log file
         sys.stdout = open(log_file, "a")
         sys.stderr = open(log_file, "a")
@@ -124,25 +126,11 @@ def run(
         else:
             coder.run(message)
 
-        # #### TMP
-
-        # #### TMP
-        # import time
-        # import random
-
-        # time.sleep(random.random() * 5)
-        # n = random.random() / 10
-        # with open(log_file, "a") as f:
-        #     f.write(
-        #         f"> Tokens: 33k sent, 1.3k received. Cost: $0.12 message, ${n} session.  \n"
-        #     )
-        # #### TMP
-
         # Close redirected stdout and stderr
         sys.stdout.close()
         sys.stderr.close()
         # Restore original stdout and stderr
         sys.stdout = sys.__stdout__
         sys.stderr = sys.__stderr__
 
-        return AgentReturn(log_file)
+        return AiderReturn(log_file)

agent/display.py

@@ -96,6 +96,7 @@ def __init__(self, total_repos: int):
         self.start_time_per_repo = {}
         self.end_time_per_repo = {}
         self.total_time_spent = 0
+        self.branch_name = ""
 
         self.overall_progress = Progress(
             SpinnerColumn(),
@@ -243,6 +244,7 @@ def update_time_display(self, time_in_seconds: int) -> None:
 
     def update_branch_display(self, branch: str) -> None:
         """Update the branch display with the given branch."""
+        self.branch_name = branch
         self.branch_display = Text(f"{branch}", justify="center")
         self.layout["info"]["other_info"]["branch"].update(
             Panel(self.branch_display, title="Branch", border_style="blue")
@@ -436,7 +438,7 @@ def __exit__(
         }
 
         with open(
-            f"processing_summary_{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.json",
+            f"processing_summary_{self.branch_name}.json",
             "w",
         ) as json_file:
             json.dump(summary_data, json_file, indent=4)

agent/run_agent.py

@@ -138,9 +138,6 @@ def run_agent_for_repo(
         if agent_config.run_tests:
             update_queue.put(("start_repo", (repo_name, len(test_files))))
             # when unit test feedback is available, iterate over test files
-            # REMOVE LATER
-            if agent_config.max_iteration == 10 and repo_name == "simpy":
-                test_files = test_files[6:]
             for test_file in test_files:
                 update_queue.put(("set_current_file", (repo_name, test_file)))
                 test_cmd = f"python -m commit0 test {repo_path} {test_file} --branch {branch} --backend {backend} --commit0-config-file {commit0_config_file} --timeout 100"
@@ -257,7 +254,7 @@ def run_agent(
     # if len(filtered_dataset) > 1:
     #     sys.stdout = open(os.devnull, "w")
 
-    if agent_config.use_topo_sort_dependencies:
+    if agent_config.add_import_module_to_context:
         # Install Chrome for Playwright for browser-based agents
         try:
             subprocess.run(["playwright", "install", "chromium"], check=True)

agent/run_agent_no_rich.py

@@ -5,7 +5,6 @@
 from datasets import load_dataset
 from git import Repo
 from agent.agent_utils import (
-    args2string,
     create_branch,
     get_message,
     get_target_edit_files,
@@ -48,10 +47,11 @@ def run_agent_for_repo(
     repo_base_dir: str,
     agent_config: AgentConfig,
     example: RepoInstance,
-    branch: Optional[str] = None,
+    branch: str,
     override_previous_changes: bool = False,
     backend: str = "modal",
     log_dir: str = str(RUN_AGENT_LOG_DIR.resolve()),
+    commit0_config_file: str = "",
 ) -> None:
     """Run Aider for a given repository."""
     # get repo info
@@ -79,8 +79,8 @@ def run_agent_for_repo(
         )
 
     # if branch_name is not provided, create a new branch name based on agent_config
-    if branch is None:
-        branch = args2string(agent_config)
+    # if branch is None:
+    #     branch = args2string(agent_config)
 
     # Check if there are changes in the current branch
     if local_repo.is_dirty():
@@ -128,23 +128,21 @@ def run_agent_for_repo(
     with open(agent_config_log_file, "w") as agent_config_file:
         yaml.dump(agent_config, agent_config_file)
 
-    # TODO: make this path more general
-    commit0_config_file = str(Path(repo_path).parent.parent / ".commit0.yaml")
-
     with DirContext(repo_path):
         if agent_config is None:
             raise ValueError("Invalid input")
 
         if agent_config.run_tests:
             # when unit test feedback is available, iterate over test files
             for test_file in test_files:
-                test_cmd = f"python -m commit0 test {repo_path} {test_file} --branch {branch} --backend {backend} --commit0-config-file {commit0_config_file}"
+                test_cmd = f"python -m commit0 test {repo_path} {test_file} --branch {branch} --backend {backend} --commit0-config-file {commit0_config_file} --timeout 100"
                 test_file_name = test_file.replace(".py", "").replace("/", "__")
                 test_log_dir = experiment_log_dir / test_file_name
                 lint_cmd = get_lint_cmd(
                     repo_name, agent_config.use_lint_info, commit0_config_file
                 )
                 message = get_message(agent_config, repo_path, test_file=test_file)
+
                 _ = agent.run(
                     message,
                     test_cmd,
@@ -178,7 +176,6 @@ def run_agent_for_repo(
                 agent_config, repo_path, test_dir=example["test"]["test_dir"]
             )
             for f in target_edit_files:
-                dependencies = import_dependencies.get(f, [])
                 if agent_config.add_import_module_to_context:
                     dependencies = import_dependencies.get(f, [])
                     message = update_message_with_dependencies(message, dependencies)
@@ -208,6 +205,7 @@ def run_agent(
 
     agent_config = AgentConfig(**config)
 
+    commit0_config_file = os.path.abspath(commit0_config_file)
     commit0_config = read_commit0_dot_file(commit0_config_file)
 
     dataset = load_dataset(
@@ -230,7 +228,7 @@ def run_agent(
     # if len(filtered_dataset) > 1:
     #     sys.stdout = open(os.devnull, "w")
 
-    if agent_config.use_topo_sort_dependencies:
+    if agent_config.add_import_module_to_context:
         # Install Chrome for Playwright for browser-based agents
         try:
             subprocess.run(["playwright", "install", "chromium"], check=True)
@@ -258,6 +256,7 @@ def run_agent(
                         override_previous_changes,
                         backend,
                         log_dir,
+                        commit0_config_file,
                     ),
                     callback=lambda _: pbar.update(
                         1