Update app.py

app.py

@@ -32,7 +32,6 @@ class QuizGenerator:
         prompt = self._create_prompt(text, num_questions)
         
         try:
-            # API call with simplified parameters
             response = self.client.chat.completions.create(
                 messages=[
                     {
@@ -58,8 +57,18 @@ class QuizGenerator:
             questions = self._parse_response(content)
             validated = self._validate_questions(questions, num_questions)
             
-            if not validated:
-                raise ValueError("No valid questions generated")
+            # Check if we have exactly the requested number of questions
+            if len(validated) < num_questions:
+                # Generate additional questions if needed
+                additional_needed = num_questions - len(validated)
+                additional_questions = self.generate_questions(text, additional_needed)
+                validated.extend(additional_questions)
+            elif len(validated) > num_questions:
+                # Trim to exact number needed
+                validated = validated[:num_questions]
+            
+            if len(validated) != num_questions:
+                raise ValueError(f"Failed to generate exactly {num_questions} questions")
             
             return validated
             
@@ -69,9 +78,56 @@ class QuizGenerator:
                 print("Response content:", content if 'content' in locals() else None)
             raise QuizGenerationError(f"Failed to generate questions: {str(e)}")
     
+    def _validate_questions(self, questions: List[Dict], num_questions: int) -> List[Question]:
+        """Validate questions with strict checking and ensure correct number"""
+        validated = []
+        
+        for q in questions:
+            try:
+                # Skip invalid questions
+                if not isinstance(q, dict):
+                    continue
+                
+                # Check required fields
+                if not all(key in q for key in ['question', 'options', 'correct_answer']):
+                    continue
+                
+                # Validate options
+                if not isinstance(q['options'], list) or len(q['options']) != 4:
+                    continue
+                
+                # Validate correct_answer
+                try:
+                    correct_idx = int(q['correct_answer'])
+                    if not 0 <= correct_idx <= 3:
+                        continue
+                except (ValueError, TypeError):
+                    continue
+                
+                # Validate question content
+                if not q['question'].strip() or any(not opt.strip() for opt in q['options']):
+                    continue
+                
+                # Create validated Question object
+                validated.append(Question(
+                    question=str(q['question']).strip(),
+                    options=[str(opt).strip() for opt in q['options']],
+                    correct_answer=correct_idx
+                ))
+                
+            except Exception as e:
+                print(f"Validation error: {str(e)}")
+                continue
+            
+            # Stop if we have enough validated questions
+            if len(validated) == num_questions:
+                break
+        
+        return validated
+
     def _create_prompt(self, text: str, num_questions: int) -> str:
-        """Create a simple, clear prompt optimized for llama-3.2-3b-preview"""
-        return f"""Create {num_questions} multiple choice questions about this text. Return only the JSON array in this exact format:
+        """Create a simple, clear prompt optimized for gemma2-9b-it with emphasis on exact number"""
+        return f"""Create exactly {num_questions} multiple choice questions about this text. Return only the JSON array in this exact format:
 [
   {{
     "question": "Write the question here?",
@@ -87,9 +143,10 @@ class QuizGenerator:
 
 Rules:
 1. Return only the JSON array
-2. Each question must have exactly 4 options
-3. correct_answer must be 0, 1, 2, or 3
-4. No explanations or additional text
+2. Generate exactly {num_questions} questions
+3. Each question must have exactly 4 options
+4. correct_answer must be 0, 1, 2, or 3
+5. No explanations or additional text
 
 Text to use:
 {text.strip()}"""