Update app.py

app.py

@@ -1,36 +1,67 @@
 """
-ThutoAI - Complete Student Assistant with School Management
-Refactored for Hugging Face Spaces using Gradio (Flask won't work here)
-Enhanced with mobile UI, course filtering, admin panel, and smarter AI chat.
+SmartMate - AI Student Assistant (Upgraded for Hugging Face Spaces)
+Author: ngwakomadikwe
+Enhanced with: course filtering, admin panel, mobile UI, smarter AI context.
+
+Features:
+- Filter announcements by course/subject
+- Upload files (PDFs, notes)
+- AI chatbot with school context (OpenAI)
+- Admin login to post announcements
+- Responsive, beautiful UI
+
+Deployed on Hugging Face Spaces → https://huggingface.co/spaces/ngwakomadikwe/SmartMate
 """
 
 import os
-import json
-from datetime import datetime
-from typing import List, Dict, Any, Optional
 import gradio as gr
+from datetime import datetime
+from typing import List, Dict
 
-# ==================== MOCK SERVICES (Replace with real DB logic) ====================
+# ==================== MOCK DATA SERVICES (Replace with DB in future) ====================
 
-class MockSchoolService:
-    """Simulates school data services. Replace with real DB/API calls."""
+class SchoolService:
+    """Manages announcements, files, and school context for AI."""
 
     def __init__(self):
-        # Sample data — replace with database queries in production
+        # Sample announcements — you can replace this with database later
         self.announcements = [
-            {"id": 1, "title": "Math Exam Reminder", "content": "Final exam next Monday. Chapters 1-5.", "course": "Mathematics", "date": "2025-04-10", "priority": "high"},
-            {"id": 2, "title": "Science Fair", "content": "Submit projects by Friday.", "course": "Science", "date": "2025-04-08", "priority": "normal"},
-            {"id": 3, "title": "Library Hours Update", "content": "Open until 8 PM during exams.", "course": "General", "date": "2025-04-07", "priority": "low"},
+            {
+                "id": 1,
+                "title": "Math Final Exam",
+                "content": "Covers chapters 1-5. Bring calculator.",
+                "course": "Mathematics",
+                "date": "2025-04-15",
+                "priority": "high"
+            },
+            {
+                "id": 2,
+                "title": "Science Project Due",
+                "content": "Submit your ecology report by Friday.",
+                "course": "Science",
+                "date": "2025-04-12",
+                "priority": "normal"
+            },
+            {
+                "id": 3,
+                "title": "Library Extended Hours",
+                "content": "Open until 9 PM during exam week.",
+                "course": "General",
+                "date": "2025-04-10",
+                "priority": "low"
+            },
         ]
-        self.courses = ["Mathematics", "Science", "English", "History", "General"]
-        self.files = []  # Simulate uploaded files
+        self.courses = ["All", "Mathematics", "Science", "English", "History", "General"]
+        self.uploaded_files = []
 
-    def get_announcements_by_course(self, course: str = "All") -> List[Dict]:
-        if course == "All":
+    def get_announcements(self, course_filter: str = "All") -> List[Dict]:
+        """Return announcements filtered by course."""
+        if course_filter == "All":
             return self.announcements
-        return [a for a in self.announcements if a["course"] == course]
+        return [a for a in self.announcements if a["course"] == course_filter]
 
     def add_announcement(self, title: str, content: str, course: str, priority: str):
+        """Add new announcement (used by admin)."""
         new_id = max([a["id"] for a in self.announcements], default=0) + 1
         self.announcements.append({
             "id": new_id,
@@ -41,40 +72,44 @@ class MockSchoolService:
             "priority": priority
         })
 
-    def upload_file(self, file):
-        if file:
-            self.files.append({"name": file.name, "uploaded_at": datetime.now().strftime("%Y-%m-%d %H:%M")})
-        return f"✅ Uploaded: {file.name}" if file else "❌ No file selected"
-
-    def search_school_info(self, query: str) -> List[Dict]:
-        results = []
-        for ann in self.announcements:
-            if query.lower() in ann["title"].lower() or query.lower() in ann["content"].lower():
-                results.append(ann)
-        return results
-
-    def format_school_context_for_ai(self) -> str:
-        context = "Current School Context:\n"
-        for ann in self.announcements[:5]:  # Top 5 recent
-            context += f"- [{ann['course']}] {ann['title']}: {ann['content'][:50]}... (Priority: {ann['priority']})\n"
+    def upload_file(self, file) -> str:
+        """Simulate file upload."""
+        if not file:
+            return "❌ No file selected"
+        self.uploaded_files.append({
+            "name": file.name,
+            "uploaded_at": datetime.now().strftime("%Y-%m-%d %H:%M")
+        })
+        return f"✅ Uploaded: {file.name}"
+
+    def get_school_context_for_ai(self) -> str:
+        """Return formatted context for AI to use in responses."""
+        context = "Current School Announcements (for context):\n"
+        for ann in self.announcements[:5]:  # Limit to 5 most recent
+            context += f"- [{ann['course']}] {ann['title']}: {ann['content'][:60]}... (Priority: {ann['priority']})\n"
         return context
 
 
