Update app.py

app.py

@@ -1,10 +1,10 @@
 """
-ThutoAI - Complete School Assistant with SQLite Persistence
-✅ Teacher Assignments + Admin Analytics
-✅ Dark Mode + Profile Pictures
-✅ Voice Input + Class Groups
-✅ SQLite Database — data survives restarts!
-✅ Fixed event handler errors
+ThutoAI - Complete School Assistant with File Uploads & Assignment Submission
+✅ Teacher Assignments + Student Submissions
+✅ File Uploads Saved to Disk
+✅ SQLite Persistence — data survives restarts
+✅ Dark Mode + Profile Pictures + Voice + Groups
+✅ Fixed event handlers — no more '_id' errors
 ✅ Runs perfectly on Hugging Face Spaces
 """
 
@@ -19,6 +19,11 @@ import base64
 from collections import Counter
 import shutil
 
+# Create uploads directory
+UPLOADS_DIR = "uploads"
+if not os.path.exists(UPLOADS_DIR):
+    os.makedirs(UPLOADS_DIR)
+
 # ==================== DATABASE SETUP ====================
 
 class DatabaseManager:
@@ -44,14 +49,14 @@ class DatabaseManager:
             )
         ''')
 
-        # Student sessions (chat history, files, assignments, groups)
+        # Student sessions
         cursor.execute('''
             CREATE TABLE IF NOT EXISTS student_sessions (
                 username TEXT PRIMARY KEY,
-                chat_history TEXT,  -- JSON string
-                files TEXT,         -- JSON string
-                assignments TEXT,   -- JSON string
-                groups TEXT,        -- JSON string
+                chat_history TEXT,
+                files TEXT,
+                assignments TEXT,
+                groups TEXT,
                 FOREIGN KEY (username) REFERENCES students (username)
             )
         ''')
@@ -87,6 +92,23 @@ class DatabaseManager:
             )
         ''')
 
+        # Assignment submissions
+        cursor.execute('''
+            CREATE TABLE IF NOT EXISTS assignment_submissions (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                assignment_id INTEGER NOT NULL,
+                student_username TEXT NOT NULL,
+                submission_text TEXT,
+                submission_file TEXT,
+                submitted_at TEXT NOT NULL,
+                status TEXT DEFAULT 'pending',
+                feedback TEXT,
+                graded_by TEXT,
+                grade TEXT,
+                FOREIGN KEY (student_username) REFERENCES students (username)
+            )
+        ''')
+
         # Insert sample data if tables are empty
         cursor.execute("SELECT COUNT(*) FROM students")
         if cursor.fetchone()[0] == 0:
@@ -290,7 +312,7 @@ class StudentService:
             print(f"Get files error: {e}")
             return []
 
