Update app.py

app.py

@@ -134,7 +134,7 @@ if 'user_hash' not in st.session_state:
 def format_timestamp_prefix(username):
     central = pytz.timezone('US/Central')
     now = datetime.now(central)
-    return f"{now.strftime('%I-%M-%p-ct-%m-%d-%Y')}-by-{username}-{st.session_state.user_id}"
+    return f"{username}-{now.strftime('%I-%M-%p-%m-%d-%Y')}"
 
 # Compute image hash from binary data
 def compute_image_hash(image_data):
@@ -225,7 +225,7 @@ class AudioProcessor:
         return cache_path
 
 # Chat saver - words locked tight! 💬🔒
-async def save_chat_entry(username, message, is_markdown=False, quote_line=None, media_file=None):
+async def save_chat_entry(username, message, is_markdown=False, quote_line=None, media_file=None, skip_audio=False):
     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")
@@ -252,34 +252,36 @@ 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")
-        with open(user_history_file, 'a') as f:
-            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")
+    # Generate audio (unless skipped)
+    if not skip_audio and message.strip():
+        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
+        if audio_file:
+            with open(HISTORY_FILE, 'a') as f:
+                f.write(f"[{timestamp}] {username} ({voice}): Audio generated - {audio_filename}\n")
+            with open(user_history_file, 'a') as f:
+                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")
     if media_file:
         if isinstance(media_file, Image.Image):
-            img_hash = compute_image_hash(media_file)
             timestamp_prefix = format_timestamp_prefix(username)
-            media_filename = f"{timestamp_prefix}-{img_hash}.b64"
-            media_path = os.path.join(MEDIA_DIR, media_filename)
-            os.makedirs(MEDIA_DIR, exist_ok=True)
+            media_filename = f"{username}-{timestamp_prefix.split('-')[-1]}.png"
+            media_path = media_filename  # Save at root
             img_byte_arr = io.BytesIO()
             media_file.save(img_byte_arr, format='PNG')
-            img_bytes = img_byte_arr.getvalue()
-            b64_data = base64.b64encode(img_bytes).decode()
-            with open(media_path, 'w') as f:
-                f.write(b64_data)
+            await asyncio.to_thread(lambda: open(media_path, 'wb').write(img_byte_arr.getvalue()))
+            media_file = media_filename
+        elif media_file.name in ['png', 'jpg', 'mp4', 'mp3']:
+            timestamp_prefix = format_timestamp_prefix(username)
+            media_filename = f"{username}-{timestamp_prefix.split('-')[-1]}.{media_file.name.split('.')[-1]}"
+            media_path = media_filename  # Save at root
+            await asyncio.to_thread(lambda: open(media_path, 'wb').write(media_file.getbuffer()))
             media_file = media_filename
         with open(CHAT_FILE, 'a') as f:
             f.write(f"{indent}[{timestamp}] Media: ![Media]({media_file})\n")
@@ -413,49 +415,32 @@ def play_and_download_audio(file_path):
         return audio_html
     return ""
 
-# Image saver - pics preserved with naming as base64! 📸💾
+# Image saver - pics preserved with naming! 📸💾
 async def save_pasted_image(image, username):
     await asyncio.to_thread(log_action, username, "📸💾 - Image saver - pics preserved!")
-    img_hash = compute_image_hash(image)
-    if img_hash in st.session_state.image_hashes:
-        return None
     timestamp = format_timestamp_prefix(username)
-    voice = st.session_state.voice if username == st.session_state.username else FUN_USERNAMES.get(username, "en-US-AriaNeural")
-    filename = f"{timestamp}-{img_hash}-voice-{voice}.b64"
-    filepath = os.path.join(MEDIA_DIR, filename)
-    os.makedirs(MEDIA_DIR, exist_ok=True)
+    media_filename = f"{username}-{timestamp.split('-')[-1]}.png"
+    media_path = media_filename  # Save at root
     img_byte_arr = io.BytesIO()
     image.save(img_byte_arr, format='PNG')
