Address more Phillbot code review comments

Author: sumitramanga

whatsapp/README.md

@@ -35,6 +35,7 @@ Configure the integration within Autohive using platform authentication for What
 - **Inputs:**
   - `to` (required): Recipient's phone number in E.164 format (e.g., +1234567890)
   - `message` (required): Text content of the message to send
+  - `phone_number_id` (required): The Phone Number ID associated with the WhatsApp Business account
 - **Outputs:**
   - `message_id`: Unique WhatsApp message identifier if successful
   - `success`: Boolean indicating if the message was sent successfully
@@ -46,6 +47,7 @@ Configure the integration within Autohive using platform authentication for What
 - **Inputs:**
   - `to` (required): Recipient's phone number in E.164 format
   - `template_name` (required): Name of the approved message template
+  - `phone_number_id` (required): The Phone Number ID associated with the WhatsApp Business account
   - `language_code` (optional): Template language code (default: "en")
   - `parameters` (optional): Array of string parameters for template substitution
 - **Outputs:**
@@ -60,6 +62,7 @@ Configure the integration within Autohive using platform authentication for What
   - `to` (required): Recipient's phone number in E.164 format
   - `media_type` (required): Media type - "image", "document", "audio", or "video"
   - `media_url` (required): HTTPS URL of the media content to send
+  - `phone_number_id` (required): The Phone Number ID associated with the WhatsApp Business account
   - `caption` (optional): Text caption for the media (images, videos, documents)
   - `filename` (optional): Custom filename for document type media
 - **Outputs:**
@@ -89,7 +92,8 @@ Configure the integration within Autohive using platform authentication for What
 ```json
 {
   "to": "+1234567890",
-  "message": "Welcome to our service! Thank you for signing up."
+  "message": "Welcome to our service! Thank you for signing up.",
+  "phone_number_id": "123456789012345"
 }
 ```
 
@@ -99,6 +103,7 @@ Configure the integration within Autohive using platform authentication for What
 {
   "to": "+1234567890",
   "template_name": "customer_welcome",
+  "phone_number_id": "123456789012345",
   "language_code": "en",
   "parameters": ["John Doe", "Premium"]
 }
@@ -111,6 +116,7 @@ Configure the integration within Autohive using platform authentication for What
   "to": "+1234567890",
   "media_type": "document",
   "media_url": "https://yourdomain.com/invoices/invoice-123.pdf",
+  "phone_number_id": "123456789012345",
   "filename": "Invoice-123.pdf",
   "caption": "Your invoice for Order #123"
 }

whatsapp/tests/test_whatsapp.py

@@ -54,7 +54,7 @@ async def test_send_media_message():
     inputs = {
         "to": TEST_RECIPIENT_PHONE,
         "media_type": "image",
-        "media_url": "https://cdn.prod.website-files.com/67f5c4ac73ceeeb74774a8ee/691b8e27af0bfbc9290f345d_bee-left.webp",
+        "media_url": "https://fastly.picsum.photos/id/184/640/320.jpg?hmac=Zu0guI3nKOcrdKw3FDso83cEaPL-6BltxGz8mrSEErg",
         "caption": "Test image from WhatsApp integration",
         "phone_number_id": PHONE_NUMBER_ID
     }

whatsapp/whatsapp.py

@@ -3,6 +3,7 @@
 )
 from typing import Dict, Any
 import re
+from urllib.parse import urlparse
 
 whatsapp = Integration.load()
 
@@ -21,13 +22,16 @@ def get_whatsapp_creds(auth: Dict[str, Any]) -> Dict[str, str]:
     }
 
 def validate_phone_number(phone: str) -> bool:
-    """Validate that the phone number is in E.164 format."""
-    pattern = r'^\+[1-9]\d{1,14}$'
+    """Validate that the phone number is in E.164 format (with or without + prefix)."""
+    pattern = r'^\+?[1-9]\d{1,14}$'
     return bool(re.match(pattern, phone))
 
 def validate_media_url(url: str) -> bool:
-    """Validate that the media URL is a valid HTTPS URL."""
-    return url.startswith("https://")
+    try:
+        u = urlparse(url)
+        return u.scheme == "https" and bool(u.netloc)
+    except Exception:
+        return False
 
 def validate_phone_number_id(phone_number_id: str) -> bool:
     """Validate that the phone number ID is a numeric string."""
@@ -58,7 +62,7 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
             return ActionResult(data={
                 "message_id": None,
                 "success": False,
-                "error": "Invalid phone number format. Use format: +1234567890"
+                "error": "Invalid phone number format. Use format: +1234567890 or 1234567890"
             })
 
         try:
@@ -129,7 +133,7 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
             return ActionResult(data={
                 "message_id": None,
                 "success": False,
-                "error": "Invalid phone number format. Use format: +1234567890"
+                "error": "Invalid phone number format. Use format: +1234567890 or 1234567890"
             })
 
         try:
@@ -211,7 +215,7 @@ async def execute(self, inputs: Dict[str, Any], context: ExecutionContext):
             return ActionResult(data={
                 "message_id": None,
                 "success": False,
-                "error": "Invalid phone number format. Use format: +1234567890"
+                "error": "Invalid phone number format. Use format: +1234567890 or 1234567890"
             })
 
         # Validate media URL