Update app.py

app.py

@@ -224,13 +224,15 @@ class AudioProcessor:
         return cache_path
 
 # Chat saver - words locked tight! 💬🔒
-async def save_chat_entry(username, message, is_markdown=False, quote_line=None):
+async def save_chat_entry(username, message, is_markdown=False, quote_line=None, media_file=None):
     await asyncio.to_thread(log_action, username, "💬🔒 - Chat saver - words locked tight!")
     central = pytz.timezone('US/Central')
     timestamp = datetime.now(central).strftime("%Y-%m-%d %H:%M:%S")
     user_history_file = f"{username}_history.md"
     voice = st.session_state.voice if username == st.session_state.username else FUN_USERNAMES.get(username, "en-US-AriaNeural")
     indent = "  " if quote_line else ""  # Nesting for replies
+
+    # Prepare entry
     if is_markdown:
         entry = f"{indent}[{timestamp}] {username}:\n{indent}```markdown\n{indent}{message}\n{indent}```"
     else:
@@ -239,7 +241,8 @@ async def save_chat_entry(username, message, is_markdown=False, quote_line=None)
         entry = f"{indent}> {quote_line}\n{entry}"
 
     # Save to global chat file
-    await asyncio.to_thread(lambda: open(CHAT_FILE, 'a').write(f"{entry}\n"))
+    with open(CHAT_FILE, 'a') as f:
+        f.write(f"{entry}\n")
 
     # Save to user-specific history file
     if not os.path.exists(user_history_file):
@@ -248,11 +251,14 @@ async def save_chat_entry(username, message, is_markdown=False, quote_line=None)
     with open(user_history_file, 'a') as f:
         f.write(f"{entry}\n")
 
+    # Generate audio
     cleaned_message = clean_text_for_tts(message)
     audio_processor = AudioProcessor()
     audio_filename = f"{format_timestamp_prefix(username)}-{hashlib.md5(cleaned_message.encode()).hexdigest()[:8]}.mp3"
     log_action(username, f"Attempting TTS with text: '{cleaned_message}' and voice: '{voice}'")
     audio_file = await audio_processor.create_audio(cleaned_message, voice, audio_filename)
+    
+    # Log audio and media
     if audio_file:
         with open(HISTORY_FILE, 'a') as f:
             f.write(f"[{timestamp}] {username} ({voice}): Audio generated - {audio_filename}\n")
@@ -260,16 +266,11 @@ async def save_chat_entry(username, message, is_markdown=False, quote_line=None)
             f.write(f"{indent}[{timestamp}] Audio: {audio_filename}\n")
         with open(CHAT_FILE, 'a') as f:
             f.write(f"{indent}[{timestamp}] Audio: {audio_filename}\n")
-        
-        # Embed audio and image in global chat if applicable
-        if message.startswith("Pasted image:") or message.startswith("Uploaded media:") or message.startswith("Uploaded PDF:"):
-            with open(CHAT_FILE, 'a') as f:
-                f.write(f"{indent}[{timestamp}] Audio: {audio_filename}\n")
-                file_path = message.split(": ")[1]
-                if os.path.exists(file_path) and file_path.endswith(('.png', '.jpg', '.mp4', '.pdf')):
-                    f.write(f"{indent}[{timestamp}] Media: ![Media]({file_path})\n")
-    else:
-        log_action(username, f"Failed to generate audio for message: '{message}'")
+    if media_file:
+        with open(CHAT_FILE, 'a') as f:
+            f.write(f"{indent}[{timestamp}] Media: ![Media]({media_file})\n")
+        with open(user_history_file, 'a') as f:
+            f.write(f"{indent}[{timestamp}] Media: ![Media]({media_file})\n")
 
     await broadcast_message(f"{username}|{message}", "chat")
     st.session_state.last_chat_update = time.time()