-    b64_data = base64.b64encode(img_byte_arr.getvalue()).decode()
-    with open(filepath, 'w') as f:
-        f.write(b64_data)
-    st.session_state.image_hashes.add(img_hash)
-    await save_chat_history_with_image(username, filepath)
-    return filename
-
-# Display base64 image and audio
-def display_base64_media(media_file, width="100px"):
-    if os.path.exists(os.path.join(MEDIA_DIR, media_file)) and media_file.endswith('.b64'):
-        with open(os.path.join(MEDIA_DIR, media_file), 'r') as f:
-            b64_data = f.read()
-        img_data = base64.b64decode(b64_data)
-        img = Image.open(io.BytesIO(img_data))
-        st.image(img, use_container_width=True)
-        
-        # Find corresponding audio file
-        timestamp = media_file.split('-by-')[0] + '-by-' + media_file.split('-by-')[1].split('-')[0]
-        voice = media_file.split('-voice-')[1].split('.b64')[0]
-        audio_files = glob.glob(f"{timestamp}*-{voice}.mp3")
-        if audio_files:
-            audio_file = audio_files[0]
-            st.audio(audio_file)
+    await asyncio.to_thread(lambda: open(media_path, 'wb').write(img_byte_arr.getvalue()))
+    return media_filename
+
+# Video and Audio savers
+async def save_media(file, username, ext):
+    await asyncio.to_thread(log_action, username, f"📸💾 - Media saver - {ext} preserved!")
+    timestamp = format_timestamp_prefix(username)
+    media_filename = f"{username}-{timestamp.split('-')[-1]}.{ext}"
+    media_path = media_filename  # Save at root
+    await asyncio.to_thread(lambda: open(media_path, 'wb').write(file.getbuffer()))
+    return media_filename
 
 # PDF saver and audio generator
 async def save_pdf_and_generate_audio(pdf_file, username, max_pages=10):
     await asyncio.to_thread(log_action, username, "📜🎶 - PDF saver and audio generator!")
     timestamp = format_timestamp_prefix(username)
     file_hash = hashlib.md5(pdf_file.getbuffer()).hexdigest()[:8]
-    pdf_filename = f"{timestamp}-{file_hash}.pdf"
+    pdf_filename = f"{username}-{timestamp.split('-')[-1]}-{file_hash}.pdf"
     with open(pdf_filename, 'wb') as f:
         f.write(pdf_file.getbuffer())
 
@@ -470,7 +455,7 @@ async def save_pdf_and_generate_audio(pdf_file, username, max_pages=10):
     for i in range(total_pages):
         text = reader.pages[i].extract_text()
         texts.append(text)
-        audio_filename = f"{timestamp}-page{i+1}-{file_hash}-voice-{voice}.mp3"
+        audio_filename = f"{username}-{timestamp.split('-')[-1]}-page{i+1}-{file_hash}-voice-{voice}.mp3"
         audio_data = await audio_processor.create_audio(text, voice, audio_filename)
         if audio_data:
             audio_files.append(audio_filename)
@@ -683,12 +668,12 @@ def main():
                                     audio_html = play_and_download_audio(audio_file)
                                 elif "Media:" in nl:
                                     media_file = nl.split("Media: ")[-1].strip('![]()')
-                                    if media_file.endswith('.b64'):
-                                        media_content = display_base64_media(media_file, width="100px")
-                                    elif media_file.endswith(('.png', '.jpg')):
+                                    if media_file.endswith(('.png', '.jpg')):
                                         media_content = f"<img src='file://{media_file}' width='100'>"
                                     elif media_file.endswith('.mp4'):
                                         media_content = get_video_html(media_file)
+                                    elif media_file.endswith('.mp3'):
+                                        media_content = await get_audio_html(media_file)
                                     elif media_file.endswith('.pdf'):
                                         media_content = f"📜 {os.path.basename(media_file)}"
                             minute_output += f"- 💬 **{user}**: {msg} {audio_html} {media_content}\n"
@@ -746,14 +731,10 @@ def main():
                 message = st.text_input(f"Message as {st.session_state.username} (Voice: {st.session_state.voice})", key="message_input", value=st.session_state.message_text)
             with col_send:
                 if st.button("Send 🚀", key="send_button"):
-                    if message.strip():
-                        audio_file = await save_chat_entry(st.session_state.username, message, is_markdown=True)
-                        if audio_file:
-                            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}", media_file=st.session_state.pasted_image_data)
-                        st.session_state.pasted_image_data = None
+                    if message.strip() or st.session_state.pasted_image_data:
+                        await save_chat_entry(st.session_state.username, message if message.strip() else "Image shared", is_markdown=True, media_file=st.session_state.pasted_image_data if st.session_state.pasted_image_data else None, skip_audio=not message.strip())
+                        if st.session_state.pasted_image_data:
+                            st.session_state.pasted_image_data = None
                     st.session_state.message_text = ''
                     st.rerun()
 
@@ -766,43 +747,34 @@ def main():
                     st.image(paste_result_msg.image_data, caption="Received Image for Quote")
                     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}", media_file=paste_result_msg.image_data)
