Update app.py

app.py

@@ -671,8 +671,22 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
                     comparison_output = gr.Markdown()
             
             
+            # recommend_btn.click(
+            #     fn=get_recommendation_with_ai,
+            #     inputs=[user_dropdown, merchant_dropdown, category_dropdown, amount_input],
+            #     outputs=[recommendation_output, recommendation_chart]
+            # )
+            def get_recommendation_with_loading(user_id, merchant, category, amount):
+                """Wrapper to show loading state"""
+                # Show loading first
+                yield "⏳ **Loading recommendation...** Please wait...", None
+                
+                # Get actual result
+                result = get_recommendation_with_ai(user_id, merchant, category, amount)
+                yield result
+            
             recommend_btn.click(
-                fn=get_recommendation_with_ai,
+                fn=get_recommendation_with_loading,
                 inputs=[user_dropdown, merchant_dropdown, category_dropdown, amount_input],
                 outputs=[recommendation_output, recommendation_chart]
             )
@@ -839,56 +853,47 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
         def update_analytics_with_charts(user_id: str):
             """Fetch and format analytics with charts for selected user"""
             
-            # Show loading state first
-            empty_fig = create_empty_chart("⏳ Loading...")
-            loading_html = """
-            <div style="text-align: center; padding: 40px;">
-                <h2>⏳ Loading Analytics...</h2>
-                <p>Please wait while we fetch your data</p>
-            </div>
-            """
-            
-            yield (
-                loading_html,
-                empty_fig, empty_fig, empty_fig, empty_fig, empty_fig,
-                "⏳ Loading...",
-                "⏳ Loading...",
-                "⏳ Loading...",
-                "*Loading analytics...*"
-            )
-            
             try:
                 # Fetch analytics data from API
                 result = client.get_user_analytics(user_id)
                 
+                # DEBUG: Print what we received
+                print("=" * 60)
+                print(f"DEBUG: Analytics for {user_id}")
+                print(f"Success: {result.get('success')}")
+                if result.get('data'):
+                    print(f"Data keys: {result['data'].keys()}")
+                    print(f"Total spending: {result['data'].get('total_spending')}")
+                    print(f"Total rewards: {result['data'].get('total_rewards')}")
+                print("=" * 60)
+                
                 # Check if request was successful
                 if not result.get('success'):
                     error_msg = result.get('error', 'Unknown error')
-                    error_fig = create_empty_chart(f"Error: {error_msg}")
-                    yield (
+                    empty_fig = create_empty_chart(f"Error: {error_msg}")
+                    return (
                         f"<p>❌ Error: {error_msg}</p>",
-                        error_fig, error_fig, error_fig, error_fig, error_fig,
+                        empty_fig, empty_fig, empty_fig, empty_fig, empty_fig,
                         "Error loading data",
                         "Error loading data",
                         "Error loading data",
                         f"*Error: {error_msg}*"
                     )
-                    return
                 
-                # Extract the actual data
+                # ✅ Extract the actual data
                 analytics_data = result.get('data', {})
                 
+                # Verify we have data
                 if not analytics_data:
-                    error_fig = create_empty_chart("No analytics data available")
-                    yield (
+                    empty_fig = create_empty_chart("No analytics data available")
+                    return (
                         "<p>No data available</p>",
-                        error_fig, error_fig, error_fig, error_fig, error_fig,
+                        empty_fig, empty_fig, empty_fig, empty_fig, empty_fig,
                         "No data",
                         "No data",
                         "No data",
                         "*No data available*"
                     )
-                    return
                 
                 # Import chart functions
                 from utils.formatters import (
@@ -900,10 +905,10 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
                     create_card_performance_chart
                 )
                 
-                # Format text data
+                # Format text data (pass unwrapped data)
                 metrics_html, table_md, insights_md, forecast_md = format_analytics_metrics(analytics_data)
                 
-                # Generate charts
+                # Generate charts (pass unwrapped data)
                 spending_fig = create_spending_chart(analytics_data)
                 pie_fig = create_rewards_pie_chart(analytics_data)
                 gauge_fig = create_optimization_gauge(analytics_data)
@@ -914,17 +919,17 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
                 from datetime import datetime
                 status = f"*Analytics updated for {user_id} at {datetime.now().strftime('%I:%M %p')}*"
                 
-                yield (
-                    metrics_html,
-                    spending_fig,
-                    gauge_fig,
-                    pie_fig,
-                    performance_fig,
-                    trend_fig,
-                    table_md,
-                    insights_md,
-                    forecast_md,
-                    status
+                return (
+                    metrics_html,      # Metric cards
+                    spending_fig,      # Spending bar chart
+                    gauge_fig,         # Optimization gauge
+                    pie_fig,           # Rewards pie chart
+                    performance_fig,   # Card performance chart
+                    trend_fig,         # Trend line chart
+                    table_md,          # Spending table
+                    insights_md,       # Insights text
+                    forecast_md,       # Forecast text
+                    status             # Status message
                 )
                 
             except Exception as e:
@@ -934,11 +939,12 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
                 print(error_msg)
                 print(error_details)
                 
-                error_fig = create_empty_chart("Error loading chart")
+                # Return empty/error states
+                empty_fig = create_empty_chart("Error loading chart")
                 
-                yield (
+                return (
                     f"<p>{error_msg}</p>",
-                    error_fig, error_fig, error_fig, error_fig, error_fig,
+                    empty_fig, empty_fig, empty_fig, empty_fig, empty_fig,
                     "Error loading table",
                     "Error loading insights",
                     "Error loading forecast",
@@ -993,6 +999,7 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
             ]
         )
         # Tab 3: Chat (NEW!)
+        # Tab 3: Chat (NEW!)
         with gr.Tab("💬 Ask AI"):
             gr.Markdown("## Chat with RewardPilot AI")
             gr.Markdown("*Ask questions about credit cards, rewards, and your spending*")
@@ -1014,14 +1021,10 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
             )
             
             def respond(message, chat_history, user_id):
-                """Handle chat responses with error handling and loading state"""
+                """Handle chat responses with error handling"""
                 if not message.strip():
                     return "", chat_history
                 
-                # Add loading message
-                loading_history = chat_history + [(message, "⏳ Thinking...")]
-                yield "", loading_history
-                
                 # Get user context
                 user_context = {}
                 try:
@@ -1052,7 +1055,23 @@ Get AI-powered credit card recommendations that maximize your rewards based on:
                     bot_response = f"I encountered an error. Please try asking your question differently."
                 
                 chat_history.append((message, bot_response))
-                yield "", chat_history
+                return "", chat_history
+            
+            msg.submit(respond, [msg, chatbot, chat_user], [msg, chatbot])
+            send_btn.click(respond, [msg, chatbot, chat_user], [msg, chatbot])
+            
+            # ✅ RESTORED: Example questions
+            gr.Markdown("### 💡 Try asking:")
+            gr.Examples(
+                examples=[
+                    ["Which card should I use at Costco?"],
+                    ["How can I maximize my grocery rewards?"],
+                    ["What's the best travel card for international trips?"],
+                    ["Tell me about the Amex Gold card"],
+                    ["Am I close to any spending caps?"],
+                ],
+                inputs=[msg]
+            )
         # ========== Tab 3: About ==========
         with gr.Tab("ℹ️ About"):
             gr.Markdown(