Update app.py

app.py

@@ -9,12 +9,10 @@ import requests
 from PIL import Image
 from gtts import gTTS
 from duckduckgo_search import DDGS
-import base64
-import tempfile
+import warnings
+warnings.filterwarnings('ignore')
 
-# -----------------------------------------------------------------------------
-# 1. PAGE CONFIGURATION
-# -----------------------------------------------------------------------------
+# Page Configuration
 st.set_page_config(
     page_title="H2 Physics Feynman Bot",
     page_icon="⚛️",
@@ -22,18 +20,13 @@ st.set_page_config(
     initial_sidebar_state="expanded"
 )
 
-# -----------------------------------------------------------------------------
-# 2. HELPER FUNCTIONS (Optimized for Docker)
-# -----------------------------------------------------------------------------
-
+# Audio generation
 @st.cache_data(show_spinner=False, ttl=3600)
 def generate_audio(text):
     """Generates MP3 audio from text, skipping code/image tags."""
-    # Clean text so the bot doesn't read code or tags out loud
     clean_text = re.sub(r'```.*?```', 'I have generated a graph.', text, flags=re.DOTALL)
     clean_text = re.sub(r'\[IMAGE:.*?\]', 'Here is a diagram.', clean_text)
     
-    # Limit text length for audio generation
     if len(clean_text) > 1000:
         clean_text = clean_text[:1000] + "..."
     
@@ -47,6 +40,7 @@ def generate_audio(text):
         st.error(f"Audio generation error: {e}")
         return None
 
+# Image search functions
 def google_search_api(query, api_key, cx):
     """Helper: Performs a single Google Search."""
     try:
@@ -95,44 +89,102 @@ def search_image(query):
     """MASTER FUNCTION: Google Search -> DuckDuckGo"""
     cx = os.environ.get("GOOGLE_CX", st.secrets.get("GOOGLE_CX", ""))
     
-    # 1. Try Google Key 1
     key1 = os.environ.get("GOOGLE_SEARCH_KEY", st.secrets.get("GOOGLE_SEARCH_KEY", ""))
     if key1 and cx:
         url = google_search_api(query, key1, cx)
         if url: 
             return url
 
-    # 2. Try Google Key 2
     key2 = os.environ.get("GOOGLE_SEARCH_KEY_2", st.secrets.get("GOOGLE_SEARCH_KEY_2", ""))
     if key2 and cx:
         url = google_search_api(query, key2, cx)
         if url: 
             return url
 
-    # 3. Fallback to DuckDuckGo
     return duckduckgo_search_api(query)
 
+# Graph plotting function - FIXED VERSION
 def execute_plotting_code(code_snippet):
     """Execute plotting code in a safe environment."""
     try:
-        fig, ax = plt.subplots(figsize=(8, 4))
-        local_env = {'plt': plt, 'np': np, 'fig': fig, 'ax': ax}
-        exec(code_snippet, {}, local_env)
+        # Clear any existing plots
+        plt.close('all')
+        
+        # Create a new figure
+        fig, ax = plt.subplots(figsize=(10, 6))
+        
+        # Prepare execution environment
+        namespace = {
+            'plt': plt,
+            'np': np,
+            'ax': ax,
+            'fig': fig,
+            'math': __import__('math')
+        }
+        
+        # Clean the code
+        cleaned_code = code_snippet.strip()
+        
+        # Execute the code
+        exec(cleaned_code, namespace)
+        
+        # Get current axis
+        ax = plt.gca()
+        
+        # Ensure proper formatting
+        if not ax.get_xlabel():
+            ax.set_xlabel('X-axis', fontsize=12)
+        if not ax.get_ylabel():
+            ax.set_ylabel('Y-axis', fontsize=12)
+        if not ax.get_title():
+            ax.set_title('Physics Graph', fontsize=14)
+        
+        # Ensure grid is visible
+        ax.grid(True, linestyle='--', alpha=0.6)
+        
+        # Ensure legend if labels exist
+        if ax.get_legend_handles_labels()[1]:
+            ax.legend()
+        
+        # Display the plot
         st.pyplot(fig)
+        
+        # Close the figure
         plt.close(fig)
+        
     except Exception as e:
         st.error(f"Graph Error: {str(e)[:200]}")
+        
+        # Fallback: Create a simple sine wave
+        try:
+            fig, ax = plt.subplots(figsize=(10, 6))
+            x = np.linspace(0, 2*np.pi, 100)
+            y = np.sin(x)
+            ax.plot(x, y, 'b-', linewidth=2, label='sin(x)')
+            ax.set_xlabel('Angle (radians)', fontsize=12)
+            ax.set_ylabel('Value', fontsize=12)
+            ax.set_title('Sample Graph (Fallback)', fontsize=14)
+            ax.grid(True, linestyle='--', alpha=0.6)
+            ax.legend()
+            st.pyplot(fig)
+            plt.close(fig)
+        except:
+            st.warning("Could not generate graph. Please check the Python code.")
 
+# Display message function
 def display_message(role, content, enable_voice=False):
     """Display chat message with all features."""
     with st.chat_message(role):
         
         text_to_display = content
         
-        # 1. Check for Python Code
-        code_match = re.search(r'```python(.*?)```', content, re.DOTALL)
-        if code_match and role == "assistant":
-            text_to_display = text_to_display.replace(code_match.group(0), "")
+        # 1. Extract and handle Python code blocks
+        code_pattern = r'```python\s*(.*?)```'
+        code_matches = list(re.finditer(code_pattern, content, re.DOTALL))
+        
+        # Remove code blocks from displayed text
+        for match in reversed(code_matches):
+            text_to_display = text_to_display.replace(match.group(0), "")
         
         # 2. Check for [IMAGE: query] Tags
         image_match = re.search(r'\[IMAGE:\s*(.*?)\]', text_to_display, re.IGNORECASE)
@@ -147,11 +199,15 @@ def display_message(role, content, enable_voice=False):
         # --- DISPLAY TEXT ---
         st.markdown(text_to_display)
 
-        # --- DISPLAY CODE & GRAPH ---
-        if code_match and role == "assistant":
-            with st.expander("📊 Show Graph Code"):
-                st.code(code_match.group(1), language='python')
-            execute_plotting_code(code_match.group(1))
+        # --- EXECUTE AND DISPLAY GRAPHS ---
+        if code_matches and role == "assistant":
+            for match in code_matches:
+                code_content = match.group(1).strip()
+                if code_content:
+                    with st.expander("📊 Generated Graph", expanded=True):
+                        execute_plotting_code(code_content)
+                    with st.expander("📝 View Python Code"):
+                        st.code(code_content, language='python')
             
         # --- DISPLAY IMAGE ---
         if image_match and role == "assistant":
@@ -169,7 +225,7 @@ def display_message(role, content, enable_voice=False):
             audio_bytes = generate_audio(text_to_display)
             if audio_bytes:
                 st.audio(audio_bytes, format='audio/mp3')
-
+# Groq API function
 def call_groq_api(api_key, messages, max_tokens=2000):
     """Call Groq API - FREE tier available (10,000 requests/month)."""
     url = "https://api.groq.com/openai/v1/chat/completions"
@@ -187,22 +243,17 @@ def call_groq_api(api_key, messages, max_tokens=2000):
                 "role": "system",
                 "content": msg["content"]
             })
-        elif msg["role"] == "user":
+        elif msg["role"] in ["user", "assistant"]:
             formatted_messages.append({
-                "role": "user",
-                "content": msg["content"]
-            })
-        elif msg["role"] == "assistant":
-            formatted_messages.append({
-                "role": "assistant",
+                "role": msg["role"],
                 "content": msg["content"]
             })
     
-    # Try multiple models in order of preference
+    # Try multiple models
     models_to_try = [
-        "llama-3.1-8b-instant",      # Fast, free, good for education
-        "llama-3.2-3b-preview",      # Smaller, faster alternative
-        "mixtral-8x7b-32768",        # Higher capacity if available
+        "llama-3.1-8b-instant",
+        "llama-3.2-3b-preview",
+        "mixtral-8x7b-32768",
     ]
     
     for model in models_to_try:
@@ -221,7 +272,6 @@ def call_groq_api(api_key, messages, max_tokens=2000):
                 result = response.json()
                 return result["choices"][0]["message"]["content"]
             elif response.status_code == 429:
-                # Rate limit, try next model
                 continue
             elif response.status_code == 401:
                 return "❌ Invalid API Key. Please check your Groq API key."
@@ -229,16 +279,13 @@ def call_groq_api(api_key, messages, max_tokens=2000):
                 return "❌ Payment required. The free model might be unavailable. Try again later."
                 
         except requests.exceptions.Timeout:
-            continue  # Try next model if timeout
+            continue
         except Exception as e:
-            continue  # Try next model
+            continue
     
     return "⚠️ All models are currently unavailable. Please try again in a few moments."
 
-# -----------------------------------------------------------------------------
-# 3. SYSTEM INSTRUCTIONS
-# -----------------------------------------------------------------------------
-
+# System Instructions for the AI - Part 5a (Start)
 SYSTEM_INSTRUCTIONS = """You are Richard Feynman, the Nobel Prize-winning physicist, now serving as a tutor for Singapore H2 Physics (syllabus 9478).
 
 **CORE DIRECTIVE:** 
@@ -246,26 +293,46 @@ SYSTEM_INSTRUCTIONS = """You are Richard Feynman, the Nobel Prize-winning physic
 - Reject topics not in the syllabus
 - Teach with clarity, enthusiasm, and the Feynman method
 
-**YOUR TOOLS:**
-1. **GRAPHS:** When asked to plot or visualize data, write Python code using matplotlib/numpy inside ```python code blocks.
-2. **DIAGRAMS:** When you need to show a diagram, use the tag: [IMAGE: search query]
-   Example: "Here's the setup: [IMAGE: double slit experiment diagram]"
-   DO NOT use regular markdown images.
+**GRAPH GENERATION RULES (CRITICAL):**
+When asked to create a graph, you MUST write COMPLETE, EXECUTABLE Python code that:
+1. Starts with: import matplotlib.pyplot as plt, import numpy as np
+2. Creates a figure: plt.figure(figsize=(10, 6)) or fig, ax = plt.subplots(figsize=(10, 6))
+3. Generates or uses appropriate physics data
+4. Plots the data with plt.plot(), plt.scatter(), etc.
+5. Adds proper labels: plt.xlabel(), plt.ylabel(), plt.title()
+6. Adds grid: plt.grid(True, linestyle='--', alpha=0.6)
+7. Adds legend if needed: plt.legend()
 
-**TEACHING METHOD:**
-1. **ASK ONE QUESTION AT A TIME** - keep it simple
-2. **USE ANALOGIES** - explain complex concepts with everyday examples
-3. **GUIDE, DON'T GIVE ANSWERS** - ask leading questions
-4. **VALIDATE UNDERSTANDING** - check frequently if the student follows
-5. **"I GIVE UP" CLAUSE** - only give full solutions when student explicitly says "I give up"
-6. **SUMMARIZE** - after each concept, provide a clear summary in a blockquote (>)
+**EXAMPLE OF GOOD GRAPH CODE:**
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.figure(figsize=(10, 6))
+x = np.linspace(0, 10, 100)
+y = np.sin(x)
+plt.plot(x, y, 'b-', linewidth=2, label='sin(x)')
+plt.xlabel('X Variable', fontsize=12)
+plt.ylabel('Y Variable', fontsize=12)
+plt.title('Physics Graph', fontsize=14)
+plt.grid(True, linestyle='--', alpha=0.6)
+plt.legend()
+
+**DIAGRAMS:**
+When you need to show a diagram, use: [IMAGE: search query]
+Example: "Here's the setup: [IMAGE: double slit experiment diagram]"
 
+**TEACHING METHOD:**
+1. Ask ONE question at a time
+2. Use analogies to explain complex concepts
+3. Guide, don't give answers immediately
+4. Validate understanding frequently
+5. Only give full solutions when student says "I give up"
+6. Summarize each concept with a clear summary in > blockquote
 **FORMATTING:**
-- Use LaTeX for equations: $F = ma$
+- Use LaTeX for equations: $F = ma$, $E = mc^2$
 - Use **bold** for key terms
 - Keep responses concise but thorough
 - Be enthusiastic and encouraging
-- Use emojis sparingly for emphasis ⚛️📚🔬
 
 **TOPICS COVERED (9478 Syllabus):**
 1. Measurement & Uncertainty
@@ -279,11 +346,10 @@ SYSTEM_INSTRUCTIONS = """You are Richard Feynman, the Nobel Prize-winning physic
 9. Electricity & DC Circuits
 10. Electromagnetism
 11. Modern Physics (Quantum/Nuclear)
-"""
+'''
 
-# -----------------------------------------------------------------------------
-# 4. SIDEBAR CONFIGURATION
-# -----------------------------------------------------------------------------
+## **PART 6: SIDEBAR CONFIGURATION**
+# Sidebar Configuration
 with st.sidebar:
     # Header with Feynman image
     col1, col2 = st.columns([1, 3])
@@ -417,11 +483,7 @@ with st.sidebar:
     st.divider()
     st.caption("Made with ❤️ for H2 Physics students | Powered by Groq AI")
 
-# -----------------------------------------------------------------------------
-# 5. MAIN CHAT INTERFACE
-# -----------------------------------------------------------------------------
-
-# Initialize session state
+# Main Chat Interface
 if "messages" not in st.session_state:
     st.session_state.messages = [
         {"role": "system", "content": SYSTEM_INSTRUCTIONS},
@@ -429,14 +491,14 @@ if "messages" not in st.session_state:
 **Hello JPJC Physics students! I'm Richard Feynman, ready to help you master H2 Physics!** ⚛️
 
 I can:
-- 📊 **Plot graphs** using Python
+- 📊 **Plot graphs** using Python (ask me to plot any physics equation!)
 - 🖼️ **Find diagrams** through web search  
 - 💬 **Explain concepts** with analogies
 - ❓ **Ask questions** to test your understanding
 
 **What would you like to learn today?**
-*You can ask me anything from the H2 Physics syllabus, upload images of problems, or ask me to explain a specific topic.*
 """}
+
     ]
 
 # Title and mode indicator
@@ -565,9 +627,7 @@ st.divider()
 st.markdown("""
 <div style="text-align: center; color: #888; font-size: 0.9em;">
     <p><strong>H2 Physics Feynman Tutor</strong> | Singapore H2 Physics (9478) Syllabus</p>
-    <p>Powered by <a href="https://groq.com" target="_blank">Groq AI</a> | 
-    <a href="https://www.seab.gov.sg/docs/default-source/national-examinations/syllabus/alevel/2024syllabus/9478_y24_sy.pdf" target="_blank">Official Syllabus</a> | 
-    <a href="https://github.com" target="_blank">GitHub</a></p>
+    <p>Powered by <a href="https://groq.com" target="_blank">Groq AI</a></p>
     <p style="font-size: 0.8em;">Disclaimer: This is an AI tutoring assistant. Always verify with official syllabus documents.</p>
 </div>
-""", unsafe_allow_html=True)
+""", unsafe_allow_html=True)