Update app.py

app.py

@@ -32,16 +32,16 @@ st.set_page_config(
 # Game Config
 GAME_NAME = "Rocky Mountain Quest 3D 🏔️🎮"
 START_LOCATION = "Trailhead Camp ⛺"
-CHARACTERS = {
-    "Trailblazer Tim 🌄": {"voice": "en-US-GuyNeural", "desc": "Fearless hiker seeking epic trails!", "color": 0x00ff00},
-    "Meme Queen Mia 😂": {"voice": "en-US-JennyNeural", "desc": "Spreads laughs with wild memes!", "color": 0xff00ff},
-    "Elk Whisperer Eve 🦌": {"voice": "en-GB-SoniaNeural", "desc": "Talks to wildlife, loves nature!", "color": 0x0000ff},
-    "Tech Titan Tara 💾": {"voice": "en-AU-NatashaNeural", "desc": "Codes her way through the Rockies!", "color": 0xffff00},
-    "Ski Guru Sam ⛷️": {"voice": "en-CA-ClaraNeural", "desc": "Shreds slopes, lives for snow!", "color": 0xffa500},
-    "Cosmic Camper Cal 🌠": {"voice": "en-US-AriaNeural", "desc": "Stargazes and tells epic tales!", "color": 0x800080},
-    "Rasta Ranger Rick 🍃": {"voice": "en-GB-RyanNeural", "desc": "Chills with nature’s vibes!", "color": 0x00ffff},
-    "Boulder Bro Ben 🪨": {"voice": "en-AU-WilliamNeural", "desc": "Climbs rocks, bro-style!", "color": 0xff4500}
-}
+CHARACTERS = [
+    {"name": "Trailblazer Tim 🌄", "voice": "en-US-GuyNeural", "desc": "Fearless hiker seeking epic trails!", "color": 0x00ff00},
+    {"name": "Meme Queen Mia 😂", "voice": "en-US-JennyNeural", "desc": "Spreads laughs with wild memes!", "color": 0xff00ff},
+    {"name": "Elk Whisperer Eve 🦌", "voice": "en-GB-SoniaNeural", "desc": "Talks to wildlife, loves nature!", "color": 0x0000ff},
+    {"name": "Tech Titan Tara 💾", "voice": "en-AU-NatashaNeural", "desc": "Codes her way through the Rockies!", "color": 0xffff00},
+    {"name": "Ski Guru Sam ⛷️", "voice": "en-CA-ClaraNeural", "desc": "Shreds slopes, lives for snow!", "color": 0xffa500},
+    {"name": "Cosmic Camper Cal 🌠", "voice": "en-US-AriaNeural", "desc": "Stargazes and tells epic tales!", "color": 0x800080},
+    {"name": "Rasta Ranger Rick 🍃", "voice": "en-GB-RyanNeural", "desc": "Chills with nature’s vibes!", "color": 0x00ffff},
+    {"name": "Boulder Bro Ben 🪨", "voice": "en-AU-WilliamNeural", "desc": "Climbs rocks, bro-style!", "color": 0xff4500}
+]
 FILE_EMOJIS = {"md": "📜", "mp3": "🎵"}
 
 # Prairie Simulator Locations
@@ -61,15 +61,25 @@ STATE_FILE = "user_state.txt"
 CHAT_FILE = os.path.join(CHAT_DIR, "quest_log.md")
 GAME_STATE_FILE = "game_state.json"
 
-# Cached Game State as "ML Model"
-@st.cache_data
+# Cached Game State as "ML Model" using st.cache_resource
+@st.cache_resource
 def load_game_state(_timestamp):
-    """Load or initialize the game state, treated as a cached 'model'."""
+    """Load or initialize the game state, treated as a cached resource."""
     if os.path.exists(GAME_STATE_FILE):
         with open(GAME_STATE_FILE, 'r') as f:
             state = json.load(f)
     else:
-        state = {"players": {}, "treasures": []}
+        state = {
+            "players": {},
+            "treasures": [
+                {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+                {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+                {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+                {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+                {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)}
+            ],
+            "history": []
+        }
         with open(GAME_STATE_FILE, 'w') as f:
             json.dump(state, f)
     return state
@@ -78,10 +88,24 @@ def update_game_state(state):
     """Update the game state and persist to file."""
     with open(GAME_STATE_FILE, 'w') as f:
         json.dump(state, f)
-    # Clear cache to force reload with new timestamp
-    load_game_state.clear()
+    load_game_state.clear()  # Clear cache to force reload
     return load_game_state(time.time())
 
+def reset_game_state():
+    """Reset the game state to initial conditions."""
+    state = {
+        "players": {},
+        "treasures": [
+            {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+            {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+            {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+            {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)},
+            {"id": str(uuid.uuid4()), "x": random.uniform(-40, 40), "z": random.uniform(-40, 40)}
+        ],
+        "history": []
+    }
+    return update_game_state(state)
+
 # Helpers
 def format_timestamp(username=""):
     now = datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -162,9 +186,13 @@ async def save_chat_entry(username, message, voice, is_markdown=False):
     await broadcast_message(f"{username}|{message}", "quest")
     st.session_state.chat_history.append(entry)
     st.session_state.last_transcript = message
-    st.session_state.score += 10
-    st.session_state.treasures += 1
-    st.session_state.last_chat_update = time.time()
+    game_state = load_game_state(st.session_state.game_state_timestamp)
+    game_state["history"].append(entry)
+    if username in game_state["players"]:
+        game_state["players"][username]["score"] += 10
+        game_state["players"][username]["treasures"] += 1
+        game_state["players"][username]["last_active"] = time.time()
+    update_game_state(game_state)
     return md_file, audio_file
 
 async def load_chat():
@@ -185,28 +213,26 @@ def init_session_state():
         'update_interval': 1, 'x_pos': 0, 'z_pos': 0, 'move_left': False,
         'move_right': False, 'move_up': False, 'move_down': False,
         'prairie_players': {}, 'last_chat_update': 0,
-        'game_state_timestamp': time.time()
+        'game_state_timestamp': time.time(), 'name_index': 0,
+        'timeout': 60, 'auto_refresh': 30, 'last_activity': time.time()
     }
     for k, v in defaults.items():
         if k not in st.session_state:
             st.session_state[k] = v
     if st.session_state.username is None:
-        saved_username = load_username()
-        if saved_username and saved_username in CHARACTERS:
-            st.session_state.username = saved_username
-        else:
-            st.session_state.username = random.choice(list(CHARACTERS.keys()))
-            asyncio.run(save_chat_entry(st.session_state.username, "🗺️ Begins the Rocky Mountain Quest!", CHARACTERS[st.session_state.username]["voice"]))
+        st.session_state.name_index = (st.session_state.name_index + 1) % len(CHARACTERS)
+        st.session_state.username = CHARACTERS[st.session_state.name_index]["name"]
+        asyncio.run(save_chat_entry(st.session_state.username, "🗺️ Joins the Rocky Mountain Quest!", CHARACTERS[st.session_state.name_index]["voice"]))
         save_username(st.session_state.username)
-    # Initialize player in cached game state if new
     game_state = load_game_state(st.session_state.game_state_timestamp)
     if st.session_state.username not in game_state["players"]:
         game_state["players"][st.session_state.username] = {
             "x": random.uniform(-20, 20),
             "z": random.uniform(-40, 40),
-            "color": CHARACTERS[st.session_state.username]["color"],
+            "color": CHARACTERS[st.session_state.name_index]["color"],
             "score": 0,
-            "treasures": 0
+            "treasures": 0,
+            "last_active": time.time()
         }
         update_game_state(game_state)
 
@@ -227,7 +253,7 @@ async def websocket_handler(websocket, path):
             "username": username,
             "animal": "prairie_dog",
             "location": PRAIRIE_LOCATIONS["Deadwood, SD"],
-            "color": CHARACTERS[username]["color"]
+            "color": CHARACTERS[st.session_state.name_index]["color"]
         }
         await broadcast_message(f"System|{username} joins the prairie!", room_id)
     else:
@@ -235,9 +261,10 @@ async def websocket_handler(websocket, path):
             game_state["players"][username] = {
                 "x": random.uniform(-20, 20),
                 "z": random.uniform(-40, 40),
-                "color": CHARACTERS[username]["color"],
+                "color": CHARACTERS[st.session_state.name_index]["color"],
                 "score": 0,
-                "treasures": 0
+                "treasures": 0,
+                "last_active": time.time()
             }
             update_game_state(game_state)
         st.session_state.players[client_id] = game_state["players"][username]
@@ -247,7 +274,7 @@ async def websocket_handler(websocket, path):
         async for message in websocket:
             if '|' in message:
                 sender, content = message.split('|', 1)
-                voice = CHARACTERS.get(sender, {"voice": "en-US-AriaNeural"})["voice"]
+                voice = next(c["voice"] for c in CHARACTERS if c["name"] == sender)
                 game_state = load_game_state(st.session_state.game_state_timestamp)
                 if content.startswith("MOVE:"):
                     _, x, z = content.split(":")
@@ -256,19 +283,22 @@ async def websocket_handler(websocket, path):
                     st.session_state.players[client_id]["z"] = z
                     game_state["players"][sender]["x"] = x
                     game_state["players"][sender]["z"] = z
+                    game_state["players"][sender]["last_active"] = time.time()
                     update_game_state(game_state)
                 elif content.startswith("SCORE:"):
                     score = int(content.split(":")[1])
                     st.session_state.players[client_id]["score"] = score
                     game_state["players"][sender]["score"] = score
+                    game_state["players"][sender]["last_active"] = time.time()
                     update_game_state(game_state)
                 elif content.startswith("TREASURE:"):
                     treasures = int(content.split(":")[1])
                     st.session_state.players[client_id]["treasures"] = treasures
                     game_state["players"][sender]["treasures"] = treasures
+                    game_state["players"][sender]["last_active"] = time.time()
                     for i, t in enumerate(game_state["treasures"]):
-                        if st.session_state.players[client_id]["x"] - 2 < t["x"] < st.session_state.players[client_id]["x"] + 2 and \
-                           st.session_state.players[client_id]["z"] - 2 < t["z"] < st.session_state.players[client_id]["z"] + 2:
+                        if abs(st.session_state.players[client_id]["x"] - t["x"]) < 2 and \
+                           abs(st.session_state.players[client_id]["z"] - t["z"]) < 2:
                             game_state["treasures"].pop(i)
                             break
                     update_game_state(game_state)
@@ -298,7 +328,15 @@ async def periodic_update():
     while True:
         if st.session_state.active_connections.get("quest"):
             game_state = load_game_state(st.session_state.game_state_timestamp)
-            player_list = ", ".join([p["username"] for p in st.session_state.players.values()]) or "No adventurers yet!"
+            # Remove inactive players (timeout after 60 seconds)
+            current_time = time.time()
+            inactive_players = [p for p, data in game_state["players"].items() if current_time - data["last_active"] > st.session_state.timeout]
+            for player in inactive_players:
+                del game_state["players"][player]
+                await broadcast_message(f"System|{player} timed out after 60 seconds!", "quest")
+            update_game_state(game_state)
+
+            player_list = ", ".join([p for p in game_state["players"].keys()]) or "No adventurers yet!"
             message = f"📢 Quest Update: Active Adventurers - {player_list}"
             player_data = json.dumps(list(game_state["players"].values()))
             await broadcast_message(f"MAP_UPDATE:{player_data}", "quest")
@@ -333,7 +371,7 @@ async def perform_arxiv_search(query, username):
         query, 5, "Semantic Search", "mistralai/Mixtral-8x7B-Instruct-v0.1", api_name="/update_with_rag_md"
     )[0]
     result = f"📚 Ancient Rocky Knowledge:\n{refs}"
-    voice = CHARACTERS[username]["voice"]
+    voice = next(c["voice"] for c in CHARACTERS if c["name"] == username)
     md_file, audio_file = await save_chat_entry(username, result, voice, True)
     return md_file, audio_file
 
@@ -370,6 +408,7 @@ rocky_map_html = f"""
             <div id="players">Players: 1</div>
             <div id="score">Score: 0</div>
             <div id="treasures">Treasures: 0</div>
+            <div id="timeout">Timeout: 60s</div>
         </div>
         <div id="chatBox"></div>
         <div id="controls">WASD/Arrows to move, Space to collect treasure</div>
@@ -407,11 +446,11 @@ rocky_map_html = f"""
         let treasures = [];
         const treasureMeshes = {{}};
         let xPos = 0, zPos = 0, moveLeft = false, moveRight = false, moveUp = false, moveDown = false, collect = false;
-        let score = 0, treasureCount = 0;
+        let score = 0, treasureCount = 0, lastActive = performance.now() / 1000;
 
         // Player initialization
         const playerGeometry = new THREE.BoxGeometry(2, 2, 2);
-        const playerMaterial = new THREE.MeshPhongMaterial({{ color: {CHARACTERS[st.session_state.username]["color"]} }});
+        const playerMaterial = new THREE.MeshPhongMaterial({{ color: {next(c["color"] for c in CHARACTERS if c["name"] == st.session_state.username)} }});
         const playerMesh = new THREE.Mesh(playerGeometry, playerMaterial);
         playerMesh.position.set(xPos, 1, zPos);
         playerMesh.castShadow = true;
@@ -435,7 +474,6 @@ rocky_map_html = f"""
                     treasureMeshes[t.id].position.set(t.x, 1, t.z);
                 }}
             }});
-            // Remove treasures not in the data
             Object.keys(treasureMeshes).forEach(id => {{
                 if (!treasureData.some(t => t.id === id)) {{
                     scene.remove(treasureMeshes[id]);
@@ -454,6 +492,7 @@ rocky_map_html = f"""
                 case 'ArrowDown': case 'KeyS': moveDown = true; break;
                 case 'Space': collect = true; break;
             }}
+            lastActive = performance.now() / 1000;
         }});
         document.addEventListener('keyup', (event) => {{
             switch (event.code) {{
@@ -491,6 +530,8 @@ rocky_map_html = f"""
 
             camera.position.set(xPos, 50, zPos + 50);
             camera.lookAt(xPos, 0, zPos);
+            const timeout = 60 - (performance.now() / 1000 - lastActive);
+            document.getElementById('timeout').textContent = `Timeout: ${{Math.max(0, timeout.toFixed(0))}}s`;
         }}
 
         function updatePlayers(playerData) {{
@@ -561,20 +602,16 @@ rocky_map_html = f"""
 def main():
     st.sidebar.title(f"🎮 {GAME_NAME}")
     st.sidebar.subheader(f"🌄 {st.session_state.username}’s Adventure - Score: {st.session_state.score} 🏆")
-    st.sidebar.write(f"📜 {CHARACTERS[st.session_state.username]['desc']}")
+    st.sidebar.write(f"📜 {next(c['desc'] for c in CHARACTERS if c['name'] == st.session_state.username)}")
     st.sidebar.write(f"📍 Location: {st.session_state.location}")
     st.sidebar.write(f"🏅 Score: {st.session_state.score}")
     st.sidebar.write(f"🎵 Treasures: {st.session_state.treasures}")
     st.sidebar.write(f"👥 Players: {', '.join([p['username'] for p in st.session_state.players.values()]) or 'None'}")
     
-    # User-controlled refresh interval
     st.session_state.update_interval = st.sidebar.slider("Refresh Interval (seconds)", 1, 10, 1, step=1)
-
-    new_username = st.sidebar.selectbox("🧙‍♂️ Choose Your Hero", list(CHARACTERS.keys()), index=list(CHARACTERS.keys()).index(st.session_state.username))
-    if new_username != st.session_state.username:
-        asyncio.run(save_chat_entry(st.session_state.username, f"🔄 Transforms into {new_username}!", CHARACTERS[st.session_state.username]["voice"]))
-        st.session_state.username = new_username
-        save_username(st.session_state.username)
+    if st.sidebar.button("Reset World"):
+        reset_game_state()
+        st.session_state.game_state_timestamp = time.time()
         st.rerun()
 
     left_col, right_col = st.columns([2, 1])
@@ -586,21 +623,23 @@ def main():
         message = st.text_input(f"🗨️ {st.session_state.username} says:", placeholder="Speak or type to chat! 🌲")
         if st.button("🌟 Send & Chat 🎤"):
             if message:
-                voice = CHARACTERS[st.session_state.username]["voice"]
+                voice = next(c["voice"] for c in CHARACTERS if c["name"] == st.session_state.username)
                 md_file, audio_file = asyncio.run(save_chat_entry(st.session_state.username, message, voice))
                 if audio_file:
                     play_and_download_audio(audio_file)
+                st.session_state.last_activity = time.time()
                 st.success(f"🌄 +10 points! New Score: {st.session_state.score}")
         mycomponent = components.declare_component("speech_component", path="./speech_component")
         val = mycomponent(my_input_value="", key=f"speech_{st.session_state.get('speech_processed', False)}")
         if val and val != st.session_state.last_transcript:
             val_stripped = val.strip().replace('\n', ' ')
             if val_stripped:
-                voice = CHARACTERS.get(st.session_state.username, {"voice": "en-US-AriaNeural"})["voice"]
+                voice = next(c["voice"] for c in CHARACTERS if c["name"] == st.session_state.username)
                 st.session_state['speech_processed'] = True
                 md_file, audio_file = asyncio.run(save_chat_entry(st.session_state.username, val_stripped, voice))
                 if audio_file:
                     play_and_download_audio(audio_file)
+                st.session_state.last_activity = time.time()
                 st.rerun()
 
     with right_col:
@@ -608,6 +647,16 @@ def main():
         prairie_map = folium.Map(location=[44.0, -103.0], zoom_start=8, tiles="CartoDB Positron")
         for loc, (lat, lon) in PRAIRIE_LOCATIONS.items():
             folium.Marker([lat, lon], popup=loc).add_to(prairie_map)
+        game_state = load_game_state(st.session_state.game_state_timestamp)
+        for player in game_state["players"].values():
+            folium.CircleMarker(
+                location=[44.0 + player["x"] * 0.01, -103.0 + player["z"] * 0.01],  # Approximate mapping to lat/lon
+                radius=5,
+                color=f"#{player['color']:06x}",
+                fill=True,
+                fill_opacity=0.7,
+                popup=f"{player['username']} (Score: {player['score']}, Treasures: {player['treasures']})"
+            ).add_to(prairie_map)
         for client_id, player in st.session_state.prairie_players.items():
             folium.CircleMarker(
                 location=player['location'],
@@ -624,14 +673,25 @@ def main():
         if st.button("Move"):
             asyncio.run(broadcast_message(f"{st.session_state.username}|PRAIRIE:ANIMAL:{animal}", "quest"))
             asyncio.run(broadcast_message(f"{st.session_state.username}|PRAIRIE:MOVE:{location}", "quest"))
+            st.session_state.last_activity = time.time()
             st.rerun()
 
     elapsed = time.time() - st.session_state.last_update
     remaining = max(0, st.session_state.update_interval - elapsed)
     st.sidebar.markdown(f"⏳ Next Update in: {int(remaining)}s")
-    if remaining <= 0:
+    
+    # Timeout and Auto-Refresh Logic
+    if time.time() - st.session_state.last_activity > st.session_state.timeout:
+        st.sidebar.warning("Timed out! Refreshing in 5 seconds...")
+        time.sleep(5)
+        st.session_state.game_state_timestamp = time.time()
+        st.rerun()
+    elif time.time() - st.session_state.last_update > st.session_state.auto_refresh:
+        st.session_state.game_state_timestamp = time.time()
+        st.rerun()
+    elif remaining <= 0:
         st.session_state.last_update = time.time()
-        st.session_state.game_state_timestamp = time.time()  # Update timestamp to refresh cache
+        st.session_state.game_state_timestamp = time.time()
         st.rerun()
 
     if not st.session_state.get('server_running', False):