Update app.py

app.py

@@ -9,11 +9,11 @@ from calendar_rag import (
     create_default_config,
     AcademicCalendarRAG,
     PipelineConfig,
-    ModelConfig,  # Import ModelConfig
-    RetrieverConfig,  # Import RetrieverConfig
-    CacheConfig,  # Import CacheConfig
-    ProcessingConfig,  # Import ProcessingConfig
-    LocalizationConfig  # Import LocalizationConfig
+    ModelConfig,
+    RetrieverConfig,
+    CacheConfig,
+    ProcessingConfig,
+    LocalizationConfig
 )
 # Custom CSS for enhanced styling
 def load_custom_css():
@@ -93,28 +93,28 @@ def load_custom_css():
             </style>
     """, unsafe_allow_html=True)
 
-
 def initialize_pipeline():
-    """Initialize RAG pipeline with enhanced configurations"""
+    """Initialize RAG pipeline with same configuration as main()"""
     try:
+        # Get API key from environment or secrets
         openai_api_key = os.getenv('OPENAI_API_KEY') or st.secrets['OPENAI_API_KEY']
         
-        # Create configuration using create_default_config
+        # Create config with same settings as main()
         config = create_default_config(openai_api_key)
         
-        # Customize any specific settings if needed
-        config.model.embedder_model = "sentence-transformers/paraphrase-multilingual-mpnet-base-v2"
-        config.model.openai_model = "gpt-4o"
-        
+        # Create pipeline
         pipeline = AcademicCalendarRAG(config)
         
-        # Load calendar data
-        with open("calendar.json", "r", encoding="utf-8") as f:
-            calendar_data = json.load(f)
-        pipeline.load_data(calendar_data)
-        
-        return pipeline
-        
+        # Load raw data instead of calendar.json
+        try:
+            with open("calendar.json", "r", encoding="utf-8") as f:
+                raw_data = json.load(f)
+            pipeline.load_data(raw_data)
+            return pipeline
+        except FileNotFoundError:
+            st.error("calendar.json not found. Please ensure the file exists in the same directory.")
+            return None
+            
     except Exception as e:
         st.error(f"Error initializing pipeline: {str(e)}")
         return None
@@ -293,35 +293,55 @@ def add_to_history(role: str, message: str):
         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):
+    """Display chat history with improved document display"""
+    for role, content in st.session_state.chat_history:
         if role == "user":
             st.markdown(f"""
                 <div class="chat-message user-message">
                     <strong>🧑 คำถาม:</strong><br>
-                    {message}
+                    {content}
                 </div>
             """, unsafe_allow_html=True)
         else:
-            st.markdown(f"""
-                <div class="chat-message assistant-message">
-                    <strong>🤖 คำตอบ:</strong><br>
-                    {message}
-                </div>
-            """, unsafe_allow_html=True)
+            if isinstance(content, dict):
+                assistant_response = content.get('answer', '❌ ไม่มีข้อมูลคำตอบ')
+                st.markdown(f"""
+                    <div class="chat-message assistant-message">
+                        <strong>🤖 คำตอบ:</strong><br>
+                        {assistant_response}
+                    </div>
+                """, unsafe_allow_html=True)
+
+                # Show reference documents like in main()
+                if content.get('documents'):
+                    with st.expander("📚 ข้อมูลอ้างอิง", expanded=False):
+                        for i, doc in enumerate(content['documents'], 1):
+                            st.markdown(f"""
+                                <div style="padding: 1rem; background-color: #000000; border-radius: 8px; margin: 0.5rem 0;">
+                                    <strong>เอกสารที่ {i}:</strong><br>
+                                    {doc.content}
+                                </div>
+                            """, unsafe_allow_html=True)
+            else:
+                st.markdown(f"""
+                    <div class="chat-message assistant-message">
+                        <strong>🤖 คำตอบ:</strong><br>
+                        {content}
+                    </div>
+                """, unsafe_allow_html=True)
 
 if 'context_memory' not in st.session_state:
     st.session_state.context_memory = []
 
 def handle_submit(user_query: str):
-    """Handle form submission logic"""
+    """Enhanced query handling matching main() functionality"""
     if not user_query:
         st.warning("⚠️ กรุณาระบุคำถาม")
         return
 
     user_query = user_query.strip()
     
-    # Prevent duplicate submissions by checking last message
+    # Prevent duplicate submissions
     if not st.session_state.chat_history or st.session_state.chat_history[-1][1] != user_query:
         try:
             st.session_state.processing_query = True
@@ -329,35 +349,26 @@ def handle_submit(user_query: str):
             # Add user message to chat history
             st.session_state.chat_history.append(("user", user_query))
             
-            # Show loading message while processing
+            # Process query with semantic weight 0.3 (matching main())
             with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
-                # Maintain context memory
-                if len(st.session_state.context_memory) > 5:
-                    st.session_state.context_memory.pop(0)
-                
-                # Build query with context
-                query_with_context = "\n".join(
-                    [f"Q: {qa['query']}\nA: {qa['answer']}" for qa in st.session_state.context_memory]
-                ) + f"\nQ: {user_query}"
-                
-                # Process query
-                result = st.session_state.pipeline.process_query(query_with_context)
+                result = st.session_state.pipeline.process_query(
+                    query=user_query,
+                    weight_semantic=0.3  # Match main() configuration
+                )
                 
-                # Create response dictionary with answer and documents
+                # Create response with same structure as main()
                 response_dict = {
                     "answer": result.get("answer", ""),
-                    "documents": result.get("documents", [])
+                    "documents": result.get("relevant_docs", [])
                 }
                 
                 # Update chat history and context
                 st.session_state.chat_history.append(("assistant", response_dict))
-                st.session_state.context_memory.append({"query": user_query, "answer": response_dict})
-                
-                # Save to QA history
                 add_to_qa_history(user_query, response_dict)
             
         except Exception as e:
-            st.session_state.chat_history.append(("assistant", f"❌ เกิดข้อผิดพลาด: {str(e)}"))
+            error_msg = f"❌ เกิดข้อผิดพลาด: {str(e)}"
+            st.session_state.chat_history.append(("assistant", error_msg))
             st.error(f"Query processing error: {e}")
         
         finally:
@@ -365,8 +376,7 @@ def handle_submit(user_query: str):
             st.rerun()
 
 def create_chat_input():
-    """Create the chat input section with form handling"""
-    # Create the form for chat input
+    """Create chat input with enhanced configuration"""
     with st.form(key="chat_form", clear_on_submit=True):
         st.markdown("""
             <label for="query_input" style="font-size: 1.2rem; font-weight: 600; margin-bottom: 1rem; display: block;">
@@ -376,18 +386,15 @@ def create_chat_input():
             </label>
         """, unsafe_allow_html=True)
         
-        # Text input
         query = st.text_input(
             "",
             key="query_input",
-            placeholder="เช่น: วันสุดท้ายของการสอบปากเปล่าในภาคเรียนที่ 1/2567 คือวันที่เท่าไร?"
+            placeholder="เช่น: วิชาเลือกมีอะไรบ้าง?"
         )
         
-        # Create two columns for buttons with a 7:3 ratio
         col1, col2 = st.columns([7, 3])
         
         with col1:
-            # Submit button in form
             submitted = st.form_submit_button(
                 "📤 ส่งคำถาม",
                 type="primary",
@@ -395,7 +402,6 @@ def create_chat_input():
             )
         
         with col2:
-            # Clear history button inside the form
             clear_button = st.form_submit_button(
                 "🗑️ ล้างประวัติ",
                 type="secondary",
@@ -435,12 +441,7 @@ def main():
     if 'processing_query' not in st.session_state:
         st.session_state.processing_query = False
 
-    # Load QA history at startup
-    if 'qa_history_loaded' not in st.session_state:
-        st.session_state.qa_history_loaded = True
-        load_qa_history()
-
-    # Initialize pipeline
+    # Initialize pipeline with enhanced configuration
     if st.session_state.pipeline is None:
         with st.spinner("กำลังเริ่มต้นระบบ..."):
             st.session_state.pipeline = initialize_pipeline()
@@ -456,57 +457,25 @@ def main():
     chat_col, info_col = st.columns([7, 3])
     
     with chat_col:
-        # Display chat history first
-        for i, (role, content) in enumerate(st.session_state.chat_history):
-            if role == "user":
-                st.markdown(f"""
-                    <div class="chat-message user-message">
-                        <strong>🧑 คำถาม:</strong><br>
-                        {content}
-                    </div>
-                """, unsafe_allow_html=True)
-            else:
-                if isinstance(content, dict):  
-                    assistant_response = content.get('answer', '❌ ไม่มีข้อมูลคำตอบ')
-                else:  
-                    assistant_response = content
-
-                st.markdown(f"""
-                    <div class="chat-message assistant-message">
-                        <strong>🤖 คำตอบ:</strong><br>
-                        {assistant_response}
-                    </div>
-                """, unsafe_allow_html=True)
-
-                if isinstance(content, dict) and content.get('documents'):
-                    with st.expander("📚 แสดงข้อมูลอ้างอิง", expanded=False):
-                        for i, doc in enumerate(content['documents'], 1):
-                            st.markdown(f"""
-                                <div style="padding: 1rem; background-color: #000000; border-radius: 8px; margin: 0.5rem 0;">
-                                    <strong>เอกสารที่ {i}:</strong><br>
-                                    {doc.content}
-                                </div>
-                            """, unsafe_allow_html=True)
-        
-        # Create chat input using the new implementation
+        display_chat_history()
         create_chat_input()
 
-    # Sidebar info column
+    # Info column
     with info_col:
         st.markdown("""
             <div style="background-color: #F9FAFB; padding: 1.5rem; border-radius: 12px; margin-bottom: 2rem;">
                 <h3 style="color: #1E3A8A;">ℹ️ เกี่ยวกับระบบ</h3>
                 <p style="color: #000000;">
                     ระบบนี้ใช้เทคโนโลยี <strong>RAG (Retrieval-Augmented Generation)</strong> 
-                    ในการค้นหาและตอบคำถามเกี่ยวกับปฏิทินการศึกษา
+                    ในการค้นหาและตอบคำถามเกี่ยวกับหลักสูตรและปฏิทินการศึกษา
                 </p>
                 <h4 style="color: #1E3A8A; margin-top: 1rem;">สามารถสอบถามข้อมูลเกี่ยวกับ:</h4>
                 <ul style="list-style-type: none; padding-left: 0;">
-                    <li style="color: #000000; margin-bottom: 0.5rem;">📅 กำหนดการต่างๆ ในปฏิทินการศึกษา</li>
-                    <li style="color: #000000; margin-bottom: 0.5rem;">🎯 วันสำคัญและกิจกรรม</li>
+                    <li style="color: #000000; margin-bottom: 0.5rem;">📚 รายวิชาในหลักสูตร</li>
                     <li style="color: #000000; margin-bottom: 0.5rem;">📝 การลงทะเบียนเรียน</li>
-                    <li style="color: #000000; margin-bottom: 0.5rem;">📚 กำหนดการสอบ</li>
-                    <li style="color: #000000; margin-bottom: 0.5rem;">🏖️ วันหยุดการศึกษา</li>
+                    <li style="color: #000000; margin-bottom: 0.5rem;">📅 กำหนดการต่างๆ</li>
+                    <li style="color: #000000; margin-bottom: 0.5rem;">💰 ค่าธรรมเนียมการศึกษา</li>
+                    <li style="color: #000000; margin-bottom: 0.5rem;">📋 ขั้นตอนการสมัคร</li>
                 </ul>
             </div>
         """, unsafe_allow_html=True)