Update app.py

app.py

@@ -1,7 +1,9 @@
 import streamlit as st
 import json
 import os
+import time
 from datetime import datetime, timedelta
+import subprocess
 from huggingface_hub import HfApi
 from pathlib import Path
 from calendar_rag import (
@@ -120,11 +122,9 @@ def load_qa_history():
         st.error(f"Error loading QA history: {str(e)}")
         return []
 
-
 def save_qa_history(history_entry):
     """Save QA history entry to local JSON file and push to Hugging Face"""
     try:
-        
         history_file = Path("qa_history.json")
         
         # Initialize or load existing history
@@ -144,29 +144,22 @@ def save_qa_history(history_entry):
         with open("qa_history.json", "w", encoding="utf-8") as f:
             json.dump(history_data, f, ensure_ascii=False, indent=2)
         
-        # Push to Hugging Face
-        hf_token = os.getenv('HF_TOKEN') or st.secrets['HF_TOKEN']
-        api = HfApi(token=hf_token)
-        api.upload_file(
-            path_or_fileobj="qa_history.json",
-            path_in_repo="qa_history.json",
-            repo_id="JirasakJo/Questions_Graduate_Studies_Calendar_2024",
-            repo_type="space"
-        )
+        # Push to Hugging Face without triggering a reload
+        try:
+            hf_token = os.getenv('HF_TOKEN') or st.secrets['HF_TOKEN']
+            api = HfApi(token=hf_token)
+            api.upload_file(
+                path_or_fileobj="qa_history.json",
+                path_in_repo="qa_history.json",
+                repo_id="JirasakJo/Questions_Graduate_Studies_Calendar_2024",
+                repo_type="space"
+            )
+        except Exception as e:
+            st.warning(f"Warning: Could not sync history to Hugging Face: {str(e)}", icon="⚠️")
+            
     except Exception as e:
         st.error(f"Error saving QA history: {str(e)}")
 
-def add_to_qa_history(query: str, answer: str):
-    """Add new QA pair to history"""
-    history_entry = {
-        "timestamp": (datetime.now() + timedelta(hours=7)).isoformat(),
-        "query": query,
-        "answer": answer
-    }
-    
-    save_qa_history(history_entry)
-    return history_entry
-
 def clear_qa_history():
     """Clear QA history file"""
     try:
@@ -185,17 +178,7 @@ def clear_qa_history():
         )
     except Exception as e:
         st.error(f"Error clearing QA history: {str(e)}")
-        
-def add_to_history(role: str, message: str):
-    """Add message to chat history and save if it's a complete QA pair"""
-    st.session_state.chat_history.append((role, message))
-    
-    # If this is an assistant response, save the QA pair
-    if role == "assistant" and len(st.session_state.chat_history) >= 2:
-        # Get the corresponding user query (previous message)
-        user_query = st.session_state.chat_history[-2][1]
-        add_to_qa_history(user_query, message)
-    
+
 def display_chat_history():
     """Display chat history with enhanced styling"""
     for i, (role, message) in enumerate(st.session_state.chat_history):
@@ -214,6 +197,29 @@ def display_chat_history():
                 </div>
             """, unsafe_allow_html=True)
 
+def process_query(query: str, pipeline):
+    """Process a query and update the chat history"""
+    try:
+        result = pipeline.process_query(query)
+        
+        # Add to session state history
+        st.session_state.chat_history.append(("user", query))
+        st.session_state.chat_history.append(("assistant", result["answer"]))
+        
+        # Save to QA history without reloading
+        history_entry = {
+            "timestamp": (datetime.now() + timedelta(hours=7)).isoformat(),
+            "query": query,
+            "answer": result["answer"]
+        }
+        save_qa_history(history_entry)
+        
+        return result
+        
+    except Exception as e:
+        st.error(f"Error processing query: {str(e)}")
+        return None
+
 def main():
     # Page config
     st.set_page_config(
@@ -232,6 +238,9 @@ def main():
     
     if 'chat_history' not in st.session_state:
         st.session_state.chat_history = []
+    
+    if 'current_result' not in st.session_state:
+        st.session_state.current_result = None
 
     # Load QA history at startup
     if 'qa_history_loaded' not in st.session_state:
@@ -264,6 +273,7 @@ def main():
                 </label>
             """, unsafe_allow_html=True)
             
