Update app.py

app.py

@@ -1493,22 +1493,9 @@ def show_story():
                     """, unsafe_allow_html=True)
                 else:
                     # Regular AI Response with ending mode indicator
-                    ending_badge = ""
+                    ending_info = ""
                     if st.session_state.get('ending_mode'):
-                        remaining = st.session_state.sentences_to_end
-                        ending_badge = f"""
-                            <div style="
-                                display: inline-block;
-                                background-color: #fff3e0;
-                                padding: 3px 8px;
-                                border-radius: 12px;
-                                font-size: 0.8em;
-                                color: #f57c00;
-                                margin-left: 10px;
-                            ">
-                                🎭 Ending: {remaining} sentences left
-                            </div>
-                        """
+                        ending_info = f"🎭 เหลืออีก {st.session_state.sentences_to_end} ประโยค"
                     
                     st.markdown(f"""
                         <div style="
@@ -1518,35 +1505,24 @@ def show_story():
                             margin: 8px 0;
                             border-left: 4px solid #4caf50;
                         ">
-                            <div style="color: #2e7d32; display: flex; align-items: center;">
-                                <span>🤖 AI: {entry['content']}</span>
-                                {ending_badge}
+                            <div style="color: #2e7d32;">
+                                <div style="display: flex; justify-content: space-between; align-items: center;">
+                                    <span>🤖 AI: {entry['content']}</span>
+                                    <span style="color: #f57c00; font-size: 0.9em;">{ending_info}</span>
+                                </div>
                             </div>
                         </div>
                     """, unsafe_allow_html=True)
             
             elif entry['role'] == 'You':
-                # User Entry with ending mode indicator
+                # User Entry
                 status_icon = "✅" if entry.get('is_correct') else "✍️"
                 bg_color = "#e8f5e9" if entry.get('is_correct') else "#fff"
                 border_color = "#4caf50" if entry.get('is_correct') else "#1e88e5"
                 
-                ending_badge = ""
+                ending_info = ""
                 if st.session_state.get('ending_mode'):
-                    remaining = st.session_state.sentences_to_end
-                    ending_badge = f"""
-                        <div style="
-                            display: inline-block;
-                            background-color: #fff3e0;
-                            padding: 3px 8px;
-                            border-radius: 12px;
-                            font-size: 0.8em;
-                            color: #f57c00;
-                            margin-left: 10px;
-                        ">
-                            🎭 Ending: {remaining} sentences left
-                        </div>
-                    """
+                    ending_info = f"🎭 เหลืออีก {st.session_state.sentences_to_end} ประโยค"
                 
                 st.markdown(f"""
                     <div style="
@@ -1556,9 +1532,11 @@ def show_story():
                         margin: 8px 0;
                         border-left: 4px solid {border_color};
                     ">
-                        <div style="color: #333; display: flex; align-items: center;">
-                            <span>👤 You: {status_icon} {entry['content']}</span>
-                            {ending_badge}
+                        <div style="color: #333;">
+                            <div style="display: flex; justify-content: space-between; align-items: center;">
+                                <span>👤 You: {status_icon} {entry['content']}</span>
+                                <span style="color: #f57c00; font-size: 0.9em;">{ending_info}</span>
+                            </div>
                         </div>
                         {f'<div style="font-size: 0.9em; color: #666; margin-top: 5px;">{entry.get("feedback", "")}</div>' if entry.get('feedback') else ''}
                     </div>
@@ -1636,41 +1614,25 @@ def handle_ending_mode(text: str):
     try:
         remaining = st.session_state.sentences_to_end
         
-        # Show remaining sentences warning
-        st.warning(f"""
-            🎭 Ending Mode Active:
-            - Remaining sentences: {remaining}
-            - Ending Type: {st.session_state.ending_type}
-            
-            Try to work towards completing your story!
-        """)
-        
-        # Get specialized ending feedback
-        feedback_data = provide_feedback(text, st.session_state.level)
-        st.session_state.feedback = feedback_data
-        is_correct = not feedback_data.get('has_errors', False)
-        
         # Add user's sentence
         st.session_state.story.append({
             "role": "You",
             "content": text,
             "is_corrected": False,
-            "is_correct": is_correct,
+            "is_correct": True,  # We don't check correctness in ending mode
             "timestamp": datetime.now().isoformat()
         })
         
-        # Update stats and achievements
-        words = set(text.lower().split())
-        st.session_state.stats['vocabulary_used'].update(words)
-        update_points(is_correct)
-        update_achievements()
+        # Decrease remaining count
+        remaining -= 1
+        st.session_state.sentences_to_end = remaining
         
-        # Generate AI's ending continuation
-        if remaining > 1:  # Still have sentences remaining
+        if remaining > 0:
+            # Generate AI's ending continuation
             ai_response = generate_ending_continuation(
                 text,
                 ending_type=st.session_state.ending_type,
-                remaining_sentences=remaining - 1
+                remaining_sentences=remaining
             )
             
             st.session_state.story.append({
@@ -1679,10 +1641,11 @@ def handle_ending_mode(text: str):
                 "timestamp": datetime.now().isoformat()
             })
             
-            # Decrease remaining sentences count
-            st.session_state.sentences_to_end = remaining - 2  # -2 because both user and AI added sentences
+            # Decrease for AI's sentence
+            st.session_state.sentences_to_end = remaining - 1
             
-        else:  # Last sentence - complete the story
+        else:
+            # Generate final ending
             final_response = generate_final_ending(
                 st.session_state.story,
                 st.session_state.ending_type
@@ -1699,10 +1662,7 @@ def handle_ending_mode(text: str):
             st.session_state.story_completed = True
             complete_story()
         
-        # Update session stats
-        update_session_stats()
-        
-        # Clear input and rerun
+        # Clear input
         st.session_state.story_input_area = ""
         st.rerun()
         
@@ -2423,27 +2383,80 @@ def main():
             else:
                 # Show story progress if story exists
                 if st.session_state.story:
-                    show_story_progress()
+                    # แสดงความคืบหน้าของเรื่อง
+                    total_sentences = len(st.session_state.story)
+                    st.markdown(f"""
+                        <div style="
+                            background-color: #f0f7ff;
+                            padding: 15px;
+                            border-radius: 10px;
+                            margin: 10px 0;
+                        ">
+                            <div style="margin-bottom: 10px;">
+                                📊 ความยาวเรื่อง: {total_sentences} ประโยค
+                            </div>
+                            <div class="progress-bar">
+                                <div class="progress-bar-fill" style="width: {min(total_sentences * 10, 100)}%;"></div>
+                            </div>
+                            <div style="font-size: 0.9em; color: #666; margin-top: 5px;">
+                                เรื่องควรยาว 10-20 ประโยค เพื่อความสมบูรณ์
+                            </div>
+                        </div>
+                    """, unsafe_allow_html=True)
                     
-                    # Show ending options if story is long enough and not in ending mode
-                    if (len(st.session_state.story) >= 10 and 
-                        not st.session_state.ending_mode):
-                        show_story_ending_options()
+                    # แสดงตัวเลือกจบเรื่องเมื่อเรื่องยาวพอ
+                    if (total_sentences >= 10 and not st.session_state.get('ending_mode')):
+                        st.markdown("### 🎭 ต้องการจบเรื่องหรือไม่?")
+                        ending_type = st.radio(
+                            "เลือกวิธีจบเรื่อง:",
+                            options=[
+                                "Happy Ending - จบแบบมีความสุข",
+                                "Mysterious Ending - จบแบบทิ้งท้ายให้คิดต่อ",
+                                "Lesson Learned - จบแบบได้ข้อคิด",
+                                "Surprise Ending - จบแบบพลิกความคาดหมาย"
+                            ],
+                            index=0,
+                            key="ending_type_selector"
+                        )
+                        
+                        if st.button("🎬 เริ่มจบเรื่อง", use_container_width=True):
+                            st.session_state.ending_mode = True
+                            st.session_state.ending_type = ending_type
+                            st.session_state.sentences_to_end = 5
+                            st.rerun()
                     
-                    # Show ending mode warning if active
-                    if st.session_state.ending_mode:
-                        st.warning(f"""
-                            🎭 กำลังอยู่ในโหมดจบเรื่อง - เหลือ {st.session_state.sentences_to_end} ประโยค
-                            \nรูปแบบการจบ: {st.session_state.ending_type}
-                        """)
+                    # แสดงแจ้งเตือนโหมดจบเรื่อง
+                    if st.session_state.get('ending_mode'):
+                        remaining = st.session_state.sentences_to_end
+                        if remaining > 0:
+                            st.warning(f"""
+                                🎭 กำลังอยู่ในโหมดจบเรื่อง
+                                - เหลืออีก {remaining} ประโยค
+                                - รูปแบบการจบ: {st.session_state.ending_type}
+                                
+                                พยายามเขียนให้เรื่องจบอย่างสมบูรณ์!
+                            """)
                 
-                # Show main interface
+                # แสดงส่วนหลัก
                 show_main_interface()
                 
-                # Check if story is complete
-                if (st.session_state.ending_mode and 
-                    st.session_state.sentences_to_end <= 0):
-                    complete_story()
+                # ตรวจสอบการจบเรื่อง
+                if st.session_state.get('ending_mode'):
+                    if st.session_state.sentences_to_end <= 0:
+                        if not st.session_state.get('story_completed'):
+                            complete_story()
+                            st.balloons()
+                    elif st.session_state.sentences_to_end == 1:
+                        st.info("⚡ เหลือประโยคสุดท้ายแล้ว! เขียนให้จบอย่างสวยงาม")
+
+        # Handle reset if needed
+        if st.session_state.get('should_reset'):
+            reset_story()
+            # Reset ending states
+            st.session_state.ending_mode = False
+            st.session_state.sentences_to_end = 5
+            st.session_state.ending_type = None
+            st.session_state.story_completed = False
 
         # Handle reset if needed
         if st.session_state.should_reset: