Fix CI; ensure agents have different names

Author: klieret

codeclash/games/battlesnake/battlesnake.py

@@ -70,6 +70,7 @@ def _run_single_simulation(self, player2port: dict[str, int], idx: int) -> str:
         return output["output"]
 
     def execute_round(self, agents: list[Player]):
+        assert len(agents) > 1, "Battlesnake requires at least two players"
         self.logger.debug("Starting game servers")
         player2port = {}
         for idx, agent in enumerate(agents):
@@ -87,9 +88,9 @@ def execute_round(self, agents: list[Player]):
 
         if len(available_ports) == 1:
             missing_ports = set(player2port.values()) - set(available_ports)
-            player = next(player for player, port in player2port.items() if port in missing_ports)
-            self.logger.warning(f"Player {player} failed to start")
-            self._failed_to_start_player.append(player)
+            missing_player = next(player for player, port in player2port.items() if port in missing_ports)
+            self.logger.warning(f"Player {missing_player} failed to start")
+            self._failed_to_start_player.append(missing_player)
             return
 
         if len(available_ports) < len(agents):

codeclash/games/game.py

@@ -212,6 +212,9 @@ def run_round(self, agents: list[Player], round_num: int) -> RoundStats:
         Returns the log output, result output, and winner name. All bookkeeping should be
         handled by the tournament class.
         """
+        all_names = {agent.name for agent in agents}
+        assert len(all_names) == len(agents), "All agents must have unique names"
+
         random.shuffle(agents)  # Shuffle to ensure fairness in case of positional advantages
         stats = RoundStats(round_num, agents)
         validated: list[Player] = []

codeclash/tournaments/single_player.py

@@ -62,12 +62,12 @@ def get_agent(self, agent_config: dict, round: int) -> Player:
         game_context = self.get_game_context(agent_config, round=round)
         return get_agent(agent_config, game_context, environment)
 
-    def get_dummy_agent(self) -> Player:
+    def get_dummy_agent(self, player_config: dict) -> Player:
         """Create a dummy agent that does nothing."""
         return Dummy(
-            self.config["player"],
+            player_config,
             environment=self.game.get_environment(f"{self.game.game_id}.dummy"),
-            game_context=self.get_game_context(self.config["player"], round=0),
+            game_context=self.get_game_context(player_config, round=0),
         )
 
     def run(self):
@@ -128,11 +128,11 @@ def evaluate(self, n_repetitions: int = 3) -> None:
         """
         p1_config = self.config["player"].copy()
         p1_config["name"] = "p1"
-        p1 = self.get_dummy_agent()
+        p1 = self.get_dummy_agent(p1_config)
 
         p2_config = self.config["player"].copy()
         p2_config["name"] = "p2"
-        p2 = self.get_dummy_agent()
+        p2 = self.get_dummy_agent(p2_config)
         matrix = {
             p1_round: {p2_round: [] for p2_round in range(0, self.rounds + 1)} for p1_round in range(0, self.rounds + 1)
         }