+            # Query input with key
             query = st.text_input(
                 "",
                 placeholder="เช่น: วันสุดท้ายของการสอบปากเปล่าในภาคเรียนที่ 1/2567 คือวันที่เท่าไร?",
@@ -282,51 +292,43 @@ def main():
                 )
         
             with col2:
-                clear_history = st.button(
+                if st.button(
                     "🗑️ ล้างประวัติ",
                     type="secondary",
                     use_container_width=True,
                     key="clear_history_button"
-                )
+                ):
+                    st.session_state.chat_history = []
+                    st.session_state.current_result = None
+                    clear_qa_history()
+                    st.rerun()
 
             # Process query
             if send_query and query:
                 if st.session_state.pipeline is None:
                     st.error("❌ ไม่สามารถเชื่อมต่อกับระบบได้ กรุณาลองใหม่อีกครั้ง")
-                    return
-
-                add_to_history("user", query)
-                    
-                try:
+                else:
                     with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
-                        result = st.session_state.pipeline.process_query(query)
-                        add_to_history("assistant", result["answer"])
-                        
-                        with st.expander("📚 แสดงข้อมูลอ้างอิง", expanded=False):
-                            for i, doc in enumerate(result["documents"], 1):
-                                st.markdown(f"""
-                                    <div style="padding: 1rem; background-color: #F9FAFB; border-radius: 8px; margin: 0.5rem 0;">
-                                        <strong>เอกสารที่ {i}:</strong><br>
-                                        {doc.content}
-                                    </div>
-                                """, unsafe_allow_html=True)
-                        
-                        with st.expander("🔍 รายละเอียดการวิเคราะห์คำถาม", expanded=False):
-                            st.json(result["query_info"])
-                        
-                        st.rerun()
-                        
-                except Exception as e:
-                    st.error(f"❌ เกิดข้อผิดพลาด: {str(e)}")
+                        result = process_query(query, st.session_state.pipeline)
+                        if result:
+                            st.session_state.current_result = result
+                            
+                            # Display reference documents
+                            with st.expander("📚 แสดงข้อมูลอ้างอิง", expanded=False):
+                                for i, doc in enumerate(result["documents"], 1):
+                                    st.markdown(f"""
+                                        <div style="padding: 1rem; background-color: #F9FAFB; border-radius: 8px; margin: 0.5rem 0;">
+                                            <strong>เอกสารที่ {i}:</strong><br>
+                                            {doc.content}
+                                        </div>
+                                    """, unsafe_allow_html=True)
+                            
+                            # Display query analysis
+                            with st.expander("🔍 รายละเอียดการวิเคราะห์คำถาม", expanded=False):
+                                st.json(result["query_info"])
             
             elif send_query and not query:
                 st.warning("⚠️ กรุณาระบุคำถาม")
-            
-            # Clear history
-            if clear_history:
-                st.session_state.chat_history = []
-                save_qa_history([])  # Clear saved history
-                st.rerun()
     
     with info_col:
         # System information
@@ -362,17 +364,11 @@ def main():
                 </div>
             </div>
         """.format(
-            (datetime.now() + timedelta(hours=6)).strftime('%Y-%m-%d %H:%M:%S'),
+            (datetime.now() + timedelta(hours=7)).strftime('%Y-%m-%d %H:%M:%S'),
             "status-online" if st.session_state.pipeline else "status-offline",
             "🟢" if st.session_state.pipeline else "🔴",
             "พร้อมใช้งาน" if st.session_state.pipeline else "ไม่พร้อมใช้งาน"
         ), unsafe_allow_html=True)
 
-        # Handle clear history action
-        if clear_history:
-            st.session_state.chat_history = []
-            clear_qa_history()
-            st.rerun()
-
 if __name__ == "__main__":
     main()