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

agentle/agents/whatsapp/models/whatsapp_bot_config.py

@@ -98,7 +98,13 @@ class WhatsAppBotConfig(BaseModel):
         description="Default error message",
     )
     welcome_message: str | None = Field(
-        default=None, description="Message to send on first interaction"
+        default=None, description="Message to send on first interaction (or caption if welcome image is set)"
+    )
+    welcome_image_url: str | None = Field(
+        default=None, description="URL of welcome image to send on first interaction"
+    )
+    welcome_image_base64: str | None = Field(
+        default=None, description="Base64-encoded welcome image to send on first interaction (alternative to welcome_image_url)"
     )
 
     # === Message Batching (Simplified) ===
@@ -257,6 +263,8 @@ class WhatsAppBotConfig(BaseModel):
         max_split_messages: int | None = None,
         error_message: str | None = None,
         welcome_message: str | None = None,
+        welcome_image_url: str | None = None,
+        welcome_image_base64: str | None = None,
         # Message Batching
         enable_message_batching: bool | None = None,
         batch_delay_seconds: float | None = None,
@@ -366,6 +374,10 @@ class WhatsAppBotConfig(BaseModel):
             overrides["error_message"] = error_message
         if welcome_message is not None:
             overrides["welcome_message"] = welcome_message
+        if welcome_image_url is not None:
+            overrides["welcome_image_url"] = welcome_image_url
+        if welcome_image_base64 is not None:
+            overrides["welcome_image_base64"] = welcome_image_base64
 
         # Message Batching
         if enable_message_batching is not None:

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/agents/whatsapp/providers/evolution/evolution_api_provider.py

@@ -1597,15 +1597,18 @@ 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@s.whatsapp.net
+        Example: 5534998137839@lid
         """
         original_phone = phone
 
-        # Remove @s.whatsapp.net suffix if present
+        # Remove @s.whatsapp.net or @lid suffix if present
         if "@s.whatsapp.net" in phone:
             phone = phone.split("@")[0]
+        elif "@lid" in phone:
+            phone = phone.split("@")[0]
 
         # Remove non-numeric characters
         phone = "".join(c for c in phone if c.isdigit())
@@ -1657,9 +1660,15 @@ class EvolutionAPIProvider(WhatsAppProvider):
                     f"Phone number may be invalid - 5th digit is not '9': {phone}"
                 )
 
-        # Add @s.whatsapp.net suffix if not present
-        if not phone.endswith("@s.whatsapp.net"):
-            phone = phone + "@s.whatsapp.net"
+        # 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"
 
         if original_phone != phone:
             logger.info(f"Phone number normalized: {original_phone} -> {phone}")

agentle/agents/whatsapp/whatsapp_bot.py

@@ -431,23 +431,117 @@ class WhatsAppBot[T_Schema: WhatsAppResponseBase = WhatsAppResponseBase](BaseMod
                 f"[MESSAGE_HANDLER] Effective chat_id para conversação: {effective_chat_id}"
             )
 
-            # Check welcome message for first interaction
+            # Check welcome message/image for first interaction
             if (
                 await cast(
                     ConversationStore, self.agent.conversation_store
                 ).get_conversation_history_length(effective_chat_id)
                 == 0
-                and self.config.welcome_message
+                and (
+                    self.config.welcome_message
+                    or self.config.welcome_image_url
+                    or self.config.welcome_image_base64
+                )
             ):
                 logger.info(
-                    f"[WELCOME] Sending welcome message to {message.from_number}"
+                    f"[WELCOME] Sending welcome message/image to {message.from_number}"
                 )
-                formatted_welcome = self._format_whatsapp_markdown(
-                    self.config.welcome_message
-                )
-                await self.provider.send_text_message(
-                    message.from_number, formatted_welcome
+
+                # Determine if we're sending an image or text
+                has_welcome_image = (
+                    self.config.welcome_image_url or self.config.welcome_image_base64
                 )
+
+                if has_welcome_image:
+                    # Prepare caption from welcome_message if available
+                    caption = None
+                    if self.config.welcome_message:
+                        caption = self._format_whatsapp_markdown(
+                            self.config.welcome_message
+                        )
+
+                    # Handle welcome image via URL
+                    if self.config.welcome_image_url:
+                        logger.info(
+                            f"[WELCOME] Sending welcome image from URL to {message.from_number}"
+                        )
+                        await self.provider.send_media_message(
+                            to=message.from_number,
+                            media_url=self.config.welcome_image_url,
+                            media_type="image",
+                            caption=caption,
+                        )
+                    # Handle welcome image via base64
+                    elif self.config.welcome_image_base64:
+                        # Try to upload base64 to file storage if available
+                        image_url = None
+                        if self.file_storage_manager:
+                            try:
+                                import base64
+                                import time
+
+                                logger.info(
+                                    "[WELCOME] Uploading base64 welcome image to file storage"
+                                )
+
+                                # Decode base64 to bytes
+                                image_bytes = base64.b64decode(
+                                    self.config.welcome_image_base64
+                                )
+
+                                # Generate unique filename
+                                timestamp = int(time.time())
+                                filename = f"welcome_image_{timestamp}.jpg"
+
+                                # Upload to storage
+                                image_url = await self.file_storage_manager.upload_file(
+                                    file_data=image_bytes,
+                                    filename=filename,
+                                    mime_type="image/jpeg",
+                                )
+
+                                logger.info(
+                                    f"[WELCOME] Welcome image uploaded to storage: {image_url}"
+                                )
+                            except Exception as e:
+                                logger.warning(
+                                    f"[WELCOME] Failed to upload welcome image to storage: {e}"
+                                )
+                                image_url = None
+
+                        # Send image via URL if upload succeeded, otherwise send text fallback
+                        if image_url:
+                            logger.info(
+                                f"[WELCOME] Sending uploaded welcome image to {message.from_number}"
+                            )
+                            await self.provider.send_media_message(
+                                to=message.from_number,
+                                media_url=image_url,
+                                media_type="image",
+                                caption=caption,
+                            )
+                        else:
+                            # Fallback to text if base64 upload failed and no URL available
+                            logger.warning(
+                                "[WELCOME] Could not send welcome image (base64 upload failed and no URL), falling back to text"
+                            )
+                            if caption:
+                                await self.provider.send_text_message(
+                                    message.from_number, caption
+                                )
+                            else:
+                                logger.warning(
+                                    "[WELCOME] No caption available, skipping welcome message"
+                                )
+                else:
+                    # Send text-only welcome message (backward compatible)
+                    formatted_welcome = self._format_whatsapp_markdown(
+                        self.config.welcome_message
+                    )
+                    await self.provider.send_text_message(
+                        message.from_number, formatted_welcome
+                    )
+
                 session.message_count += 1
                 await self.provider.update_session(session)
 

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

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

{agentle-0.9.39.dist-info → agentle-0.9.41.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=3ohpjdjeeX0MPxrcllLamT8lfi6y2UjSzFxYTeVLQ-o,165392
+agentle/agents/whatsapp/whatsapp_bot.py,sha256=o3fa5iSD-26CcmcMw0pzU0aS9ju1Mm9vD9ZHWwfEI9o,169964
 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
@@ -152,7 +152,7 @@ agentle/agents/whatsapp/models/message_context_info.py,sha256=msCSuu8uMN3G9GDaXd
 agentle/agents/whatsapp/models/quoted_message.py,sha256=QC4sp7eLPE9g9i-_f3avb0sDO7gKpkzZR2qkbxqptts,1073
 agentle/agents/whatsapp/models/video_message.py,sha256=0s4ak68euff25a_tXvYscKCFn7rQj8Rj6U89rupQnO0,3697
 agentle/agents/whatsapp/models/whatsapp_audio_message.py,sha256=AAcnjzJC1O5VjyWZaSWpG_tmZFc2-CdcPn9abjyLrpc,378
-agentle/agents/whatsapp/models/whatsapp_bot_config.py,sha256=hkbOAdSZbSt634mZEARuPQSer7wf3biL7dL9TFW-a7o,37164
+agentle/agents/whatsapp/models/whatsapp_bot_config.py,sha256=-YLnzFOUlNwNvROTOlJ1W8RLNwnJ3irXI3znaMo7UnI,37831
 agentle/agents/whatsapp/models/whatsapp_contact.py,sha256=6iO6xmFs7z9hd1N9kZzGyNHYvCaUoCHn3Yi1DAJN4YU,240
 agentle/agents/whatsapp/models/whatsapp_document_message.py,sha256=ECM_hXF-3IbC9itbtZI0eA_XRNXFVefw9Mr-Lo_lrH0,323
 agentle/agents/whatsapp/models/whatsapp_image_message.py,sha256=xOAPRRSgqj9gQ2ZZOGdFWfOgtmNpE1W8mIUAmB5YTpo,314
@@ -165,13 +165,13 @@ 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
 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=rE0OwJma7mnLiPXcK2oBFFmr69zQxTRfmHNrEvj4NoU,68539
+agentle/agents/whatsapp/providers/evolution/evolution_api_provider.py,sha256=6nIItw8dwBEuWDa8lb3qaEthN4ywbSRJgYyY49EXowI,69043
 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.39.dist-info/METADATA,sha256=koWpbsp8gWkx7AtBogPGlGRfoQQ6lo2_A7v-gBJisZs,86879
-agentle-0.9.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agentle-0.9.39.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
-agentle-0.9.39.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,,

{agentle-0.9.39.dist-info → agentle-0.9.41.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any