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

agentle/agents/whatsapp/models/whatsapp_webhook_payload.py

@@ -77,18 +77,69 @@ 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):
+            # This is a bit of a hack to ensure we have a structure to hold the key
+            # if we only got root level JIDs
+            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:
+            # Should we raise? For now let's just return and let validation fail if strict
             return
+            
+        # Optimization: treating @lid
+        # If the selected JID is an LID, verify if we have an ALT available
+        if "@lid" in selected_jid:
+            # If we selected a main JID that is LID, try to find an Alt
+            # candidates for alt: key.remoteJidAlt, self.remoteJidAlt
+            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
+            elif not key.remoteJidAlt and not self.remoteJidAlt:
+                 # If we have an LID but no ALT, we might be in trouble depending on the use case,
+                 # but we proceed with what we have or raise as before
+                 # The original code raised ValueError here
+                 pass
 
-        self.phone_number_id = key.remoteJid.split("@")[0]
+        self.phone_number_id = selected_jid.split("@")[0]
+        
+        # Normalize the key inside data so the rest of the app uses the "best" JID
+        self.data.key.remoteJid = selected_jid

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

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

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

@@ -165,7 +165,7 @@ agentle/agents/whatsapp/models/whatsapp_response_base.py,sha256=IIDONx9Ipt593tAZ
 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=qtLlJJ1RxHkj89bU9tFHplv9qcV_5SqIsp1GOzQFCEU,6207
 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
@@ -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.41.dist-info/METADATA,sha256=AYTLK3-J2KRaGK_AwjNjyzxsUlgOJciq4GxvsPgW2wI,86879
+agentle-0.9.41.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+agentle-0.9.41.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
+agentle-0.9.41.dist-info/RECORD,,