-class MockAdminService:
-    """Simulates admin authentication and management."""
+class AdminService:
+    """Handles admin authentication."""
 
     def __init__(self):
-        self.admins = {"[email protected]": "password123"}  # In prod: use hashed passwords!
+        # In production, store hashed passwords in a database!
+        self.admin_credentials = {
+            "[email protected]": "password123",
+            "[email protected]": "letmein"
+        }
 
-    def authenticate_admin(self, username: str, password: str) -> bool:
-        return self.admins.get(username) == password
+    def authenticate(self, username: str, password: str) -> bool:
+        """Check if username/password is valid."""
+        return self.admin_credentials.get(username) == password
 
 
 # Initialize services
-school_service = MockSchoolService()
-admin_service = MockAdminService()
+school_service = SchoolService()
+admin_service = AdminService()
 
-# Load OpenAI key
+# Check if OpenAI key is set
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
 USE_OPENAI = bool(OPENAI_API_KEY)
 
@@ -82,29 +117,37 @@ if USE_OPENAI:
     try:
         from openai import OpenAI
         openai_client = OpenAI(api_key=OPENAI_API_KEY)
-        print("✅ OpenAI client initialized")
-    except ImportError:
-        print("⚠️ OpenAI library not installed. Falling back to mock responses.")
+        print("✅ OpenAI client ready")
+    except Exception as e:
+        print(f"⚠️ Error initializing OpenAI: {e}")
         USE_OPENAI = False
 else:
-    print("⚠️ OPENAI_API_KEY not set. Using mock AI responses.")
+    print("⚠️ OPENAI_API_KEY not set. AI will use mock responses.")
 
 # ==================== AI CHAT FUNCTION ====================
 
-def ai_chat(message: str, history: List) -> str:
+def smart_chat(message: str, history: List) -> str:
     """
-    Generate AI response using OpenAI or fallback mock.
-    Injects school context for better, relevant answers.
+    Generate AI response using OpenAI (or mock if no key).
+    Injects school announcements as context for better, relevant answers.
     """
     if USE_OPENAI:
         try:
-            school_context = school_service.format_school_context_for_ai()
-            system_prompt = f"""You are ThutoAI, a helpful student assistant at a school.
-Use this context to answer accurately:
-{school_context}
+            # Get school context to make AI responses relevant
+            context = school_service.get_school_context_for_ai()
 
-Be supportive, clear, and student-friendly. If asked about exams, assignments, or announcements, refer to the context above.
-If unsure, say 'I don't know' rather than guessing."""
+            system_prompt = f"""You are SmartMate, a friendly AI assistant for students.
+Use the school context below to give accurate, helpful answers.
+
+{context}
+
+Guidelines:
+- Be encouraging and supportive.
+- If asked about exams, assignments, or announcements, refer to the context.
+- Offer study tips if appropriate.
+- If unsure, say so — don't guess.
+
+Now respond to the student's question:"""
 
             response = openai_client.chat.completions.create(
                 model="gpt-3.5-turbo",
@@ -117,205 +160,232 @@ If unsure, say 'I don't know' rather than guessing."""
             )
             reply = response.choices[0].message.content.strip()
 
-            # Append related info if keywords detected
-            keywords = ['exam', 'test', 'due', 'assignment', 'announcement']
+            # If question relates to school, append matching announcements
+            keywords = ["exam", "test", "due", "assignment", "announcement", "when", "what", "deadline"]
             if any(kw in message.lower() for kw in keywords):
-                search_results = school_service.search_school_info(message)
-                if search_results:
-                    reply += "\n\n📚 **Related Info:**\n"
-                    for r in search_results[:2]:
-                        reply += f"• **{r['title']}** ({r['course']}) - {r['content'][:60]}...\n"
+                matches = school_service.get_announcements()
+                relevant = [a for a in matches if any(kw in a["title"].lower() or kw in a["content"].lower() for kw in keywords)]
+                if relevant:
+                    reply += "\n\n📌 **Relevant Announcements:**"
+                    for ann in relevant[:2]:  # Show top 2
+                        reply += f"\n- **{ann['title']}** ({ann['course']}) → {ann['content'][:70]}..."
 
             return reply
 
         except Exception as e:
-            return f"⚠️ AI Error: {str(e)}"
-
+            return f"⚠️ Sorry, I had trouble thinking. Error: {str(e)}"
     else:
-        # Mock response for demo without API key
-        return f"👋 Hi! I'm ThutoAI. You asked: '{message}'.\n*(Mock mode — set OPENAI_API_KEY for real AI answers)*"
+        # Mock response if no API key
+        return f"👋 Hi! I’m SmartMate. You asked: '{message}'.\n*(Tip: Set OPENAI_API_KEY in HF Secrets for real AI answers.)*"
 
 
-# ==================== GRADIO INTERFACE ====================
+# ==================== UI RENDERING HELPERS ====================
 
-# Custom CSS for mobile-friendly, clean design
-CUSTOM_CSS = """
-.gradio-container {
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-}
-.announcement-box {
-    border: 1px solid #e0e0e0;
-    border-radius: 8px;
-    padding: 16px;
-    margin-bottom: 12px;
-    background: #fafafa;
-}
-.announcement-title {
-    font-weight: bold;
-    color: #2c3e50;
-    font-size: 1.1em;
-}
-.priority-high { color: #e74c3c; }
-.priority-normal { color: #f39c12; }
-.priority-low { color: #7f8c8d; }
-.course-tag {
-    display: inline-block;
-    background: #3498db;
-    color: white;
-    padding: 2px 8px;
-    border-radius: 4px;
-    font-size: 0.8em;
-    margin-left: 8px;
-}
-.admin-panel {
-    background: #f8f9fa;
-    padding: 20px;
-    border-radius: 8px;
-    border: 1px solid #dee2e6;
-}
-"""
+def render_announcements(course: str) -> str:
+    """Generate HTML to display announcements with styling."""
+    announcements = school_service.get_announcements(course)
+    if not announcements:
+        return "<p style='color: #6c757d; text-align: center;'>No announcements for this course.</p>"
 
-# State to track if user is admin
+    html = ""
+    priority_colors = {"high": "#dc3545", "normal": "#ffc107", "low": "#6c757d"}
+
+    for ann in announcements:
+        color = priority_colors.get(ann["priority"], "#6c757d")
+        html += f"""
+        <div style="
+            border: 1px solid #e9ecef;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 12px;
+            background: #f8f9fa;
+        ">
+            <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px;">
+                <strong style="font-size: 1.1em; color: #212529;">{ann['title']}</strong>
+                <span style="
+                    background: {color};
+                    color: white;
+                    padding: 3px 8px;
+                    border-radius: 4px;
+                    font-size: 0.8em;
+                    font-weight: bold;
+                ">{ann['priority'].upper()}</span>
+            </div>
+            <div style="margin-bottom: 8px;">{ann['content']}</div>
+            <div style="font-size: 0.85em; color: #6c757d;">
+                📚 {ann['course']} &nbsp; | &nbsp; 📅 {ann['date']}
+            </div>
+        </div>
+        """
+    return html
+
+
+# ==================== ADMIN STATE & FUNCTIONS ====================
+
+# Track if user is logged in as admin (simple state — not secure for production)
 IS_ADMIN = False
 
-def toggle_admin_login(username: str, password: str) -> tuple:
-    """Authenticate admin and toggle UI state."""
+def admin_login(username: str, password: str) -> tuple:
+    """Attempt to log in admin. Returns UI update instructions."""
     global IS_ADMIN
-    if admin_service.authenticate_admin(username, password):
+    if admin_service.authenticate(username, password):
         IS_ADMIN = True
         return (
-            gr.update(visible=False),  # Hide login
+            gr.update(visible=False),  # Hide login form
             gr.update(visible=True),   # Show dashboard
-            "✅ Login successful! Welcome, Admin.",
+            "✅ Login successful! You can now post announcements.",
             gr.update(visible=True)    # Show post form
         )
     else:
         return (
             gr.update(visible=True),
             gr.update(visible=False),
-            "❌ Invalid credentials. Try again.",
+            "❌ Invalid username or password. Try again.",
             gr.update(visible=False)
         )
 
-def logout_admin() -> tuple:
-    """Logout admin and reset UI."""
+def admin_logout() -> tuple:
+    """Log out admin."""
     global IS_ADMIN
     IS_ADMIN = False
     return (
-        gr.update(visible=True),
-        gr.update(visible=False),
+        gr.update(visible=True),   # Show login
+        gr.update(visible=False),  # Hide dashboard
         "",
-        gr.update(visible=False)
+        gr.update(visible=False)   # Hide post form
     )
 
-def post_announcement(title: str, content: str, course: str, priority: str) -> str:
-    """Post new announcement and refresh list."""
+def admin_post_announcement(title: str, content: str, course: str, priority: str) -> str:
+    """Post new announcement if admin."""
     if not IS_ADMIN:
-        return "🔒 Only admins can post announcements."
-    if not title or not content:
-        return "⚠️ Title and content required."
+        return "🔒 You must be logged in as admin to post announcements."
+    if not title.strip() or not content.strip():
+        return "⚠️ Title and content cannot be empty."
     school_service.add_announcement(title, content, course, priority)
-    return "✅ Announcement posted successfully!"
+    return "✅ Announcement posted successfully! Refresh announcements to see it."
 
-def display_announcements(course_filter: str) -> str:
-    """Render announcements with HTML for styling."""
-    announcements = school_service.get_announcements_by_course(course_filter)
-    if not announcements:
-        return "<p style='color: #7f8c8d;'>No announcements found.</p>"
+# ==================== CUSTOM CSS FOR MOBILE & BEAUTY ====================
 
-    html = ""
-    for ann in announcements:
-        priority_class = f"priority-{ann['priority']}"
-        html += f"""
-        <div class="announcement-box">
-            <div>
-                <span class="announcement-title">{ann['title']}</span>
-                <span class="course-tag">{ann['course']}</span>
-            </div>
-            <div style="margin-top: 8px;">{ann['content']}</div>
-            <div style="margin-top: 8px; font-size: 0.9em; color: #7f8c8d;">
-                Posted on {ann['date']} · <span class="{priority_class}">Priority: {ann['priority'].title()}</span>
-            </div>
-        </div>
-        """
-    return html
+CUSTOM_CSS = """
+.gradio-container {
+    font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
+}
+.announcement-box {
+    border: 1px solid #e0e0e0;
+    border-radius: 10px;
+    padding: 16px;
+    margin: 10px 0;
+    background: white;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+}
+.priority-badge {
+    font-size: 0.75em;
+    padding: 3px 8px;
+    border-radius: 4px;
+    font-weight: bold;
+    color: white;
+}
+.high { background: #e74c3c; }
+.normal { background: #f39c12; }
+.low { background: #7f8c8d; }
+"""
 
-def file_upload_status(file) -> str:
-    """Handle file upload and return status."""
-    return school_service.upload_file(file)
+# ==================== BUILD GRADIO INTERFACE ====================
 
-# Build Gradio app
 with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# 🎓 ThutoAI - Student Assistant")
+    gr.Markdown("# 🎓 SmartMate — Your AI School Assistant")
 
+    # ========= TAB: Announcements =========
     with gr.Tab("📢 Announcements"):
-        gr.Markdown("### Latest Updates from Your Courses")
+        gr.Markdown("### Filter by Course/Subject")
         course_dropdown = gr.Dropdown(
-            choices=["All"] + school_service.courses,
+            choices=school_service.courses,
             value="All",
-            label="Filter by Course",
+            label="Select Course",
             interactive=True
         )
-        announcement_display = gr.HTML(label="Announcements")
-        course_dropdown.change(fn=display_announcements, inputs=course_dropdown, outputs=announcement_display)
-        demo.load(fn=display_announcements, inputs=course_dropdown, outputs=announcement_display)  # Initial load
+        announcements_html = gr.HTML()
+        course_dropdown.change(
+            fn=render_announcements,
+            inputs=course_dropdown,
+            outputs=announcements_html
+        )
+        # Load initial announcements
+        demo.load(
+            fn=render_announcements,
+            inputs=course_dropdown,
+            outputs=announcements_html
+        )
 
-    with gr.Tab("💬 Ask AI Assistant"):
-        gr.Markdown("### Ask any question — homework help, deadlines, school info, and more!")
-        chatbot = gr.Chatbot(height=400)
-        msg = gr.Textbox(label="Type your question", placeholder="E.g., When is the Math exam?")
-        clear = gr.Button("Clear Chat")
+    # ========= TAB: AI Chat =========
+    with gr.Tab("💬 Ask SmartMate"):
+        gr.Markdown("### Ask me anything — homework, deadlines, school info, or just for motivation!")
+        chatbot = gr.Chatbot(height=450, bubble_full_width=False)
+        msg = gr.Textbox(label="Type your question", placeholder="E.g., What's due this week in Math?")
+        clear_btn = gr.Button("🗑️ Clear Chat")
 
         def respond(message, chat_history):
-            bot_message = ai_chat(message, chat_history)
-            chat_history.append((message, bot_message))
+            bot_reply = smart_chat(message, chat_history)
+            chat_history.append((message, bot_reply))
             return "", chat_history
 
         msg.submit(respond, [msg, chatbot], [msg, chatbot])
-        clear.click(lambda: None, None, chatbot, queue=False)
+        clear_btn.click(lambda: None, None, chatbot, queue=False)
 
-    with gr.Tab("📂 Upload Files"):
-        gr.Markdown("### Upload study materials (PDFs, notes, etc.)")
-        file_input = gr.File(label="Choose a file")
-        upload_btn = gr.Button("Upload")
+    # ========= TAB: Upload Files =========
+    with gr.Tab("📂 Upload Notes/PDFs"):
+        gr.Markdown("### Upload study materials for personal reference (not yet stored long-term)")
+        file_uploader = gr.File(label="Choose a file (PDF, DOC, TXT, etc.)")
+        upload_btn = gr.Button("📤 Upload")
         upload_status = gr.Textbox(label="Status", interactive=False)
-        upload_btn.click(fn=file_upload_status, inputs=file_input, outputs=upload_status)
+        upload_btn.click(
+            fn=school_service.upload_file,
+            inputs=file_uploader,
+            outputs=upload_status
+        )
 
-    with gr.Tab("🔐 Admin Panel"):
-        gr.Markdown("### Teacher/Admin Login")
+    # ========= TAB: Admin Panel =========
+    with gr.Tab("🔐 Admin (Teachers)"):
+        gr.Markdown("### Post Announcements to Students")
 
+        # Login Form
         with gr.Group() as login_group:
-            username = gr.Textbox(label="Username", placeholder="e.g., [email protected]")
-            password = gr.Textbox(label="Password", type="password")
-            login_btn = gr.Button("Login")
-            login_status = gr.Textbox(label="Status", interactive=False)
+            gr.Markdown("#### Login to Post Announcements")
+            admin_username = gr.Textbox(label="Username", placeholder="e.g., [email protected]")
+            admin_password = gr.Textbox(label="Password", type="password", placeholder="••••••••")
+            login_btn = gr.Button("🔓 Login")
+            login_status = gr.Textbox(label="Login Status", interactive=False)
 
+        # Admin Dashboard (hidden until login)
         with gr.Group(visible=False) as admin_dashboard:
-            gr.Markdown("## ✍️ Post New Announcement")
+            gr.Markdown("#### ✍️ Create New Announcement")
             with gr.Row():
-                admin_title = gr.Textbox(label="Title", placeholder="Enter announcement title")
-                admin_course = gr.Dropdown(choices=school_service.courses, label="Course", value="General")
-            admin_content = gr.TextArea(label="Content", placeholder="Enter full announcement details...")
-            admin_priority = gr.Radio(["low", "normal", "high"], label="Priority", value="normal")
-            post_btn = gr.Button("Post Announcement")
+                ann_title = gr.Textbox(label="Title", placeholder="e.g., Science Quiz Moved")
+                ann_course = gr.Dropdown(choices=school_service.courses[1:], label="Course", value="General")
+            ann_content = gr.Textbox(label="Content", placeholder="Details for students...", lines=3)
+            ann_priority = gr.Radio(["low", "normal", "high"], label="Priority", value="normal")
+            post_btn = gr.Button("📬 Post Announcement")
             post_status = gr.Textbox(label="Result", interactive=False)
 
+            # Post logic
             post_btn.click(
-                fn=post_announcement,
-                inputs=[admin_title, admin_content, admin_course, admin_priority],
+                fn=admin_post_announcement,
+                inputs=[ann_title, ann_content, ann_course, ann_priority],
                 outputs=post_status
             )
 
-            logout_btn = gr.Button("Logout")
+            # Logout button
+            logout_btn = gr.Button("⬅️ Logout")
             logout_btn.click(
-                fn=logout_admin,
+                fn=admin_logout,
                 inputs=None,
                 outputs=[login_group, admin_dashboard, login_status, post_status]
             )
 
+        # Login logic
         login_btn.click(
-            fn=toggle_admin_login,
-            inputs=[username, password],
+            fn=admin_login,
+            inputs=[admin_username, admin_password],
             outputs=[login_group, admin_dashboard, login_status, post_status]
         )