Update app.py

app.py

@@ -3177,6 +3177,7 @@ with gr.Blocks(
                 # Define fallback alternatives by category
                 category_alternatives = {
                     "Wholesale Club": [
+                        {"card": "Costco Anywhere Visa", "rewards": amount * 0.02, "rate": "2% cashback", "note": "Best for Costco purchases"},
                         {"card": "Citi Double Cash", "rewards": amount * 0.02, "rate": "2% cashback", "note": "Works everywhere"},
                         {"card": "Chase Freedom Unlimited", "rewards": amount * 0.015, "rate": "1.5% cashback", "note": "Good backup option"},
                         {"card": "Capital One Quicksilver", "rewards": amount * 0.015, "rate": "1.5% cashback", "note": "No annual fee"}
@@ -3184,17 +3185,20 @@ with gr.Blocks(
                     "Grocery Store": [
                         {"card": "Amex Gold", "rewards": amount * 0.04, "rate": "4x points", "note": "Best for U.S. supermarkets"},
                         {"card": "Citi Custom Cash", "rewards": amount * 0.05, "rate": "5% cashback", "note": "Up to $500/month"},
-                        {"card": "Chase Freedom Flex", "rewards": amount * 0.05, "rate": "5% rotating", "note": "When groceries are bonus category"}
+                        {"card": "Chase Freedom Flex", "rewards": amount * 0.05, "rate": "5% rotating", "note": "When groceries are bonus category"},
+                        {"card": "Citi Double Cash", "rewards": amount * 0.02, "rate": "2% cashback", "note": "Universal fallback"}
                     ],
                     "Restaurant": [
                         {"card": "Amex Gold", "rewards": amount * 0.04, "rate": "4x points", "note": "Worldwide dining"},
                         {"card": "Chase Sapphire Reserve", "rewards": amount * 0.03, "rate": "3x points", "note": "Premium travel card"},
-                        {"card": "Capital One Savor", "rewards": amount * 0.04, "rate": "4% cashback", "note": "Dining specialist"}
+                        {"card": "Capital One Savor", "rewards": amount * 0.04, "rate": "4% cashback", "note": "Dining specialist"},
+                        {"card": "Citi Double Cash", "rewards": amount * 0.02, "rate": "2% cashback", "note": "Universal fallback"}
                     ],
                     "Gas Station": [
                         {"card": "Costco Anywhere Visa", "rewards": amount * 0.04, "rate": "4% cashback", "note": "Best for gas"},
                         {"card": "Citi Custom Cash", "rewards": amount * 0.05, "rate": "5% cashback", "note": "Up to $500/month"},
-                        {"card": "Chase Freedom Unlimited", "rewards": amount * 0.015, "rate": "1.5% cashback", "note": "Baseline option"}
+                        {"card": "Chase Freedom Unlimited", "rewards": amount * 0.015, "rate": "1.5% cashback", "note": "Baseline option"},
+                        {"card": "Citi Double Cash", "rewards": amount * 0.02, "rate": "2% cashback", "note": "Universal fallback"}
                     ],
                     "Department Store": [
                         {"card": "Target RedCard", "rewards": amount * 0.05, "rate": "5% off", "note": "At Target only"},
@@ -3220,11 +3224,19 @@ with gr.Blocks(
                     {"card": "Capital One Quicksilver", "rewards": amount * 0.015, "rate": "1.5% cashback", "note": "Simple cashback"}
                 ])
                 
-                # Filter out the primary card if it's in alternatives
-                primary_lower = primary_card.lower()
-                alternatives = [alt for alt in alternatives if primary_lower not in alt['card'].lower()]
+                # ✅ IMPROVED FILTER: Normalize card names for comparison
+                primary_normalized = primary_card.lower().replace('_', ' ').replace('-', ' ').strip()
                 
-                return alternatives[:3]  # Return top 3
+                filtered_alternatives = []
+                for alt in alternatives:
+                    alt_normalized = alt['card'].lower().replace('_', ' ').replace('-', ' ').strip()
+                    
+                    # Check if this alternative matches the primary card
+                    if primary_normalized not in alt_normalized and alt_normalized not in primary_normalized:
+                        filtered_alternatives.append(alt)
+                
+                # Return top 3 unique alternatives
+                return filtered_alternatives[:3]
             
             def analyze_receipt_with_vision(image_path, user_id):
                 """Extract transaction data from receipt using GPT-4 Vision"""
@@ -3308,29 +3320,29 @@ with gr.Blocks(
                     }
                     
                     mcc = category_to_mcc.get(category, "5999")
+                    amount = float(receipt_data['amount'])
                     
-                    print(f"📊 Receipt: {receipt_data['merchant']} | {category} | MCC {mcc} | ${receipt_data['amount']:.2f}")
+                    print(f"📊 Receipt: {receipt_data['merchant']} | {category} | MCC {mcc} | ${amount:.2f}")
                     
                     # Get primary recommendation
                     rec_result = client.get_recommendation(
                         user_id=user_id,
                         merchant=receipt_data['merchant'],
                         category=category,
-                        amount=float(receipt_data['amount']),
+                        amount=amount,
                         mcc=mcc
                     )
                     
                     if rec_result.get('success'):
                         data = normalize_recommendation_data(rec_result.get('data', {}))
                         
-                        # ✅ FIX: Generate alternatives if not provided
+                        # Generate alternatives
                         alternatives = data.get('alternatives', [])
                         
                         if not alternatives or len(alternatives) < 2:
-                            # Manually create alternatives based on category
                             alternatives = generate_card_alternatives(
                                 category=category,
-                                amount=float(receipt_data['amount']),
+                                amount=amount,
                                 primary_card=data['recommended_card']
                             )
                         
@@ -3341,7 +3353,9 @@ with gr.Blocks(
                         if "costco" in merchant_lower:
                             context_note = """
 ---
+
 ### 💡 Costco Shopping Tip
+
 **Accepted Payment:** Costco only accepts **Visa cards** at warehouse locations. Amex and Mastercard are not accepted.
 
 **Best Card:** Costco Anywhere Visa Card offers **2% cashback** at Costco and Costco.com.
@@ -3351,7 +3365,9 @@ with gr.Blocks(
                         elif "whole foods" in merchant_lower or "amazon" in merchant_lower:
                             context_note = """
 ---
+
 ### 💡 Whole Foods Tip
+
 **Amazon Prime Members:** Get an extra **10% off** sale items at Whole Foods with Prime membership.
 
 **Best Card:** Amazon Prime Visa offers **5% cashback** at Whole Foods for Prime members.
@@ -3359,12 +3375,28 @@ with gr.Blocks(
 ---
 """
                         
+                        # ✅ FORMAT REASONING INTO BULLET POINTS
+                        reasoning = data.get('reasoning', '')
+                        
+                        # Split reasoning into sentences and format as bullets
+                        reasoning_bullets = []
+                        if reasoning:
+                            # Split by periods, but keep sentences together
+                            sentences = re.split(r'(?<=[.!?])\s+', reasoning)
+                            for sentence in sentences:
+                                sentence = sentence.strip()
+                                if sentence and len(sentence) > 10:  # Ignore very short fragments
+                                    reasoning_bullets.append(f"  - {sentence}")
+                        
+                        reasoning_formatted = "\n".join(reasoning_bullets) if reasoning_bullets else f"  - {reasoning}"
+                        
                         # Build output
                         output = f"""## 📸 Receipt Analysis
             
 ### 🧾 Extracted Information
+
 - **Merchant:** {receipt_data['merchant']}
-- **Amount:** ${receipt_data['amount']:.2f}
+- **Amount:** ${amount:.2f}
 - **Date:** {receipt_data['date']}
 - **Category:** {receipt_data['category']}
 
@@ -3373,35 +3405,38 @@ with gr.Blocks(
                         for item in receipt_data.get('items', []):
                             output += f"- {item}\n"
                         
-                        output += f"\n{context_note}\n"
+                        output += context_note
                         
                         output += f"""
+            
 ### 💳 Best Card for This Purchase
 
 **🏆 {data['recommended_card']}**
 
 - **Rewards Earned:** ${data['rewards_earned']:.2f}
 - **Rewards Rate:** {data['rewards_rate']}
-- **Reasoning:** {data['reasoning']}
-- **Annual Potential:** ${data['annual_potential']:.2f}/year (based on similar spending)
+- **Annual Potential:** ${data['annual_potential']:.2f}/year
+
+**Why This Card:**
+{reasoning_formatted}
 
 """
                         
-                        # ✅ Always show alternatives
+                        # Show alternatives
                         if alternatives and len(alternatives) > 0:
-                            output += """
-### 🔄 Other Card Options
-
-"""
-                            for i, alt in enumerate(alternatives[:3], 1):
+                            output += """### 🔄 Other Card Options
+            
+            """
+                            for i, alt in enumerate(alternatives, 1):
                                 card_name = alt.get('card', 'Unknown Card')
                                 rewards = alt.get('rewards', 0)
                                 rate = alt.get('rate', '0%')
+                                note = alt.get('note', '')
                                 
-                                output += f"{i}. **{card_name}**\n"
+                                output += f"**{i}. {card_name}**\n"
                                 output += f"   - Rewards: ${rewards:.2f} ({rate})\n"
-                                if 'note' in alt:
-                                    output += f"   - Note: {alt['note']}\n"
+                                if note:
+                                    output += f"   - {note}\n"
                                 output += "\n"
                         
                         # Add warnings