Update app.py

app.py

@@ -55,11 +55,11 @@ EDGE_TTS_VOICES = [
 ]
 FILE_EMOJIS = {"md": "📜", "mp3": "🎵"}
 WORLD_OBJECTS = [
-    {"type": "🌿 Plants", "emoji": "🌱🌿🌾", "color": 0x228B22, "shape": "cylinder", "count": 10},
-    {"type": "🐦 Animal Flocks", "emoji": "🕊️🐦🐤", "color": 0x87CEEB, "shape": "sphere", "count": 5},
-    {"type": "🏔️ Mountains", "emoji": "🏔️⛰️", "color": 0x808080, "shape": "cone", "count": 3},
-    {"type": "🌳 Trees", "emoji": "🌲🌳🌴", "color": 0x006400, "shape": "cylinder", "count": 8},
-    {"type": "🐾 Animals", "emoji": "🐻🐺🦌", "color": 0x8B4513, "shape": "cube", "count": 6}
+    {"type": "🌿 Plants", "emoji": "🌱", "color": 0x228B22, "shape": "cylinder", "count": 10},
+    {"type": "🐦 Animal Flocks", "emoji": "🕊️", "color": 0x87CEEB, "shape": "sphere", "count": 5},
+    {"type": "🏔️ Mountains", "emoji": "🏔️", "color": 0x808080, "shape": "cone", "count": 3},
+    {"type": "🌳 Trees", "emoji": "🌲", "color": 0x006400, "shape": "cylinder", "count": 8},
+    {"type": "🐾 Animals", "emoji": "🐻", "color": 0x8B4513, "shape": "cube", "count": 6}
 ]
 PRAIRIE_LOCATIONS = {
     "Deadwood, SD": (44.3769, -103.7298),
@@ -88,11 +88,8 @@ def load_game_state(_timestamp):
         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)}
+                for _ in range(5)
             ],
             "world_objects": [],
             "history": []
@@ -114,59 +111,17 @@ def reset_game_state():
     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)}
+            for _ in range(5)
         ],
         "world_objects": [],
         "history": []
     }
     return update_game_state(state)
 
-# Agent Class for Players
-class PlayerAgent:
-    def __init__(self, username, char_data):
-        self.username = username
-        self.x = random.uniform(-20, 20)
-        self.z = random.uniform(-40, 40)
-        self.color = char_data["color"]
-        self.shape = char_data["shape"]
-        self.score = 0
-        self.treasures = 0
-        self.last_active = time.time()
-        self.voice = char_data["voice"]
-
-    def to_dict(self):
-        return {
-            "username": self.username,
-            "x": self.x,
-            "z": self.z,
-            "color": self.color,
-            "shape": self.shape,
-            "score": self.score,
-            "treasures": self.treasures,
-            "last_active": self.last_active
-        }
-
-    def update_from_message(self, message):
-        if '|' in message:
-            _, content = message.split('|', 1)
-            if content.startswith("MOVE:"):
-                _, x, z = content.split(":")
-                self.x, self.z = float(x), float(z)
-                self.last_active = time.time()
-            elif content.startswith("SCORE:"):
-                self.score = int(content.split(":")[1])
-                self.last_active = time.time()
-            elif content.startswith("TREASURE:"):
-                self.treasures = int(content.split(":")[1])
-                self.last_active = time.time()
-
-# Helpers
+# Timestamp Formatter (Pattern: mmddYYYY-HHMM-AM/PM)
 def format_timestamp(username=""):
-    now = datetime.now(pytz.timezone('US/Central')).strftime("%Y%m%d_%H%M%S")
+    now = datetime.now(pytz.timezone('US/Central')).strftime("%m%d%Y-%I%M-%p")
     return f"{now}-by-{username}"
 
 def clean_text_for_tts(text):
@@ -199,6 +154,26 @@ def load_username():
             return f.read().strip()
     return None
 
+# ---------------------
+# New Pair of Helper Functions
+# ---------------------
+def log_chat_history(username, message, is_markdown=False):
+    """Log the chat entry to a markdown file."""
+    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    if is_markdown:
+        entry = f"[{timestamp}] {username}:\n```markdown\n{message}\n```"
+    else:
+        entry = f"[{timestamp}] {username}: {message}"
+    md_file = create_file(entry, username, "md")
+    with open(CHAT_FILE, 'a') as f:
+        f.write(f"{entry}\n")
+    return md_file
+
+async def generate_chat_audio(username, message, voice):
+    """Generate TTS audio file for the chat message."""
+    audio_file = await async_edge_tts_generate(message, voice, username)
+    return audio_file
+
 # Audio Processing
 async def async_edge_tts_generate(text, voice, username):
     cache_key = f"{text[:100]}_{voice}"
@@ -218,29 +193,14 @@ def play_and_download_audio(file_path):
         st.audio(file_path, start_time=0)
         st.markdown(get_download_link(file_path), unsafe_allow_html=True)
 
