Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py - Enhanced Professional UI with Fixed Dropdowns
+# app.py - Updated for New Modal Backend
 import gradio as gr
 import requests
 import json
@@ -7,13 +7,15 @@ import aiohttp
 from typing import Optional
 from fpdf import FPDF
 
-# Update this to your new optimized Modal URL
-MODAL_URL = "https://devsam2898--personal-investment-strategist-fixed-web.modal.run/strategy"
-HEALTH_URL = "https://devsam2898--personal-investment-strategist-fixed-web.modal.run/health"
-TEST_URL = "https://devsam2898--personal-investment-strategist-fixed-web.modal.run/test"
+# Update these URLs to match your new Modal deployment
+MODAL_BASE_URL = "https://your-app-name--personal-investment-strategist-enhanced-web.modal.run"
+STRATEGY_URL = f"{MODAL_BASE_URL}/generate_strategy"
+HEALTH_URL = f"{MODAL_BASE_URL}/health"
+MARKET_DATA_URL = f"{MODAL_BASE_URL}/market_data"
+COUNTRY_ANALYSIS_URL = f"{MODAL_BASE_URL}/country_analysis"
 
 async def get_investment_strategy_async(age_group, income, expenses, current_assets, current_liabilities, risk_profile, goal, timeframe, country):
-    """Async version with better timeout handling and assets/liabilities support"""
+    """Updated async function for new Modal backend structure"""
     
     # Input validation
     if not all([age_group, income, expenses, risk_profile, goal, timeframe, country]):
