Update app.py

app.py

@@ -2,84 +2,72 @@ import gradio as gr
 import numpy as np
 from game_logic import my_agent, Configuration, Observation
 
-# Constants
-EMPTY = 0
-PLAYER = 1
-AI = 2
-SYMBOLS = {EMPTY: "⚪", PLAYER: "🔴", AI: "🟡"}
-BOARD_SIZE = (6, 7)
-WIN_LENGTH = 4
-
 def initialize_game():
-    return np.zeros(BOARD_SIZE, dtype=int)
+    return np.zeros((6, 7), dtype=int)
 
 def make_move(board, column, player):
-    """Make a move on the board - returns None if invalid move"""
-    row = np.where(board[:, column] == EMPTY)[0]
-    if len(row) == 0:
-        return None
-    board[row[-1], column] = player
+    """Make a move on the board"""
+    for row in range(5, -1, -1):
+        if board[row][column] == 0:
+            board[row][column] = player
+            return board
     return board
 
+def format_board(board):
+    """Convert board to player-friendly visualization"""
+    symbols = {0: "⚪", 1: "🔴", 2: "🟡"}
+    return [[symbols[cell] for cell in row] for row in board]
+
 def check_winner(board):
-    """Optimized winner check using numpy operations"""
+    """Check if there's a winner"""
+    board = np.array(board)
+    
+    def check_line(line):
+        return (len(line) >= 4 and 
+                (any(np.all(line[i:i+4] == 1) for i in range(len(line)-3)) or
+                 any(np.all(line[i:i+4] == 2) for i in range(len(line)-3))))
+
     # Horizontal
-    for row in range(BOARD_SIZE[0]):
-        for col in range(BOARD_SIZE[1] - WIN_LENGTH + 1):
-            window = board[row, col:col + WIN_LENGTH]
-            if np.all(window == PLAYER) or np.all(window == AI):
-                return True
+    for row in board:
+        if check_line(row):
+            return True
 
     # Vertical
-    for row in range(BOARD_SIZE[0] - WIN_LENGTH + 1):
-        for col in range(BOARD_SIZE[1]):
-            window = board[row:row + WIN_LENGTH, col]
-            if np.all(window == PLAYER) or np.all(window == AI):
-                return True
+    for col in board.T:
+        if check_line(col):
+            return True
 
     # Diagonals
-    for row in range(BOARD_SIZE[0] - WIN_LENGTH + 1):
-        for col in range(BOARD_SIZE[1] - WIN_LENGTH + 1):
-            # Positive diagonal
-            window = board[range(row, row + WIN_LENGTH), range(col, col + WIN_LENGTH)]
-            if np.all(window == PLAYER) or np.all(window == AI):
-                return True
-            # Negative diagonal
-            window = board[range(row, row + WIN_LENGTH), range(col + WIN_LENGTH - 1, col - 1, -1)]
-            if np.all(window == PLAYER) or np.all(window == AI):
-                return True
-    
-    return False
+    for offset in range(-2, 4):
+        diag = np.diagonal(board, offset)
+        if check_line(diag):
+            return True
+        diag = np.diagonal(np.fliplr(board), offset)
+        if check_line(diag):
+            return True
 
-def format_board(board):
-    """Convert board to emoji representation"""
-    return [[SYMBOLS[cell] for cell in row] for row in board]
+    return False
 
 def play_game(board, col, state):
     if state["game_over"]:
         return board, "Game is over! Click 'New Game' to play again."
     
-    # Convert display format to game logic format
-    board_array = np.array([[0 if cell == SYMBOLS[EMPTY] else 
-                            1 if cell == SYMBOLS[PLAYER] else 2 
-                            for cell in row] for row in board.values.tolist()])
+    # Convert Dataframe to numpy array for game logic
+    board_array = np.array([[0 if cell == "⚪" else 1 if cell == "🔴" else 2 for cell in row] 
+                           for row in board.values.tolist()])
     
     # Player move
-    new_board = make_move(board_array.copy(), col, PLAYER)
-    if new_board is None:
-        return format_board(board_array), "Invalid move! Try again."
-    board_array = new_board
-    
+    board_array = make_move(board_array, col, 1)
     if check_winner(board_array):
         state["game_over"] = True
         return format_board(board_array), "You win! 🎉"
     
     # AI move
-    config = Configuration({"rows": BOARD_SIZE[0], "columns": BOARD_SIZE[1], "inarow": WIN_LENGTH})
-    obs = Observation({"board": board_array.flatten().tolist(), "mark": AI})
+    config = Configuration({"rows": 6, "columns": 7, "inarow": 4})
+    obs = Observation({"board": board_array.flatten().tolist(), "mark": 2})
     
     ai_col = my_agent(obs, config)
-    board_array = make_move(board_array, ai_col, AI)
+    board_array = make_move(board_array, ai_col, 2)
     
     if check_winner(board_array):
         state["game_over"] = True
@@ -87,34 +75,6 @@ def play_game(board, col, state):
     
     return format_board(board_array), "Your turn!"
 
-css = """
-#board {
-    max-width: 400px;
-    margin: 20px auto;
-}
-#board table {
-    width: 100%;
-    table-layout: fixed;
-}
-#board td {
-    text-align: center;
-    font-size: 32px;
-    padding: 12px;
-    width: 14.28%;
-}
-.button-row {
-    max-width: 400px;
-    margin: 0 auto;
-    display: flex;
-    justify-content: space-between;
-    gap: 10px;
-}
-.button-row button {
-    flex: 1;
-    min-width: 40px;
-}
-"""
-
 def create_ui():
     with gr.Blocks(css=css) as demo:
         gr.Markdown("# Play Connect Four Against AI")
@@ -129,7 +89,7 @@ def create_ui():
             value=format_board(initialize_game()),
             interactive=False,
             show_label=False,
-            headers=False,
+            headers=None,
             wrap=True,
             elem_id="board",
             row_count=BOARD_SIZE[0],
@@ -157,5 +117,34 @@ def create_ui():
     
     return demo
 
+# CSS definition
+css = """
+#board {
+    max-width: 400px;
+    margin: 20px auto;
+}
+#board table {
+    width: 100%;
+    table-layout: fixed;
+}
+#board td {
+    text-align: center;
+    font-size: 32px;
+    padding: 12px;
+    width: 14.28%;  /* 100% / 7 columns */
+}
+.button-row {
+    max-width: 400px;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    gap: 10px;
+}
+.button-row button {
+    flex: 1;
+    min-width: 40px;
+}
+"""
+
 demo = create_ui()
 demo.launch()