Update app.py

app.py

@@ -1,6 +1,7 @@
 """
 Life Frontier: Partner's Concerto
 Single-app turn-based game with SQLite state management
+Upgraded for Gradio 5.49
 """
 
 import gradio as gr
@@ -789,7 +790,7 @@ def create_ui():
         *A turn-based strategy game for couples*
         """)
         
-        # Session state
+        # Session state - Gradio 5 style
         session_state = gr.State({
             'room_id': None,
             'player_id': None,
@@ -812,33 +813,33 @@ def create_ui():
                 create_btn = gr.Button("🆕 Create Room", variant="primary")
                 join_btn = gr.Button("🚪 Join Room", variant="secondary")
             
-            join_result = gr.Markdown()
+            join_result = gr.Markdown(value="")
         
         with gr.Tab("🎯 Game Board"):
             gr.Markdown("### Game Status")
-            status_display = gr.Markdown("*No game joined*")
+            status_display = gr.Markdown(value="*No game joined*")
             
             with gr.Row():
                 # Player 1 Panel
                 with gr.Column():
                     gr.Markdown("### Player 1")
-                    p1_name = gr.Textbox(label="Name", interactive=False)
-                    p1_character = gr.Textbox(label="Character", interactive=False)
-                    p1_display = gr.JSON(label="Status")
+                    p1_name = gr.Textbox(label="Name", interactive=False, value="")
+                    p1_character = gr.Textbox(label="Character", interactive=False, value="")
+                    p1_display = gr.JSON(label="Status", value={})
                     with gr.Row():
-                        p1_time = gr.Number(label="⏰ Time", interactive=False)
-                        p1_money = gr.Number(label="💰 Money", interactive=False)
+                        p1_time = gr.Number(label="⏰ Time", interactive=False, value=0)
+                        p1_money = gr.Number(label="💰 Money", interactive=False, value=0)
                     with gr.Row():
-                        p1_hp = gr.Number(label="❤️ HP", interactive=False)
-                        p1_cp = gr.Number(label="🧠 CP", interactive=False)
+                        p1_hp = gr.Number(label="❤️ HP", interactive=False, value=0)
+                        p1_cp = gr.Number(label="🧠 CP", interactive=False, value=0)
                     with gr.Row():
-                        p1_stress = gr.Number(label="😰 Stress", interactive=False)
-                        p1_qol = gr.Number(label="✨ QoL", interactive=False)
+                        p1_stress = gr.Number(label="😰 Stress", interactive=False, value=0)
+                        p1_qol = gr.Number(label="✨ QoL", interactive=False, value=0)
                 
                 # Center - Actions
                 with gr.Column():
                     gr.Markdown("### Your Actions")
-                    your_turn_msg = gr.Markdown("*Waiting for your turn...*")
+                    your_turn_msg = gr.Markdown(value="*Waiting for your turn...*")
                     
                     gr.Markdown("**Rest Actions**")
                     with gr.Row():
@@ -850,10 +851,11 @@ def create_ui():
                     tasks_display = gr.Dataframe(
                         headers=["ID", "Name", "Type", "Time", "Req (Solo)", "Req (Coop)", "Reward"],
                         label="Public Tasks",
-                        wrap=True
+                        wrap=True,
+                        value=[]
                     )
                     
-                    task_select = gr.Dropdown(label="Select Task", choices=[])
+                    task_select = gr.Dropdown(label="Select Task", choices=[], value=None)
                     
                     with gr.Row():
                         solo_task_btn = gr.Button("▶️ Execute Solo", variant="primary")
@@ -869,7 +871,7 @@ def create_ui():
                     # Negotiation response (for partner)
                     with gr.Group(visible=False) as negotiation_panel:
                         gr.Markdown("### 🤝 Partner's Cooperation Request")
-                        negotiation_info = gr.Markdown()
+                        negotiation_info = gr.Markdown(value="")
                         with gr.Row():
                             response_cp = gr.Slider(1, 10, value=1, step=1, label="Your CP Investment")
                             response_hp = gr.Slider(0, 5, value=0, step=1, label="Your HP Investment")
@@ -879,80 +881,83 @@ def create_ui():
                     
                     end_turn_btn = gr.Button("⏭️ End Turn", variant="secondary", size="lg")
                     
-                    action_result = gr.Markdown()
+                    action_result = gr.Markdown(value="")
                 
                 # Player 2 Panel
                 with gr.Column():
                     gr.Markdown("### Player 2")
-                    p2_name = gr.Textbox(label="Name", interactive=False)
-                    p2_character = gr.Textbox(label="Character", interactive=False)
-                    p2_display = gr.JSON(label="Status")
+                    p2_name = gr.Textbox(label="Name", interactive=False, value="")
+                    p2_character = gr.Textbox(label="Character", interactive=False, value="")
+                    p2_display = gr.JSON(label="Status", value={})
                     with gr.Row():
-                        p2_time = gr.Number(label="⏰ Time", interactive=False)
-                        p2_money = gr.Number(label="💰 Money", interactive=False)
+                        p2_time = gr.Number(label="⏰ Time", interactive=False, value=0)
+                        p2_money = gr.Number(label="💰 Money", interactive=False, value=0)
                     with gr.Row():
-                        p2_hp = gr.Number(label="❤️ HP", interactive=False)
-                        p2_cp = gr.Number(label="🧠 CP", interactive=False)
+                        p2_hp = gr.Number(label="❤️ HP", interactive=False, value=0)
+                        p2_cp = gr.Number(label="🧠 CP", interactive=False, value=0)
                     with gr.Row():
-                        p2_stress = gr.Number(label="😰 Stress", interactive=False)
-                        p2_qol = gr.Number(label="✨ QoL", interactive=False)
+                        p2_stress = gr.Number(label="😰 Stress", interactive=False, value=0)
+                        p2_qol = gr.Number(label="✨ QoL", interactive=False, value=0)
             
             gr.Markdown("### Spectators")
-            spectators_display = gr.Markdown("*No spectators*")
+            spectators_display = gr.Markdown(value="*No spectators*")
             
             refresh_btn = gr.Button("🔄 Refresh Game State", variant="secondary")
         
         with gr.Tab("🏆 Rankings"):
             rankings_table = gr.Dataframe(
                 headers=["Rank", "Player", "Avg QoL", "Games", "Wins", "Win %"],
-                label="Top Players"
+                label="Top Players",
+                value=[]
             )
             refresh_rankings_btn = gr.Button("🔄 Refresh Rankings")
         
         # ===== EVENT HANDLERS =====
         
-        def create_room_handler(your_name, character_id):
+        def create_room_handler(your_name, character_id, session):
             import uuid
             room_id = str(uuid.uuid4())[:8].upper()
             player_id = str(uuid.uuid4())[:8]
 
             if not db.create_room(room_id):
-                return {}, "❌ Failed to create room. Please try again."
+                return session, "❌ Failed to create room. Please try again."
 
             success, slot, msg = db.join_room(room_id, player_id, your_name, character_id)
 
             if success:
-                return {
+                new_session = {
                     'room_id': room_id,
                     'player_id': player_id,
                     'player_slot': slot,
                     'is_spectator': slot is None
-                }, f"✅ Room created: **{room_id}**\n\n{msg}\n\nShare this Room ID with your partner!"
+                }
+                return new_session, f"✅ Room created: **{room_id}**\n\n{msg}\n\nShare this Room ID with your partner!"
             
-            # If join fails, we should probably clean up the created room
+            # If join fails, clean up the created room
             with db.get_connection() as conn:
                 conn.execute("DELETE FROM rooms WHERE room_id = ?", (room_id,))
                 conn.commit()
 
-            return {}, f"❌ Failed to join room after creation: {msg}"
+            return session, f"❌ Failed to join room after creation: {msg}"
         
-        def join_room_handler(room_id, your_name, character_id):
+        def join_room_handler(room_id, your_name, character_id, session):
             import uuid
             player_id = str(uuid.uuid4())[:8]
             
             success, slot, msg = db.join_room(room_id, player_id, your_name, character_id)
             
             if success:
-                return {
+                new_session = {
                     'room_id': room_id,
                     'player_id': player_id,
                     'player_slot': slot,
                     'is_spectator': slot is None
-                }, f"✅ {msg}"
-            return {}, f"❌ {msg}"
+                }
+                return new_session, f"✅ {msg}"
+            return session, f"❌ {msg}"
         
         def refresh_game_state(session):
-            empty_return = ("*No game joined*", "", "", {}, "", "", {}, [], gr.Dropdown(choices=[]), "*No spectators*", "")
+            empty_return = ("*No game joined*", "", "", {}, "", "", {}, [], [], "*No spectators*", "")
             
             if not session.get('room_id'):
                 return empty_return
@@ -978,9 +983,9 @@ def create_ui():
             p1_data = players[0] if len(players) > 0 else {}
             p2_data = players[1] if len(players) > 1 else {}
             
-            p1_name = p1_data.get('name', '')
+            p1_name_val = p1_data.get('name', '')
             p1_char = p1_data.get('character_id', '')
-            p2_name = p2_data.get('name', '')
+            p2_name_val = p2_data.get('name', '')
             p2_char = p2_data.get('character_id', '')
             
             # Tasks with better formatting
@@ -1020,50 +1025,50 @@ def create_ui():
             else:
                 turn_msg = "⏳ **Partner's turn...** Click Refresh to see updates."
             
-            return (status_md, p1_name, p1_char, p1_data, p2_name, p2_char, p2_data, 
-                   task_rows, gr.Dropdown(choices=task_options, value=None), spec_md, turn_msg)
+            return (status_md, p1_name_val, p1_char, p1_data, p2_name_val, p2_char, p2_data, 
+                   task_rows, task_options, spec_md, turn_msg)
         
         def execute_rest_handler(session, rest_type):
             if not session.get('room_id') or session.get('is_spectator'):
-                return "❌ Not in game as player", session
+                return "❌ Not in game as player"
             
             state = db.get_room_state(session['room_id'])
             if not state:
-                return "❌ Room not found", session
+                return "❌ Room not found"
             
             room = state['room']
             if room['current_turn'] != session['player_slot']:
-                return "❌ Not your turn!", session
+                return "❌ Not your turn!"
             
             player = state['players'][session['player_slot']]
             success, msg, updates = execute_rest(player, rest_type)
             
             if success:
                 db.update_player(session['room_id'], session['player_slot'], updates)
-                return f"✅ {msg}", session
+                return f"✅ {msg}"
             
-            return f"❌ {msg}", session
+            return f"❌ {msg}"
         
         def execute_solo_task_handler(session, task_id):
             if not session.get('room_id') or session.get('is_spectator'):
-                return "❌ Not in game as player", session
+                return "❌ Not in game as player"
             
             if not task_id:
-                return "❌ Select a task first", session
+                return "❌ Select a task first"
             
             state = db.get_room_state(session['room_id'])
             if not state:
-                return "❌ Room not found", session
+                return "❌ Room not found"
             
             room = state['room']
             if room['current_turn'] != session['player_slot']:
-                return "❌ Not your turn!", session
+                return "❌ Not your turn!"
             
             player = state['players'][session['player_slot']]
             task = next((t for t in TASKS if t['id'] == task_id), None)
             
             if not task:
-                return "❌ Task not found", session
+                return "❌ Task not found"
             
             success, msg, updates = execute_solo_task(player, task)
             
@@ -1074,24 +1079,24 @@ def create_ui():
                 updates['completed_tasks'] = json.dumps(completed)
                 
                 db.update_player(session['room_id'], session['player_slot'], updates)
-                return f"✅ {msg}", session
+                return f"✅ {msg}"
             
-            return f"❌ {msg}", session
+            return f"❌ {msg}"
         
         def end_turn_handler(session):
             if not session.get('room_id') or session.get('is_spectator'):
-                return "❌ Not in game as player", session
+                return "❌ Not in game as player"
             
             state = db.get_room_state(session['room_id'])
             if not state:
-                return "❌ Room not found", session
+                return "❌ Room not found"
             
             room = state['room']
             if room['current_turn'] != session['player_slot']:
-                return "❌ Not your turn!", session
+                return "❌ Not your turn!"
             
             db.end_turn(session['room_id'], session['player_slot'])
-            return "✅ Turn ended. Waiting for partner...", session
+            return "✅ Turn ended. Waiting for partner..."
         
         def load_rankings():
             rankings = db.get_rankings(20)
@@ -1107,21 +1112,21 @@ def create_ui():
                 ])
             return rows
         
-        # Wire up events
+        # Wire up events - Gradio 5 style with proper outputs
         create_btn.click(
-            create_room_handler,
-            inputs=[your_name_input, character_select],
+            fn=create_room_handler,
+            inputs=[your_name_input, character_select, session_state],
             outputs=[session_state, join_result]
         )
         
         join_btn.click(
-            join_room_handler,
-            inputs=[room_id_input, your_name_input, character_select],
+            fn=join_room_handler,
+            inputs=[room_id_input, your_name_input, character_select, session_state],
             outputs=[session_state, join_result]
         )
         
         refresh_btn.click(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display, 
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1129,11 +1134,11 @@ def create_ui():
         )
         
         quick_nap_btn.click(
-            lambda s: execute_rest_handler(s, "quick_nap"),
+            fn=lambda s: execute_rest_handler(s, "quick_nap"),
             inputs=[session_state],
-            outputs=[action_result, session_state]
+            outputs=[action_result]
         ).then(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display,
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1141,11 +1146,11 @@ def create_ui():
         )
         
         full_sleep_btn.click(
-            lambda s: execute_rest_handler(s, "full_sleep"),
+            fn=lambda s: execute_rest_handler(s, "full_sleep"),
             inputs=[session_state],
-            outputs=[action_result, session_state]
+            outputs=[action_result]
         ).then(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display,
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1153,11 +1158,11 @@ def create_ui():
         )
         
         deep_rest_btn.click(
-            lambda s: execute_rest_handler(s, "deep_rest"),
+            fn=lambda s: execute_rest_handler(s, "deep_rest"),
             inputs=[session_state],
-            outputs=[action_result, session_state]
+            outputs=[action_result]
         ).then(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display,
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1165,11 +1170,11 @@ def create_ui():
         )
         
         solo_task_btn.click(
-            execute_solo_task_handler,
+            fn=execute_solo_task_handler,
             inputs=[session_state, task_select],
-            outputs=[action_result, session_state]
+            outputs=[action_result]
         ).then(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display,
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1177,11 +1182,11 @@ def create_ui():
         )
         
         end_turn_btn.click(
-            end_turn_handler,
+            fn=end_turn_handler,
             inputs=[session_state],
-            outputs=[action_result, session_state]
+            outputs=[action_result]
         ).then(
-            refresh_game_state,
+            fn=refresh_game_state,
             inputs=[session_state],
             outputs=[status_display, p1_name, p1_character, p1_display,
                     p2_name, p2_character, p2_display, tasks_display, task_select,
@@ -1189,12 +1194,12 @@ def create_ui():
         )
         
         refresh_rankings_btn.click(
-            load_rankings,
+            fn=load_rankings,
             outputs=[rankings_table]
         )
         
         # Auto-refresh on tab switch
-        app.load(load_rankings, outputs=[rankings_table])
+        app.load(fn=load_rankings, outputs=[rankings_table])
     
     return app
 
@@ -1205,4 +1210,4 @@ if __name__ == "__main__":
         server_name="0.0.0.0",
         server_port=7860,
         share=False
-    )
+    )