update

backend/app/main.py

@@ -516,9 +516,8 @@ async def push_to_smartlead(request: SmartleadPushRequest, db: Session = Depends
                                 'email': lead_email,
                                 'custom_vars': item['custom_vars']
                             })
-                    # If response doesn't have lead_ids, try to match by email order
-                    if not email_to_lead_id and len(batch) == len(lead_batch):
-                        # Store with email for now - we'll try to get lead_id another way
+                    # If response doesn't have lead_ids, store with email for later lookup
+                    if not email_to_lead_id:
                         for item in batch:
                             if item.get('custom_vars'):
                                 leads_to_update.append({
@@ -537,7 +536,21 @@ async def push_to_smartlead(request: SmartleadPushRequest, db: Session = Depends
                     failed_count += 1
         
         # Step 2: Try to update each successfully added lead with custom variables
-        # Use lead_id from the response
+        # First, fetch lead_id for any leads that don't have it
+        for item in leads_to_update:
+            if not item.get('lead_id'):
+                # Try to fetch lead_id by email
+                try:
+                    lead_info = client.get_lead_by_email(campaign_id, item['email'])
+                    if lead_info:
+                        lead_id = lead_info.get('lead_id') or lead_info.get('id') or lead_info.get('leadId')
+                        if lead_id:
+                            item['lead_id'] = lead_id
+                except Exception as e:
+                    # If we can't fetch lead_id, we'll skip updating this lead
+                    pass
+        
+        # Now update leads with custom variables
         for item in leads_to_update:
             if item.get('lead_id'):
                 try:
@@ -556,10 +569,10 @@ async def push_to_smartlead(request: SmartleadPushRequest, db: Session = Depends
                         "error": f"Lead added but custom variables could not be set: {str(e)}"
                     })
             else:
-                # If we don't have lead_id, log an error
+                # If we still don't have lead_id after trying to fetch it, log an error
                 errors.append({
                     "email": item.get('email', 'unknown'),
-                    "error": "Lead added but lead_id not found in response - cannot update custom variables"
+                    "error": "Lead added but lead_id not found - cannot update custom variables. You may need to set them manually in Smartlead UI."
                 })
         
         # Update run record

backend/app/smartlead_client.py

@@ -161,6 +161,44 @@ class SmartleadClient:
         }
         return self._make_request("POST", f"/campaigns/{campaign_id}/leads", data)
     
+    def get_lead_by_email(self, campaign_id: str, email: str) -> Optional[Dict]:
+        """Get lead information by email address
+        
+        This may use different endpoint patterns:
+        - GET /campaigns/{campaign_id}/leads?email={email}
+        - GET /campaigns/{campaign_id}/leads/{email}
+        """
+        endpoints = [
+            f"/campaigns/{campaign_id}/leads?email={email}",
+            f"/campaigns/{campaign_id}/leads",
+        ]
+        
+        for endpoint in endpoints:
+            try:
+                response = self._make_request("GET", endpoint)
+                # Response might be a list of leads or a single lead
+                if isinstance(response, list):
+                    for lead in response:
+                        if lead.get('email') == email or lead.get('email_address') == email:
+                            return lead
+                elif isinstance(response, dict):
+                    if response.get('email') == email or response.get('email_address') == email:
+                        return response
+                    # Check if response has a 'leads' or 'data' array
+                    leads_list = response.get('leads') or response.get('data') or []
+                    for lead in leads_list:
+                        if lead.get('email') == email or lead.get('email_address') == email:
+                            return lead
+                return None
+            except Exception as e:
+                # If 404 or other error, try next endpoint
+                if "404" in str(e):
+                    continue
+                # For other errors, log and continue
+                continue
+        
+        return None
+    
     def update_campaign_settings(self, campaign_id: str, settings: Dict) -> Dict:
         """Update campaign settings"""
         return self._make_request("POST", f"/campaigns/{campaign_id}/settings", settings)