Update LLM analysis format and fix navigation issues

- Updated LLM analyzer to use clean format without emojis or em dashes
- Changed to numbered format (1-3) for Strengths, Areas for Improvement, and Practice Tips
- Updated practice tips to only use drills from golf articles CSV
- Removed putting/short game drills, kept only swing technique and setup drills
- Fixed navigation issue between improvements page and chatbot page
- Added session state safeguards to prevent unnecessary video re-uploads
- Enhanced chatbot access with graceful fallbacks for missing analysis data

app/models/llm_analyzer.py

@@ -531,36 +531,40 @@ Use the benchmarks above to guide your evaluation. Follow this exact format:
 **PERFORMANCE_CLASSIFICATION:** [XX%]
 (XX = number from 10% to 100%)
 
-**STRENGTHS:**
-List exactly 3 strengths. Each should:
-- Be qualitative (no numbers)
+**Strengths**
+
+List exactly 3 strengths numbered 1-3. Each should:
+- Include the topic name followed by a colon
+- Be qualitative and positive 
 - Compare to professional benchmarks
-- Highlight what's working well and when (e.g. during backswing, at impact)
-- Use a positive, supportive tone
+- Highlight what's working well and the benefit
+- Use supportive tone
 
 Example:
-• Your shoulder rotation during the backswing shows strong upper body mobility, similar to professional swings.
+1. Arm Extension:
+Excellent extension at impact, this maintains a wide swing arc, just like elite players.
+
+**Areas for Improvement**
 
-**WEAKNESSES:**
-List exactly 3 areas for improvement. Each should:
-- Use numbers when necessary, and only use 1 number per weakness (for example, the difference between your metric and the professional standard)
-- Describe the impact on power, accuracy, or consistency
-- Use phrases like "less than optimal" or "more than ideal"
-- Don't suggest fixes here—save those for the next section
+List exactly 3 areas for improvement numbered 1-3. Each should:
+- Include the topic name and your specific metric vs pro range
+- Use format: "Topic — Your metric, pro range"
+- Follow with explanation of impact and drill suggestion
+- Focus on what needs work and why
 
 Example:
-• Your hip rotation is less than optimal, which may reduce your power through the downswing.
+1. Hip Rotation — Only 12.7°, pros range from 25–90°
+Try drills that increase hip mobility during backswing. More rotation = more power and distance.
 
-**PRIORITY_IMPROVEMENTS:**
-List exactly 3 improvement areas. Each should:
-- Include the topic name
-- Explain what to improve and when in the swing
-- Reference benchmarks when relevant, without being too technical
-- Use coaching-style language (e.g. "try increasing...")
-- Emphasize benefits
+**Practice Tips**
+
+List exactly 3 practice tips numbered 1-3. Each should:
+- Include the topic name followed by "Drill:"
+- Provide specific, actionable drill instructions
+- Be easy to understand and practice
 
 Example:
-Hip Mobility: Try increasing your hip rotation during the downswing to unlock more lower body power.
+1. Ground Force Timing: Practice pushing against the ground earlier in the downswing to improve power transfer.
 
 **SCORING GUIDELINES (Use to help decide % score)**
 
@@ -585,12 +589,26 @@ Hip Mobility: Try increasing your hip rotation during the downswing to unlock mo
 - **10–39%**: Novice
 
 **STYLE & FORMATTING RULES:**
-- Use these headers: PERFORMANCE_CLASSIFICATION, STRENGTHS, WEAKNESSES, PRIORITY_IMPROVEMENTS
-- Avoid statistics in strengths/weaknesses (okay in improvements if helpful)
+- Use these headers: PERFORMANCE_CLASSIFICATION, Strengths, Areas for Improvement, Practice Tips
+- No emojis anywhere in the response
+- No em dashes, use colons for topic separation
+- Use numbered lists (1-3) for each section
 - Tie all points to professional standards
 - Use a positive, coaching tone throughout
 - Avoid saying "perfect" — say "strong" or "meets standards"
 - Focus on biomechanics, not timing (e.g. tempo, frame count)
