Skip to content

Commit d27befb

Browse files
committed
feat(whatsapp): Improve WhatsApp webhook payload and key handling
- Add `remoteJidAlt` field to `Key` model for enhanced JID parsing - Update phone number ID extraction logic in webhook payload processing - Modify message handling to use `remoteJidAlt` for linked WhatsApp accounts - Enhance robustness of JID parsing for different WhatsApp account types
1 parent 67cdfff commit d27befb

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

agentle/agents/whatsapp/models/key.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ class Key(BaseModel):
1111
"""
1212

1313
remoteJid: str
14+
remoteJidAlt: str
1415
fromMe: bool
1516
id: str

agentle/agents/whatsapp/models/whatsapp_webhook_payload.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,5 @@ def model_post_init(self, context: Any, /) -> None:
8282
return
8383

8484
key = self.data.key
85-
if self.sender and "@lid" in key.remoteJid:
86-
self.phone_number_id = self.sender.split("@")[0]
87-
elif key.remoteJid:
88-
self.phone_number_id = key.remoteJid.split("@")[0]
85+
if "@lid" in key.remoteJid:
86+
self.phone_number_id = key.remoteJidAlt.split('@')[0]

agentle/agents/whatsapp/whatsapp_bot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2587,7 +2587,7 @@ async def _handle_message_upsert(
25872587

25882588
message = self._parse_evolution_message_from_data(
25892589
data,
2590-
from_number=cast(str, payload.sender)
2590+
from_number=payload.data.key.remoteJidAlt
25912591
if "@lid" in payload.data.key.remoteJid
25922592
else payload.data.key.remoteJid,
25932593
)

0 commit comments

Comments
 (0)