Update app.py

app.py

@@ -40,7 +40,7 @@ Specify the column letter (a–g) for your next move.
 def extract_xml_move(text: str) -> str:
     """
     Extracts the move (a single column letter a–g) from the XML format
-    using regex.
+    using an improved regex. This function is kept simple for reuse.
     """
     match = re.search(r'<move>\s*([a-g])\s*</move>', text)
     if match:
@@ -66,7 +66,7 @@ def convert_moves_to_coordinate_list(moves_list: List[str]) -> str:
                 grid[row][col] = 'X' if i % 2 == 0 else 'O'
                 break
     
-    # Build coordinate list: Only include cells with a piece
+    # Build coordinate list: Only include cells with a piece.
     coords = []
     for row in range(6):
         for col in range(7):
@@ -84,7 +84,6 @@ def parse_coordinate_list(board_str: str) -> List[List[str]]:
     grid = [['.' for _ in range(7)] for _ in range(6)]
     if not board_str.strip() or board_str == "Empty Board":
         return grid
-        
     coords = board_str.split(",")
     for coord in coords:
         coord = coord.strip()
@@ -103,8 +102,12 @@ def parse_coordinate_list(board_str: str) -> List[List[str]]:
             grid[row][col] = piece
     return grid
 
-def get_available_positions(grid: List[List[str]]) -> str:
+def get_available_positions(board_str: str) -> str:
     """Returns the next available position (lowest empty spot) for each column."""
+    # Parse the board state
+    grid = parse_coordinate_list(board_str)
+    
+    # Find next available position in each column
     available = []
     for col in range(7):
         col_letter = chr(ord('a') + col)
@@ -133,11 +136,13 @@ class ConnectFour:
             
         # Find the lowest empty row in the selected column
         for row in range(5, -1, -1):
-            if self.board[5-row][col] == 0:  # Flip the row index to match the display
+            if self.board[5-row][col] == 0:
                 self.board[5-row][col] = self.current_player
+                # Store the move
+                col_letter = chr(ord('a') + col)
+                row_num = row + 1
+                move = f"{col_letter}{row_num}"
                 
-                # Record the move
-                move = f"{chr(ord('a') + col)}{row+1}"
                 if self.current_player == 1:
                     self.player_moves.append(move)
                 else:
@@ -191,37 +196,17 @@ class ConnectFour:
                     piece = "X" if self.board[row][col] == 1 else "O"
                     moves.append(f"{col_letter}{row_num}({piece})")
         return ", ".join(moves) if moves else "Empty Board"
-    
-    def get_grid_from_board(self):
-        grid = [['.' for _ in range(7)] for _ in range(6)]
-        for row in range(6):
-            for col in range(7):
-                if self.board[row][col] == 1:
-                    grid[5-row][col] = 'X'  # Convert to the format used by helper functions
-                elif self.board[row][col] == 2:
-                    grid[5-row][col] = 'O'
-        return grid
 
-    def parse_ai_move(self, move_str):
-        # Parse move like 'a', 'b', etc.
-        try:
-            col = ord(move_str.strip().lower()) - ord('a')
-            if 0 <= col <= 6:
-                return col
-            return -1
-        except:
-            return -1
-    
     def format_game_state(self):
         board_str = self.board_to_string()
-        grid = self.get_grid_from_board()
-        available_positions = get_available_positions(grid)
+        available_positions = get_available_positions(board_str)
         
-        # Format the player and AI moves
+        # Format player and AI moves
         player_moves_str = ", ".join(self.player_moves) if self.player_moves else ""
         ai_moves_str = ", ".join(self.ai_moves) if self.ai_moves else ""
         
-        return f"""Game State:
+        # Format according to the new template
+        game_state = f"""Game State:
 - You are playing as: O
 - Your previous moves: {ai_moves_str}
 - Opponent's moves: {player_moves_str}
@@ -230,6 +215,17 @@ class ConnectFour:
   {available_positions}
 
 Make your move."""
+        return game_state
+
+    def parse_ai_move(self, move_str):
+        # Parse move like 'a', 'b', etc.
+        try:
+            col = ord(move_str.strip().lower()) - ord('a')
+            if 0 <= col <= 6:
+                return col
+            return -1
+        except:
+            return -1
 
 def create_interface():
     game = ConnectFour()
@@ -352,8 +348,10 @@ def create_interface():
             # AI move
             game.current_player = 2
             
-            # Format game state using the new format
+            # NEW FORMAT: Use the new game state formatting
             game_state = game.format_game_state()
+            print("Sending game state to model:")
+            print(game_state)
             
             # Get AI response
             response = model.create_chat_completion(