@@ -40,29 +42,31 @@ async def get_investment_strategy_async(age_group, income, expenses, current_ass
     if expenses_val >= income_val:
         return "⚠️ **Warning**: Your expenses are equal to or exceed your income. Consider budgeting advice before investing."
 
+    # Clean country name (remove emoji flags if present)
+    clean_country = country.split(' ', 1)[-1] if '🇺🇸' in country or '🇨🇦' in country else country
+
+    # Updated payload structure to match new Modal backend
     payload = {
-        "profile": {
-            "age_group": age_group,
-            "income": income_val,
-            "expenses": expenses_val,
-            "current_assets": assets_val,
-            "current_liabilities": liabilities_val,
-            "risk_profile": risk_profile,
-            "goal": goal,
-            "timeframe": timeframe,
-            "country": country
-        }
+        "age_group": age_group,
+        "income": income_val,
+        "expenses": expenses_val,
+        "current_assets": assets_val,
+        "current_liabilities": liabilities_val,
+        "risk_profile": risk_profile,
+        "goal": goal,
+        "timeframe": timeframe,
+        "country": clean_country
     }
     
     try:
-        print(f"🚀 Sending request to: {MODAL_URL}")
+        print(f"🚀 Sending request to: {STRATEGY_URL}")
         
         # Use aiohttp for better async handling
-        timeout = aiohttp.ClientTimeout(total=150)  # 2.5 minute timeout
+        timeout = aiohttp.ClientTimeout(total=180)  # 3 minute timeout for comprehensive analysis
         
         async with aiohttp.ClientSession(timeout=timeout) as session:
             async with session.post(
-                MODAL_URL,
+                STRATEGY_URL,
                 json=payload,
                 headers={
                     'Content-Type': 'application/json',
@@ -76,12 +80,17 @@ async def get_investment_strategy_async(age_group, income, expenses, current_ass
                     result = await response.json()
                     strategy = result.get("strategy", "No strategy returned.")
                     status = result.get("status", "unknown")
+                    processing_time = result.get("processing_time", 0)
                     
-                    # Add status indicator
-                    if status == "basic":
-                        prefix = "## 📊 Your Investment Strategy (Rule-Based)\n*AI service was unavailable, using optimized rule-based strategy*\n\n"
+                    # Add enhanced status indicator
+                    if status == "success":
+                        prefix = f"## 💼 Your Comprehensive Investment Strategy\n*✨ AI-Powered Analysis Complete (Generated in {processing_time:.1f}s)*\n\n"
+                    elif status == "validation_error":
+                        return f"❌ **Validation Error**\n\n{strategy}"
+                    elif status == "llm_error":
+                        prefix = "## 📊 Your Investment Strategy (Rule-Based Fallback)\n*⚠️ AI service temporarily unavailable, using optimized rule-based strategy*\n\n"
                     else:
-                        prefix = "## 📊 Your Personalized Investment Strategy\n*Powered by AI*\n\n"
+                        prefix = "## 📊 Your Investment Strategy\n*Generated using advanced algorithms*\n\n"
                     
                     return f"{prefix}{strategy}"
                 else:
@@ -91,28 +100,29 @@ async def get_investment_strategy_async(age_group, income, expenses, current_ass
     except asyncio.TimeoutError:
         return """⏱️ **Request Timeout**
 
-The AI service is taking longer than expected. This could be due to:
-- High server load
-- Cold start (first request after idle period)
-- Network connectivity issues
+The comprehensive AI analysis is taking longer than expected. This could be due to:
+- Extensive market data collection and analysis
+- Real-time financial data processing
+- High server load or cold start
+- Complex tax calculations
 
 **What to try:**
-1. Wait 30 seconds and try again
-2. Simplify your goal description
-3. Check if the service is healthy using the 'Test Service' button"""
+1. Wait 1-2 minutes and try again
+2. Check if the service is healthy using the 'Test Service' button
+3. Simplify your goal description if very detailed"""
 
     except aiohttp.ClientError as e:
         return f"""🔌 **Connection Error**
 
-Unable to connect to the backend service.
+Unable to connect to the enhanced backend service.
 
 **Possible causes:**
-- Service is starting up (cold start)
+- Service is performing cold start (initial startup)
 - Network connectivity issues
-- Service is temporarily down
+- Enhanced features are initializing
 
 **What to try:**
-1. Wait 1-2 minutes and try again
+1. Wait 2-3 minutes and try again (cold start can take time)
 2. Check service health with 'Test Service' button
 3. Refresh the page
 
@@ -139,56 +149,90 @@ def get_investment_strategy(age_group, income, expenses, current_assets, current
         return f"❌ **Error**: {str(e)}"
 
 async def test_service_async():
-    """Test service connectivity"""
+    """Enhanced service connectivity test"""
     try:
         timeout = aiohttp.ClientTimeout(total=30)
         
         async with aiohttp.ClientSession(timeout=timeout) as session:
-            # Test health endpoint first
+            # Test health endpoint
             try:
                 async with session.get(HEALTH_URL) as response:
                     if response.status == 200:
                         health_data = await response.json()
-                        health_status = f"✅ Service is healthy\n- Status: {health_data.get('status')}\n- Timestamp: {health_data.get('timestamp')}"
+                        health_status = f"""✅ **Service is healthy**
+- Status: {health_data.get('status')}
+- Version: {health_data.get('version', 'N/A')}
+- Timestamp: {health_data.get('timestamp')}"""
                     else:
                         health_status = f"⚠️ Health check returned status {response.status}"
             except Exception as e:
                 health_status = f"❌ Health check failed: {str(e)}"
             
-            # Test strategy endpoint with sample data
+            # Test market data endpoint
             try:
-                async with session.get(TEST_URL) as response:
+                async with session.get(MARKET_DATA_URL) as response:
                     if response.status == 200:
-                        test_data = await response.json()
-                        test_status = f"✅ Test endpoint working\n- Result: {test_data.get('test_result')}"
+                        market_data = await response.json()
+                        market_status = f"""✅ **Market data service working**
+- Status: {market_data.get('status')}
+- Timestamp: {market_data.get('timestamp')}
+- Features: Real-time market data, sector analysis"""
                     else:
-                        test_status = f"⚠️ Test endpoint returned status {response.status}"
+                        market_status = f"⚠️ Market data endpoint returned status {response.status}"
             except Exception as e:
-                test_status = f"❌ Test endpoint failed: {str(e)}"
+                market_status = f"❌ Market data test failed: {str(e)}"
             
-            return f"""## 🔍 Service Status Check
+            # Test country analysis endpoint
+            try:
+                test_payload = {
+                    "country": "United States",
+                    "include_tax_calc": False
+                }
+                async with session.post(COUNTRY_ANALYSIS_URL, json=test_payload) as response:
+                    if response.status == 200:
+                        country_data = await response.json()
+                        country_status = f"""✅ **Country analysis service working**
+- Status: {country_data.get('status')}
+- Features: Tax analysis, economic data, interest rates"""
+                    else:
+                        country_status = f"⚠️ Country analysis returned status {response.status}"
+            except Exception as e:
+                country_status = f"❌ Country analysis test failed: {str(e)}"
+            
+            return f"""## 🔍 Enhanced Service Status Check
 
-**Health Check:**
+**Core Health:**
 {health_status}
 
-**Functionality Test:**
-{test_status}
+**Market Data Service:**
+{market_status}
+
+**Country Analysis Service:**
+{country_status}
 
-**Service URL:** {MODAL_URL}
+**Service Features:**
+✨ Real-time market data via Yahoo Finance
+🏦 Comprehensive tax analysis for 8+ countries  
+🤖 AI-powered strategy generation
+📊 Bullish sector and stock analysis
+🌍 Country-specific financial context
+
+**Service URL:** {MODAL_BASE_URL}
 
 *Last checked: {asyncio.get_event_loop().time()}*"""
             
     except Exception as e:
         return f"""❌ **Service Test Failed**
 
-Unable to connect to the service.
+Unable to connect to the enhanced service.
 
 Error: {str(e)}
 
 **Troubleshooting:**
 1. Check if the Modal deployment is running
-2. Verify the service URL is correct
-3. Check network connectivity"""
+2. Verify the service URL is correct: {MODAL_BASE_URL}
+3. Check network connectivity
+4. Allow extra time for cold start (enhanced features take longer to initialize)"""
 
 def test_service():
     """Sync wrapper for service test"""
@@ -200,8 +244,53 @@ def test_service():
         return result
     except Exception as e:
         return f"❌ **Test Error**: {str(e)}"
+
+async def get_market_preview_async():
+    """Get current market data preview"""
+    try:
+        timeout = aiohttp.ClientTimeout(total=30)
+        
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.get(MARKET_DATA_URL) as response:
+                if response.status == 200:
+                    market_data = await response.json()
+                    
+                    preview = "## 📊 Current Market Snapshot\n\n"
+                    
+                    # Market indices
+                    if market_data.get("market_indices"):
+                        preview += "**Major Indices:**\n"
+                        for index, data in list(market_data["market_indices"].items())[:4]:
+                            if not data.get('error'):
+                                change_emoji = "📈" if data.get('change_percent', 0) > 0 else "📉"
+                                preview += f"• {change_emoji} {index}: {data.get('current_price', 'N/A'):.2f} ({data.get('change_percent', 0):+.2f}%)\n"
+                    
+                    # Bullish sectors
+                    if market_data.get("bullish_sectors", {}).get("bullish_sectors"):
+                        preview += "\n**🚀 Top Performing Sectors:**\n"
+                        for sector in market_data["bullish_sectors"]["bullish_sectors"][:3]:
+                            preview += f"• {sector['sector']}: {sector['performance']}\n"
+                    
+                    preview += f"\n*Updated: {market_data.get('timestamp', 'Unknown')}*"
+                    return preview
+                else:
+                    return "📊 **Market data temporarily unavailable**\n\nClick 'Generate Strategy' for comprehensive analysis including current market conditions."
+    except Exception as e:
+        return "📊 **Market preview unavailable**\n\nFull market analysis will be included in your personalized strategy."
+
+def get_market_preview():
+    """Sync wrapper for market preview"""
+    try:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        result = loop.run_until_complete(get_market_preview_async())
+        loop.close()
+        return result
+    except Exception as e:
+        return "📊 **Market preview unavailable**\n\nFull analysis available in strategy generation."
     
 def generate_pdf(strategy):
+    """Generate PDF from strategy"""
     pdf = FPDF()
     pdf.add_page()
     pdf.set_font("Arial", size=12)
@@ -216,10 +305,11 @@ def generate_pdf(strategy):
     return pdf_output
 
 def download_strategy(strategy):
+    """Download strategy as PDF"""
     pdf_path = generate_pdf(strategy)
     return pdf_path
 
-# Fixed CSS - Removed problematic dropdown overrides
+# Enhanced CSS with new features
 custom_css = """
 /* Global container styling */
 .gradio-container {
@@ -283,15 +373,7 @@ custom_css = """
     z-index: 1;
 }
 
-/* Icon styling */
-.finance-icon {
-    font-size: 4rem;
-    margin-bottom: 1rem;
-    position: relative;
-    z-index: 1;
-}
-
-/* Form sections */
+/* Enhanced form sections */
 .form-section {
     background: white !important;
     border-radius: 16px !important;
@@ -317,7 +399,7 @@ custom_css = """
     gap: 0.75rem !important;
 }
 
-/* Input styling - only for textboxes and numbers, NOT dropdowns */
+/* Input styling - only for textboxes and numbers */
 input[type="text"], input[type="number"], textarea {
     border-radius: 12px !important;
     border: 2px solid #e5e7eb !important;
@@ -332,11 +414,6 @@ input[type="text"]:focus, input[type="number"]:focus, textarea:focus {
     outline: none !important;
 }
 
-/* Minimal dropdown styling - let Gradio handle the functionality */
-.gradio-dropdown {
-    margin-bottom: 1rem !important;
-}
-
 /* Button styling */
 .primary-btn {
     background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
@@ -374,6 +451,16 @@ input[type="text"]:focus, input[type="number"]:focus, textarea:focus {
     box-shadow: 0 12px 32px rgba(100, 116, 139, 0.4) !important;
 }
 
+/* Market preview styling */
+.market-preview {
+    background: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%) !important;
+    border-radius: 16px !important;
+    padding: 1.5rem !important;
+    margin: 1.5rem 0 !important;
+    border-left: 4px solid #0ea5e9 !important;
+    font-size: 0.9rem !important;
+}
+
 /* Output area styling */
 .output-area {
     background: white !important;
@@ -400,44 +487,6 @@ input[type="text"]:focus, input[type="number"]:focus, textarea:focus {
     margin-bottom: 1rem !important;
 }
 
-/* Radio button styling */
-.gradio-radio {
-    gap: 1rem !important;
-}
-
-.gradio-radio label {
-    background: white !important;
-    border: 2px solid #e5e7eb !important;
-    border-radius: 12px !important;
-    padding: 1rem !important;
-    transition: all 0.3s ease !important;
-    cursor: pointer !important;
-}
-
-.gradio-radio label:hover {
-    border-color: #667eea !important;
-    background: #f8fafc !important;
-}
-
-.gradio-radio input:checked + label {
-    border-color: #667eea !important;
-    background: linear-gradient(135deg, #667eea10, #764ba210) !important;
-    color: #1e3c72 !important;
-}
-
-/* Progress indicator */
-.loading-indicator {
-    background: linear-gradient(90deg, #667eea, #764ba2, #667eea) !important;
-    background-size: 200% 100% !important;
-    animation: gradient 2s ease infinite !important;
-}
-
-@keyframes gradient {
-    0% { background-position: 0% 50%; }
-    50% { background-position: 100% 50%; }
-    100% { background-position: 0% 50%; }
-}
-
 /* Responsive design */
 @media (max-width: 768px) {
     .finance-header h1 {
@@ -453,29 +502,12 @@ input[type="text"]:focus, input[type="number"]:focus, textarea:focus {
         padding: 1.5rem !important;
     }
 }
-
-/* Chart and finance icons */
-.finance-bg {
-    position: relative;
-    overflow: hidden;
-}
-
-.finance-bg::after {
-    content: "📈📊💰🏦💳📋";
-    position: absolute;
-    top: -20px;
-    right: -20px;
-    font-size: 6rem;
-    opacity: 0.05;
-    z-index: 0;
-    transform: rotate(12deg);
-}
 """
 
 # Create the enhanced interface
 with gr.Blocks(
     theme=gr.themes.Soft(primary_hue="blue", secondary_hue="slate"),
-    title="💼 Vittaśāstra - AI Strategist",
+    title="💼 Vittaśāstra - AI Strategist Enhanced",
     css=custom_css
 ) as interface:
     
@@ -484,10 +516,10 @@ with gr.Blocks(
         gr.HTML("""
             <div style="text-align: center; position: relative; z-index: 1;">
                 <div class="finance-icon">💼</div>
-                <h1>Vittaśāstra - AI Strategist</h1>
+                <h1>Vittaśāstra - AI Strategist Enhanced</h1>
                 <p>Professional-Grade Investment Strategy Generator</p>
                 <div style="margin-top: 1rem; font-size: 0.95rem; opacity: 0.8;">
-                    🤖 Powered by Advanced AI  •  🔒 Secure & Private  •  📊 Data-Driven Insights
+                    🤖 Enhanced AI Analysis • 📊 Real-Time Market Data • 🏦 Tax Optimization • 🔒 Secure & Private
                 </div>
             </div>
         """)
@@ -495,6 +527,13 @@ with gr.Blocks(
     with gr.Row(elem_classes="main-content"):
         with gr.Column():
             
+            # Market Preview Section
+            with gr.Group(elem_classes="market-preview"):
+                market_preview = gr.Markdown(
+                    value="📊 **Loading current market data...**",
+                    elem_id="market-preview"
+                )
+            
             # Personal Information Section
             with gr.Group(elem_classes="form-section"):
                 gr.HTML("<h3>👤 Personal Profile</h3>")
@@ -516,7 +555,6 @@ with gr.Blocks(
                         show_label=True
                     )
 
-            
             # Financial Information Section
             with gr.Group(elem_classes="form-section"):
                 gr.HTML("<h3>💰 Financial Overview</h3>")
@@ -553,7 +591,8 @@ with gr.Blocks(
                 gr.HTML("""
                     <div style="background: linear-gradient(90deg, #10b981, #059669); color: white; 
                                padding: 1rem; border-radius: 8px; margin-top: 1rem; font-size: 0.9rem;">
-                        💡 <strong>Quick Tip:</strong> A healthy savings rate is typically 20% or more of your income. Consider your net worth (assets - liabilities) for better strategy planning.
+                        💡 <strong>Enhanced Analysis:</strong> The new system provides comprehensive tax optimization, 
+                        real-time market data, and personalized asset allocation based on your complete financial profile.
                     </div>
                 """)
             
@@ -586,82 +625,70 @@ with gr.Blocks(
             with gr.Row():
                 with gr.Column(scale=3):
                     submit_btn = gr.Button(
-                        "🚀 Generate My Investment Strategy", 
+                        "🚀 Generate Enhanced Investment Strategy", 
                         variant="primary",
                         size="lg",
                         elem_classes="primary-btn"
                     )
                 with gr.Column(scale=1):
                     test_btn = gr.Button(
-                        "🔍 Test Service", 
+                        "🔍 Test Enhanced Service", 
+                        variant="secondary",
+                        size="lg",
+                        elem_classes="secondary-btn"
+                    )
+                with gr.Column(scale=1):
+                    market_btn = gr.Button(
+                        "📊 Refresh Market Data", 
                         variant="secondary",
                         size="lg",
                         elem_classes="secondary-btn"
                     )
             
-            # Tips Section
+            # Enhanced Tips Section
             with gr.Group(elem_classes="tips-section"):
                 gr.HTML("""
-                    <h4>💡 Pro Tips for Better Results</h4>
-                    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); gap: 1rem; margin-top: 1rem;">
+                    <h4>✨ Enhanced Features & Pro Tips</h4>
+                    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 1rem; margin-top: 1rem;">
                         <div style="display: flex; align-items: start; gap: 0.5rem;">
-                            <span style="color: #10b981; font-size: 1.2rem;">✓</span>
-                            <span><strong>Be Specific:</strong> Detailed goals lead to better recommendations</span>
+                            <span style="color: #10b981; font-size: 1.2rem;">📊</span>
+                            <span><strong>Real-Time Market Data:</strong> Live analysis of market conditions and sector performance</span>
                         </div>
                         <div style="display: flex; align-items: start; gap: 0.5rem;">
-                            <span style="color: #10b981; font-size: 1.2rem;">✓</span>
-                            <span><strong>Realistic Timeline:</strong> Match your goals with appropriate timeframes</span>
+                            <span style="color: #10b981; font-size: 1.2rem;">🏦</span>
+                            <span><strong>Tax Optimization:</strong> Country-specific tax strategies and account recommendations</span>
                         </div>
                         <div style="display: flex; align-items: start; gap: 0.5rem;">
-                            <span style="color: #10b981; font-size: 1.2rem;">✓</span>
-                            <span><strong>Know Your Risk:</strong> Be honest about your comfort level</span>
+                            <span style="color: #10b981; font-size: 1.2rem;">🤖</span>
+                            <span><strong>AI-Powered Analysis:</strong> Advanced algorithms for personalized recommendations</span>
                         </div>
                         <div style="display: flex; align-items: start; gap: 0.5rem;">
-                            <span style="color: #10b981; font-size: 1.2rem;">✓</span>
-                            <span><strong>Include Assets & Debts:</strong> Complete financial picture enables better advice</span>
+                            <span style="color: #10b981; font-size: 1.2rem;">💎</span>
+                            <span><strong>Complete Financial Picture:</strong> Assets, liabilities, and cash flow analysis</span>
                         </div>
                     </div>
                 """)
             
             # Output Section
-            # with gr.Group(elem_classes="output-area"):
-            #     output = gr.Markdown(
-            #         value="""
-            #         ## 🎯 Ready to Get Started?
-                    
-            #         Fill out your each and every financial profile above and click **"Generate My Investment Strategy"** to receive:
-                    
-            #         📋 **Personalized Investment Plan**  
-            #         📊 **Asset Allocation Recommendations**  
-            #         🏦 **Account Type Suggestions**  
-            #         💡 **Tax Optimization Strategies**  
-            #         📈 **Risk Management Advice**  
-            #         💳 **Debt Management Guidance**  
-                    
-            #         *Your data is processed securely and never stored permanently.*
-            #         """,
-            #         elem_id="strategy-output"
-            #     )
             with gr.Group(elem_classes="output-area"):
                 output = gr.Markdown(
                     value="""
-                    ## 🎯 Ready to Get Started?
+                    ## 🎯 Ready for Enhanced Analysis?
 
-                    Fill out your each and every financial profile above and click **"Generate My Investment Strategy"** to receive:
+                    The enhanced system provides:
 
-                    📋 **Personalized Investment Plan**
-                    📊 **Asset Allocation Recommendations**
-                    🏦 **Account Type Suggestions**
-                    💡 **Tax Optimization Strategies**
-                    📈 **Risk Management Advice**
-                    💳 **Debt Management Guidance**
+                    📊 **Real-Time Market Analysis** - Current indices, sector performance, bullish stocks
+                    🏦 **Comprehensive Tax Optimization** - Country-specific strategies and calculations  
+                    💼 **Professional Asset Allocation** - Based on your complete financial profile
+                    📈 **Advanced Risk Management** - Tailored to your risk tolerance and timeline
+                    🌍 **Global Financial Context** - Economic indicators and country-specific advice
+                    💡 **Implementation Roadmap** - Step-by-step action plan
 
-                    *Your data is processed securely and never stored permanently.*
+                    *Enhanced with real-time data processing and comprehensive financial analysis.*
                     """,
                     elem_id="strategy-output"
                 )
                 download_btn = gr.Button("📥 Download Strategy as PDF", variant="secondary", elem_classes="secondary-btn")
-
     
     # Event handlers
     submit_btn.click(
@@ -676,11 +703,23 @@ with gr.Blocks(
         outputs=output,
         show_progress=True
     )
+    
+    market_btn.click(
+        fn=get_market_preview,
+        outputs=market_preview,
+        show_progress=True
+    )
 
     download_btn.click(
-    fn=download_strategy,
-    inputs=output,
-    outputs=gr.File(label="Download PDF")
+        fn=download_strategy,
+        inputs=output,
+        outputs=gr.File(label="Download PDF")
+    )
+    
+    # Load market data on startup
+    interface.load(
+        fn=get_market_preview,
+        outputs=market_preview
     )
 
 if __name__ == "__main__":