Merge branch 'main' of github.com:emagedoc/CodeClash

Author: john-b-yang

codeclash/agents/__init__.py

@@ -11,10 +11,11 @@ def get_agent(config: dict, game: CodeGame) -> Player:
     }.get(config["agent"])
     if agents is None:
         raise ValueError(f"Unknown agent type: {config['agent']}")
-    environment = game.get_environment(f"{game.game_id}_{config['name']}")
-    format_vars = {
-        "game_name": game.name,
+    environment = game.get_environment()
+    template_vars = {
         "game_id": game.game_id,
         "rounds": game.rounds,
+        "player_id": config["name"],
+        "game_description": game.config.get("description", ""),
     }
-    return agents(config, environment, format_vars)
+    return agents(config, environment, template_vars)

codeclash/agents/abstract.py

@@ -15,17 +15,17 @@ def __init__(
         self,
         config: dict,
         environment: Environment,
-        format_vars: dict,
+        template_vars: dict,
     ):
         self.config = config
-        self.name = f"{format_vars['game_id']}_{config['name']}"
+        self.name = f"{template_vars['game_id']}_{config['name']}"
         self.environment = environment
-        self.format_vars = format_vars
+        self.template_vars = template_vars
         self.round = 1  # TODO: This is disconnected from game.round right now
 
     def commit(self):
         """Commit changes to the agent's codebase."""
-        rounds = self.format_vars["rounds"]
+        rounds = self.template_vars["rounds"]
         for cmd in [
             "git add -A",
             f"git commit --allow-empty -m 'Round {self.round}/{rounds} Update'",

codeclash/agents/minisweagent.py

@@ -29,14 +29,14 @@ def __init__(
         model: Model,
         env: Environment,
         name: str,
-        format_vars: dict,
+        template_vars: dict,
         *,
         config_class: Callable = AgentConfig,
         **kwargs,
     ):
         super().__init__(model, env, config_class=config_class, **kwargs)
         self.name = name
-        self.format_vars = format_vars
+        self.template_vars = template_vars
         self.console = Console()
 
     def add_message(self, role: str, content: str, **kwargs):
@@ -52,7 +52,7 @@ def render_template(self, template: str, **kwargs) -> str:
             | asdict(self.env.config)
             | asdict(self.model.config)
             | platform.uname()._asdict()
-            | self.format_vars
+            | self.template_vars
         )
         return Template(template).render(**kwargs, **cs, **os.environ)
 
@@ -65,16 +65,16 @@ def run(self) -> tuple[str, str]:
 class MiniSWEAgent(Player):
     """Player with agentic code editing capabilities"""
 
-    def __init__(self, config: dict, environment: Environment, format_vars: dict):
-        super().__init__(config, environment=environment, format_vars=format_vars)
+    def __init__(self, config: dict, environment: Environment, template_vars: dict):
+        super().__init__(config, environment=environment, template_vars=template_vars)
         self.agent = ClashAgent(
             LitellmModel(
                 model_name=config["model"],
                 model_kwargs={"api_key": resolve_api_key(config["model"])},
             ),
             self.environment,
             self.name,
-            format_vars,
+            template_vars,
             **yaml.safe_load(Path(config["config"]).read_text())["agent"],
         )
 
@@ -93,7 +93,7 @@ def run(self):
             save_traj(
                 self.agent,  # type: ignore
                 DIR_LOGS
-                / f"{self.format_vars['game_id']}/{player_id}_r{self.format_vars['round']}.traj.json",
+                / f"{self.template_vars['game_id']}/{player_id}_r{self.template_vars['round']}.traj.json",
                 exit_status=exit_status,
                 result=result,
             )