Update app.py

app.py

@@ -103,126 +103,102 @@ def search_image(query):
 
     return duckduckgo_search_api(query)
 
-# Graph plotting function - COMPLETELY FIXED VERSION
+# Graph plotting function - REORDERED AND FIXED
 def execute_plotting_code(code_snippet):
     """Execute plotting code in a safe environment."""
     try:
-        # Clear any existing plots
+        # Clear any existing plots FIRST
         plt.close('all')
         
-        # Create a new figure
-        fig, ax = plt.subplots(figsize=(10, 6))
+        # Create a fresh figure
+        fig = plt.figure(figsize=(10, 6))
         
-        # Add matplotlib style for better-looking graphs
-        plt.style.use('seaborn-v0_8-darkgrid')
-        
-        # Prepare execution environment with ALL necessary imports
+        # Create execution namespace with ALL required imports
         namespace = {
             'plt': plt,
             'np': np,
-            'ax': ax,
             'fig': fig,
-            'math': __import__('math'),
-            'np': np
+            'ax': None,
+            'math': __import__('math')
         }
         
         # Clean the code
         cleaned_code = code_snippet.strip()
         
-        # DEBUG: Show the code being executed
-        print(f"Executing code:\n{cleaned_code[:500]}...")
+        # CRITICAL FIX: Ensure imports are at the top
+        if 'import matplotlib' not in cleaned_code:
+            cleaned_code = 'import matplotlib.pyplot as plt\nimport numpy as np\n' + cleaned_code
+        
+        # CRITICAL FIX: Ensure plt.figure or plt.subplots is called
+        if 'plt.figure' not in cleaned_code and 'plt.subplots' not in cleaned_code:
+            cleaned_code = cleaned_code.replace('import matplotlib.pyplot as plt', 
+                                                'import matplotlib.pyplot as plt\nplt.figure(figsize=(10, 6))')
+        
+        # CRITICAL FIX: Check if there's actual plotting
+        plot_keywords = ['plt.plot(', 'ax.plot(', 'plt.scatter(', 'ax.scatter(', 
+                        'plt.bar(', 'ax.bar(', 'plt.hist(', 'ax.hist(']
         
-        # Check if code contains actual plotting commands
-        has_plot = any(keyword in cleaned_code.lower() for keyword in [
-            'plt.plot', 'ax.plot', 'plt.scatter', 'ax.scatter', 
-            'plt.bar', 'ax.bar', 'plt.hist', 'ax.hist'
-        ])
+        has_plot = any(keyword in cleaned_code for keyword in plot_keywords)
         
-        # If no plotting command, add sample data
         if not has_plot:
-            cleaned_code += '\n\n# Adding sample data for visualization\n'
+            # Add a sample plot
+            cleaned_code += '\n\n# Adding sample plot since no plotting command was found\n'
             cleaned_code += 'x = np.linspace(0, 10, 100)\n'
             cleaned_code += 'y = np.sin(x)\n'
-            cleaned_code += 'ax.plot(x, y, "b-", linewidth=2, label="sin(x)")\n'
-            cleaned_code += 'ax.set_xlabel("X (units)", fontsize=12)\n'
-            cleaned_code += 'ax.set_ylabel("Y (units)", fontsize=12)\n'
-            cleaned_code += 'ax.set_title("Physics Graph", fontsize=14)\n'
-        
-        # Execute the code
-        exec(cleaned_code, namespace)
+            cleaned_code += 'plt.plot(x, y, "b-", linewidth=2, label="sin(x)")\n'
         
-        # Get current axis
-        ax = plt.gca()
+        # CRITICAL FIX: Ensure plt.show() is NOT in the code (Streamlit handles this)
+        cleaned_code = cleaned_code.replace('plt.show()', '')
+        cleaned_code = cleaned_code.replace('plt.show', '')
         
-        # FORCE visibility of all elements
-        # Ensure labels
-        if not ax.get_xlabel() or ax.get_xlabel() == '':
-            ax.set_xlabel('X-axis', fontsize=12)
-        if not ax.get_ylabel() or ax.get_ylabel() == '':
-            ax.set_ylabel('Y-axis', fontsize=12)
-        if not ax.get_title() or ax.get_title() == '':
-            ax.set_title('Physics Graph', fontsize=14)
+        # Add labels if missing
+        if 'plt.xlabel' not in cleaned_code:
+            cleaned_code += '\nplt.xlabel("X-axis", fontsize=12)'
+        if 'plt.ylabel' not in cleaned_code:
+            cleaned_code += '\nplt.ylabel("Y-axis", fontsize=12)'
+        if 'plt.title' not in cleaned_code:
+            cleaned_code += '\nplt.title("Physics Graph", fontsize=14)'
+        if 'plt.grid' not in cleaned_code:
+            cleaned_code += '\nplt.grid(True, linestyle="--", alpha=0.6)'
         
-        # Ensure grid is visible
-        ax.grid(True, linestyle='--', alpha=0.6, color='gray')
+        # DEBUG: Print the code being executed
+        # print("DEBUG - Executing code:\n", cleaned_code[:200])
         
-        # Ensure legend if there are labels
-        handles, labels = ax.get_legend_handles_labels()
-        if labels:
-            ax.legend()
-        
-        # Ensure there's data on the plot
-        if len(ax.lines) == 0 and len(ax.collections) == 0 and len(ax.patches) == 0:
-            # No data plotted, add sample data
-            x = np.linspace(0, 10, 100)
-            y = np.sin(x)
-            ax.plot(x, y, 'r--', linewidth=2, label='Sample: sin(x)')
-            ax.set_xlabel('X (sample)', fontsize=12)
-            ax.set_ylabel('Y (sample)', fontsize=12)
-            ax.set_title('Sample Graph (No data provided)', fontsize=14)
-            ax.legend()
-            st.warning("⚠️ No data found in graph code. Displaying sample graph.")
+        # EXECUTE THE CODE
+        exec(cleaned_code, namespace)
         
-        # Set tight layout
-        plt.tight_layout()
+        # Get current figure
+        fig = plt.gcf()
         
-        # Display the plot
+        # Display the plot IMMEDIATELY
         st.pyplot(fig)
         
         # Close the figure
         plt.close(fig)
         
+        return True
+        
     except Exception as e:
-        st.error(f"Graph Error: {str(e)[:200]}")
+        st.error(f"❌ Graph Error: {str(e)[:100]}")
         
-        # ALWAYS show a fallback plot
+        # Create a SIMPLE guaranteed plot
         try:
             fig, ax = plt.subplots(figsize=(10, 6))
-            plt.style.use('seaborn-v0_8-darkgrid')
-            
-            # Create sample physics data
-            x = np.linspace(0, 2*np.pi, 100)
-            y1 = np.sin(x)
-            y2 = np.cos(x)
-            
-            ax.plot(x, y1, 'b-', linewidth=2, label='sin(x)')
-            ax.plot(x, y2, 'r--', linewidth=2, label='cos(x)')
-            ax.set_xlabel('Angle (radians)', fontsize=12)
-            ax.set_ylabel('Value', fontsize=12)
-            ax.set_title('Trigonometric Functions (Fallback)', fontsize=14)
-            ax.grid(True, linestyle='--', alpha=0.6, color='gray')
+            x = np.linspace(0, 10, 100)
+            y = x**2  # Simple quadratic
+            ax.plot(x, y, 'b-', linewidth=2, label='y = x²')
+            ax.set_xlabel('X', fontsize=12)
+            ax.set_ylabel('Y', fontsize=12)
+            ax.set_title('Sample Graph (Code had issues)', fontsize=14)
+            ax.grid(True, linestyle='--', alpha=0.6)
             ax.legend()
-            ax.axhline(y=0, color='k', linestyle='-', alpha=0.3)
-            ax.axvline(x=0, color='k', linestyle='-', alpha=0.3)
-            
-            plt.tight_layout()
             st.pyplot(fig)
             plt.close(fig)
-            
-            st.info("Displayed fallback graph. The AI's code may need adjustment.")
+            st.warning("Displayed sample graph. The AI's code may need adjustment.")
         except:
             st.error("⚠️ Could not generate any graph.")
-
+        
+        return False
 # Display message function
 def display_message(role, content, enable_voice=False):
     """Display chat message with all features."""
@@ -355,6 +331,16 @@ When asked to create a graph, you MUST write COMPLETE, EXECUTABLE Python code th
 6. Adds grid: plt.grid(True, linestyle='--', alpha=0.6)
 7. Adds legend if needed: plt.legend()
 
+**IMPORTANT GRAPH RULES:**
+- You MUST include ACTUAL DATA in your graph code
+- Example of BAD code (won't show graph):
+  ```python
+  import matplotlib.pyplot as plt
+  plt.figure(figsize=(10, 6))
+  # Missing actual plot() command!
+  plt.show()
+
+
 **EXAMPLE OF GOOD GRAPH CODE:**
 import matplotlib.pyplot as plt
 import numpy as np