Merge pull request #63 from commit-0/agent

fix modal version

Author: nanjiangwill

agent/agents.py

@@ -62,6 +62,7 @@ def run(
         lint_cmd: str,
         fnames: list[str],
         log_dir: Path,
+        test_first: bool = False,
     ) -> AgentReturn:
         """Start aider agent"""
         if test_cmd:
@@ -111,7 +112,14 @@ def run(
         coder.stream = True
 
         # Run the agent
-        coder.run(message)
+        if test_first:
+            test_errors = coder.commands.cmd_test(test_cmd)
+            if test_errors:
+                coder.run(test_errors)
+        else:
+            coder.run(message)
+
+        # #### TMP
 
         # #### TMP
         # import time

agent/cli.py

@@ -190,52 +190,28 @@ def run(
         5,
         help="Display the agent progress",
     ),
-) -> None:
-    """Run the agent on the repository."""
-    run_agent(
-        branch,
-        override_previous_changes,
-        backend,
-        agent_config_file,
-        log_dir,
-        max_parallel_repos,
-        display_repo_progress_num,
-    )
-
-
-@agent_app.command()
-def run_test_no_rich(
-    branch: str = typer.Argument(
-        ...,
-        help="Branch name of current run",
-    ),
-    override_previous_changes: bool = typer.Option(
-        False,
-        help="If override the previous agent changes on `branch` or run the agent continuously on the new changes",
-    ),
-    backend: str = typer.Option(
-        "modal",
-        help="Test backend to run the agent on, ignore this option if you are not adding `test` option to agent",
-    ),
-    agent_config_file: str = typer.Option(
-        ".agent.yaml",
-        help="Path to the agent config file",
-    ),
-    log_dir: str = typer.Option(
-        str(RUN_AGENT_LOG_DIR.resolve()),
-        help="Log directory to store the logs",
-    ),
-    max_parallel_repos: int = typer.Option(
-        1,
-        help="Maximum number of repositories for agent to run in parallel",
+    show_rich_progress: bool = typer.Option(
+        True,
+        help="Display the agent progress with rich",
     ),
 ) -> None:
     """Run the agent on the repository."""
-    run_agent_no_rich(
-        branch,
-        override_previous_changes,
-        backend,
-        agent_config_file,
-        log_dir,
-        max_parallel_repos,
-    )
+    if show_rich_progress:
+        run_agent(
+            branch,
+            override_previous_changes,
+            backend,
+            agent_config_file,
+            log_dir,
+            max_parallel_repos,
+            display_repo_progress_num,
+        )
+    else:
+        run_agent_no_rich(
+            branch,
+            override_previous_changes,
+            backend,
+            agent_config_file,
+            log_dir,
+            max_parallel_repos,
+        )

agent/display.py

@@ -120,11 +120,11 @@ def __init__(self, total_repos: int):
         self.layout["progress"]["pbar"].update(
             Panel(self.overall_progress, title="Overall Progress", border_style="blue")
         )
-        self.time_display = Text("Time Taken So Far: 0s", justify="center")
+        self.time_display = Text("0s", justify="center")
         self.layout["progress"]["time"].update(
-            Panel(self.time_display, title="Time", border_style="blue")
+            Panel(self.time_display, title="Time Taken", border_style="blue")
         )
-        self.money_display = Text("Money Spent So Far: $0.00", justify="center")
+        self.money_display = Text("$0.00", justify="center")
         self.layout["progress"]["money"].update(
             Panel(self.money_display, title="$$$$", border_style="blue")
         )
@@ -222,9 +222,9 @@ def update_time_display(self, time_in_seconds: int) -> None:
         else:
             time_str = f"{seconds:02d}s"
         self.total_time_spent = time_in_seconds
-        self.time_display = Text(f"Time Spent So Far: {time_str}", justify="center")
+        self.time_display = Text(f"{time_str}", justify="center")
         self.layout["progress"]["time"].update(
-            Panel(self.time_display, title="Time", border_style="blue")
+            Panel(self.time_display, title="Time Taken", border_style="blue")
         )
 
     def update_backend_display(self, backend: str) -> None:
@@ -251,7 +251,7 @@ def update_money_display(
             sum(repo_money.values()) for repo_money in self.repo_money_spent.values()
         )
         self.money_display = Text(
-            f"Money Spent So Far: ${total_money_spent_for_all_repos:.2f}",
+            f"${total_money_spent_for_all_repos:.2f}",
             justify="center",
         )
         self.layout["progress"]["money"].update(

agent/run_agent.py

@@ -67,9 +67,12 @@ def run_agent_for_repo(
     repo_path = os.path.join(repo_base_dir, repo_name)
     repo_path = os.path.abspath(repo_path)
 
-    # # TODO: remove this to make web3.py work
-    # if repo_name == "web3-py":
-    #     repo_path = repo_path.replace("web3-py", "web3.py")
+    target_edit_files = get_target_edit_files(
+        repo_path, example["src_dir"], example["test"]["test_dir"]
+    )
+    # Call the commit0 get-tests command to retrieve test files
+    test_files_str = get_tests(repo_name, verbose=0)
+    test_files = sorted(list(set([i.split(":")[0] for i in test_files_str])))
 
     try:
         local_repo = Repo(repo_path)
@@ -118,15 +121,7 @@ def run_agent_for_repo(
         if agent_config is None:
             raise ValueError("Invalid input")
 
-        target_edit_files = get_target_edit_files(
-            repo_path, example["src_dir"], example["test"]["test_dir"]
-        )
-
         if agent_config.run_tests:
-            # Call the commit0 get-tests command to retrieve test files
-            test_files_str = get_tests(repo_name, verbose=0)
-            test_files = sorted(list(set([i.split(":")[0] for i in test_files_str])))
-
             update_queue.put(("start_repo", (original_repo_name, len(test_files))))
             # when unit test feedback is available, iterate over test files
             for test_file in test_files:
@@ -144,6 +139,7 @@ def run_agent_for_repo(
                     lint_cmd,
                     target_edit_files,
                     test_log_dir,
+                    test_first=True,
                 )
                 # after running the agent, update the money display
                 update_queue.put(

agent/run_agent_no_rich.py

@@ -53,13 +53,22 @@ def run_agent_for_repo(
     """Run Aider for a given repository."""
     # get repo info
     _, repo_name = example["repo"].split("/")
+    print("Working on repo: ", repo_name)
 
-    repo_name = repo_name.lower()
-    repo_name = repo_name.replace(".", "-")
+    # repo_name = repo_name.lower()
+    # repo_name = repo_name.replace(".", "-")
 
     repo_path = os.path.join(repo_base_dir, repo_name)
     repo_path = os.path.abspath(repo_path)
 
+    # get target files to edit and test files to run
+    target_edit_files = get_target_edit_files(
+        repo_path, example["src_dir"], example["test"]["test_dir"]
+    )
+    # Call the commit0 get-tests command to retrieve test files
+    test_files_str = get_tests(repo_name, verbose=0)
+    test_files = sorted(list(set([i.split(":")[0] for i in test_files_str])))
+
     try:
         local_repo = Repo(repo_path)
     except Exception:
@@ -102,22 +111,15 @@ def run_agent_for_repo(
 
     # TODO: make this path more general
     commit0_dot_file_path = str(Path(repo_path).parent.parent / ".commit0.yaml")
+
     with DirContext(repo_path):
         if agent_config is None:
             raise ValueError("Invalid input")
 
-        target_edit_files = get_target_edit_files(
-            repo_path, example["src_dir"], example["test"]["test_dir"]
-        )
-
         if agent_config.run_tests:
-            # Call the commit0 get-tests command to retrieve test files
-            test_files_str = get_tests(repo_name, verbose=0)
-            test_files = sorted(list(set([i.split(":")[0] for i in test_files_str])))
-
             # 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_dot_file_path {commit0_dot_file_path}"
+                test_cmd = f"python -m commit0 test {repo_path} {test_file} --branch {branch} --backend {backend} --commit0-dot-file-path {commit0_dot_file_path}"
                 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)
@@ -128,6 +130,7 @@ def run_agent_for_repo(
                     lint_cmd,
                     target_edit_files,
                     test_log_dir,
+                    test_first=True,
                 )
                 # cost = agent_return.last_cost
         else:

pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "pre-commit>=3.8.0",
     "PyMuPDF>=1.24.5",
     "aider-chat>=0.56.0",
-    "modal>=0.64.95",
+    "modal==0.64.95",
     "typer>=0.12.0",
     "tenacity>=8.5.0",
     "datasets>=3.0.0",