Add run_manager code, not completely working

Author: EugeneChoi4

agent/agent_utils.py

@@ -571,3 +571,13 @@ def read_yaml_config(config_file: str) -> dict:
         raise FileNotFoundError(f"The config file '{config_file}' does not exist.")
     with open(config_file, "r") as f:
         return yaml.load(f, Loader=yaml.FullLoader)
+    
+    
+def parse_tasks(text: str) -> list[str]:
+    """Parse the tasks from the manager output."""
+    tasks = [] 
+    for line in text.strip().splitlines():
+        if not line.strip()[0].isdigit():
+            continue 
+        tasks.append(line.strip())
+    return tasks

agent/agents.py

@@ -61,6 +61,59 @@ class AgentTeams(Agents):
     def __init__(self, max_iteration: int, model_name: str):
         super().__init__(max_iteration)
         self.model = Model(model_name)
+        
+    def run_manager(
+        self,
+        message: str,
+        fnames: list[str],
+        log_dir: Path,
+    ) -> AgentReturn:
+        """Start agent manager"""
+        
+        log_dir = log_dir.resolve()
+        log_dir.mkdir(parents=True, exist_ok=True)
+        input_history_file = log_dir / ".manager.input.history"
+        chat_history_file = log_dir / ".manager.chat.history.md"
+
+        # Set up logging
+        log_file = log_dir / "manager.log"
+        logging.basicConfig(
+            filename=log_file,
+            level=logging.INFO,
+            format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+        )
+
+        # Redirect print statements to the log file
+        sys.stdout = open(log_file, "a")
+        sys.stderr = open(log_file, "a")
+
+        # Configure httpx and backoff logging
+        handle_logging("httpx", log_file)
+        handle_logging("backoff", log_file)
+
+        io = InputOutput(
+            yes=False,
+            input_history_file=input_history_file,
+            chat_history_file=chat_history_file,
+        )
+        manager = Coder.create(
+            main_model=self.model,
+            read_only_fnames=fnames,
+            io=io,
+        )
+        manager.max_reflection = self.max_iteration
+        manager.stream = True
+
+        manager.run(message)
+
+        sys.stdout.close()
+        sys.stderr.close()
+        # Restore original stdout and stderr
+        sys.stdout = sys.__stdout__
+        sys.stderr = sys.__stderr__
+
+        return AgentReturn(log_file)
+        
     def run(
         self,
         message: str,
@@ -81,11 +134,11 @@ def run(
             auto_lint = False
         log_dir = log_dir.resolve()
         log_dir.mkdir(parents=True, exist_ok=True)
-        input_history_file = log_dir / ".team.input.history"
-        chat_history_file = log_dir / ".team.chat.history.md"
+        input_history_file = log_dir / ".coder.input.history"
+        chat_history_file = log_dir / ".coder.chat.history.md"
 
         # Set up logging
-        log_file = log_dir / "team.log"
+        log_file = log_dir / "coder.log"
         logging.basicConfig(
             filename=log_file,
             level=logging.INFO,
@@ -96,11 +149,6 @@ def run(
         sys.stdout = open(log_file, "a")
         sys.stderr = open(log_file, "a")
 
-        # Log the message
-        agent_message_log_file = log_dir / "agent_message.log"
-        with open(agent_message_log_file, "a") as f:
-            f.write(f"Message Sent: {message}\n\n")
-
         # Configure httpx and backoff logging
         handle_logging("httpx", log_file)
         handle_logging("backoff", log_file)
@@ -110,26 +158,12 @@ def run(
             input_history_file=input_history_file,
             chat_history_file=chat_history_file,
         )
-        manager = Coder.create(
-            main_model=self.model,
-            fnames=fnames,
-            auto_lint=auto_lint,
-            auto_test=auto_test,
-            lint_cmds={"python": lint_cmd},
-            test_cmd=test_cmd,
-            io=io,
-        )
-        manager.max_reflection = 1
-        manager.stream = True
-
-        # Run the agent
-        manager_message = "First, add every file in the repo to your conversation. Second, write a plan of attack to implement the entire repo and return this plan."
-        manager.run(manager_message)
-
 
         coder = Coder.create(
             main_model=self.model,
-            fnames=fnames,
+            
+            #make the coder import files on its own for now
+            fnames=[],
             auto_lint=auto_lint,
             auto_test=auto_test,
             lint_cmds={"python": lint_cmd},
@@ -138,12 +172,7 @@ def run(
         )
         coder.max_reflection = self.max_iteration
         coder.stream = True
-
-        # Run the agent
-        with open(chat_history_file, 'r', encoding='utf-8') as file:
-            plan = file.read()
-        coder_message = "follow this implementation plan: "+plan
-        coder.run(coder_message)
+        coder.run(message)
 
         sys.stdout.close()
         sys.stderr.close()

agent/run_agent.py

@@ -12,6 +12,7 @@
     update_message_with_dependencies,
     get_lint_cmd,
     read_yaml_config,
+    parse_tasks,
 )
 import subprocess
 from agent.agents import AiderAgents
@@ -293,8 +294,8 @@ def run_team_for_repo(
             f"{repo_path} is not a git repo. Check if base_dir is correctly specified."
         )
 
-    manager = AiderAgents(1, agent_config.model_name)
-    coder = AiderAgents(agent_config.max_iteration, agent_config.model_name)
+    manager = AgentTeams(agent_config.max_iteration, agent_config.model_name)
+    coder = AgentTeams(agent_config.max_iteration, agent_config.model_name)
 
      # Check if there are changes in the current branch
     if local_repo.is_dirty():
@@ -345,7 +346,8 @@ def run_team_for_repo(
     with open(agent_config_log_file, "w") as agent_config_file:
         yaml.dump(agent_config, agent_config_file)
 
-    manager_message = "Write a concise plan of attack to implement the entire repo, but don't actually do any coding. The plan should not include any reccommendations to add files and should be a maximum of 500 words."
+    # /ask will make aider not write any code, but only a plan
+    manager_message = "/ask You are a manager in charge of writing a plan to complete the implementations for all functions (i.e., those with pass statements) and pass the unit tests. Write a concise plan of attack to implement the entire repo, but don't actually do any coding. Please output the plan in the format of a list of numbered steps. Each step should specify a file to edit and a high-level description of the change to make. For example, '1.) file.py: add a function to calculate the sum of two numbers'. Note that we only need to edit the files that contain functions with pass statements, ie. those in the current context. Give me only the plan, with no extraneous text."
 
     with DirContext(repo_path):
         if agent_config is None:
@@ -364,36 +366,46 @@ def run_team_for_repo(
                 dependencies = import_dependencies[f]
             file_name = "all"
             file_log_dir = experiment_log_dir / file_name
-            lint_cmd = get_lint_cmd(repo_name, agent_config.use_lint_info)
+            lint_cmd = get_lint_cmd(repo_name, agent_config.use_lint_info, commit0_config_file)
 
+                
+            """
+            #uncommenting below works, but the manager.run_manager line doesnt work idk why
             
-            agent_return = manager.run(manager_message, "", lint_cmd, target_edit_files, file_log_dir)
-            with open(agent_return.log_file, 'r', encoding='utf-8') as file:
-                plan = file.read()
-            coder_message = "follow this implementation plan: "+plan
-
+            coder_message = f"Complete the following task, implementing the relevant incomplete functions (i.e., those with pass statements). You may add the specified file to the context if necessary:"
+                
             agent_return = coder.run(coder_message, "", lint_cmd, target_edit_files, file_log_dir)
+            """
+            
+            agent_return = manager.run_manager(manager_message, target_edit_files, file_log_dir)
+            
+            #TODO: uncomment below after figuring out why manager.run_manager doesnt work
+            
+            # with open(agent_return.log_file, 'r', encoding='utf-8') as file:
+            #     plan = file.read()
+                
+            # update_queue.put(
+            #     (
+            #         "update_money_display",
+            #         (repo_name, file_name, agent_return.last_cost),
+            #     )
+            # )
+            
+            # tasks = parse_tasks(plan)
 
-            # for f in target_edit_files:
-            #     update_queue.put(("set_current_file", (repo_name, f)))
-            #     dependencies = import_dependencies[f]
-            #     message = update_message_with_dependencies(coder_message, dependencies)
-            #     file_name = f.replace(".py", "").replace("/", "__")
-            #     file_log_dir = experiment_log_dir / file_name
-            #     lint_cmd = get_lint_cmd(repo_name, agent_config.use_lint_info)
-            #     agent_return = coder.run(message, "", lint_cmd, [f], file_log_dir)
+            # for task in tasks:
+            #     coder_message = f"Complete the following task, implementing the relevant incomplete functions (i.e., those with pass statements). You may add the specified file to the context if necessary: \n{task}"
+                
+            #     agent_return = coder.run(coder_message, "", lint_cmd, target_edit_files, file_log_dir)
+            #     #TODO: fix the display (right now it just displys one file)
+            
+
             #     update_queue.put(
             #         (
             #             "update_money_display",
             #             (repo_name, file_name, agent_return.last_cost),
             #         )
             #     )
-            update_queue.put(
-                    (
-                        "update_money_display",
-                        (repo_name, file_name, agent_return.last_cost),
-                    )
-                )