@@ -384,16 +385,18 @@ async def async_edge_tts_generate(text, voice, rate=0, pitch=0, file_format="mp3
         return None
 
 # Audio player - tunes blast off! 🔊🚀
-def play_and_download_audio(file_path):
+def play_and_download_audio(file_path, timestamp):
     if file_path and os.path.exists(file_path):
-        st.audio(file_path)
-        if file_path not in st.session_state.base64_cache:
-            with open(file_path, "rb") as f:
-                b64 = base64.b64encode(f.read()).decode()
-            st.session_state.base64_cache[file_path] = b64
-        b64 = st.session_state.base64_cache[file_path]
-        dl_link = f'<a href="data:audio/mpeg;base64,{b64}" download="{os.path.basename(file_path)}">🎵 Download {os.path.basename(file_path)}</a>'
-        st.markdown(dl_link, unsafe_allow_html=True)
+        with open(file_path, "rb") as f:
+            audio_data = f.read()
+        b64 = base64.b64encode(audio_data).decode()
+        audio_html = f'''
+        <audio controls style="display:inline; vertical-align:middle;">
+            <source src="data:audio/mpeg;base64,{b64}" type="audio/mpeg">
+        </audio>
+        <a href="data:audio/mpeg;base64,{b64}" download="{os.path.basename(file_path)}" style="vertical-align:middle;">🎵 Download</a>
+        '''
+        st.markdown(f"{timestamp} {audio_html}", unsafe_allow_html=True)
 
 # Image saver - pics preserved with naming! 📸💾
 async def save_pasted_image(image, username):
@@ -560,7 +563,7 @@ def main():
                 st.session_state.displayed_chat_lines = f.read().split('\n')
 
         user_url = f"/q={st.session_state.username}"
-        st.write(f"Your unique URL path: [{user_url}]({user_url})")
+        st.markdown(f"Your unique URL path: [{user_url}]({user_url})", unsafe_allow_html=True)
 
         st.title(f"🤖🧠MMO {st.session_state.username}📝🔬")
         st.markdown(f"Welcome to {START_ROOM} - chat, vote, upload, paste images, and enjoy quoting! 🎉 User ID: {st.session_state.user_id}")
@@ -572,38 +575,31 @@ def main():
         st.subheader(f"{START_ROOM} Chat History 💬")
         chat_content = await load_chat()
         chat_lines = [line for line in chat_content.split('\n') if line.strip() and not line.startswith('#')]
+        current_entry = None
         if chat_lines:
             col1, col2 = st.columns([2, 1])
             with col1:
                 st.write("### Text & Audio Chat")
-                for i, line in enumerate(reversed(chat_lines)):  # Descending order
-                    col_text, col_audio = st.columns([3, 1])
-                    with col_text:
-                        if "```markdown" in line:
-                            markdown_content = re.search(r'```markdown\n(.*?)(?=\n\s*\[|$)', line, re.DOTALL)
-                            if markdown_content:
-                                st.markdown(markdown_content.group(1))
-                            else:
-                                st.markdown(line)
-                        else:
-                            st.markdown(line)
-                        if "Media:" in line:
-                            file_path = line.split("Media: ")[-1].strip('![]()')
-                            if os.path.exists(file_path):
-                                if file_path.endswith(('.png', '.jpg')):
-                                    st.image(file_path, use_container_width=True)
-                                elif file_path.endswith('.mp4'):
-                                    st.markdown(get_video_html(file_path), unsafe_allow_html=True)
-                                elif file_path.endswith('.pdf'):
-                                    st.write(f"PDF: {os.path.basename(file_path)}")
-                    with col_audio:
-                        if "Audio:" in line:
-                            audio_ref = line.split("Audio: ")[-1].strip()
-                            if os.path.exists(audio_ref):
-                                play_and_download_audio(audio_ref)
-                                username = line.split(': ')[1].split(' ')[0] if ': ' in line else "Unknown"
-                                cache_key = f"{line}_{FUN_USERNAMES.get(username, 'en-US-AriaNeural')}"
-                                st.session_state.audio_cache[cache_key] = audio_ref
+                for line in reversed(chat_lines):
+                    if not line.startswith('  '):  # Main message line
+                        current_entry = line
+                        st.markdown(line)
+                    elif "Audio:" in line and current_entry:
+                        audio_ref = line.split("Audio: ")[-1].strip()
+                        if os.path.exists(audio_ref):
+                            timestamp = current_entry.split('] ')[0] + ']'
+                            play_and_download_audio(audio_ref, timestamp)
+                    elif "Media:" in line and current_entry:
+                        file_path = line.split("Media: ")[-1].strip('![]()')
+                        if os.path.exists(file_path):
+                            timestamp = current_entry.split('] ')[0] + ']'
+                            st.markdown(f"{timestamp}")
+                            if file_path.endswith(('.png', '.jpg')):
+                                st.image(file_path, use_container_width=True)
+                            elif file_path.endswith('.mp4'):
+                                st.markdown(get_video_html(file_path), unsafe_allow_html=True)
+                            elif file_path.endswith('.pdf'):
+                                st.write(f"PDF: {os.path.basename(file_path)}")
 
         if st.session_state.quote_line:
             st.markdown(f"### Quoting: {st.session_state.quote_line}")
@@ -623,7 +619,7 @@ def main():
                 markdown_response = f"### Quote Response\n- **Original**: {st.session_state.quote_line}\n- **{st.session_state.username} Replies**: {quote_response}"
                 if st.session_state.pasted_image_data:
                     markdown_response += f"\n- **Image**: ![Pasted Image]({st.session_state.pasted_image_data})"
-                    await save_chat_entry(st.session_state.username, f"Pasted image: {st.session_state.pasted_image_data}", quote_line=st.session_state.quote_line)
+                    await save_chat_entry(st.session_state.username, f"Pasted image: {st.session_state.pasted_image_data}", quote_line=st.session_state.quote_line, media_file=st.session_state.pasted_image_data)
                     st.session_state.pasted_image_data = None
                 await save_chat_entry(st.session_state.username, markdown_response, is_markdown=True, quote_line=st.session_state.quote_line)
                 st.session_state.quote_line = None
@@ -651,7 +647,7 @@ def main():
                         st.session_state.audio_cache[f"{message}_{FUN_USERNAMES[st.session_state.username]}"] = audio_file
                         st.audio(audio_file)  # Immediate preview
                 if st.session_state.pasted_image_data:
-                    await save_chat_entry(st.session_state.username, f"Pasted image: {st.session_state.pasted_image_data}")
+                    await save_chat_entry(st.session_state.username, f"Pasted image: {st.session_state.pasted_image_data}", media_file=st.session_state.pasted_image_data)
                     st.session_state.pasted_image_data = None
                 st.session_state.message_text = ''
                 st.rerun()
@@ -665,7 +661,7 @@ def main():
                 st.image(paste_result_msg.image_data, caption="Received Image for Message")
                 filename = await save_pasted_image(paste_result_msg.image_data, st.session_state.username)
                 if filename:
-                    await save_chat_entry(st.session_state.username, f"Pasted image: {filename}")
+                    await save_chat_entry(st.session_state.username, f"Pasted image: {filename}", media_file=filename)
                     st.session_state.pasted_image_data = None
 
         tab_main = st.radio("Action:", ["📸 Media", "🔍 ArXiv", "📝 Editor"], horizontal=True)
@@ -686,13 +682,13 @@ def main():
                 st.success(f"Uploaded {filename}")
                 if ext == 'pdf':
                     pdf_filename, texts, audio_files = await save_pdf_and_generate_audio(uploaded_file, username)
-                    await save_chat_entry(username, f"Uploaded PDF: {pdf_filename}")
+                    await save_chat_entry(username, f"Uploaded PDF: {pdf_filename}", media_file=pdf_filename)
                     for i, (text, audio_file) in enumerate(zip(texts, audio_files)):
                         if audio_file:
                             with open(CHAT_FILE, 'a') as f:
                                 f.write(f"  [{timestamp}] Page {i+1} Audio: {audio_file}\n")
                 else:
-                    await save_chat_entry(username, f"Uploaded media: {file_path}")
+                    await save_chat_entry(username, f"Uploaded media: {file_path}", media_file=file_path)
                 await save_chat_history_with_image(username, file_path)
                 st.session_state.image_hashes.add(file_hash)
                 if file_path.endswith('.mp4'):
@@ -719,7 +715,7 @@ def main():
             time.sleep(1)
         st.rerun()
 
-        # Gallery with Adjustable Tiles - Consistent Three-Set from Provided Code
+        # Consistent Three-Gallery Set
         st.subheader("Image Gallery 🖼")
         image_files = glob.glob("*.png") + glob.glob("*.jpg") + glob.glob("*.jpeg")
         image_cols = st.slider("Image Gallery Columns 🖼", min_value=1, max_value=15, value=5)