agentle 0.9.40__py3-none-any.whl → 0.9.42__py3-none-any.whl

agentle/agents/whatsapp/models/whatsapp_message.py

@@ -24,7 +24,7 @@ class WhatsAppMessage(BaseModel):
     metadata: dict[str, Any] = Field(default_factory=dict)
     remote_jid: str | None = Field(
         default=None,
-        description="Actual WhatsApp JID for sending messages (critical for @lid numbers)",
+        description="Actual WhatsApp JID for sending messages back to the contact",
     )
 
     @override

agentle/agents/whatsapp/models/whatsapp_webhook_payload.py

@@ -77,18 +77,59 @@ class WhatsAppWebhookPayload(BaseModel):
     ForwardedFrom: str | None = Field(default=None)  # For forwarded messages
     FrequentlyForwarded: str | None = Field(default=None)  # "true" or "false" as string
 
+    # Root level fallbacks for robust extraction
+    remoteJid: str | None = Field(default=None)
+    remoteJidAlt: str | None = Field(default=None)
+
     def model_post_init(self, context: Any, /) -> None:
-        if self.phone_number_id or not self.data:
+        if self.phone_number_id:
+            return
+
+        # Initialize data if missing but root fields are present
+        if not self.data and (self.remoteJid or self.remoteJidAlt):
+            from agentle.agents.whatsapp.models.key import Key
+            from agentle.agents.whatsapp.models.data import Data
+
+            self.data = Data(
+                key=Key(
+                    remoteJid=self.remoteJid or self.remoteJidAlt or "", fromMe=False
+                )
+            )
+
+        if not self.data:
             return
 
         key = self.data.key
-        if "@lid" in key.remoteJid:
-            remote_jid_alt = key.remoteJidAlt
-            if remote_jid_alt is None:
-                raise ValueError("No remotejidalt was provided.")
 
-            self.phone_number_id = remote_jid_alt.split("@")[0]
-            self.data.key.remoteJid = remote_jid_alt
+        # Extraction logic:
+        # 1. key.remoteJid
+        # 2. remoteJid (root)
+        # 3. key.remoteJidAlt
+        # 4. remoteJidAlt (root)
+        
+        candidates = [
+            key.remoteJid,
+            self.remoteJid,
+            key.remoteJidAlt,
+            self.remoteJidAlt,
+        ]
+
+        # Find first valid candidate
+        selected_jid = next((c for c in candidates if c), None)
+
+        if not selected_jid:
             return
 
-        self.phone_number_id = key.remoteJid.split("@")[0]
+        # Handle @lid: Evolution API sometimes sends @lid in remoteJid,
+        # but provides the correct @s.whatsapp.net format in remoteJidAlt.
+        # In this case, prefer remoteJidAlt.
+        if "@lid" in selected_jid:
+            alt_candidates = [key.remoteJidAlt, self.remoteJidAlt]
+            alt_jid = next((c for c in alt_candidates if c), None)
+            if alt_jid:
+                selected_jid = alt_jid
+
+        self.phone_number_id = selected_jid.split("@")[0]
+        
+        # Store the selected JID in data.key for downstream use
+        self.data.key.remoteJid = selected_jid

agentle/agents/whatsapp/providers/evolution/evolution_api_provider.py

@@ -752,8 +752,7 @@ class EvolutionAPIProvider(WhatsAppProvider):
             logger.debug(f"Message is quoting message ID: {quoted_message_id}")
 
         try:
-            # CRITICAL FIX: Check if there's a stored remoteJid for this contact
-            # This is essential for @lid numbers (Brazilian WhatsApp contacts)
+            # Check if there's a stored remoteJid for this contact
             session = await self.get_session(to)
             remote_jid = session.context_data.get("remote_jid") if session else None
 
@@ -1117,8 +1116,7 @@ class EvolutionAPIProvider(WhatsAppProvider):
         logger.debug(f"Sending typing indicator to {to} for {duration}s")
 
         try:
-            # CRITICAL FIX: Check if there's a stored remoteJid for this contact
-            # This is essential for @lid numbers (Brazilian WhatsApp contacts)
+            # Check if there's a stored remoteJid for this contact
             session = await self.get_session(to)
             remote_jid = session.context_data.get("remote_jid") if session else None
 
@@ -1179,8 +1177,7 @@ class EvolutionAPIProvider(WhatsAppProvider):
         logger.debug(f"Sending recording indicator to {to} for {duration}s")
 
         try:
-            # CRITICAL FIX: Check if there's a stored remoteJid for this contact
-            # This is essential for @lid numbers (Brazilian WhatsApp contacts)
+            # Check if there's a stored remoteJid for this contact
             session = await self.get_session(to)
             remote_jid = session.context_data.get("remote_jid") if session else None
 
