Update main.py

main.py

@@ -1271,62 +1271,111 @@ def view_quizzes():
 
 @app.route('/api/user/performance', methods=['GET'])
 def get_user_performance():
-    """Retrieves user's quiz performance and provides simple suggestions."""
+    """Retrieves user's quiz performance grouped by quiz"""
     try:
         # Authentication
         user, error = verify_token(request.headers.get('Authorization'))
-        if error: return jsonify({'error': error['error']}), error['status']
+        if error: 
+            return jsonify({'error': error['error']}), error['status']
         
-        # Query with proper error handling
+        # Get all quiz attempts with related data
         attempts_res = supabase.table('quiz_attempts') \
-            .select('id, quiz_id, score, submitted_at, quizzes(difficulty, notes(study_materials(title, type)))') \
+            .select('''
+                id,
+                quiz_id,
+                score,
+                submitted_at,
+                quizzes(
+                    id,
+                    difficulty,
+                    created_at,
+                    notes!inner(
+                        id,
+                        study_materials!inner(title)
+                    )
+                )
+            ''') \
             .eq('user_id', user.id) \
             .order('submitted_at', desc=True) \
-            .limit(20)
-            
-        result = attempts_res.execute()
-        
-        if hasattr(result, 'error') and result.error:
-            raise Exception(result.error.message)
-        
-        attempts_data = result.data
-        
-        # --- Basic Analysis ---
-        average_score = 0.0
-        suggestions = []
-        if attempts_data:
-            total_score = sum(a['score'] for a in attempts_data)
-            average_score = total_score / len(attempts_data)
-
-            # Simple Suggestion Logic
-            if average_score < 60:
-                suggestions.append("Your average score is a bit low. Try reviewing the notes more thoroughly before taking quizzes.")
-                # Suggest reviewing specific materials from recent low scores
-                low_score_attempts = sorted([a for a in attempts_data if a['score'] < 60], key=lambda x: x['submitted_at'], reverse=True)
-                if low_score_attempts:
-                    quiz_info = low_score_attempts[0].get('quizzes')
-                    if quiz_info and quiz_info.get('notes') and quiz_info['notes'].get('study_materials'):
-                        material_info = quiz_info['notes']['study_materials']
-                        if material_info.get('title'):
-                            suggestions.append(f"Focus on reviewing the material titled: '{material_info['title']}'.")
-            elif average_score > 85:
-                suggestions.append("Great job on your recent quizzes! Consider trying 'hard' difficulty quizzes or exploring new topics.")
-            else:
-                suggestions.append("You're making good progress! Keep practicing to solidify your understanding.")
+            .execute()
+
+        if attempts_res.error:
+            raise Exception(attempts_res.error.message)
+
+        # Group attempts by quiz
+        quizzes = {}
+        for attempt in attempts_res.data:
+            quiz_id = attempt['quizzes']['id']
+            if quiz_id not in quizzes:
+                quizzes[quiz_id] = {
+                    'quiz_info': {
+                        'id': quiz_id,
+                        'title': attempt['quizzes']['notes']['study_materials']['title'],
+                        'difficulty': attempt['quizzes']['difficulty'],
+                        'created_at': attempt['quizzes']['created_at']
+                    },
+                    'attempts': [],
+                    'average_score': 0
+                }
+            quizzes[quiz_id]['attempts'].append(attempt)
+
+        # Calculate averages and format
+        performance_data = []
+        for quiz in quizzes.values():
+            scores = [a['score'] for a in quiz['attempts']]
+            quiz['average_score'] = sum(scores) / len(scores) if scores else 0
+            quiz['attempt_count'] = len(scores)
+            performance_data.append(quiz)
+
+        # Sort quizzes by most recent attempt
+        performance_data.sort(
+            key=lambda x: max(a['submitted_at'] for a in x['attempts']), 
+            reverse=True
+        )
+
+        # Generate suggestions
+        overall_avg = sum(q['average_score'] for q in performance_data) / len(performance_data) if performance_data else 0
+        suggestions = generate_suggestions(performance_data, overall_avg)
 
         return jsonify({
             'success': True,
-            'average_score': round(average_score, 2) if attempts_data else None,
-            'recent_attempts': attempts_data,
+            'average_score': round(overall_avg, 2),
+            'quizzes': performance_data,
             'suggestions': suggestions
         })
-    
+
     except Exception as e:
-        print(f"Error in /api/user/performance: {str(e)}")  # Debug logging
-        logging.error(f"Performance endpoint error: {str(e)}")
-        logging.error(traceback.format_exc())
+        logging.error(f"Performance error: {traceback.format_exc()}")
         return jsonify({'error': str(e)}), 500
 
+def generate_suggestions(quizzes, overall_avg):
+    """Generate personalized suggestions based on quiz performance"""
+    suggestions = []
+    
+    if overall_avg < 60:
+        suggestions.append("Your average score is a bit low. Try reviewing notes before retaking quizzes.")
+    elif overall_avg > 85:
+        suggestions.append("Great job! Challenge yourself with harder difficulty levels.")
+    else:
+        suggestions.append("Keep practicing! Focus on your weaker areas for improvement.")
+
+    # Find weakest quiz
+    weakest = min(quizzes, key=lambda x: x['average_score'], default=None)
+    if weakest and weakest['average_score'] < 60:
+        title = weakest['quiz_info']['title'] or "your recent quizzes"
+        suggestions.append(f"Focus on improving in '{title}' (current average: {weakest['average_score']:.0f}%).")
+
+    # Check for difficulty distribution
+    difficulty_count = {}
+    for quiz in quizzes:
+        diff = quiz['quiz_info']['difficulty']
+        difficulty_count[diff] = difficulty_count.get(diff, 0) + 1
+        
+    if difficulty_count.get('easy', 0) / len(quizzes) > 0.7:
+        suggestions.append("Try more medium difficulty quizzes to push your skills!")
+
+    return suggestions
+
 
 # === Admin Endpoints (Adapted for Supabase) ===