+
+**PRACTICE TIPS MUST USE ONLY THESE PROVEN SWING DRILLS:**
+- Ground Force Timing (push against ground earlier in downswing)
+- Halfway Back Drill (check club position when lead arm parallel to ground)
+- Takeaway Drill (practice one-piece takeaway movement)
+- Impact Drill (work on strong left side position at impact)
+- Extension & Rotation Drill (perfect arm rotation through impact)
+- Feet Together L-to-L Swings (continuous swings with feet together)
+- Two-Tee Drill (swing through tee gate for driver path)
+- Mirror Work (practice setup and positions)
+- Ballistic Exercises (explosive movements for power development)
+- Strength Training (for mobility and power foundation)
 """
 
     return prompt
@@ -637,23 +655,29 @@ def parse_and_format_analysis(raw_analysis):
                 break
     
     # Extract strengths using the new structured format
-    strengths_match = re.search(r'\*\*STRENGTHS:\*\*\s*(.*?)(?=\*\*WEAKNESSES:\*\*|\*\*PRIORITY_IMPROVEMENTS:\*\*|$)', raw_analysis, re.IGNORECASE | re.DOTALL)
+    strengths_match = re.search(r'\*\*Strengths\*\*\s*(.*?)(?=\*\*Areas for Improvement\*\*|\*\*Practice Tips\*\*|$)', raw_analysis, re.IGNORECASE | re.DOTALL)
     if strengths_match:
         strengths_text = strengths_match.group(1)
-        # Extract bullet points
-        strength_items = re.findall(r'•\s*([^\n•]+)', strengths_text)
-        formatted_analysis['strengths'] = [item.strip() for item in strength_items if item.strip()]
+        # Extract numbered items (1. Topic: Description)
+        strength_items = re.findall(r'\d+\.\s*([^:]+):\s*([^\n\d]+)', strengths_text)
+        formatted_analysis['strengths'] = [f"{topic.strip()}: {desc.strip()}" for topic, desc in strength_items if topic.strip() and desc.strip()]
     
-    # Extract weaknesses using the new structured format
-    weaknesses_match = re.search(r'\*\*WEAKNESSES:\*\*\s*(.*?)(?=\*\*PRIORITY_IMPROVEMENTS:\*\*|$)', raw_analysis, re.IGNORECASE | re.DOTALL)
+    # Extract areas for improvement using the new structured format
+    weaknesses_match = re.search(r'\*\*Areas for Improvement\*\*\s*(.*?)(?=\*\*Practice Tips\*\*|$)', raw_analysis, re.IGNORECASE | re.DOTALL)
     if weaknesses_match:
         weaknesses_text = weaknesses_match.group(1)
-        # Extract bullet points
-        weakness_items = re.findall(r'•\s*([^\n•]+)', weaknesses_text)
-        formatted_analysis['weaknesses'] = [item.strip() for item in weakness_items if item.strip()]
+        # Extract numbered items (1. Topic — metric info\nExplanation)
+        weakness_items = re.findall(r'\d+\.\s*([^—\n]+)—([^\n]+)\n?([^\d]+)?', weaknesses_text)
+        formatted_analysis['weaknesses'] = []
+        for topic, metric, explanation in weakness_items:
+            if topic.strip() and metric.strip():
+                full_text = f"{topic.strip()} — {metric.strip()}"
+                if explanation and explanation.strip():
+                    full_text += f"\n{explanation.strip()}"
+                formatted_analysis['weaknesses'].append(full_text)
     
-    # Extract priority improvements using the new structured format
-    priority_match = re.search(r'\*\*PRIORITY_IMPROVEMENTS:\*\*\s*(.*?)$', raw_analysis, re.IGNORECASE | re.DOTALL)
+    # Extract practice tips using the new structured format
+    priority_match = re.search(r'\*\*Practice Tips\*\*\s*(.*?)$', raw_analysis, re.IGNORECASE | re.DOTALL)
     if priority_match:
         priority_text = priority_match.group(1)
         # First try to parse numbered format: "1. Topic: Description"
@@ -680,11 +704,11 @@ def parse_and_format_analysis(raw_analysis):
     
     # Ensure exactly 3 priority improvements with distinct topics
     if len(formatted_analysis['priority_improvements']) < 3:
-        # Define 3 distinct improvement areas
+        # Define 3 distinct practice tips using drills from golf articles CSV
         common_improvements = [
-            "Hip Mobility: Try increasing your hip rotation during the downswing to unlock more lower body power and improve overall swing efficiency.",
-            "Arm Extension: Focus on achieving better arm extension at impact to improve power transfer and ball striking consistency.",
-            "Weight Transfer: Work on shifting your weight more effectively from back foot to front foot during the swing to enhance balance and power generation."
+            "Ground Force Timing: Practice pushing against the ground earlier in the downswing to improve power transfer efficiency.",
+            "Halfway Back Drill: Work on swing path by checking club position when lead arm is parallel to ground.",
+            "Feet Together L-to-L Swings: Make continuous three-quarter swings with feet together to improve balance and timing."
         ]
         
         # Get existing topics to avoid duplicates
@@ -784,27 +808,27 @@ def parse_and_format_analysis(raw_analysis):
         percentage = formatted_analysis['classification']
         if percentage >= 80:
             formatted_analysis['priority_improvements'] = [
-                {'rank': 1, 'description': 'Technical Refinement: Fine-tune specific mechanics to achieve consistency at the highest level.'},
-                {'rank': 2, 'description': 'Performance Optimization: Focus on maximizing efficiency and power transfer.'},
-                {'rank': 3, 'description': 'Competitive Preparation: Enhance mental game and course management skills.'}
+                {'rank': 1, 'description': 'Ground Force Timing: Practice pushing against ground earlier in downswing for elite power transfer.'},
+                {'rank': 2, 'description': 'Extension & Rotation Drill: Perfect arm rotation through impact for maximum efficiency.'},
+                {'rank': 3, 'description': 'Ballistic Exercises: Use explosive movements for advanced power development and speed training.'}
             ]
         elif percentage >= 60:
             formatted_analysis['priority_improvements'] = [
-                {'rank': 1, 'description': 'Kinematic Sequence Enhancement: Improve body rotation coordination to generate more power and consistency.'},
-                {'rank': 2, 'description': 'Clubface Control: Enhance swing path consistency for better ball striking accuracy.'},
-                {'rank': 3, 'description': 'Energy Transfer Efficiency: Optimize power transfer throughout the swing to maximize distance.'}
+                {'rank': 1, 'description': 'Halfway Back Drill: Check club position when lead arm parallel to ground for proper swing path.'},
+                {'rank': 2, 'description': 'Two-Tee Drill: Practice swinging through tee gate to improve driver swing path and reduce slices.'},
+                {'rank': 3, 'description': 'Impact Drill: Work on strong left side position at impact for better ball striking.'}
             ]
         elif percentage >= 40:
             formatted_analysis['priority_improvements'] = [
-                {'rank': 1, 'description': 'Fundamental Mechanics: Establish consistent posture, grip, and setup positions.'},
-                {'rank': 2, 'description': 'Body Rotation Development: Improve hip and shoulder turn coordination.'},
-                {'rank': 3, 'description': 'Weight Transfer: Develop proper weight shift from back foot to front foot during swing.'}
+                {'rank': 1, 'description': 'Takeaway Drill: Practice one-piece takeaway movement for consistent swing foundation.'},
+                {'rank': 2, 'description': 'Feet Together L-to-L Swings: Continuous three-quarter swings with feet together for balance and timing.'},
+                {'rank': 3, 'description': 'Mirror Work: Practice setup positions and swing mechanics for consistency and muscle memory.'}
             ]
         else:  # Below 40%
             formatted_analysis['priority_improvements'] = [
-                {'rank': 1, 'description': 'Basic Setup and Posture: Focus on establishing proper spine angle and athletic stance.'},
-                {'rank': 2, 'description': 'Fundamental Swing Motion: Develop basic backswing and downswing mechanics.'},
-                {'rank': 3, 'description': 'Balance and Stability: Improve overall balance throughout the swing motion.'}
+                {'rank': 1, 'description': 'Mirror Work: Practice basic setup position focusing on proper spine angle and athletic stance.'},
+                {'rank': 2, 'description': 'Takeaway Drill: Work on simple one-piece takeaway movement for swing foundation.'},
+                {'rank': 3, 'description': 'Strength Training: Focus on mobility and foundational strength for better swing mechanics.'}
             ]
     
     return formatted_analysis
@@ -823,7 +847,7 @@ def display_formatted_analysis(analysis_data):
     # Display classification in black bolded header
     st.markdown(f"""
     <h2 style='color: black; font-weight: bold; text-align: center; margin-bottom: 20px;'>
-        🎯 Performance Score: {user_percentage}%
+        Performance Score: {user_percentage}%
     </h2>
     """, unsafe_allow_html=True)
     
@@ -904,38 +928,46 @@ def display_formatted_analysis(analysis_data):
     st.markdown("---")
     
     # 2. Strengths and Weaknesses Table
-    st.subheader("⚖️ Strengths & Areas for Improvement")
+    st.subheader("Strengths & Areas for Improvement")
+    
+    # Create responsive columns - divider hidden on mobile
+    st.markdown("""
+    <style>
+    @media (max-width: 768px) {
+        .desktop-divider { display: none !important; }
+    }
+    </style>
+    """, unsafe_allow_html=True)
     
-    # Create two columns for the table with a visual divider
     col_left, col_divider, col_right = st.columns([5, 1, 5])
     
     with col_left:
         st.markdown("""
         <div style='background-color: #e8f5e8; padding: 15px; border-radius: 10px; height: 100%;'>
-            <h4 style='color: #2d5a2d; margin-top: 0;'>✅ Strengths</h4>
+            <h4 style='color: #2d5a2d; margin-top: 0;'>Strengths</h4>
         """, unsafe_allow_html=True)
-        for strength in analysis_data['strengths']:
-            st.markdown(f"• {strength}")
+        for i, strength in enumerate(analysis_data['strengths'], 1):
+            st.markdown(f"{i}. {strength}")
         st.markdown("</div>", unsafe_allow_html=True)
     
     with col_divider:
         st.markdown("""
-        <div style='width: 2px; background-color: #ddd; height: 200px; margin: 20px auto;'></div>
+        <div class='desktop-divider' style='width: 2px; background-color: #ddd; height: 200px; margin: 20px auto;'></div>
         """, unsafe_allow_html=True)
     
     with col_right:
         st.markdown("""
         <div style='background-color: #fff5e6; padding: 15px; border-radius: 10px; height: 100%;'>
-            <h4 style='color: #cc6600; margin-top: 0;'>⚠️ Areas for Improvement</h4>
+            <h4 style='color: #cc6600; margin-top: 0;'>Areas for Improvement</h4>
         """, unsafe_allow_html=True)
-        for weakness in analysis_data['weaknesses']:
-            st.markdown(f"• {weakness}")
+        for i, weakness in enumerate(analysis_data['weaknesses'], 1):
+            st.markdown(f"{i}. {weakness}")
         st.markdown("</div>", unsafe_allow_html=True)
     
     st.markdown("---")
     
-    # 3. Priority Improvement Areas
-    st.subheader("🎯 Priority Improvement Areas")
+    # 3. Practice Tips
+    st.subheader("Practice Tips")
     
     for priority in sorted(analysis_data['priority_improvements'], key=lambda x: x['rank']):
         rank = priority['rank']

app/streamlit_app.py

@@ -769,6 +769,9 @@ def main():
                 st.rerun()
                     
             if st.button("💬 Ask Questions", key="nav_chatbot", use_container_width=True):
+                # Ensure we preserve the analysis state when navigating
+                if st.session_state.get('video_analyzed', False):
+                    st.session_state.video_analyzed = True  # Explicitly preserve this
                 st.session_state.current_step = 5
                 st.rerun()
             
@@ -781,15 +784,23 @@ def main():
                 st.rerun()
 
     # Step-based content rendering
-    if st.session_state.current_step == 1:
+    current_step = st.session_state.current_step
+    
+    # Safeguard: If user tries to access step 4 or 5 without analysis, 
+    # but they have analysis data, let them proceed
+    if current_step >= 4 and not st.session_state.get('video_analyzed', False):
+        if 'analysis_data' in st.session_state and st.session_state.analysis_data.get('video_path'):
+            st.session_state.video_analyzed = True  # Restore the flag if we have data
+    
+    if current_step == 1:
         render_step_1()
-    elif st.session_state.current_step == 2:
+    elif current_step == 2:
         render_step_2()
-    elif st.session_state.current_step == 3:
+    elif current_step == 3:
         render_step_3()
-    elif st.session_state.current_step == 4:
+    elif current_step == 4:
         render_step_4()
-    elif st.session_state.current_step == 5:
+    elif current_step == 5:
         render_step_5()
     
     st.markdown("---")
@@ -857,8 +868,6 @@ def render_step_2():
     """Step 2: Analyzing Video and Pose"""
     st.markdown('<h2 style="color: #0B3B0B; font-family: Georgia, serif;">Step 2: Analyzing Video and Pose</h2>', unsafe_allow_html=True)
     
-    st.markdown("🔄 **Processing your swing video...**")
-    
     video_path = st.session_state.analysis_data.get('video_path')
     
     if video_path and not st.session_state.video_analyzed:
@@ -934,7 +943,6 @@ def render_step_3():
                 display_video(video_path, width=300)
         
         # Main action buttons - larger and more prominent
-        st.markdown("### Choose Your Path:")
         
         col1, col2 = st.columns(2)
         
@@ -981,8 +989,6 @@ def render_step_4():
             # Generate detailed analysis with recommendations
             analysis = generate_swing_analysis(pose_data, swing_phases, trajectory_data)
             
-            st.markdown("## 🎯 Personalized Swing Improvements")
-            
             # Check available services
             llm_services = check_llm_services()
             any_service_available = llm_services['ollama']['available'] or llm_services['openai']['available']
@@ -1011,6 +1017,12 @@ def render_step_5():
     
     st.markdown("💬 **Ready to answer your swing questions!**")
     
+    # Check if we have any analysis data, but don't block access if we don't
+    has_analysis = st.session_state.get('video_analyzed', False) and 'analysis_data' in st.session_state
+    
+    if not has_analysis:
+        st.info("💡 **Tip**: For personalized answers about your swing, complete the video analysis first. You can still ask general golf questions!")
+    
     if RAG_AVAILABLE:
         render_rag_interface()
     else: