Update chess-gpt-eval/mainvs.py

chess-gpt-eval/mainvs.py

@@ -355,7 +355,7 @@ def get_player_titles_and_time(
 
 used_openings = []
 def random_book_opening(
-    game_state: str, board: chess.Board
+    game_state_with_move_num: str, game_state_without_move_num: str, board: chess.Board
 ) -> Tuple[str, chess.Board]:
     global used_openings
     with open("openings.csv", "r") as file:
@@ -364,11 +364,9 @@ def random_book_opening(
     while moves_string in used_openings:
         moves_string = random.choice(lines)
     used_openings.append(moves_string)
-    if move_num_in_gamestate:
-        game_state = moves_string.rstrip() + " "
-    else:
-        game_state = ' '.join(['.' + m.split(".")[-1] if "." in m else m for m in moves_string.split()])
-        game_state = game_state.rstrip() + " "
+    game_state_with_move_num = moves_string.rstrip() + " "
+    game_state_without_move_num = ' '.join(['.' + m.split(".")[-1] if "." in m else m for m in moves_string.split()])
+    game_state_without_move_num = game_state_without_move_num.rstrip() + " "
     # Splitting the moves string on spaces
     tokens = moves_string.split()
 
@@ -380,11 +378,11 @@ def random_book_opening(
             move = token
 
         board.push_san(move)
-    return game_state.rstrip(), board, len(tokens) // 2
+    return game_state_with_move_num.rstrip(), game_state_without_move_num.rstrip(), board, len(tokens) // 2
 
 
 def add_random_moves(
-    game_state: str, board: chess.Board, num_moves: int = 20
+    game_state_with_move_num: str, game_state_without_move_num: str, board: chess.Board, num_moves: int = 20
 ) -> Tuple[str, chess.Board, int]:
     for i in range(num_moves * 2):  # Full moves to half moves
         legal_moves = list(board.legal_moves)
@@ -395,15 +393,16 @@ def add_random_moves(
         board.push(board.parse_san(move))
 
         if board.turn == chess.BLACK:
-            game_state += f" {i//2 + 1}.{move}" if move_num_in_gamestate else f" .{move}"
+            game_state_with_move_num += f" {i//2 + 1}.{move}"
+            game_state_without_move_num += f" .{move}"
         else:
-            game_state += f" {move}"
+            game_state_with_move_num += f" {move}"
+            game_state_without_move_num += f" {move}"
 
         if board.is_game_over():
             return None, None, 0  # Game over, discard the game
 
-    game_state = game_state.strip()
-    return game_state, board, num_moves
+    return game_state_with_move_num.strip(), game_state_without_move_num.strip(), board, num_moves
 
 
 # Return is (move_san, move_uci, attempts, is_resignation, is_illegal_move)
@@ -508,11 +507,14 @@ def play_games(
         board = chess.Board()
 
         if book_opening:
-            game_state, board, opening_moves = random_book_opening(game_state, board)
+            game_state_with_move_num, game_state_without_move_num, board, opening_moves = random_book_opening(game_state_with_move_num, game_state_without_move_num, board)
         elif random_opening:
-            while True:
-                game_state, board, opening_moves = add_random_moves(game_state, board, random_opening_moves)
-                if game_state is not None:
+            for _ in range(10):
+                g1, g2, b, opening_moves = add_random_moves(game_state_with_move_num, game_state_without_move_num, board, random_opening_moves)
+                if g1 is not None:
+                    game_state_with_move_num = g1
+                    game_state_without_move_num = g2
+                    board = b
                     break
         else:
             opening_moves = 0
@@ -601,14 +603,14 @@ def play_games(
         print(f"Result: {board.result()}")
         print(board)
         print()
-        game_transcript = game_state.strip()
+        game_transcript = game_state_without_move_num.strip()
         if game_transcript not in unique_games:
             unique_games.add(game_transcript)
             record_results(
                 board,
                 player_one,
                 player_two,
-                game_state,
+                game_transcript,
                 player_one_illegal_moves,
                 player_one_illegal_attempts,
                 player_two_illegal_moves,