minor update

Author: nanjiangwill

agent/agents.py

@@ -111,19 +111,19 @@ def run(
         coder.stream = True
 
         # Run the agent
-        # coder.run(message)
-
-        #### 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
+        coder.run(message)
+
+        # #### 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()

agent/cli.py

@@ -190,6 +190,10 @@ def run(
         1,
         help="Maximum number of repositories for agent to run in parallel",
     ),
+    display_repo_progress_num: int = typer.Option(
+        5,
+        help="Display the agent progress",
+    ),
 ) -> None:
     """Run the agent on the repository."""
     run_agent(
@@ -199,6 +203,7 @@ def run(
         agent_config_file,
         log_dir,
         max_parallel_repos,
+        display_repo_progress_num,
     )
 
 
@@ -238,41 +243,3 @@ def run_test_no_rich(
         log_dir,
         max_parallel_repos,
     )
-
-
-@agent_app.command()
-def run_test(
-    experiment_name: str = typer.Argument(
-        ...,
-        help="Experiment name of current run",
-    ),
-    override_previous_changes: bool = typer.Option(
-        False,
-        help="If override the previous agent changes on `experiment_name` 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_AIDER_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",
-    ),
-) -> None:
-    """Run the agent on the repository."""
-    run_agent(
-        experiment_name,
-        override_previous_changes,
-        backend,
-        agent_config_file,
-        log_dir,
-        max_parallel_repos,
-    )

agent/display.py

@@ -81,6 +81,7 @@ def __init__(self, total_repos: int):
         self.finished_files = {}
         self.total_files_per_repo = {}
         self.repo_money_spent = {}
+        self.display_repo_progress_num = 5
 
         self.overall_progress = Progress(
             SpinnerColumn(),
@@ -157,6 +158,10 @@ def __init__(self, total_repos: int):
             Panel(Layout(name="ongoing"), title="Ongoing", border_style="yellow")
         )
 
+    def update_repo_progress_num(self, display_repo_progress_num: int) -> None:
+        """Update the number of repositories to display in the ongoing section."""
+        self.display_repo_progress_num = display_repo_progress_num
+
     def update_agent_display(
         self,
         agent_name: str,
@@ -262,15 +267,20 @@ def update(self) -> None:
 
         if ongoing_panels:
             ongoing_layout = Layout()
-            for i, panel in enumerate(ongoing_panels[:5]):
+            for i, panel in enumerate(ongoing_panels[: self.display_repo_progress_num]):
                 ongoing_layout.add_split(Layout(panel, name=f"repo_{i}"))
-            ongoing_layout.split_row(
-                *[ongoing_layout[f"repo_{i}"] for i in range(len(ongoing_panels[:5]))]
+            ongoing_layout.split_column(
+                *[
+                    ongoing_layout[f"repo_{i}"]
+                    for i in range(
+                        len(ongoing_panels[: self.display_repo_progress_num])
+                    )
+                ]
             )
             self.layout["main"]["right"].update(
                 Panel(
                     ongoing_layout,
-                    title="Ongoing(Only first 5 shown if more than 5)",
+                    title=f"Ongoing(only show at most {self.display_repo_progress_num} repos, set with `--display_repo_progress_num` flag)",
                     border_style="yellow",
                 )
             )

agent/run_agent.py

@@ -178,6 +178,7 @@ def run_agent(
     agent_config_file: str,
     log_dir: str,
     max_parallel_repos: int,
+    display_repo_progress_num: int,
 ) -> None:
     """Main function to run Aider for a given repository."""
     config = read_yaml_config(agent_config_file)
@@ -208,10 +209,12 @@ def run_agent(
 
     with TerminalDisplay(len(filtered_dataset)) as display:
         not_started_repos = [
-            getattr(example, "repo", "").split("/")[-1] for example in filtered_dataset
+            cast(RepoInstance, example)["repo"].split("/")[-1]
+            for example in filtered_dataset
         ]
         display.set_not_started_repos(not_started_repos)
 
+        display.update_repo_progress_num(display_repo_progress_num)
         display.update_backend_display(backend)
         display.update_log_dir_display(log_dir)
         display.update_agent_display(
@@ -223,7 +226,6 @@ def run_agent(
             agent_config.use_spec_info,
             agent_config.use_lint_info,
         )
-
         with multiprocessing.Manager() as manager:
             update_queue = manager.Queue()
             with multiprocessing.Pool(processes=max_parallel_repos) as pool: