Update app.py

app.py

@@ -237,13 +237,25 @@ def main():
             st.write("### 📖 Our Story So Far:")
             for entry in st.session_state.story:
                 css_class = "ai-text" if entry['author'] == 'AI' else "player-text"
+                
+                # แสดงข้อความหลัก
                 st.markdown(f'<div class="story-text {css_class}">{entry["text"]}</div>', 
-                          unsafe_allow_html=True)
-                if 'prompt' in entry:
-                    st.markdown(f'<div class="prompt-text">🤔 {entry["prompt"]}</div>', 
-                              unsafe_allow_html=True)
+                           unsafe_allow_html=True)
+                
+                # ถ้าเป็น AI response ให้แสดงคำแปลและ prompt
+                if entry['author'] == 'AI':
+                    if 'translation' in entry:
+                        st.markdown(f'<div class="prompt-text">🇹🇭 {entry["translation"]}</div>', 
+                                  unsafe_allow_html=True)
+                    if 'prompt' in entry:
+                        st.markdown(f'<div class="prompt-text">🤔 {entry["prompt"]}</div>', 
+                                  unsafe_allow_html=True)
+                    if 'vocabulary' in entry:
+                        vocab_text = ", ".join(entry["vocabulary"])
+                        st.markdown(f'<div class="prompt-text">📚 Suggested words: {vocab_text}</div>', 
+                                  unsafe_allow_html=True)
             st.markdown('</div>', unsafe_allow_html=True)
-        
+
         # Box 2: Writing Area
         if st.session_state.current_turn == 'Player':
             with st.container():
@@ -255,6 +267,8 @@ def main():
                         process_player_input(user_input)
                         st.rerun()
                 st.markdown('</div>', unsafe_allow_html=True)
+        else:
+            st.info("🤖 AI is thinking...")  # แสดงสถานะเมื่อเป็น turn ของ AI
         
         # Box 3: Help Buttons
         with st.container():
@@ -288,44 +302,18 @@ def main():
             st.markdown('</div>', unsafe_allow_html=True)
 
 def process_player_input(user_input):
-    """Process the player's input, generate feedback, and update the story"""
     try:
         # Get story context for AI
         story_context = " ".join([entry['text'] for entry in st.session_state.story])
         
-        # Get writing feedback from GPT
-        feedback_response = openai.ChatCompletion.create(
-            model="gpt-4o-mini",  # หรือ model ที่ถูกต้องตามที่คุณใช้
-            messages=[
-                {"role": "system", "content": f"""You are an English teacher helping a {st.session_state.current_level} level student.
-                Analyze their sentence and provide feedback in JSON format with:
-                1. grammar_check: List of grammar issues found (if any)
-                2. spelling_check: List of spelling issues found (if any)
-                3. improvement_suggestions: Specific suggestions for improvement
-                4. positive_feedback: What they did well
-                Be encouraging but thorough in your feedback."""},
-                {"role": "user", "content": f"Student's sentence: {user_input}"}
-            ],
-            temperature=0.7
-        )
-        feedback = json.loads(feedback_response.choices[0].message.content)
-        
-        # Add player's sentence to story with feedback
+        # Add player's sentence first
         st.session_state.story.append({
             'author': 'Player',
             'text': user_input,
-            'feedback': feedback,
             'timestamp': datetime.now().isoformat()
         })
         
-        # Update vocabulary used
-        words = set(user_input.lower().split())
-        st.session_state.vocabulary_used.update(words)
-        
-        # Check for achievements
-        check_achievements(user_input, feedback)
-        
-        # Get AI's continuation
+        # Get AI's continuation immediately after player's input
         ai_response = get_ai_story_continuation(
             story_context + "\n" + user_input,
             st.session_state.current_level
@@ -341,8 +329,28 @@ def process_player_input(user_input):
             'timestamp': datetime.now().isoformat()
         })
         
-        # Switch turn back to player
-        st.session_state.current_turn = 'Player'
+        # Get feedback for player's writing
+        feedback_response = openai.ChatCompletion.create(
+            model="gpt-4o-mini",
+            messages=[
+                {"role": "system", "content": f"""You are an English teacher helping a {st.session_state.current_level} level student.
+                Analyze their sentence and provide feedback in JSON format with:
+                1. grammar_check: List of grammar issues found (if any)
+                2. spelling_check: List of spelling issues found (if any)
+                3. improvement_suggestions: Specific suggestions for improvement
+                4. positive_feedback: What they did well
+                Be encouraging but thorough in your feedback."""},
+                {"role": "user", "content": f"Student's sentence: {user_input}"}
+            ]
+        )
+        feedback = json.loads(feedback_response.choices[0].message.content)
+        
+        # Update vocabulary used
+        words = set(user_input.lower().split())
+        st.session_state.vocabulary_used.update(words)
+        
+        # Check for achievements
+        check_achievements(user_input, feedback)
         
         # Show feedback to player
         display_feedback(feedback)