Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py - Enhanced MCQ Test Generator for Hugging Face
+# app.py - Enhanced Test Generator for Hugging Face
 # Aligned with Pakistani National Curriculum (2006)
 # Developer: Najaf Ali Sharqi
 
@@ -9,6 +9,8 @@ from datetime import datetime
 from docx import Document
 from docx.shared import Pt, RGBColor, Inches
 from docx.enum.text import WD_ALIGN_PARAGRAPH
+from docx.oxml.ns import qn
+from docx.oxml import OxmlElement
 import re
 import json
 
@@ -23,8 +25,7 @@ client = Groq(api_key=GROQ_API_KEY)
 # ---------------------------
 # Configuration Constants
 # ---------------------------
-APP_VERSION = "2.0"
-MAX_MCQS = 20
+APP_VERSION = "2.5"
 MODEL_NAME = "llama-3.3-70b-versatile"
 
 # ---------------------------
@@ -51,6 +52,228 @@ subjects_by_grade = {
 # Chapter mapping (National Curriculum 2006)
 # ---------------------------
 chapters_by_subject_and_grade = {
+    "Grade 1": {
+        "Mathematics": ["Counting & Numbers", "Basic Addition", "Basic Subtraction", "Shapes", "Measurements"],
+        "English": ["Alphabet & Sounds", "Basic Words", "Simple Sentences", "Listening & Speaking", "Reading Short Texts"],
+        "Urdu": ["حروف", "الفاظ", "سادہ جملے", "پڑھنا", "لکھنا"],
+        "Islamiyat": ["Basic Beliefs", "Prophets Stories", "Good Manners", "Prayers & Worship"],
+        "General Knowledge": ["My Body", "My Home", "My School", "Seasons"]
+    },
+    "Grade 2": {
+        "Mathematics": ["Place Value", "Addition & Subtraction", "Money", "Time", "Shapes"],
+        "English": ["Parts of Speech Basics", "Simple Grammar", "Short Comprehension", "Vocabulary Building"],
+        "Urdu": ["الفاظ و جملے", "مختصر کہانیاں", "حروفِ صحیح"],
+        "Islamiyat": ["Prophets", "Good Deeds", "Mosque Etiquette"],
+        "General Knowledge": ["Plants & Animals", "Local Community", "Transport"]
+    },
+    "Grade 3": {
+        "Mathematics": ["Multiplication", "Division", "Fractions", "Geometry Basics", "Measurement"],
+        "English": ["Tenses (simple)", "Comprehension Passages", "Vocabulary", "Sentence Formation"],
+        "Urdu": ["کالم و مضامین", "قواعدِ اردو", "کہانیاں"],
+        "Science": ["Plants", "Animals", "Human Body", "Materials"],
+        "Islamiyat": ["Basics of Iman", "Seerat", "Manners"],
+        "General Knowledge": ["Environment", "Community Helpers", "Safety"]
+    },
+    "Grade 4": {
+        "Mathematics": ["Fractions & Decimals", "Geometry", "Data Handling", "Word Problems"],
+        "English": ["Grammar (intermediate)", "Comprehension", "Writing Short Paragraphs"],
+        "Urdu": ["نظم و نثر", "قواعد", "مفردات"],
+        "Science": ["Ecosystems", "Forces", "Heat & Energy"],
+        "Islamiyat": ["Pillars of Islam", "Seerah Stories"],
+        "General Knowledge": ["Maps & Directions", "Cultural Heritage", "Technology"]
+    },
+    "Grade 5": {
+        "Mathematics": ["Numbers & Operations", "Geometry", "Statistics", "Ratio & Proportion"],
+        "English": ["Advanced Grammar Basics", "Paragraph Writing", "Comprehension"],
+        "Urdu": ["ادبی مطالعہ", "تعبیر و تشریح"],
+        "Science": ["Cells & Life", "Matter", "Energy"],
+        "Islamiyat": ["Quranic Stories", "Akhlaq"],
+        "Social Studies": ["Pakistan Geography", "History Basics", "Civics Introduction"]
+    },
+    "Grade 6": {
+        "Mathematics": ["Number System", "Algebra Introduction", "Geometry", "Data Handling"],
+        "English": ["Grammar (complex)", "Essay Writing", "Comprehension Skills"],
+        "Urdu": ["ادب و نحو", "تحریر"],
+        "Science": ["Atoms & Molecules", "Human Body", "Plants"],
+        "Islamiyat": ["Seerah & Ahkam"],
+        "Social Studies": ["World Geography", "Historical Events", "Government"]
+    },
+    "Grade 7": {
+        "Mathematics": ["Algebra", "Geometry", "Mensuration", "Statistics"],
+        "English": ["Poetry & Prose", "Grammar", "Comprehension"],
+        "Urdu": ["نثر و شاعری", "قواعد"],
+        "Science": ["Cell Biology", "Human Systems", "Electricity Basics"],
+        "Islamiyat": ["Islamic History", "Moral Teachings"],
+        "Social Studies": ["Geography Basics", "History", "Civics"],
+        "Computer": ["Basic ICT", "Computer Hardware", "Introduction to Coding"]
+    },
+    "Grade 8": {
+        "Mathematics": ["Linear Equations", "Geometry", "Pythagoras", "Graphs"],
+        "English": ["Advanced Comprehension", "Composition", "Grammar"],
+        "Urdu": ["تجزیہ ادب", "تحقیقِ مختصر"],
+        "Science": ["Forces & Motion", "Heat", "Waves Basics"],
+        "Islamiyat": ["Islamic Law Basics", "Seerah"],
+        "Social Studies": ["Regional Geography", "Historical Events"],
+        "Computer": ["Algorithms", "Basic Programming"]
+    },
+    "Grade 9": {
+        "Mathematics": ["Number Systems & Algebra", "Coordinate Geometry", "Trigonometry", "Graphs"],
+        "English": ["Advanced Grammar", "Comprehension", "Writing Skills"],
+        "Urdu": ["ادب اور نثر", "نظم", "مضامین"],
+        "Biology": [
+            "Introduction to Biology", "Solving a Biological Problem", "Biodiversity",
+            "Cells and Tissues", "Cell Cycle", "Enzymes", "Bioenergetics", "Nutrition", "Transport"
+        ],
+        "Chemistry": [
+            "Fundamentals of Chemistry", "Structure of Atoms", "Periodic Table and Periodicity of Properties",
+            "Structure of Molecules", "Physical States of Matter", "Solutions", "Electrochemistry", "Chemical Reactivity"
+        ],
+        "Physics": [
+            "Physical Quantities and Measurement", "Kinematics", "Dynamics", "Turning Effect of Forces",
+            "Gravitation", "Work and Energy", "Properties of Matter", "Thermal Properties of Matter", "Transfer of Heat"
+        ],
+        "Islamiyat": ["Seerat of Prophet", "Faith & Beliefs", "Worship Practices"],
+        "Pakistan Studies": ["Ideological Basis of Pakistan", "Making of Pakistan", "Land and Environment", "History of Pakistan"]
+    },
+    "Grade 10": {
+        "Mathematics": ["Advanced Algebra", "Trigonometry", "Geometry", "Probability"],
+        "English": ["Literature", "Advanced Composition", "Comprehension"],
+        "Urdu": ["ادبِ جدید", "تحقیقی مضمون"],
+        "Biology": [
+            "Gaseous Exchange", "Homeostasis", "Coordination", "Support and Movement",
+            "Reproduction", "Inheritance", "Man and His Environment", "Biotechnology", "Pharmacology"
+        ],
+        "Chemistry": [
+            "Chemical Equilibrium", "Acids, Bases and Salts", "Organic Chemistry", "Hydrocarbons",
+            "Biochemistry", "Environmental Chemistry I: The Atmosphere", "Environmental Chemistry II: Water", "Chemical Industries"
+        ],
+        "Physics": [
+            "Simple Harmonic Motion and Waves", "Sound", "Geometrical Optics", "Electrostatics",
+            "Current Electricity", "Electromagnetism", "Introductory Electronics", 
+            "Information and Communication Technology", "Radioactivity"
+        ],
+        "Islamiyat": ["Islamic Studies II", "Ethics & Society", "Fiqh Basics"],
+        "Pakistan Studies": [
+            "History of Pakistan-II", "Pakistan in World Affairs", "Economic Developments",
+            "Population, Society and Culture of Pakistan"
+        ]
+    },
+    "Grade 11": {
+        "Mathematics": ["Advanced Algebra & Calculus Intro", "Coordinate Geometry", "Trigonometry", "Vectors"],
+        "English": ["Academic Writing", "Literature Studies", "Critical Reading"],
+        "Urdu": ["ادبی مطالعہ", "نظم و نثر کی تشریح"],
+        "Biology": [
+            "Cell Structure and Functions", "Biological Molecules", "Enzymes", "Bioenergetics",
+            "Acellular Life", "Prokaryotes", "Protists and Fungi", "Diversity among Plants",
+            "Diversity among Animals", "Form and Functions in Plants", "Digestion", "Circulation", "Immunity"
+        ],
+        "Chemistry": [
+            "Stoichiometry", "Atomic Structure", "Theories of Covalent Bonding and Shapes of Molecules",
+            "States of Matter I: Gases", "States of Matter II: Liquids", "States of Matter III: Solids",
+            "Chemical Equilibrium", "Acids, Bases and Salts", "Chemical Kinetics",
+            "Solutions and Colloids", "Thermochemistry", "Oxidation, Reduction and Electrochemistry"
+        ],
+        "Physics": [
+            "Measurement", "Vectors and Equilibrium", "Forces and Motion", "Work and Energy",
+            "Rotational and Circular Motion", "Fluid Dynamics", "Oscillations", "Waves",
+            "Physical Optics", "Thermodynamics", "Electrostatics", "Current Electricity"
+        ],
+        "Computer": ["Programming Fundamentals", "Data Structures Intro", "Databases"],
+        "Islamiyat": ["Advanced Seerah", "Comparative Religion"],
+        "Pakistan Studies": [
+            "Pakistan in Geographical Perspective", "Pakistan Resources", "Historical Perspective (Ancient to Modern)",
+            "Islam and Pakistan", "Administrative System", "Political and Constitutional Developments", "Human Rights"
+        ]
+    },
+    "Grade 12": {
+        "Mathematics": ["Calculus", "Advanced Algebra", "Statistics", "Analytical Geometry"],
+        "English": ["Research Writing", "Advanced Literature", "Critical Analysis"],
+        "Urdu": ["تحقیق و تنقید", "ادبی شخصیات"],
+        "Biology": [
+            "Respiration", "Homeostasis", "Support and Movement", "Nervous Coordination",
+            "Chemical Coordination", "Behavior", "Reproduction", "Development and Aging",
+            "Inheritance", "Chromosome and DNA", "Evolution", "Man and His Environment",
+            "Biotechnology", "Biology and Human Welfare"
+        ],
+        "Chemistry": [
+            "s and p Block Elements", "d-Block Elements", "Organic Compounds", "Hydrocarbons",
+            "Alkyl Halides and Amines", "Alcohols and Phenols", "Aldehydes and Ketones",
+            "Carboxylic Acids and Functional Derivatives", "Biochemistry", "Industrial Chemistry",
+            "Environmental Chemistry", "Analytical Chemistry"
+        ],
+        "Physics": [
+            "Electromagnetism", "Electromagnetic Induction", "Alternating Current", "Physics of Solids",
+            "Electronics", "Dawn of Modern Physics", "Atomic Spectra", "Nuclear Physics"
+        ],
+        "Computer": ["Web Technologies", "Advanced Programming Concepts"],
+        "Islamiyat": ["Advanced Islamic Thought", "Islamic Jurisprudence"],
+        "Pakistan Studies": [
+            "Society and Culture", "Foreign Relations of Pakistan", "Economic Development",
+            "Sports, Tourism and National Identity", "Contemporary Challenges and Policies"
+        ]
+    }
+}
+
+# ---------------------------
+# Question types for comprehensive assessment
+# ---------------------------
+QUESTION_TYPES = {
+    "Multiple Choice Questions (MCQs)": {
+        "code": "mcq",
+        "description": "Four-option questions testing recall and application",
+        "format": "Question with options A, B, C, D"
+    },
+    "Fill in the Blanks": {
+        "code": "fill_blank",
+        "description": "Complete sentences with missing key terms",
+        "format": "Sentences with underlined blanks"
+    },
+    "Match the Column": {
+        "code": "match_column",
+        "description": "Connect related items from two columns",
+        "format": "Two columns with items to match"
+    },
+    "Short Response Questions": {
+        "code": "short_response",
+        "description": "Brief written answers (2-3 sentences)",
+        "format": "Questions requiring concise explanations"
+    },
+    "Essay Type Questions": {
+        "code": "essay",
+        "description": "Extended written responses with detailed analysis",
+        "format": "Open-ended questions requiring paragraphs"
+    }
+}
+
+# ---------------------------
+# Cognitive levels for item writing (Bloom's Taxonomy)
+# ---------------------------
+DIFFICULTY_LEVELS = {
+    "Remembering": {
+        "description": "Recall facts, terms, basic concepts",
+        "keywords": ["define", "list", "identify", "name", "state", "recall"]
+    },
+    "Understanding": {
+        "description": "Explain ideas or concepts",
+        "keywords": ["explain", "describe", "summarize", "interpret", "paraphrase"]
+    },
+    "Applying": {
+        "description": "Use information in new situations",
+        "keywords": ["apply", "demonstrate", "solve", "use", "calculate", "implement"]
+    },
+    "Analyzing": {
+        "description": "Draw connections, examine relationships",
+        "keywords": ["analyze", "compare", "contrast", "differentiate", "examine"]
+    },
+    "Evaluating": {
+        "description": "Justify decisions, make judgments",
+        "keywords": ["evaluate", "justify", "critique", "assess", "judge"]
+    },
+    "Creating": {
+        "description": "Produce new or original work",
+        "keywords": ["create", "design", "construct", "develop", "formulate"]
+    }
+}
     "Grade 1": {
         "Mathematics": ["Counting & Numbers", "Basic Addition", "Basic Subtraction", "Shapes", "Measurements"],
         "English": ["Alphabet & Sounds", "Basic Words", "Simple Sentences", "Listening & Speaking", "Reading Short Texts"],
@@ -319,61 +542,51 @@ chapters_by_subject_and_grade = {
 }
 
 # ---------------------------
-# Question types for comprehensive assessment
-# ---------------------------
-QUESTION_TYPES = {
-    "Multiple Choice Questions (MCQs)": {
-        "code": "mcq",
-        "description": "Four-option questions testing recall and application",
-        "format": "Question with options A, B, C, D"
-    },
-    "Fill in the Blanks": {
-        "code": "fill_blank",
-        "description": "Complete sentences with missing key terms",
-        "format": "Sentences with underlined blanks"
-    },
-    "Match the Column": {
-        "code": "match_column",
-        "description": "Connect related items from two columns",
-        "format": "Two columns with items to match"
-    },
-    "Short Response Questions": {
-        "code": "short_response",
-        "description": "Brief written answers (2-3 sentences)",
-        "format": "Questions requiring concise explanations"
-    },
-    "Essay Type Questions": {
-        "code": "essay",
-        "description": "Extended written responses with detailed analysis",
-        "format": "Open-ended questions requiring paragraphs"
-    }
-}
-
-# ---------------------------
-# Cognitive levels for item writing (Bloom's Taxonomy adapted)
+# Enhanced question generation with Bloom's Taxonomy distribution
 # ---------------------------
-DIFFICULTY_LEVELS = {
-    "Knowledge (Remembering)": {
-        "description": "Recall facts, terms, basic concepts",
-        "keywords": ["define", "list", "identify", "name", "state"]
-    },
-    "Understanding (Comprehension)": {
-        "description": "Explain ideas or concepts",
-        "keywords": ["explain", "describe", "summarize", "interpret"]
-    },
-    "Application (Applying)": {
-        "description": "Use information in new situations",
-        "keywords": ["apply", "demonstrate", "solve", "use", "calculate"]
-    },
-    "Analysis (Analyzing)": {
-        "description": "Draw connections, examine relationships",
-        "keywords": ["analyze", "compare", "contrast", "differentiate"]
-    },
-    "Evaluation & Synthesis": {
-        "description": "Justify decisions, create new solutions",
-        "keywords": ["evaluate", "justify", "critique", "synthesize", "design"]
-    }
-}
+def generate_questions_multi_level(grade, subject, chapter, test_type, school_name, question_type, 
+                                   bloom_distribution, total_questions):
+    """Generate questions with mixed cognitive levels based on user distribution"""
+    
+    all_questions = []
+    all_answers = []
+    
+    try:
+        # Calculate number of questions per level
+        for level, percentage in bloom_distribution.items():
+            if percentage > 0:
+                num_q = int((percentage / 100) * total_questions)
+                if num_q > 0:
+                    questions, answers, error, q_type_code = generate_questions(
+                        grade, subject, chapter, level,
+                        num_q, test_type, school_name, question_type
+                    )
+                    
+                    if error:
+                        return [], [], error, "mcq"
+                    
+                    all_questions.extend(questions)
+                    all_answers.extend(answers)
+        
+        # Ensure we have the right number of questions
+        if len(all_questions) < total_questions:
+            # Generate additional questions at first non-zero level
+            shortage = total_questions - len(all_questions)
+            first_level = next((k for k, v in bloom_distribution.items() if v > 0), "Understanding")
+            
+            extra_q, extra_a, error, q_type_code = generate_questions(
+                grade, subject, chapter, first_level,
+                shortage, test_type, school_name, question_type
+            )
+            
+            if not error:
+                all_questions.extend(extra_q)
+                all_answers.extend(extra_a)
+        
+        return all_questions[:total_questions], all_answers[:total_questions], None, q_type_code
+        
+    except Exception as e:
+        return [], [], f"Error in multi-level generation: {str(e)}", "mcq"
 
 # ---------------------------
 # Enhanced question generation with proper item writing principles
@@ -642,8 +855,9 @@ def parse_match_column(text):
     return questions, answers
 
 def parse_short_response(text, expected_count):
-    """Parse Short Response questions"""
-    parts = re.split(r'MARKING\s+SCHEME:?', text, flags=re.IGNORECASE)
+    """Parse Short Response questions - separating questions from expected answers"""
+    # Split by expected answers section
+    parts = re.split(r'EXPECTED\s+ANSWERS?:?|MARKING\s+SCHEME:?', text, flags=re.IGNORECASE)
     
     questions = []
     answers = []
@@ -656,18 +870,19 @@ def parse_short_response(text, expected_count):
     
     if len(parts) >= 2:
         a_text = parts[1]
-        # Extract marking schemes
+        # Extract expected answers/key points
         schemes = re.findall(r'\d+[\.\)]\s*(.+?)(?=\d+[\.\)]|$)', a_text, re.DOTALL)
         answers = [s.strip() for s in schemes[:expected_count]]
     
     if len(answers) < len(questions):
-        answers.extend(['Key points to cover'] * (len(questions) - len(answers)))
+        answers.extend(['Key points: Provide comprehensive explanation with examples'] * (len(questions) - len(answers)))
     
     return questions, answers
 
 def parse_essay(text, expected_count):
-    """Parse Essay questions"""
-    parts = re.split(r'MARKING\s+CRITERIA:?', text, flags=re.IGNORECASE)
+    """Parse Essay questions - separating questions from expected answers"""
+    # Split by expected answers section
+    parts = re.split(r'EXPECTED\s+ANSWERS?:?|MARKING\s+CRITERIA:?', text, flags=re.IGNORECASE)
     
     questions = []
     answers = []
@@ -680,15 +895,31 @@ def parse_essay(text, expected_count):
     
     if len(parts) >= 2:
         a_text = parts[1]
-        # Extract criteria
+        # Extract criteria/expected coverage
         criteria = re.findall(r'\d+[\.\)]\s*(.+?)(?=\d+[\.\)]|$)', a_text, re.DOTALL)
         answers = [c.strip() for c in criteria[:expected_count]]
     
     if len(answers) < len(questions):
-        answers.extend(['Expected coverage points'] * (len(questions) - len(answers)))
+        answers.extend(['Main points: Detailed analysis with evidence, examples, and logical argumentation'] * (len(questions) - len(answers)))
     
     return questions, answers
 
+def create_answer_table(doc, answers, num_cols=5):
+    """Helper function to create formatted answer table"""
+    num_rows = len(answers) + 1
+    ans_table = doc.add_table(rows=num_rows, cols=num_cols)
+    ans_table.style = 'Medium Grid 1 Accent 1'
+    
+    # Set column widths
+    for row in ans_table.rows:
+        for idx, cell in enumerate(row.cells):
+            if idx == 0:
+                cell.width = Inches(0.6)
+            else:
+                cell.width = Inches(1.2)
+    
+    return ans_table
+
 # ---------------------------
 # Enhanced DOCX export supporting all question types
 # ---------------------------
@@ -785,9 +1016,9 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
         if question_type_code == "mcq":
             for i, q in enumerate(questions, start=1):
                 q_para = doc.add_paragraph()
-                q_para.add_run(f"Q{i}. ").bold = True
+                q_para.add_run(f"{i}. ").bold = True
                 q_para.add_run(q)
-                q_para.space_after = Pt(6)
+                q_para.space_after = Pt(8)
                 doc.add_paragraph()
                 
         elif question_type_code == "fill_blank":
@@ -796,6 +1027,7 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
                 q_para.add_run(f"{i}. ").bold = True
                 q_para.add_run(q)
                 q_para.space_after = Pt(8)
+                doc.add_paragraph()
                 
         elif question_type_code == "match_column":
             for q in questions:
@@ -811,13 +1043,13 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
                 doc.add_paragraph()
                 # Add space for answer
                 for _ in range(3 if question_type_code == "short_response" else 8):
-                    doc.add_paragraph("_" * 80)
+                    doc.add_paragraph("_" * 85)
                 doc.add_paragraph()
         
         # Answer key (on separate page)
         doc.add_page_break()
         
-        ans_heading = doc.add_heading("ANSWER KEY / MARKING SCHEME", level=2)
+        ans_heading = doc.add_heading("ANSWER KEY", level=2)
         ans_heading.alignment = WD_ALIGN_PARAGRAPH.CENTER
         for run in ans_heading.runs:
             run.font.color.rgb = RGBColor(153, 0, 0)
@@ -828,9 +1060,7 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
         # Add answers based on type
         if question_type_code == "mcq":
             # Answer table for MCQs
-            num_rows = len(answers) + 1
-            ans_table = doc.add_table(rows=num_rows, cols=5)
-            ans_table.style = 'Medium Grid 1 Accent 1'
+            ans_table = create_answer_table(doc, answers, 5)
             
             headers = ["Q#", "A", "B", "C", "D"]
             for idx, header in enumerate(headers):
@@ -853,7 +1083,33 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
                     else:
                         cell.text = ""
                     cell.paragraphs[0].alignment = WD_ALIGN_PARAGRAPH.CENTER
-                    
+        
+        elif question_type_code == "fill_blank":
+            # Tabular answer key for Fill in the Blanks
+            ans_table = create_answer_table(doc, answers, 2)
+            
+            # Headers
+            headers = ["Q#", "Correct Answer"]
+            for idx, header in enumerate(headers):
+                cell = ans_table.cell(0, idx)
+                cell.text = header
+                cell.paragraphs[0].runs[0].bold = True
+                cell.paragraphs[0].alignment = WD_ALIGN_PARAGRAPH.CENTER
+            
+            # Fill answers
+            for r, ans in enumerate(answers, start=1):
+                ans_table.cell(r, 0).text = str(r)
+                ans_table.cell(r, 0).paragraphs[0].alignment = WD_ALIGN_PARAGRAPH.CENTER
+                ans_table.cell(r, 1).text = str(ans)
+                
+        elif question_type_code in ["short_response", "essay"]:
+            # Expected answers for subjective questions
+            for i, ans in enumerate(answers, start=1):
+                ans_para = doc.add_paragraph()
+                ans_para.add_run(f"Q{i}. Expected Answer:").bold = True
+                doc.add_paragraph(str(ans))
+                doc.add_paragraph()
+                
         else:
             # Text-based answers for other types
             for i, ans in enumerate(answers, start=1):
@@ -865,7 +1121,7 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
         # Footer
         doc.add_paragraph()
         footer = doc.add_paragraph()
-        footer.add_run(f"Generated by MCQ Test Generator Pro v{APP_VERSION} | Developer: Najaf Ali Sharqi | {datetime.now().strftime('%d-%m-%Y %H:%M')}").italic = True
+        footer.add_run(f"Generated by Test Generator Pro v{APP_VERSION} | Developer: Najaf Ali Sharqi | {datetime.now().strftime('%d-%m-%Y %H:%M')}").italic = True
         footer.runs[0].font.size = Pt(8)
         footer.runs[0].font.color.rgb = RGBColor(128, 128, 128)
         footer.alignment = WD_ALIGN_PARAGRAPH.CENTER
@@ -883,31 +1139,61 @@ def export_to_word(questions, answers, grade, subject, chapter, difficulty, test
         return None, f"Error creating document: {str(e)}"
 
 # ---------------------------
-# Main generation handler
+# Main generation handler with Bloom's Taxonomy distribution
 # ---------------------------
-def on_generate(grade, subject, chapter, difficulty, num_questions, test_type, school_name, question_type):
-    """Handle question generation request"""
+def on_generate(grade, subject, chapter, test_type, school_name, question_type,
+                use_bloom_mix, bloom_remember, bloom_understand, bloom_apply, 
+                bloom_analyze, bloom_evaluate, bloom_create, num_questions):
+    """Handle question generation request with optional Bloom's distribution"""
     
     # Validation
-    if not all([grade, subject, chapter, difficulty, question_type]):
+    if not all([grade, subject, chapter, question_type]):
         return "⚠️ Please fill all required fields", None, None
     
     if not school_name or not school_name.strip():
         school_name = "Educational Institution"
     
     try:
-        # Show progress
-        status_msg = f"🔄 Generating {num_questions} {question_type}...\n"
-        status_msg += f"📖 Grade: {grade} | Subject: {subject}\n"
-        status_msg += f"📚 Chapter: {chapter}\n"
-        status_msg += f"🎯 Cognitive Level: {difficulty}\n"
-        status_msg += "⏳ Please wait..."
-        
-        # Generate questions
-        questions, answers, error, q_type_code = generate_questions(
-            grade, subject, chapter, difficulty, 
-            num_questions, test_type, school_name, question_type
-        )
+        # Check if using Bloom's mix
+        if use_bloom_mix:
+            # Validate percentages
+            total_percent = bloom_remember + bloom_understand + bloom_apply + bloom_analyze + bloom_evaluate + bloom_create
+            if total_percent != 100:
+                return f"❌ Bloom's Taxonomy percentages must total 100% (currently {total_percent}%)", None, None
+            
+            bloom_distribution = {
+                "Remembering": bloom_remember,
+                "Understanding": bloom_understand,
+                "Applying": bloom_apply,
+                "Analyzing": bloom_analyze,
+                "Evaluating": bloom_evaluate,
+                "Creating": bloom_create
+            }
+            
+            # Show progress
+            status_msg = f"🔄 Generating {num_questions} {question_type} with mixed cognitive levels...\n"
+            status_msg += f"📊 Bloom's Distribution:\n"
+            for level, pct in bloom_distribution.items():
+                if pct > 0:
+                    status_msg += f"   • {level}: {pct}% ({int(pct * num_questions / 100)} questions)\n"
+            
+            # Generate with mixed levels
+            questions, answers, error, q_type_code = generate_questions_multi_level(
+                grade, subject, chapter, test_type, school_name, question_type,
+                bloom_distribution, num_questions
+            )
+        else:
+            # Single level generation (default to Understanding)
+            status_msg = f"🔄 Generating {num_questions} {question_type}...\n"
+            status_msg += f"📖 Grade: {grade} | Subject: {subject}\n"
+            status_msg += f"📚 Chapter: {chapter}\n"
+            status_msg += f"🎯 Cognitive Level: Understanding\n"
+            status_msg += "⏳ Please wait..."
+            
+            questions, answers, error, q_type_code = generate_questions(
+                grade, subject, chapter, "Understanding",
+                num_questions, test_type, school_name, question_type
+            )
         
         if error:
             return f"❌ Error: {error}", None, None
@@ -934,7 +1220,8 @@ def on_generate(grade, subject, chapter, difficulty, num_questions, test_type, s
         # Export to Word
         file_path, doc_error = export_to_word(
             questions, answers, grade, subject, chapter, 
-            difficulty, test_type, school_name, total_marks, q_type_code
+            "Mixed Cognitive Levels" if use_bloom_mix else "Understanding", 
+            test_type, school_name, total_marks, q_type_code
         )
         
         if doc_error:
@@ -942,15 +1229,20 @@ def on_generate(grade, subject, chapter, difficulty, num_questions, test_type, s
         
         # Success message
         success_msg = f"✅ Test generated successfully!\n\n"
-        success_msg += f"📊 Statistics:\n"
+        success_msg += f"📊 Test Statistics:\n"
         success_msg += f"• Question Type: {question_type}\n"
         success_msg += f"• Total Questions: {len(questions)}\n"
         success_msg += f"• Total Marks: {total_marks}\n"
-        success_msg += f"• Grade Level: {grade}\n"
-        success_msg += f"• Subject: {subject}\n"
+        success_msg += f"• Grade: {grade} | Subject: {subject}\n"
         success_msg += f"• Chapter: {chapter}\n"
-        success_msg += f"• Cognitive Level: {difficulty}\n\n"
-        success_msg += f"📥 Download your test document below"
+        
+        if use_bloom_mix:
+            success_msg += f"\n🎯 Bloom's Taxonomy Distribution:\n"
+            for level, pct in bloom_distribution.items():
+                if pct > 0:
+                    success_msg += f"   • {level}: {pct}%\n"
+        
+        success_msg += f"\n📥 Download your test document below"
         
         # Preview
         preview_count = min(3, len(questions))
@@ -958,7 +1250,7 @@ def on_generate(grade, subject, chapter, difficulty, num_questions, test_type, s
         
         for i, q in enumerate(questions[:preview_count], 1):
             if q_type_code == "mcq":
-                preview += f"Q{i}. {q[:200]}...\n\n" if len(q) > 200 else f"Q{i}. {q}\n\n"
+                preview += f"{i}. {q[:200]}...\n\n" if len(q) > 200 else f"{i}. {q}\n\n"
             else:
                 preview += f"{i}. {q[:200]}...\n\n" if len(q) > 200 else f"{i}. {q}\n\n"
         
@@ -989,16 +1281,18 @@ def create_ui():
         # Header
         gr.Markdown(
             """
-            # 📚 MCQ Test Generator Pro
-            ### Professional Assessment Tool Aligned with Pakistani National Curriculum (2006)
+            # 📚 Test Generator
+            ### **Developer: Najaf Ali Sharqi**
+            
+            Professional Assessment Tool Aligned with Pakistani National Curriculum (2006)
             """,
             elem_classes="header"
         )
         
         gr.Markdown(
             """
-            Generate high-quality Multiple Choice Questions for educational assessments.
-            Based on Bloom's Taxonomy and best practices in item writing.
+            Generate high-quality assessment questions with multiple formats and Bloom's Taxonomy integration.
+            Perfect for educators creating comprehensive tests for Grades 1-12.
             """,
             elem_classes="description"
         )
@@ -1073,20 +1367,66 @@ def create_ui():
                     info="Select specific chapter or unit"
                 )
                 
-                difficulty_dropdown = gr.Dropdown(
-                    choices=list(DIFFICULTY_LEVELS.keys()),
-                    value="Understanding (Comprehension)",
-                    label="Cognitive Level (Bloom's Taxonomy)",
-                    info="Select cognitive complexity level"
+                # Bloom's Taxonomy Distribution Section
+                use_bloom_mix = gr.Checkbox(
+                    label="📊 Use Mixed Bloom's Taxonomy Levels",
+                    value=False,
+                    info="Create tests with questions from multiple cognitive levels"
                 )
                 
-                # Show description of selected difficulty
-                difficulty_info = gr.Markdown(
-                    """
-                    **Level Description:** Explain ideas or concepts
+                bloom_percentages = gr.Column(visible=False)
+                
+                with bloom_percentages:
+                    gr.Markdown("### Set Percentage for Each Cognitive Level")
+                    gr.Markdown("*(Total must equal 100%)*")
                     
-                    **Keywords:** explain, describe, summarize, interpret
-                    """,
+                    with gr.Row():
+                        bloom_remember = gr.Slider(
+                            minimum=0, maximum=100, value=30, step=5,
+                            label="Remembering %",
+                            info="Recall facts and basic concepts"
+                        )
+                        bloom_understand = gr.Slider(
+                            minimum=0, maximum=100, value=30, step=5,
+                            label="Understanding %",
+                            info="Explain ideas and concepts"
+                        )
+                    
+                    with gr.Row():
+                        bloom_apply = gr.Slider(
+                            minimum=0, maximum=100, value=20, step=5,
+                            label="Applying %",
+                            info="Use information in new situations"
+                        )
+                        bloom_analyze = gr.Slider(
+                            minimum=0, maximum=100, value=10, step=5,
+                            label="Analyzing %",
+                            info="Draw connections and relationships"
+                        )
+                    
+                    with gr.Row():
+                        bloom_evaluate = gr.Slider(
+                            minimum=0, maximum=100, value=10, step=5,
+                            label="Evaluating %",
+                            info="Justify decisions and make judgments"
+                        )
+                        bloom_create = gr.Slider(
+                            minimum=0, maximum=100, value=0, step=5,
+                            label="Creating %",
+                            info="Produce new or original work"
+                        )
+                    
+                    bloom_total = gr.Textbox(
+                        label="Total Percentage",
+                        value="100%",
+                        interactive=False
+                    )
+                
+                difficulty_dropdown = gr.Dropdown(
+                    choices=list(DIFFICULTY_LEVELS.keys()),
+                    value="Understanding",
+                    label="Single Cognitive Level (if not using mix)",
+                    info="Select one level for entire test",
                     visible=True
                 )
                 
@@ -1114,8 +1454,16 @@ def create_ui():
                     - **Match the Column**: Assesses relationships and connections
                     - **Short Response**: Evaluates understanding and explanation
                     - **Essay Questions**: Measures critical thinking and synthesis
-                    - Select appropriate cognitive level for your students
+                    - **Bloom's Mix**: Use for comprehensive assessment across cognitive levels
                     - Review generated questions before final use
+                    
+                    ### 📧 Custom App Development
+                    **Need a customized assessment tool?**
+                    Contact developer **Najaf Ali Sharqi** for:
+                    - Custom question banks
+                    - Institution-specific features
+                    - Advanced analytics
+                    - Integration with LMS platforms
                     """
                 )
             
@@ -1158,12 +1506,12 @@ def create_ui():
             """
             ---
             <div class="footer">
-            <strong>MCQ Test Generator Pro v2.0</strong><br>
-            Comprehensive Assessment Tool with 5 Question Types<br>
+            <strong>Test Generator Pro v2.5</strong><br>
+            Comprehensive Assessment Tool with 5 Question Types & Bloom's Taxonomy Integration<br>
             Aligned with Pakistani National Curriculum (2006)<br>
             Developer: <strong>Najaf Ali Sharqi</strong><br>
-            Based on Bloom's Taxonomy & Professional Item Writing Standards<br><br>
-            📧 For support or feedback, please contact the developer
+            Based on Professional Item Writing Standards<br><br>
+            📧 For custom app development or support: Contact Najaf Ali Sharqi
             </div>
             """,
             elem_classes="footer"
@@ -1184,19 +1532,6 @@ def create_ui():
                 return gr.update(choices=chapters, value=None)
             return gr.update(choices=[], value=None)
         
-        def update_difficulty_info(difficulty):
-            """Update difficulty level description"""
-            if difficulty in DIFFICULTY_LEVELS:
-                info = DIFFICULTY_LEVELS[difficulty]
-                desc = info.get('description', '')
-                keywords = ', '.join(info.get('keywords', []))
-                return f"""
-                **Level Description:** {desc}
-                
-                **Keywords:** {keywords}
-                """
-            return ""
-        
         def update_question_type_info(q_type):
             """Update question type description"""
             if q_type in QUESTION_TYPES:
@@ -1210,6 +1545,16 @@ def create_ui():
                 """
             return ""
         
+        def toggle_bloom_sliders(use_mix):
+            """Show/hide Bloom's taxonomy sliders"""
+            return gr.update(visible=use_mix), gr.update(visible=not use_mix)
+        
+        def calculate_bloom_total(r, u, ap, an, e, c):
+            """Calculate total percentage"""
+            total = r + u + ap + an + e + c
+            color = "green" if total == 100 else "red"
+            return f'<span style="color:{color}; font-weight:bold;">{total}%</span>'
+        
         # Connect event handlers
         grade_dropdown.change(
             update_subjects,
@@ -1229,29 +1574,43 @@ def create_ui():
             outputs=[chapter_dropdown]
         )
         
-        difficulty_dropdown.change(
-            update_difficulty_info,
-            inputs=[difficulty_dropdown],
-            outputs=[difficulty_info]
-        )
-        
         question_type.change(
             update_question_type_info,
             inputs=[question_type],
             outputs=[question_type_info]
         )
         
+        use_bloom_mix.change(
+            toggle_bloom_sliders,
+            inputs=[use_bloom_mix],
+            outputs=[bloom_percentages, difficulty_dropdown]
+        )
+        
+        # Update total when sliders change
+        for slider in [bloom_remember, bloom_understand, bloom_apply, bloom_analyze, bloom_evaluate, bloom_create]:
+            slider.change(
+                calculate_bloom_total,
+                inputs=[bloom_remember, bloom_understand, bloom_apply, bloom_analyze, bloom_evaluate, bloom_create],
+                outputs=[bloom_total]
+            )
+        
         generate_btn.click(
             on_generate,
             inputs=[
                 grade_dropdown,
                 subject_dropdown,
                 chapter_dropdown,
-                difficulty_dropdown,
-                num_questions,
                 test_type,
                 school_name,
-                question_type
+                question_type,
+                use_bloom_mix,
+                bloom_remember,
+                bloom_understand,
+                bloom_apply,
+                bloom_analyze,
+                bloom_evaluate,
+                bloom_create,
+                num_questions
             ],
             outputs=[output_text, output_file, file_status]
         )