+                        st.session_state.pasted_image_data = filename
+                        await save_chat_entry(st.session_state.username, "Image shared", is_markdown=True, media_file=paste_result_msg.image_data, skip_audio=True)
                         st.session_state.pasted_image_data = None
+                        st.rerun()
 
         with st.container():
-            tab_main = st.radio("Action:", ["📸 Media", "🔍 ArXiv", "📝 Editor"], horizontal=True, label_visibility="collapsed")
-            useArxiv = st.checkbox("Search Arxiv for Research Paper Answers", value=True, label_visibility="collapsed")
-            useArxivAudio = st.checkbox("Generate Audio File for Research Paper Answers", value=False, label_visibility="collapsed")
-
             st.markdown("###### Upload Media 🎨🎶📜🎥")
             uploaded_file = st.file_uploader("Upload Media", type=['png', 'jpg', 'mp4', 'mp3', 'wav', 'pdf', 'txt', 'md', 'py'])
             if uploaded_file:
                 timestamp = format_timestamp_prefix(st.session_state.username)
                 username = st.session_state.username
-                ext = uploaded_file.name.split('.')[-1]
-                file_hash = hashlib.md5(uploaded_file.getbuffer()).hexdigest()[:8]
-                if file_hash not in st.session_state.image_hashes:
-                    filename = f"{timestamp}-{file_hash}.{ext}"
-                    file_path = filename  # Top-level file
-                    await asyncio.to_thread(lambda: open(file_path, 'wb').write(uploaded_file.getbuffer()))
-                    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}", 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}", 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'):
-                        st.session_state.media_notifications.append(file_path)
+                ext = uploaded_file.name.split('.')[-1].lower()
+                if ext in ['png', 'jpg']:
+                    filename = await save_pasted_image(uploaded_file, username)
+                elif ext in ['mp4', 'mp3', 'wav']:
+                    filename = await save_media(uploaded_file, username, ext)
+                elif ext == 'pdf':
+                    pdf_filename, _, _ = await save_pdf_and_generate_audio(uploaded_file, username)
+                    filename = pdf_filename
+                else:
+                    filename = f"{username}-{timestamp.split('-')[-1]}.{ext}"
+                    await asyncio.to_thread(lambda: open(filename, 'wb').write(uploaded_file.getbuffer()))
+                await save_chat_entry(username, f"Uploaded {ext.upper()}: {os.path.basename(filename)}", media_file=uploaded_file, skip_audio=True)
+                st.success(f"Uploaded {filename}")
 
             # Big Red Delete Button
             st.markdown("###### 🛑 Danger Zone")
-            if st.button("Try Not To Delete It All On Your First Day", key="delete_all", help="Deletes all user-added files!", type="primary", use_container_width=True, label_visibility="collapsed"):
+            if st.button("Try Not To Delete It All On Your First Day", key="delete_all", help="Deletes all user-added files!", type="primary", use_container_width=True):
                 deleted_files = delete_user_files()
                 if deleted_files:
                     st.markdown("### 🗑️ Deleted Files:\n" + "\n".join([f"- `{file}`" for file in deleted_files]))
@@ -811,7 +783,7 @@ def main():
                 st.rerun()
 
             st.markdown("###### Refresh ⏳")
-            refresh_rate = st.slider("Refresh Rate", 1, 300, st.session_state.refresh_rate, label_visibility="collapsed")
+            refresh_rate = st.slider("Refresh Rate", 1, 300, st.session_state.refresh_rate)
             st.session_state.refresh_rate = refresh_rate
             timer_placeholder = st.empty()
             for i in range(st.session_state.refresh_rate, -1, -1):
@@ -824,24 +796,21 @@ def main():
         # Separate Galleries for Own and Shared Files
         with st.container():
             all_files = glob.glob("*.md") + glob.glob("*.pdf") + glob.glob("*.txt") + glob.glob("*.py") + glob.glob("*.png") + glob.glob("*.jpg") + glob.glob("*.mp3") + glob.glob("*.mp4") + glob.glob(os.path.join(MEDIA_DIR, "*.b64"))
-            own_files = [f for f in all_files if st.session_state.user_id in os.path.basename(f)]
+            own_files = [f for f in all_files if st.session_state.user_id in os.path.basename(f) or st.session_state.username in os.path.basename(f)]
             shared_files = [f for f in all_files if f not in own_files and not f in [CHAT_FILE, QUOTE_VOTES_FILE, MEDIA_VOTES_FILE, HISTORY_FILE, STATE_FILE, os.path.join(MEDIA_DIR, "*")]]
 
             st.markdown("###### Your Files 📂")
             st.markdown("###### Image Gallery 🖼")
-            own_image_files = [f for f in own_files if f.endswith(('.png', '.jpg', '.b64'))]
-            image_cols = st.slider("Image Gallery Columns 🖼 (Own)", min_value=1, max_value=15, value=5, label_visibility="collapsed")
+            own_image_files = [f for f in own_files if f.endswith(('.png', '.jpg'))]
+            image_cols = st.slider("Image Gallery Columns 🖼 (Own)", min_value=1, max_value=15, value=5)
             cols = st.columns(image_cols)
             for idx, image_file in enumerate(own_image_files):
                 with cols[idx % image_cols]:
-                    if image_file.endswith('.b64'):
-                        display_base64_media(os.path.basename(image_file))
-                    else:
-                        st.image(image_file, use_container_width=True)
+                    st.image(image_file, use_container_width=True)
 
             st.markdown("###### Video Gallery 🎥")
             own_video_files = [f for f in own_files if f.endswith('.mp4')]
-            video_cols = st.slider("Video Gallery Columns 🎬 (Own)", min_value=1, max_value=5, value=3, label_visibility="collapsed")
+            video_cols = st.slider("Video Gallery Columns 🎬 (Own)", min_value=1, max_value=5, value=3)
             cols = st.columns(video_cols)
             for idx, video_file in enumerate(own_video_files):
                 with cols[idx % video_cols]:
@@ -849,7 +818,7 @@ def main():
 
             st.markdown("###### Audio Gallery 🎧")
             own_audio_files = [f for f in own_files if f.endswith(('.mp3', '.wav'))]
-            audio_cols = st.slider("Audio Gallery Columns 🎶 (Own)", min_value=1, max_value=15, value=5, label_visibility="collapsed")
+            audio_cols = st.slider("Audio Gallery Columns 🎶 (Own)", min_value=1, max_value=15, value=5)
             cols = st.columns(audio_cols)
             for idx, audio_file in enumerate(own_audio_files):
                 with cols[idx % audio_cols]:
@@ -857,19 +826,16 @@ def main():
 
             st.markdown("###### Shared Files 📤")
             st.markdown("###### Image Gallery 🖼")
-            shared_image_files = [f for f in shared_files if f.endswith(('.png', '.jpg', '.b64'))]
-            image_cols = st.slider("Image Gallery Columns 🖼 (Shared)", min_value=1, max_value=15, value=5, label_visibility="collapsed")
+            shared_image_files = [f for f in shared_files if f.endswith(('.png', '.jpg'))]
+            image_cols = st.slider("Image Gallery Columns 🖼 (Shared)", min_value=1, max_value=15, value=5)
             cols = st.columns(image_cols)
             for idx, image_file in enumerate(shared_image_files):
                 with cols[idx % image_cols]:
-                    if image_file.endswith('.b64'):
-                        display_base64_media(os.path.basename(image_file))
-                    else:
-                        st.image(image_file, use_container_width=True)
+                    st.image(image_file, use_container_width=True)
 
             st.markdown("###### Video Gallery 🎥")
             shared_video_files = [f for f in shared_files if f.endswith('.mp4')]
-            video_cols = st.slider("Video Gallery Columns 🎬 (Shared)", min_value=1, max_value=5, value=3, label_visibility="collapsed")
+            video_cols = st.slider("Video Gallery Columns 🎬 (Shared)", min_value=1, max_value=5, value=3)
             cols = st.columns(video_cols)
             for idx, video_file in enumerate(shared_video_files):
                 with cols[idx % video_cols]:
@@ -877,7 +843,7 @@ def main():
 
             st.markdown("###### Audio Gallery 🎧")
             shared_audio_files = [f for f in shared_files if f.endswith(('.mp3', '.wav'))]
-            audio_cols = st.slider("Audio Gallery Columns 🎶 (Shared)", min_value=1, max_value=15, value=5, label_visibility="collapsed")
+            audio_cols = st.slider("Audio Gallery Columns 🎶 (Shared)", min_value=1, max_value=15, value=5)
             cols = st.columns(audio_cols)
             for idx, audio_file in enumerate(shared_audio_files):
                 with cols[idx % audio_cols]:
@@ -889,7 +855,7 @@ def main():
             with open(CHAT_FILE, 'r') as f:
                 history_content = f.read()
             st.markdown(history_content)
-            st.download_button("Download Chat Log as .md", history_content, file_name=f"chat_{st.session_state.user_id}.md", mime="text/markdown", label_visibility="collapsed")
+            st.download_button("Download Chat Log as .md", history_content, file_name=f"chat_{st.session_state.user_id}.md", mime="text/markdown")
 
     loop.run_until_complete(async_interface())