update

backend/app/main.py

@@ -480,7 +480,7 @@ async def push_to_smartlead(request: SmartleadPushRequest, db: Session = Depends
         
         # Step 1: Add leads without custom variables (chunk in batches of 50)
         batch_size = 50
-        successfully_added_leads = []  # Store leads that were successfully added
+        leads_to_update = []  # Store leads with their lead_ids for updating custom vars
         
         for i in range(0, len(leads), batch_size):
             batch = leads[i:i + batch_size]
@@ -488,9 +488,45 @@ async def push_to_smartlead(request: SmartleadPushRequest, db: Session = Depends
             lead_batch = [item["lead_data"] for item in batch]
             try:
                 response = client.add_leads_to_campaign(campaign_id, lead_batch)
-                # Store successfully added leads with their custom vars for update
-                successfully_added_leads.extend(batch)
                 added_count += len(lead_batch)
+                
+                # Parse response to extract lead_ids
+                # Smartlead API response structure may vary - try common patterns
+                if isinstance(response, dict):
+                    # Check for different response structures
+                    added_leads = response.get('added_leads') or response.get('leads') or response.get('data') or []
+                    
+                    # Map emails to lead_ids from response
+                    email_to_lead_id = {}
+                    if isinstance(added_leads, list):
+                        for lead_info in added_leads:
+                            if isinstance(lead_info, dict):
+                                lead_id = lead_info.get('lead_id') or lead_info.get('id') or lead_info.get('leadId')
+                                lead_email = lead_info.get('email') or lead_info.get('email_address')
+                                if lead_id and lead_email:
+                                    email_to_lead_id[lead_email] = lead_id
+                    
+                    # Store leads with their lead_ids for updating
+                    for item in batch:
+                        lead_email = item.get('email')
+                        lead_id = email_to_lead_id.get(lead_email)
+                        if lead_id and item.get('custom_vars'):
+                            leads_to_update.append({
+                                'lead_id': lead_id,
+                                '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
+                        for item in batch:
+                            if item.get('custom_vars'):
+                                leads_to_update.append({
+                                    'lead_id': None,  # Will try to get from email lookup
+                                    'email': item.get('email'),
+                                    'custom_vars': item['custom_vars']
+                                })
+                
             except Exception as e:
                 # Mark batch as failed
                 for item in batch:
@@ -501,19 +537,30 @@ 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
-        # Note: This may not be supported by Smartlead API, but we'll try
-        if successfully_added_leads:
-            for item in successfully_added_leads:
-                if item.get('custom_vars'):
-                    try:
-                        client.update_lead(campaign_id, item['email'], item['custom_vars'])
-                    except Exception as e:
-                        # If update fails, log but don't fail the entire operation
-                        # The lead was added successfully, just without custom variables
-                        errors.append({
-                            "email": item.get('email', 'unknown'),
-                            "error": f"Lead added but custom variables could not be set: {str(e)}"
-                        })
+        # Use lead_id from the response
+        for item in leads_to_update:
+            if item.get('lead_id'):
+                try:
+                    # Convert lead_id to int if it's a string
+                    lead_id = int(item['lead_id'])
+                    client.update_lead(campaign_id, lead_id, item['custom_vars'])
+                except (ValueError, TypeError) as e:
+                    errors.append({
+                        "email": item.get('email', 'unknown'),
+                        "error": f"Lead added but invalid lead_id: {str(e)}"
+                    })
+                except Exception as e:
+                    # If update fails, log but don't fail the entire operation
+                    errors.append({
+                        "email": item.get('email', 'unknown'),
+                        "error": f"Lead added but custom variables could not be set: {str(e)}"
+                    })
+            else:
+                # If we don't have lead_id, log an error
+                errors.append({
+                    "email": item.get('email', 'unknown'),
+                    "error": "Lead added but lead_id not found in response - cannot update custom variables"
+                })
         
         # Update run record
         run.status = 'completed'

backend/app/smartlead_client.py

@@ -165,18 +165,15 @@ class SmartleadClient:
         """Update campaign settings"""
         return self._make_request("POST", f"/campaigns/{campaign_id}/settings", settings)
     
-    def update_lead(self, campaign_id: str, lead_email: str, custom_variables: Dict) -> Dict:
+    def update_lead(self, campaign_id: str, lead_id: int, custom_variables: Dict) -> Dict:
         """Update a lead's custom variables after adding to campaign
         
-        This may use a different endpoint structure. Common patterns:
-        - PUT /campaigns/{campaign_id}/leads/{email}
-        - POST /campaigns/{campaign_id}/leads/{email}/update
-        - POST /campaigns/{campaign_id}/leads/update
+        Smartlead API requires lead_id (number) to update leads.
         """
-        # Try different endpoint patterns
+        # Try different endpoint patterns with lead_id
         endpoints = [
-            f"/campaigns/{campaign_id}/leads/{lead_email}",
-            f"/campaigns/{campaign_id}/leads/{lead_email}/update",
+            f"/campaigns/{campaign_id}/leads/{lead_id}",
+            f"/campaigns/{campaign_id}/leads/{lead_id}/update",
             f"/campaigns/{campaign_id}/leads/update"
         ]
         
@@ -186,7 +183,7 @@ class SmartleadClient:
             {"custom_variables": custom_variables},
             {"variables": custom_variables},
             {"customFields": custom_variables},
-            {"email": lead_email, **custom_variables},  # Include email with custom vars
+            {"lead_id": lead_id, **custom_variables},  # Include lead_id with custom vars
         ]
         
         last_error = None
@@ -206,7 +203,7 @@ class SmartleadClient:
                     raise
         
         # If all variations failed, raise the last error
-        raise last_error if last_error else Exception(f"Failed to update lead {lead_email}: All endpoint variations failed")
+        raise last_error if last_error else Exception(f"Failed to update lead {lead_id}: All endpoint variations failed")
     
     def build_sequences(self, steps_count: int) -> List[Dict]:
         """Build sequence templates for campaign