-# WebSocket Broadcast
-async def broadcast_message(message, room_id):
-    if room_id in st.session_state.active_connections:
-        disconnected = []
-        for client_id, ws in st.session_state.active_connections[room_id].items():
-            try:
-                await ws.send(message)
-            except websockets.ConnectionClosed:
-                disconnected.append(client_id)
-        for client_id in disconnected:
-            if client_id in st.session_state.active_connections[room_id]:
-                del st.session_state.active_connections[room_id][client_id]
-
-# Chat and Quest Log
+# ---------------------
+# Wrapper Function to Save Chat Entry (Using the Two Helpers Above)
+# ---------------------
 async def save_chat_entry(username, message, voice, is_markdown=False):
     if not message.strip() or message == st.session_state.get('last_transcript', ''):
         return None, None
-    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    entry = f"[{timestamp}] {username}: {message}" if not is_markdown else f"[{timestamp}] {username}:\n```markdown\n{message}\n```"
-    md_file = create_file(entry, username, "md")
-    with open(CHAT_FILE, 'a') as f:
-        f.write(f"{entry}\n")
-    audio_file = await async_edge_tts_generate(message, voice, username)
+    md_file = log_chat_history(username, message, is_markdown)
+    audio_file = await generate_chat_audio(username, message, voice)
     await broadcast_message(f"{username}|{message}", "quest")
     st.session_state.chat_history.append({"username": username, "message": message, "audio": audio_file})
     st.session_state.last_transcript = message
@@ -249,7 +209,7 @@ async def save_chat_entry(username, message, voice, is_markdown=False):
         game_state["players"][username]["score"] += 10
         game_state["players"][username]["treasures"] += 1
         game_state["players"][username]["last_active"] = time.time()
-    game_state["history"].append(entry)
+    game_state["history"].append(md_file)
     if message.lower() in ["plants", "animal flocks", "mountains", "trees", "animals"]:
         obj_type = next(o for o in WORLD_OBJECTS if message.lower() in o["type"].lower())
         for _ in range(obj_type["count"]):
@@ -303,7 +263,63 @@ def init_session_state():
 
 init_session_state()
 
-# WebSocket for Multiplayer
+# Agent Class for Players
+class PlayerAgent:
+    def __init__(self, username, char_data):
+        self.username = username
+        self.x = random.uniform(-20, 20)
+        self.z = random.uniform(-40, 40)
+        self.color = char_data["color"]
+        self.shape = char_data["shape"]
+        self.score = 0
+        self.treasures = 0
+        self.last_active = time.time()
+        self.voice = char_data["voice"]
+
+    def to_dict(self):
+        return {
+            "username": self.username,
+            "x": self.x,
+            "z": self.z,
+            "color": self.color,
+            "shape": self.shape,
+            "score": self.score,
+            "treasures": self.treasures,
+            "last_active": self.last_active
+        }
+
+    def update_from_message(self, message):
+        if '|' in message:
+            _, content = message.split('|', 1)
+            if content.startswith("MOVE:"):
+                _, x, z = content.split(":")
+                self.x, self.z = float(x), float(z)
+                self.last_active = time.time()
+            elif content.startswith("SCORE:"):
+                self.score = int(content.split(":")[1])
+                self.last_active = time.time()
+            elif content.startswith("TREASURE:"):
+                self.treasures = int(content.split(":")[1])
+                self.last_active = time.time()
+
+# WebSocket Broadcast
+async def broadcast_message(message, room_id):
+    if room_id in st.session_state.active_connections:
+        disconnected = []
+        for client_id, ws in st.session_state.active_connections[room_id].items():
+            try:
+                await ws.send(message)
+            except websockets.ConnectionClosed:
+                disconnected.append(client_id)
+        for client_id in disconnected:
+            if client_id in st.session_state.active_connections[room_id]:
+                del st.session_state.active_connections[room_id][client_id]
+
+# Chat and Quest Log (uses the new helper functions)
+async def save_chat_entry_wrapper(username, message, voice, is_markdown=False):
+    return await save_chat_entry(username, message, voice, is_markdown)
+
+# WebSocket Handler
 async def websocket_handler(websocket, path):
     client_id = str(uuid.uuid4())
     room_id = "quest"
@@ -311,7 +327,7 @@ async def websocket_handler(websocket, path):
         st.session_state.active_connections[room_id] = {}
     st.session_state.active_connections[room_id][client_id] = websocket
     username = st.session_state.username
-    
+
     game_state = load_game_state(st.session_state.game_state_timestamp)
     if "prairie" in path:
         char = next(c for c in EDGE_TTS_VOICES if c["name"] == username)
@@ -330,7 +346,7 @@ async def websocket_handler(websocket, path):
             update_game_state(game_state)
         st.session_state.players[client_id] = game_state["players"][username]
         await broadcast_message(f"System|{username} joins the quest!", room_id)
-    
+
     try:
         async for message in websocket:
             if '|' in message:
@@ -349,10 +365,9 @@ async def websocket_handler(websocket, path):
                         target = PRAIRIE_LOCATIONS.get(value, PRAIRIE_LOCATIONS["Deadwood, SD"])
                         st.session_state.prairie_players[client_id]["location"] = target
                         action_msg = f"{sender} ({st.session_state.prairie_players[client_id]['animal']}) moves to {value}"
-                        await save_chat_entry(sender, action_msg, voice)
+                        await save_chat_entry_wrapper(sender, action_msg, voice)
                 else:
-                    await save_chat_entry(sender, content, voice)
-                    await perform_arxiv_search(content, sender)
+                    await save_chat_entry_wrapper(sender, content, voice)
                 update_game_state(game_state)
     except websockets.ConnectionClosed:
         await broadcast_message(f"System|{username} leaves the quest!", room_id)
@@ -374,7 +389,7 @@ async def periodic_update():
                 del game_state["players"][player]
                 await broadcast_message(f"System|{player} timed out after 60 seconds!", "quest")
             for username in game_state["players"]:
-                game_state["players"][username]["score"] += int((current_time - game_state["players"][username]["last_active"]) * 60)  # $1 per second
+                game_state["players"][username]["score"] += int((current_time - game_state["players"][username]["last_active"]) * 60)
             update_game_state(game_state)
 
             player_list = ", ".join([p for p in game_state["players"].keys()]) or "No adventurers yet!"
@@ -390,7 +405,7 @@ async def periodic_update():
             chat_content = await load_chat()
             await broadcast_message(f"CHAT_UPDATE:{json.dumps(chat_content[-10:])}", "quest")
             await broadcast_message(f"GAME_STATE:{json.dumps(game_state)}", "quest")
-            await save_chat_entry("System", f"{message}\n{prairie_message}", "en-US-AriaNeural")
+            await save_chat_entry_wrapper("System", f"{message}\n{prairie_message}", "en-US-AriaNeural")
         await asyncio.sleep(st.session_state.update_interval)
 
 async def run_websocket_server():
@@ -405,7 +420,7 @@ def start_websocket_server():
     asyncio.set_event_loop(loop)
     loop.run_until_complete(run_websocket_server())
 
-# ArXiv Integration
+# ArXiv Integration remains unchanged
 async def perform_arxiv_search(query, username):
     gradio_client = Client("awacke1/Arxiv-Paper-Search-And-QA-RAG-Pattern")
     refs = gradio_client.predict(
@@ -413,7 +428,7 @@ async def perform_arxiv_search(query, username):
     )[0]
     result = f"📚 Ancient Rocky Knowledge:\n{refs}"
     voice = next(c["voice"] for c in EDGE_TTS_VOICES if c["name"] == username)
-    md_file, audio_file = await save_chat_entry(username, result, voice, True)
+    md_file, audio_file = await save_chat_entry_wrapper(username, result, voice, True)
     return md_file, audio_file
 
 # Sidebar Functions
@@ -455,7 +470,7 @@ def log_performance_metrics():
             percentage = (duration / total_time) * 100
             st.sidebar.write(f"**{operation}:** {duration:.2f}s ({percentage:.1f}%)")
 
-# Enhanced 3D Game HTML
+# Enhanced 3D Game HTML remains largely unchanged, with dynamic insertion of the username and avatar details
 rocky_map_html = f"""
 <!DOCTYPE html>
 <html lang="en">
@@ -648,7 +663,7 @@ rocky_map_html = f"""
             const timeout = 60 - (performance.now() / 1000 - lastActive);
             document.getElementById('timeout').textContent = `Timeout: ${{Math.max(0, timeout.toFixed(0))}}s`;
             document.getElementById('score').textContent = `Score: $${{score}}`;
-            document.getElementById('treasures').textContent = `Treasures: ${{treasureCount}}`;
+            document.getElementById('treasures').textContent = `Treasures: $${{treasureCount}}`;
         }}
 
         function updatePlayers(playerData) {{
@@ -723,7 +738,6 @@ rocky_map_html = f"""
 
 # Main Game Loop
 def main():
-    # Top Center Chat and Character Display
     st.markdown(f"<h2 style='text-align: center;'>Welcome, {st.session_state.username}!</h2>", unsafe_allow_html=True)
     message = st.text_input(f"🗨️ Chat as {st.session_state.username}:", placeholder="Type to chat or add world features! 🌲", key="chat_input")
     if st.button("🌟 Send"):
@@ -750,7 +764,6 @@ def main():
         st.session_state.game_state_timestamp = time.time()
         st.rerun()
 
-    # Demo Buttons
     st.sidebar.markdown("### 🌟 World Additions")
     if st.sidebar.button("🌿 Add Plants"):
         asyncio.run(save_chat_entry(st.session_state.username, "plants", st.session_state.tts_voice))
@@ -848,4 +861,4 @@ def main():
     log_performance_metrics()
 
 if __name__ == "__main__":
-    main()
+    main()