-    def add_file(self, username: str, filename: str):
+    def add_file(self, username: str, filename: str, file_path: str):
         try:
             cursor = self.conn.cursor()
             cursor.execute('''
@@ -301,6 +323,7 @@ class StudentService:
                 files = json.loads(result[0]) if result[0] else []
                 files.append({
                     "name": filename,
+                    "path": file_path,
                     "uploaded_at": datetime.now().strftime("%Y-%m-%d %H:%M")
                 })
                 cursor.execute('''
@@ -325,7 +348,6 @@ class StudentService:
             student_groups = set(json.loads(result[0])) if result[0] else set()
             all_assignments = []
 
-            # Get all assignments from all students
             cursor.execute('''
                 SELECT assignments FROM student_sessions WHERE assignments IS NOT NULL AND assignments != '[]'
             ''')
@@ -336,9 +358,22 @@ class StudentService:
                     assignments = json.loads(row[0])
                     for assignment in assignments:
                         if assignment["course"] in student_groups:
+                            # Check if already submitted
+                            cursor.execute('''
+                                SELECT status, grade, feedback FROM assignment_submissions
+                                WHERE assignment_id = ? AND student_username = ?
+                            ''', (assignment["id"], username))
+                            submission = cursor.fetchone()
+                            if submission:
+                                assignment["submission_status"] = submission[0]
+                                assignment["grade"] = submission[2] if submission[2] else "Not graded"
+                                assignment["feedback"] = submission[1] if submission[1] else "No feedback yet"
+                            else:
+                                assignment["submission_status"] = "not_submitted"
+                                assignment["grade"] = None
+                                assignment["feedback"] = None
                             all_assignments.append(assignment)
 
-            # Remove duplicates
             seen = set()
             unique_assignments = []
             for assignment in all_assignments:
@@ -491,6 +526,53 @@ class StudentService:
             print(f"Get recent activity error: {e}")
             return []
 
+    def submit_assignment(self, username: str, assignment_id: int, submission_text: str, submission_file_path: str = None) -> str:
+        try:
+            cursor = self.conn.cursor()
+            cursor.execute('''
+                INSERT INTO assignment_submissions 
+                (assignment_id, student_username, submission_text, submission_file, submitted_at, status)
+                VALUES (?, ?, ?, ?, ?, ?)
+            ''', (
+                assignment_id,
+                username,
+                submission_text,
+                submission_file_path,
+                datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                "submitted"
+            ))
+            self.conn.commit()
+            return "✅ Assignment submitted successfully!"
+        except Exception as e:
+            return f"❌ Submission failed: {str(e)}"
+
+    def get_assignment_submissions(self, assignment_id: int) -> List:
+        try:
+            cursor = self.conn.cursor()
+            cursor.execute('''
+                SELECT s.name, sub.submission_text, sub.submission_file, sub.submitted_at, sub.status, sub.grade, sub.feedback
+                FROM assignment_submissions sub
+                JOIN students s ON sub.student_username = s.username
+                WHERE sub.assignment_id = ?
+                ORDER BY sub.submitted_at DESC
+            ''', (assignment_id,))
+            results = cursor.fetchall()
+            return [
+                {
+                    "student_name": row[0],
+                    "submission_text": row[1],
+                    "submission_file": row[2],
+                    "submitted_at": row[3],
+                    "status": row[4],
+                    "grade": row[5],
+                    "feedback": row[6]
+                }
+                for row in results
+            ]
+        except Exception as e:
+            print(f"Get assignment submissions error: {e}")
+            return []
+
 # Initialize student service
 student_service = StudentService()
 
@@ -591,7 +673,7 @@ class SchoolService:
             total_views = cursor.fetchone()[0] or 0
             return {
                 "total_announcements": total_announcements,
-                "total_files": 0,  # You could track this separately
+                "total_files": 0,
                 "active_courses": active_courses,
                 "high_priority": high_priority,
                 "total_views": total_views
@@ -622,7 +704,6 @@ class SchoolService:
                 "status": "pending"
             }
 
-            # Get all students in this group
             cursor = self.conn.cursor()
             cursor.execute('''
                 SELECT username FROM student_sessions
@@ -630,7 +711,6 @@ class SchoolService:
             ''', (f'%"{course}"%',))
             students = cursor.fetchall()
 
-            # Update each student's assignments
             for (username,) in students:
                 cursor.execute('''
                     SELECT assignments FROM student_sessions WHERE username = ?
@@ -677,6 +757,19 @@ class AdminService:
             print(f"Admin auth error: {e}")
             return None
 
+    def grade_assignment(self, submission_id: int, grade: str, feedback: str) -> str:
+        try:
+            cursor = self.conn.cursor()
+            cursor.execute('''
+                UPDATE assignment_submissions
+                SET status = ?, grade = ?, feedback = ?, graded_by = ?
+                WHERE id = ?
+            ''', ("graded", grade, feedback, "teacher", submission_id))
+            self.conn.commit()
+            return "✅ Assignment graded successfully!"
+        except Exception as e:
+            return f"❌ Grading failed: {str(e)}"
+
 # Initialize admin service
 admin_service = AdminService()
 
@@ -844,6 +937,10 @@ def render_assignments(assignments: List[Dict]) -> str:
             badge = f"✅ Due in {days_left} days"
             color = "#28a745"
 
+        submission_status = task.get("submission_status", "not_submitted")
+        grade = task.get("grade", "N/A")
+        feedback = task.get("feedback", "No feedback yet")
+
         html += f"""
         <div style='
             background: white;
@@ -859,6 +956,14 @@ def render_assignments(assignments: List[Dict]) -> str:
                     <div style='color: #6c757d; margin-bottom: 8px;'>📚 {task['course']} · 👩‍🏫 {task['assigned_by']}</div>
                     <div style='color: #495057;'>📅 Due: {task['due_date']}</div>
                     <div style='color: #6c757d; font-size: 0.9em;'>{task.get('description', '')}</div>
+                    
+                    <div style='margin-top: 12px; padding: 8px; background: #f8f9fa; border-radius: 8px;'>
+                        <div style='font-weight: bold; color: #212529;'>Submission Status: 
+                            <span style='color: {'#28a745' if submission_status == 'submitted' else '#dc3545'};'>{submission_status.title()}</span>
+                        </div>
+                        <div>Grade: <strong>{grade}</strong></div>
+                        <div>Feedback: <em>{feedback}</em></div>
+                    </div>
                 </div>
                 <span style='
                     background: {color};
@@ -1049,18 +1154,18 @@ def login_student(username: str, password: str) -> tuple:
         welcome_msg = f"Welcome back, {student_data['name']}!"
 
         return (
-            gr.update(visible=False),  # login_group
-            gr.update(visible=True),   # main_app
-            gr.update(value=chat_history),  # chatbot
-            gr.update(value=files),    # files
-            gr.update(value=render_assignments(assignments)),  # assignments_display
-            gr.update(value=render_groups(groups)),  # groups_display
-            gr.update(value=welcome_msg),  # login_status
-            gr.update(value=student_data["name"], visible=True),  # user_display
-            gr.update(visible=True),   # logout_btn
-            gr.update(value=avatar_html),  # avatar_display
-            gr.update(value="🌙 Light Mode" if DARK_MODE else "☀️ Dark Mode"),  # dark_mode_btn
-            gr.update()  # css placeholder
+            gr.update(visible=False),
+            gr.update(visible=True),
+            gr.update(value=chat_history),
+            gr.update(value=files),
+            gr.update(value=render_assignments(assignments)),
+            gr.update(value=render_groups(groups)),
+            gr.update(value=welcome_msg),
+            gr.update(value=student_data["name"], visible=True),
+            gr.update(visible=True),
+            gr.update(value=avatar_html),
+            gr.update(value="🌙 Light Mode" if DARK_MODE else "☀️ Dark Mode"),
+            gr.update()
         )
     return (
         gr.update(visible=True),
@@ -1112,9 +1217,13 @@ def upload_avatar(file) -> str:
         return "❌ No file selected"
     if CURRENT_USER == "guest":
         return "❌ Please log in first"
-    # In production, save file to disk
-    # For demo, just store filename
-    student_service.update_avatar(CURRENT_USER, file.name)
+    
+    # Save avatar to disk
+    filename = f"avatar_{CURRENT_USER}_{int(time.time())}{os.path.splitext(file.name)[1]}"
+    filepath = os.path.join(UPLOADS_DIR, filename)
+    shutil.copy(file.name, filepath)
+    
+    student_service.update_avatar(CURRENT_USER, filepath)
     return f"✅ Avatar updated!"
 
 def join_group(group_code: str) -> tuple:
@@ -1134,10 +1243,16 @@ def leave_group(group_code: str) -> tuple:
 def upload_file_for_student(file) -> str:
     if not file:
         return "❌ No file selected"
-    result = f"✅ Uploaded: {file.name}"
-    if CURRENT_USER != "guest":
-        student_service.add_file(CURRENT_USER, file.name)
-    return result
+    if CURRENT_USER == "guest":
+        return "❌ Please log in first"
+    
+    # Save file to disk
+    filename = f"{CURRENT_USER}_{int(time.time())}_{os.path.basename(file.name)}"
+    filepath = os.path.join(UPLOADS_DIR, filename)
+    shutil.copy(file.name, filepath)
+    
+    student_service.add_file(CURRENT_USER, file.name, filepath)
+    return f"✅ Uploaded: {file.name}"
 
 # ==================== TEACHER FUNCTIONS ====================
 
@@ -1194,7 +1309,6 @@ def create_assignment(title: str, description: str, due_date: str, course: str)
     if assignment_id == -1:
         return "❌ Failed to create assignment. Please try again."
 
-    # Count recipients
     conn = db_manager.get_connection()
     cursor = conn.cursor()
     cursor.execute('''
@@ -1206,6 +1320,30 @@ def create_assignment(title: str, description: str, due_date: str, course: str)
 
     return f"✅ Assignment created! ID: {assignment_id}. Sent to {recipients} students in {course}."
 
+# ==================== ASSIGNMENT SUBMISSION ====================
+
+def submit_assignment(assignment_id: int, submission_text: str, submission_file) -> str:
+    if CURRENT_USER == "guest":
+        return "❌ Please log in first."
+    if not submission_text.strip() and not submission_file:
+        return "⚠️ Please provide text or upload a file."
+    
+    file_path = None
+    if submission_file:
+        filename = f"submission_{CURRENT_USER}_{assignment_id}_{int(time.time())}{os.path.splitext(submission_file.name)[1]}"
+        file_path = os.path.join(UPLOADS_DIR, filename)
+        shutil.copy(submission_file.name, file_path)
+    
+    result = student_service.submit_assignment(CURRENT_USER, assignment_id, submission_text, file_path)
+    return result
+
+def get_assignment_for_submission(assignment_id: int) -> Dict:
+    assignments = student_service.get_assignments(CURRENT_USER)
+    for assignment in assignments:
+        if assignment["id"] == assignment_id:
+            return assignment
+    return None
+
 # ==================== VOICE INPUT ====================
 
 VOICE_JS = """
@@ -1288,6 +1426,14 @@ CUSTOM_CSS = """
     background: #2a2a2a !important;
     border-color: #5a5a5a !important;
 }
+
+.submission-card {
+    background: #f8f9fa;
+    border-radius: 12px;
+    padding: 16px;
+    margin: 8px 0;
+    border-left: 4px solid #007bff;
+}
 """
 
 # ==================== BUILD UI ====================
@@ -1375,6 +1521,40 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                     outputs=assignments_display
                 )
 
+                # Assignment submission section
+                with gr.Accordion("📤 Submit Assignment", open=False):
+                    gr.Markdown("### Submit your work for grading")
+                    assignment_dropdown = gr.Dropdown(
+                        choices=[],
+                        label="Select Assignment to Submit",
+                        interactive=True
+                    )
+                    submission_text = gr.Textbox(
+                        label="Your Answer / Comments",
+                        placeholder="Type your response here...",
+                        lines=4
+                    )
+                    submission_file = gr.File(label="Upload your work (PDF, DOC, TXT, etc.)")
+                    submit_assignment_btn = gr.Button("📤 Submit Assignment", variant="primary")
+                    submission_result = gr.Textbox(label="Submission Status")
+
+                    def update_assignment_dropdown():
+                        assignments = student_service.get_assignments(CURRENT_USER)
+                        choices = [(f"{a['title']} (Due: {a['due_date']})", a["id"]) for a in assignments if a.get("submission_status") != "submitted"]
+                        return gr.update(choices=choices)
+
+                    def handle_submission(assignment_id, text, file):
+                        if not assignment_id:
+                            return "⚠️ Please select an assignment."
+                        return submit_assignment(assignment_id, text, file)
+
+                    demo.load(fn=update_assignment_dropdown, inputs=None, outputs=assignment_dropdown)
+                    submit_assignment_btn.click(
+                        fn=handle_submission,
+                        inputs=[assignment_dropdown, submission_text, submission_file],
+                        outputs=submission_result
+                    )
+
             with gr.Tab("👥 Class Groups"):
                 gr.Markdown("### 🎒 Join Your Class Groups")
                 with gr.Row():
@@ -1431,7 +1611,7 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                 )
                 demo.load(
                     fn=lambda: get_avatar_html(
-                        None,  # We don't handle real avatar paths yet
+                        student_service.authenticate_student(CURRENT_USER, "")["avatar"] if CURRENT_USER != "guest" else None,
                         student_service.authenticate_student(CURRENT_USER, "")["name"] if CURRENT_USER != "guest" else "Guest"
                     ) if CURRENT_USER != "guest" else "",
                     inputs=None,
@@ -1484,6 +1664,59 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                     outputs=assignment_result
                 )
 
+                # View submissions
+                with gr.Accordion("📋 View Submissions", open=False):
+                    gr.Markdown("### View and Grade Student Submissions")
+                    submissions_assignment_dropdown = gr.Dropdown(
+                        choices=[],
+                        label="Select Assignment to View Submissions",
+                        interactive=True
+                    )
+                    submissions_display = gr.JSON(label="Submissions")
+                    grade_input = gr.Textbox(label="Grade (e.g., A+, 85%, Pass)")
+                    feedback_input = gr.Textbox(label="Feedback", lines=3)
+                    grade_btn = gr.Button("✅ Grade Submission", variant="primary")
+                    grade_result = gr.Textbox(label="Grading Status")
+
+                    def update_submissions_dropdown():
+                        # Get assignments created by this teacher
+                        conn = db_manager.get_connection()
+                        cursor = conn.cursor()
+                        cursor.execute('''
+                            SELECT DISTINCT a.id, a.title
+                            FROM assignment_submissions s
+                            JOIN student_sessions ss ON s.student_username = json_extract(ss.assignments, '$[0].assigned_by')
+                            JOIN json_each(ss.assignments) j
+                            JOIN json_tree(j.value) t ON t.key = 'id'
+                            JOIN announcements a ON t.value = a.id
+                            WHERE a.posted_by = ?
+                        ''', (CURRENT_TEACHER["name"],))
+                        results = cursor.fetchall()
+                        choices = [(f"{row[1]} (ID: {row[0]})", row[0]) for row in results]
+                        return gr.update(choices=choices)
+
+                    def load_submissions(assignment_id):
+                        if not assignment_id:
+                            return []
+                        return student_service.get_assignment_submissions(assignment_id)
+
+                    def grade_submission(submission_id, grade, feedback):
+                        if not submission_id or not grade:
+                            return "⚠️ Please select submission and enter grade."
+                        return admin_service.grade_assignment(submission_id, grade, feedback)
+
+                    submissions_assignment_dropdown.change(
+                        fn=load_submissions,
+                        inputs=submissions_assignment_dropdown,
+                        outputs=submissions_display
+                    )
+
+                    grade_btn.click(
+                        fn=grade_submission,
+                        inputs=[submissions_display, grade_input, feedback_input],
+                        outputs=grade_result
+                    )
+
             with gr.Tab("📊 Admin Analytics"):
                 gr.Markdown("### 📈 School Analytics Dashboard")
                 analytics_display = gr.HTML()
@@ -1499,7 +1732,6 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                     outputs=analytics_display
                 )
 
-    # ✅ FIXED: Use gr.update() for ALL outputs
     login_btn.click(
         fn=login_student,
         inputs=[login_username, login_password],