Updated app.py

app.py

@@ -11,24 +11,19 @@ MODAL_URL = "https://devsam2898--personal-investment-strategist-optimized-web.mo
 HEALTH_URL = "https://devsam2898--personal-investment-strategist-optimized-web.modal.run/health"
 TEST_URL = "https://devsam2898--personal-investment-strategist-optimized-web.modal.run/test"
 
-async def get_investment_strategy_async(age_group, income, expenses, risk_profile, goal, timeframe, country):
-    """Async version with better timeout handling"""
+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"""
     
     # Input validation
     if not all([age_group, income, expenses, risk_profile, goal, timeframe, country]):
         return "❌ Please fill in all fields to get a personalized strategy."
     
-    # Convert income and expenses to numbers
-    # app.py - inside get_investment_strategy_async function
-
+    # Convert income, expenses, assets, and liabilities to numbers
     try:
         income_val = float(str(income).replace('$', '').replace(',', '')) if income else 0
         expenses_val = float(str(expenses).replace('$', '').replace(',', '')) if expenses else 0
-        
-        # Handle current_assets and current_liabilities
-        assets_val = float(current_assets) if current_assets is not None and str(current_assets).strip() != "" else 0.0
-        liabilities_val = float(current_liabilities) if current_liabilities is not None and str(current_liabilities).strip() != "" else 0.0
-
+        assets_val = float(str(current_assets).replace('$', '').replace(',', '')) if current_assets else 0
+        liabilities_val = float(str(current_liabilities).replace('$', '').replace(',', '')) if current_liabilities else 0
     except ValueError:
         return "❌ Please enter valid numbers for income, expenses, assets, and liabilities."
     
@@ -37,6 +32,10 @@ async def get_investment_strategy_async(age_group, income, expenses, risk_profil
         return "❌ Income must be greater than 0."
     if expenses_val < 0:
         return "❌ Expenses cannot be negative."
+    if assets_val < 0:
+        return "❌ Assets cannot be negative."
+    if liabilities_val < 0:
+        return "❌ Liabilities cannot be negative."
     if expenses_val >= income_val:
         return "⚠️ **Warning**: Your expenses are equal to or exceed your income. Consider budgeting advice before investing."
 
@@ -45,17 +44,17 @@ async def get_investment_strategy_async(age_group, income, expenses, risk_profil
             "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,
-            "current_assets": assets_val,
-            "current_liabilities": liabilities_val  # Placeholder, can be extended later
+            "country": country
         }
     }
     
     try:
-        print(f"Sending request to: {MODAL_URL}")
+        print(f"🚀 Sending request to: {MODAL_URL}")
         
         # Use aiohttp for better async handling
         timeout = aiohttp.ClientTimeout(total=150)  # 2.5 minute timeout
@@ -125,13 +124,13 @@ An unexpected error occurred: {str(e)}
 
 Please try again or contact support if the issue persists."""
 
-def get_investment_strategy(age_group, income, expenses, risk_profile, goal, timeframe, country):
+def get_investment_strategy(age_group, income, expenses, current_assets, current_liabilities, risk_profile, goal, timeframe, country):
     """Sync wrapper for async function"""
     try:
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
         result = loop.run_until_complete(
-            get_investment_strategy_async(age_group, income, expenses, risk_profile, goal, timeframe, country)
+            get_investment_strategy_async(age_group, income, expenses, current_assets, current_liabilities, risk_profile, goal, timeframe, country)
         )
         loop.close()
         return result
@@ -397,7 +396,7 @@ custom_css = """
 }
 
 .tips-section h4 {
-    color: #1e3c72 !important;
+    color: #ffffff !important;
     font-weight: 700 !important;
     margin-bottom: 1rem !important;
 }
@@ -511,17 +510,18 @@ with gr.Blocks(
                     
                     country = gr.Dropdown(
                         choices=[
-                            "🇺🇸 United States", "🇨🇦 Canada", "🇬🇧 United Kingdom", 
-                            "🇩🇪 Germany", "🇫🇷 France", "🇮🇹 Italy", "🇯🇵 Japan", "🇮🇳 India"
+                            "United States", "Canada", "United Kingdom", 
+                            "Germany", "France", "Italy", "Japan", "India"
                         ],
                         label="🌍 Country of Residence",
-                        value="🇺🇸 United States",
+                        value="United States",
                         info="Tax jurisdiction for investment recommendations"
                     )
             
             # Financial Information Section
             with gr.Group(elem_classes="form-section"):
                 gr.HTML("<h3>💰 Financial Overview</h3>")
+                
                 with gr.Row():
                     income = gr.Number(
                         label="💵 Monthly Income ($)", 
@@ -535,25 +535,26 @@ with gr.Blocks(
                         minimum=0,
                         info="Total monthly living expenses and obligations"
                     )
+                
                 with gr.Row():
                     current_assets = gr.Number(
-                        label="🏦 Current Assets ($)",
-                        value=20000,
+                        label="💎 Current Assets ($)", 
+                        value=25000,
                         minimum=0,
-                        info="Cash, investments, savings, etc."
+                        info="Total value of current investments, savings, property, etc."
                     )
                     current_liabilities = gr.Number(
-                        label="🧾 Current Liabilities ($)",
-                        value=15000,
+                        label="💳 Current Liabilities ($)", 
+                        value=10000,
                         minimum=0,
-                        info="Debt, loans, credit card balances"
+                        info="Total debt including credit cards, loans, mortgages, etc."
                     )
                 
                 # Financial health indicator
                 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
+                        💡 <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.
                     </div>
                 """)
             
@@ -562,9 +563,9 @@ with gr.Blocks(
                 gr.HTML("<h3>🎯 Investment Strategy</h3>")
                 
                 risk_profile = gr.Radio(
-                    choices=["🛡️ Conservative", "⚖️ Moderate", "🚀 Aggressive"], 
+                    choices=["Conservative", "Moderate", "Aggressive"], 
                     label="📊 Risk Tolerance",
-                    value="⚖️ Moderate",
+                    value="Moderate",
                     info="How comfortable are you with potential investment losses?"
                 )
                 
@@ -618,7 +619,7 @@ with gr.Blocks(
                         </div>
                         <div style="display: flex; align-items: start; gap: 0.5rem;">
                             <span style="color: #10b981; font-size: 1.2rem;">✓</span>
-                            <span><strong>Positive Cash Flow:</strong> Ensure income exceeds expenses</span>
+                            <span><strong>Include Assets & Debts:</strong> Complete financial picture enables better advice</span>
                         </div>
                     </div>
                 """)
@@ -636,6 +637,7 @@ with gr.Blocks(
                     🏦 **Account Type Suggestions**  
                     💡 **Tax Optimization Strategies**  
                     📈 **Risk Management Advice**  
+                    💳 **Debt Management Guidance**  
                     
                     *Your data is processed securely and never stored permanently.*
                     """,
@@ -645,7 +647,7 @@ with gr.Blocks(
     # Event handlers
     submit_btn.click(
         fn=get_investment_strategy,
-        inputs=[age_group, income, expenses, risk_profile, goal, timeframe, country],
+        inputs=[age_group, income, expenses, current_assets, current_liabilities, risk_profile, goal, timeframe, country],
         outputs=output,
         show_progress=True
     )