@@ -1597,78 +1594,34 @@ class EvolutionAPIProvider(WhatsAppProvider):
         Normalize phone number to Evolution API format.
 
         Evolution API expects phone numbers in the format: countrycode+number@s.whatsapp.net
-        For Brazilian numbers, we now test with @lid format instead.
-
-        Brazilian mobile format: 55 + DDD (2 digits) + 9 + 8 digits = 13 digits total
-        Example: 5534998137839@lid
+        
+        This function:
+        - Removes any existing suffix (@s.whatsapp.net, @lid, etc.)
+        - Strips non-numeric characters
+        - Adds country code 55 if not present
+        - Appends @s.whatsapp.net suffix
+        
+        NOTE: This function does NOT modify the number itself (no '9' insertion).
+        The number is sent exactly as provided by the user/webhook.
         """
         original_phone = phone
 
-        # Remove @s.whatsapp.net or @lid suffix if present
-        if "@s.whatsapp.net" in phone:
-            phone = phone.split("@")[0]
-        elif "@lid" in phone:
+        # Remove any @ suffix if present
+        if "@" in phone:
             phone = phone.split("@")[0]
 
         # Remove non-numeric characters
         phone = "".join(c for c in phone if c.isdigit())
 
-        # Handle different input formats
+        # Add country code 55 if not present
         if not phone.startswith("55"):
-            # No country code - add it
-            if len(phone) == 11:
-                # Format: DDD (2) + 9 (1) + 8 digits = 11 digits
-                # Example: 34998137839 -> 5534998137839
-                phone = "55" + phone
-                logger.debug(
-                    f"Added country code 55 to phone: {original_phone} -> {phone}"
-                )
-            elif len(phone) == 10:
-                # Old format without the 9: DDD (2) + 8 digits = 10 digits
-                # Example: 3498137839 -> 5534998137839
-                # Insert '9' after area code (first 2 digits)
-                phone = "55" + phone[:2] + "9" + phone[2:]
-                logger.warning(
-                    f"Converted old format phone number: {original_phone} -> {phone}"
-                )
-            else:
-                # Unknown format, but add 55 anyway
-                phone = "55" + phone
-                logger.warning(
-                    f"Unknown phone format, added 55: {original_phone} -> {phone}"
-                )
-
-        # Validate Brazilian mobile format
-        if phone.startswith("55"):
-            # Should have 13 digits total: 55 + DDD (2) + 9 + 8 digits
-            if len(phone) == 12:
-                # Missing the '9' after area code
-                # Example: 553498137839 -> 5534998137839
-                # Insert '9' after 55 + DDD (after position 4)
-                phone = phone[:4] + "9" + phone[4:]
-                logger.warning(
-                    f"Fixed missing '9' in phone number: {original_phone} -> {phone}"
-                )
-            elif len(phone) != 13:
-                logger.error(
-                    f"Invalid Brazilian mobile number length: {phone} (expected 13 digits, got {len(phone)})"
-                )
-
-            # Validate that the 5th digit is '9' (mobile indicator)
-            if len(phone) >= 5 and phone[4] != "9":
-                logger.warning(
-                    f"Phone number may be invalid - 5th digit is not '9': {phone}"
-                )
+            phone = "55" + phone
+            logger.debug(
+                f"Added country code 55 to phone: {original_phone} -> {phone}"
+            )
 
-        # TESTING: Use @lid for Brazilian numbers (country code 55) instead of @s.whatsapp.net
-        if not phone.endswith("@lid") and not phone.endswith("@s.whatsapp.net"):
-            if phone.startswith("55"):
-                # Brazilian number - use @lid
-                phone = phone + "@lid"
-                logger.info(f"🧪 TESTING: Using @lid for Brazilian number: {phone}")
-            else:
-                # Non-Brazilian number - use @s.whatsapp.net
-                phone = phone + "@s.whatsapp.net"
+        # Always use @s.whatsapp.net for normal numbers
+        phone = phone + "@s.whatsapp.net"
 
         if original_phone != phone:
             logger.info(f"Phone number normalized: {original_phone} -> {phone}")

agentle/agents/whatsapp/whatsapp_bot.py

@@ -415,7 +415,7 @@ class WhatsAppBot[T_Schema: WhatsAppResponseBase = WhatsAppResponseBase](BaseMod
                     f"[MESSAGE_HANDLER] Stored custom chat_id in session: {chat_id}"
                 )
 
-            # CRITICAL FIX: Store remoteJid for @lid numbers
+            # Store remoteJid for later use when sending messages
             if message.remote_jid:
                 session.context_data["remote_jid"] = message.remote_jid
                 logger.info(
@@ -3478,12 +3478,17 @@ class WhatsAppBot[T_Schema: WhatsAppResponseBase = WhatsAppResponseBase](BaseMod
 
             logger.info("[MESSAGE_UPSERT] Parsing message from Evolution API data")
             # Parse message directly from data (which contains the message info)
+            # When remoteJid contains @lid, use remoteJidAlt which has the correct @s.whatsapp.net format
+            from_number = payload.data.key.remoteJid
+            if "@lid" in payload.data.key.remoteJid and payload.data.key.remoteJidAlt:
+                from_number = payload.data.key.remoteJidAlt
+                logger.info(
+                    f"[MESSAGE_UPSERT] 🔄 Using remoteJidAlt instead of @lid: {from_number}"
+                )
 
             message = self._parse_evolution_message_from_data(
                 data,
-                from_number=payload.data.key.remoteJidAlt or ""
-                if "@lid" in payload.data.key.remoteJid
-                else payload.data.key.remoteJid,
+                from_number=from_number,
             )
 
             if message:
@@ -3491,13 +3496,8 @@ class WhatsAppBot[T_Schema: WhatsAppResponseBase = WhatsAppResponseBase](BaseMod
                     f"[MESSAGE_UPSERT] ✅ Parsed message: {message.id} from {message.from_number}"
                 )
 
-                # CRITICAL FIX: Store the actual remoteJid for @lid numbers
-                # This is needed to send messages back to the correct WhatsApp JID
-                if "@lid" in payload.data.key.remoteJid:
-                    logger.info(
-                        f"[MESSAGE_UPSERT] 🔑 Detected @lid number. Storing remoteJid: {payload.data.key.remoteJid} for phone: {message.from_number}"
-                    )
-                    message.remote_jid = payload.data.key.remoteJid
+                # Store the remoteJid for later use when sending messages back
+                message.remote_jid = from_number
 
                 logger.info(
                     f"[MESSAGE_UPSERT] About to call handle_message with {len(self._response_callbacks)} callbacks"

{agentle-0.9.40.dist-info → agentle-0.9.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentle
-Version: 0.9.40
+Version: 0.9.42
 Summary: ...
 Author-email: Arthur Brenno <64020210+arthurbrenno@users.noreply.github.com>
 License-File: LICENSE

{agentle-0.9.40.dist-info → agentle-0.9.42.dist-info}/RECORD

@@ -137,7 +137,7 @@ agentle/agents/ui/__init__.py,sha256=IjHRV0k2DNwvFrEHebmsXiBvmITE8nQUnsR07h9tVkU
 agentle/agents/ui/streamlit.py,sha256=9afICL0cxtG1o2pWh6vH39-NdKiVfADKiXo405F2aB0,42829
 agentle/agents/whatsapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/whatsapp/human_delay_calculator.py,sha256=BGCDeoNTPsMn4d_QYmG0BWGCG8SiUJC6Fk295ulAsAk,18268
-agentle/agents/whatsapp/whatsapp_bot.py,sha256=o3fa5iSD-26CcmcMw0pzU0aS9ju1Mm9vD9ZHWwfEI9o,169964
+agentle/agents/whatsapp/whatsapp_bot.py,sha256=n3GPOI3HfahTrJyDcaNYXNSm8yKJX1xAeUXx0wG0HTw,169926
 agentle/agents/whatsapp/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/whatsapp/models/audio_message.py,sha256=af2apMWzxKcCtXfQN6U2qfOFoiwRj0nCUrKmrBD0whE,3067
 agentle/agents/whatsapp/models/context_info.py,sha256=sk80KuNE36S6VRnLh7n6UXmzZCXIB4E4lNxnRyVizg8,563
@@ -158,20 +158,20 @@ agentle/agents/whatsapp/models/whatsapp_document_message.py,sha256=ECM_hXF-3IbC9
 agentle/agents/whatsapp/models/whatsapp_image_message.py,sha256=xOAPRRSgqj9gQ2ZZOGdFWfOgtmNpE1W8mIUAmB5YTpo,314
 agentle/agents/whatsapp/models/whatsapp_location_message.py,sha256=CJCJR1DHjrN92OloNopvUteUxUxeEpHlWQSJhj6Ive4,407
 agentle/agents/whatsapp/models/whatsapp_media_message.py,sha256=xmYE0SVdL7UIJuYRWJTfCoGAd5-pyXBnueaxFaECuXg,386
-agentle/agents/whatsapp/models/whatsapp_message.py,sha256=QtGAJKOF1ykZycsNDld25gk-JUeg3uV7hNXx0ZXO0Rg,1217
+agentle/agents/whatsapp/models/whatsapp_message.py,sha256=u0HrWuK--cRNX96avYbiWkInHYYH67TOXI9XSNOS_BI,1209
 agentle/agents/whatsapp/models/whatsapp_message_status.py,sha256=jDWShdvSve5EhkgtDkh1jZmpRVNoXCokv4M6at1eSIU,214
 agentle/agents/whatsapp/models/whatsapp_message_type.py,sha256=GctIGOC1Bc_D_L0ehEmEwgxePFx0ioTEUoBlZEdxdG8,279
 agentle/agents/whatsapp/models/whatsapp_response_base.py,sha256=IIDONx9Ipt593tAZvoc8dPDUISeNH-WOpRP1x_-Q6Gk,1145
 agentle/agents/whatsapp/models/whatsapp_session.py,sha256=9G1HC-A2G9jTdpwYy3w9bnYkOGK2vvA7kdYAf32oWMU,15640
 agentle/agents/whatsapp/models/whatsapp_text_message.py,sha256=GpSwFrPC4qpQlVCWKKgYjQJKNv0qvwgYfuoD3ttLzdQ,441
 agentle/agents/whatsapp/models/whatsapp_video_message.py,sha256=-d-4hnkkxyLVNoje3a1pOEAvzWqoCLFcBn70wUpnyXY,346
-agentle/agents/whatsapp/models/whatsapp_webhook_payload.py,sha256=aY9pnUt4WJdvrRsXZIkmR8hP7oV9gdOJ1wJiYzFhU8w,4270
+agentle/agents/whatsapp/models/whatsapp_webhook_payload.py,sha256=N3ERXDcQKC6Vd5k2nlhlpP1EeYN5v5OsDkIUdeFv9U4,5562
 agentle/agents/whatsapp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/whatsapp/providers/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/whatsapp/providers/base/whatsapp_provider.py,sha256=Iaywrv0xer4fhZprMttC-NP4-rRYdU_45UzIZQ7dkYA,5349
 agentle/agents/whatsapp/providers/evolution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/whatsapp/providers/evolution/evolution_api_config.py,sha256=mc3jVJ1olnFgt7jP6P_eygvUVhN3XYSAYp1ozIxtAsc,1288
-agentle/agents/whatsapp/providers/evolution/evolution_api_provider.py,sha256=6nIItw8dwBEuWDa8lb3qaEthN4ywbSRJgYyY49EXowI,69043
+agentle/agents/whatsapp/providers/evolution/evolution_api_provider.py,sha256=QufRuXBtreBGEfSpfJz1wnQCGjifAu_N9AZUmjyFeyY,66584
 agentle/agents/whatsapp/providers/meta/__init__.py,sha256=ArZ2y9qUALahP2-c0j0ESFKmRjDHiZIurqxYC7MTWA8,1038
 agentle/agents/whatsapp/providers/meta/meta_whatsapp_config.py,sha256=ECzb76Sba0ExrO4NAB7v9HLlgAxsjyTg57mewdVt8EY,1257
 agentle/agents/whatsapp/providers/meta/meta_whatsapp_provider.py,sha256=95xvVrqp6f5Ku49fqOEHUhJUIJPGb1rRvCntoIY2JSM,35953
@@ -1018,7 +1018,7 @@ agentle/web/actions/scroll.py,sha256=WqVVAORNDK3BL1oASZBPmXJYeSVkPgAOmWA8ibYO82I
 agentle/web/actions/viewport.py,sha256=KCwm88Pri19Qc6GLHC69HsRxmdJz1gEEAODfggC_fHo,287
 agentle/web/actions/wait.py,sha256=IKEywjf-KC4ni9Gkkv4wgc7bY-hk7HwD4F-OFWlyf2w,571
 agentle/web/actions/write_text.py,sha256=9mxfHcpKs_L7BsDnJvOYHQwG8M0GWe61SRJAsKk3xQ8,748
-agentle-0.9.40.dist-info/METADATA,sha256=gPlRkCIx8kIOt4O70scPrcbgMuVbGXGLjc67cW2rQeU,86879
-agentle-0.9.40.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-agentle-0.9.40.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
-agentle-0.9.40.dist-info/RECORD,,
+agentle-0.9.42.dist-info/METADATA,sha256=d2ra_dRi9kbEYhixrDlJGsCRuC63r9iviZfgpOOsEk4,86879
+agentle-0.9.42.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+agentle-0.9.42.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
+agentle-0.9.42.dist-info/RECORD,,