fix (tasks): fix to triggered task webhook processing for gmail and gcal

Author: Kabeer2004

src/server/main/integrations/routes.py

@@ -406,6 +406,7 @@ async def finalize_composio_connection(
         if isinstance(e, TimeoutError) or "timed out" in str(e).lower():
             raise HTTPException(status_code=408, detail="Connection verification timed out. Please try again.")
         raise HTTPException(status_code=500, detail=str(e))
+
 @router.post("/composio/webhook", summary="Webhook receiver for Composio triggers", include_in_schema=False)
 async def composio_webhook(request: Request):
     """
@@ -422,12 +423,12 @@ async def composio_webhook(request: Request):
             raise HTTPException(status_code=400, detail="Missing required fields in webhook payload.")
 
         service_name_map = {
-            "GOOGLECALENDAR_NEW_OR_UPDATED_EVENT": "gcalendar",
-            "GMAIL_NEW_EMAIL": "gmail"
+            "GOOGLECALENDAR_GOOGLE_CALENDAR_EVENT_SYNC_TRIGGER": "gcalendar",
+            "GMAIL_NEW_GMAIL_MESSAGE": "gmail"
         }
         event_type_map = {
-            "GOOGLECALENDAR_NEW_OR_UPDATED_EVENT": "new_event",
-            "GMAIL_NEW_EMAIL": "new_email"
+            "GOOGLECALENDAR_GOOGLE_CALENDAR_EVENT_SYNC_TRIGGER": "new_event",
+            "GMAIL_NEW_GMAIL_MESSAGE": "new_email"
         }
 
         service_name = service_name_map.get(trigger_slug)

src/server/workers/proactive/utils.py

@@ -22,10 +22,11 @@ def event_pre_filter(event_data: Dict[str, Any], event_type: str, user_email: Op
     """
     if event_type == "gmail":
         headers = {h['name'].lower(): h['value'] for h in event_data.get('payload', {}).get('headers', [])}
-        subject = event_data.get("subject", "").lower()
-        snippet = event_data.get("snippet", "").lower()
-        body = event_data.get("body", "").lower()
-        content_to_check = f"{subject} {snippet}"
+        subject = event_data.get("subject", "")
+        # Use the correct keys from the Composio payload
+        snippet = event_data.get("preview", {}).get("body", "")
+        body = event_data.get("message_text", "")
+        content_to_check = f"{subject} {snippet}".lower()
 
         # Filter 1: Auto-replies (e.g., out-of-office)
         if headers.get("auto-submitted") == "auto-replied":
@@ -67,9 +68,11 @@ def event_pre_filter(event_data: Dict[str, Any], event_type: str, user_email: Op
             return False
 
         # Filter 2: Events created by the user themselves
-        if event_data.get("organizer", {}).get("self"):
-            logger.info(f"GCal pre-filter: Discarding event created by the user. Summary: {summary}")
-            return False
+        # Composio payload provides organizer_email. Compare it with the user's email.
+        organizer_email = event_data.get("organizer_email", "").lower()
+        if user_email and organizer_email == user_email.lower():
+             logger.info(f"GCal pre-filter: Discarding event created by the user. Summary: {summary}")
+             return False
 
         # Filter 3: Events the user has already declined
         if user_email:

src/server/workers/tasks.py

@@ -690,11 +690,16 @@ def _evaluate(condition: Any, data: Dict[str, Any]) -> bool:
 
         # If no logical operators, it's an implicit AND of field conditions
         for field, query in condition.items():
-            event_value = data.get(field)
+            event_value = None
+            # Special remapping for gmail 'from' filter to match Composio's 'sender' field
+            if field == 'from' and source == 'gmail':
+                event_value = data.get('sender')
+            else:
+                event_value = data.get(field)
 
             # Special handling for 'from' field
             if field == 'from' and source == 'gmail' and isinstance(event_value, str):
-                event_value = _extract_email(event_value)
+                event_value = _extract_email(event_value) # This will now work correctly
 
             if isinstance(query, dict): # Field has operators like {$contains: ...}
                 for op, op_val in query.items():