wappa 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

wappa/cli/examples/wappa_full_example/app/utils/metadata_extractor.py

@@ -6,7 +6,6 @@ IncomingMessageWebhook objects based on message type.
 """
 
 import time
-from typing import Optional
 
 from wappa.webhooks import IncomingMessageWebhook
 
@@ -24,16 +23,18 @@ from ..models.webhook_metadata import (
 
 class MetadataExtractor:
     """Utility class for extracting metadata from webhooks."""
-    
+
     @staticmethod
-    def extract_metadata(webhook: IncomingMessageWebhook, start_time: float = None) -> WebhookMetadata:
+    def extract_metadata(
+        webhook: IncomingMessageWebhook, start_time: float = None
+    ) -> WebhookMetadata:
         """
         Extract appropriate metadata from webhook based on message type.
-        
+
         Args:
             webhook: IncomingMessageWebhook to extract metadata from
             start_time: Optional start time for processing time calculation
-            
+
         Returns:
             WebhookMetadata object with extracted information
         """
@@ -41,70 +42,84 @@ class MetadataExtractor:
         processing_time_ms = None
         if start_time is not None:
             processing_time_ms = int((time.time() - start_time) * 1000)
-        
+
         # Get message type from webhook
         message_type_name = webhook.get_message_type_name().lower()
-        
+
         try:
             # Map message type string to enum
             message_type = MessageType(message_type_name)
         except ValueError:
             # Handle unknown message types
             return UnknownMessageMetadata.from_webhook(webhook, processing_time_ms)
-        
+
         # Extract metadata based on message type
         if message_type == MessageType.TEXT:
             return TextMessageMetadata.from_webhook(webhook, processing_time_ms)
-        
-        elif message_type in [MessageType.IMAGE, MessageType.VIDEO, MessageType.AUDIO, 
-                             MessageType.VOICE, MessageType.DOCUMENT, MessageType.STICKER]:
-            return MediaMessageMetadata.from_webhook(webhook, message_type, processing_time_ms)
-        
+
+        elif message_type in [
+            MessageType.IMAGE,
+            MessageType.VIDEO,
+            MessageType.AUDIO,
+            MessageType.VOICE,
+            MessageType.DOCUMENT,
+            MessageType.STICKER,
+        ]:
+            return MediaMessageMetadata.from_webhook(
+                webhook, message_type, processing_time_ms
+            )
+
         elif message_type == MessageType.LOCATION:
             return LocationMessageMetadata.from_webhook(webhook, processing_time_ms)
-        
+
         elif message_type in [MessageType.CONTACT, MessageType.CONTACTS]:
             return ContactMessageMetadata.from_webhook(webhook, processing_time_ms)
-        
+
         elif message_type == MessageType.INTERACTIVE:
             return InteractiveMessageMetadata.from_webhook(webhook, processing_time_ms)
-        
+
         else:
             # Fallback for unsupported types
             return UnknownMessageMetadata.from_webhook(webhook, processing_time_ms)
-    
+
     @staticmethod
     def format_metadata_for_user(metadata: WebhookMetadata) -> str:
         """
         Format metadata for display to user.
-        
+
         Args:
             metadata: WebhookMetadata object to format
-            
+
         Returns:
             Formatted string for user display
         """
         lines = []
         lines.append("📊 *Message Metadata*")
         lines.append("─" * 30)
-        
+
         # Basic information
         lines.append(f"🆔 Message ID: `{metadata.message_id[:20]}...`")
         # Handle both enum and string values for message_type
-        message_type_str = metadata.message_type.value if hasattr(metadata.message_type, 'value') else str(metadata.message_type)
+        message_type_str = (
+            metadata.message_type.value
+            if hasattr(metadata.message_type, "value")
+            else str(metadata.message_type)
+        )
         lines.append(f"📱 Message Type: `{message_type_str}`")
         lines.append(f"👤 User: {metadata.user_name or metadata.user_id}")
-        lines.append(f"🕐 Timestamp: {metadata.timestamp.strftime('%Y-%m-%d %H:%M:%S')}")
+        lines.append(
+            f"🕐 Timestamp: {metadata.timestamp.strftime('%Y-%m-%d %H:%M:%S')}"
+        )
         lines.append(f"🏢 Tenant: `{metadata.tenant_id}`")
         lines.append(f"🌐 Platform: `{metadata.platform}`")
-        
+
         # Processing metadata
         if metadata.processing_time_ms:
             lines.append(f"⚡ Processing Time: {metadata.processing_time_ms}ms")
-        
+
         if metadata.cache_hit:
             lines.append("💾 Cache: Hit ✅")
-        
+
         # Type-specific metadata
         if isinstance(metadata, TextMessageMetadata):
             lines.append("")
@@ -116,7 +131,7 @@ class MetadataExtractor:
                 lines.append("👥 Contains Mentions: Yes")
             if metadata.is_forwarded:
                 lines.append("↪️ Forwarded: Yes")
-        
+
         elif isinstance(metadata, MediaMessageMetadata):
             lines.append("")
             lines.append(f"🎬 *{metadata.media_type.title()} Media Details:*")
@@ -124,9 +139,13 @@ class MetadataExtractor:
             if metadata.mime_type:
                 lines.append(f"📄 MIME Type: `{metadata.mime_type}`")
             if metadata.file_size:
-                lines.append(f"📦 File Size: {MetadataExtractor._format_file_size(metadata.file_size)}")
+                lines.append(
+                    f"📦 File Size: {MetadataExtractor._format_file_size(metadata.file_size)}"
+                )
             if metadata.caption:
-                lines.append(f"💬 Caption: {metadata.caption[:50]}{'...' if len(metadata.caption) > 50 else ''}")
+                lines.append(
+                    f"💬 Caption: {metadata.caption[:50]}{'...' if len(metadata.caption) > 50 else ''}"
+                )
             if metadata.width and metadata.height:
                 lines.append(f"📐 Dimensions: {metadata.width}x{metadata.height}")
             if metadata.duration:
@@ -135,7 +154,7 @@ class MetadataExtractor:
                 lines.append(f"📎 Filename: `{metadata.filename}`")
             if metadata.is_forwarded:
                 lines.append("↪️ Forwarded: Yes")
-        
+
         elif isinstance(metadata, LocationMessageMetadata):
             lines.append("")
             lines.append("📍 *Location Details:*")
@@ -146,20 +165,22 @@ class MetadataExtractor:
                 lines.append(f"🏠 Address: {metadata.location_address}")
             if metadata.is_forwarded:
                 lines.append("↪️ Forwarded: Yes")
-        
+
         elif isinstance(metadata, ContactMessageMetadata):
             lines.append("")
             lines.append("👥 *Contact Details:*")
             lines.append(f"📇 Contact Count: {metadata.contacts_count}")
             if metadata.contact_names:
-                lines.append(f"👤 Names: {', '.join(metadata.contact_names[:3])}{'...' if len(metadata.contact_names) > 3 else ''}")
+                lines.append(
+                    f"👤 Names: {', '.join(metadata.contact_names[:3])}{'...' if len(metadata.contact_names) > 3 else ''}"
+                )
             if metadata.has_phone_numbers:
                 lines.append("📞 Has Phone Numbers: Yes")
             if metadata.has_emails:
                 lines.append("✉️ Has Emails: Yes")
             if metadata.is_forwarded:
                 lines.append("↪️ Forwarded: Yes")
-        
+
         elif isinstance(metadata, InteractiveMessageMetadata):
             lines.append("")
             lines.append("🔘 *Interactive Details:*")
@@ -168,82 +189,98 @@ class MetadataExtractor:
             if metadata.selection_title:
                 lines.append(f"🏷️ Selection: {metadata.selection_title}")
             if metadata.context_message_id:
-                lines.append(f"💬 Context Message: `{metadata.context_message_id[:20]}...`")
-        
+                lines.append(
+                    f"💬 Context Message: `{metadata.context_message_id[:20]}...`"
+                )
+
         elif isinstance(metadata, UnknownMessageMetadata):
             lines.append("")
             lines.append("❓ *Unknown Message Type*")
             lines.append("🔍 Raw data captured for debugging")
-        
+
         return "\n".join(lines)
-    
+
     @staticmethod
     def get_metadata_summary(metadata: WebhookMetadata) -> dict:
         """
         Get a summary of metadata for logging/analytics.
-        
+
         Args:
             metadata: WebhookMetadata object to summarize
-            
+
         Returns:
             Dictionary with metadata summary
         """
         # Handle both enum and string values for message_type
-        message_type_value = metadata.message_type.value if hasattr(metadata.message_type, 'value') else str(metadata.message_type)
-        
+        message_type_value = (
+            metadata.message_type.value
+            if hasattr(metadata.message_type, "value")
+            else str(metadata.message_type)
+        )
+
         summary = {
             "message_id": metadata.message_id,
             "message_type": message_type_value,
             "user_id": metadata.user_id,
             "timestamp": metadata.timestamp.isoformat(),
             "processing_time_ms": metadata.processing_time_ms,
-            "cache_hit": metadata.cache_hit
+            "cache_hit": metadata.cache_hit,
         }
-        
+
         # Add type-specific summary data
         if isinstance(metadata, TextMessageMetadata):
-            summary.update({
-                "text_length": metadata.text_length,
-                "has_urls": metadata.has_urls,
-                "has_mentions": metadata.has_mentions,
-                "is_forwarded": metadata.is_forwarded
-            })
-        
+            summary.update(
+                {
+                    "text_length": metadata.text_length,
+                    "has_urls": metadata.has_urls,
+                    "has_mentions": metadata.has_mentions,
+                    "is_forwarded": metadata.is_forwarded,
+                }
+            )
+
         elif isinstance(metadata, MediaMessageMetadata):
-            summary.update({
-                "media_id": metadata.media_id,
-                "media_type": metadata.media_type,
-                "file_size": metadata.file_size,
-                "has_caption": bool(metadata.caption),
-                "is_forwarded": metadata.is_forwarded
-            })
-        
+            summary.update(
+                {
+                    "media_id": metadata.media_id,
+                    "media_type": metadata.media_type,
+                    "file_size": metadata.file_size,
+                    "has_caption": bool(metadata.caption),
+                    "is_forwarded": metadata.is_forwarded,
+                }
+            )
+
         elif isinstance(metadata, LocationMessageMetadata):
-            summary.update({
-                "latitude": metadata.latitude,
-                "longitude": metadata.longitude,
-                "has_name": bool(metadata.location_name),
-                "has_address": bool(metadata.location_address),
-                "is_forwarded": metadata.is_forwarded
-            })
-        
+            summary.update(
+                {
+                    "latitude": metadata.latitude,
+                    "longitude": metadata.longitude,
+                    "has_name": bool(metadata.location_name),
+                    "has_address": bool(metadata.location_address),
+                    "is_forwarded": metadata.is_forwarded,
+                }
+            )
+
         elif isinstance(metadata, ContactMessageMetadata):
-            summary.update({
-                "contacts_count": metadata.contacts_count,
-                "has_phone_numbers": metadata.has_phone_numbers,
-                "has_emails": metadata.has_emails,
-                "is_forwarded": metadata.is_forwarded
-            })
-        
+            summary.update(
+                {
+                    "contacts_count": metadata.contacts_count,
+                    "has_phone_numbers": metadata.has_phone_numbers,
+                    "has_emails": metadata.has_emails,
+                    "is_forwarded": metadata.is_forwarded,
+                }
+            )
+
         elif isinstance(metadata, InteractiveMessageMetadata):
-            summary.update({
-                "interaction_type": metadata.interaction_type,
-                "selection_id": metadata.selection_id,
-                "has_title": bool(metadata.selection_title)
-            })
-        
+            summary.update(
+                {
+                    "interaction_type": metadata.interaction_type,
+                    "selection_id": metadata.selection_id,
+                    "has_title": bool(metadata.selection_title),
+                }
+            )
+
         return summary
-    
+
     @staticmethod
     def _format_file_size(size_bytes: int) -> str:
         """Format file size in human-readable format."""
@@ -258,14 +295,16 @@ class MetadataExtractor:
 
 
 # Convenience functions for direct use
-def extract_webhook_metadata(webhook: IncomingMessageWebhook, start_time: float = None) -> WebhookMetadata:
+def extract_webhook_metadata(
+    webhook: IncomingMessageWebhook, start_time: float = None
+) -> WebhookMetadata:
     """
     Extract metadata from webhook (convenience function).
-    
+
     Args:
         webhook: IncomingMessageWebhook to process
         start_time: Optional start time for processing measurement
-        
+
     Returns:
         WebhookMetadata object
     """
@@ -275,10 +314,10 @@ def extract_webhook_metadata(webhook: IncomingMessageWebhook, start_time: float
 def format_metadata_message(metadata: WebhookMetadata) -> str:
     """
     Format metadata for user display (convenience function).
-    
+
     Args:
         metadata: WebhookMetadata to format
-        
+
     Returns:
         Formatted string for user
     """
@@ -288,11 +327,11 @@ def format_metadata_message(metadata: WebhookMetadata) -> str:
 def get_processing_summary(metadata: WebhookMetadata) -> dict:
     """
     Get processing summary (convenience function).
-    
+
     Args:
         metadata: WebhookMetadata to summarize
-        
+
     Returns:
         Summary dictionary
     """
-    return MetadataExtractor.get_metadata_summary(metadata)
+    return MetadataExtractor.get_metadata_summary(metadata)

wappa/cli/main.py

@@ -398,7 +398,7 @@ def _show_examples_menu(target_directory: str) -> None:
     table.add_column("Key Features", style="yellow")
 
     example_keys = list(EXAMPLES.keys())
-    for i, (key, example) in enumerate(EXAMPLES.items(), 1):
+    for i, (_key, example) in enumerate(EXAMPLES.items(), 1):
         features_text = ", ".join(example["features"][:3])  # Show first 3 features
         if len(example["features"]) > 3:
             features_text += "..."
@@ -496,14 +496,19 @@ def _copy_example(example_key: str, target_directory: str) -> None:
         # Copy all files from the example (including hidden files, excluding .git and __pycache__)
         for item in source_path.iterdir():
             # Skip .git and __pycache__ directories
-            if item.name in {'.git', '__pycache__'}:
+            if item.name in {".git", "__pycache__"}:
                 continue
-                
+
             if item.is_file():
                 shutil.copy2(item, target_path / item.name)
                 console.print(f"📝 Copied: {item.name}")
             elif item.is_dir():
-                shutil.copytree(item, target_path / item.name, dirs_exist_ok=True, ignore=shutil.ignore_patterns('__pycache__', '*.pyc'))
+                shutil.copytree(
+                    item,
+                    target_path / item.name,
+                    dirs_exist_ok=True,
+                    ignore=shutil.ignore_patterns("__pycache__", "*.pyc"),
+                )
                 console.print(f"📁 Copied: {item.name}/")
 
         console.print("\n✅ Example copied successfully!")

wappa/core/__init__.py

@@ -10,37 +10,37 @@ Clean Architecture: Core application logic and framework components.
 # Configuration & Settings
 from .config.settings import settings
 
-# Logging System  
-from .logging import get_logger, get_app_logger, setup_app_logging
-
 # Event System
 from .events import (
-    WappaEventHandler,
-    WappaEventDispatcher, 
-    DefaultMessageHandler,
-    DefaultStatusHandler,
     DefaultErrorHandler,
     DefaultHandlerFactory,
-    MessageLogStrategy,
-    StatusLogStrategy, 
+    DefaultMessageHandler,
+    DefaultStatusHandler,
     ErrorLogStrategy,
-    WebhookURLFactory,
+    MessageLogStrategy,
+    StatusLogStrategy,
+    WappaEventDispatcher,
+    WappaEventHandler,
     WebhookEndpointType,
+    WebhookURLFactory,
     webhook_url_factory,
 )
 
 # Factory System
 from .factory import WappaBuilder, WappaPlugin
 
+# Logging System
+from .logging import get_app_logger, get_logger, setup_app_logging
+
 # Plugin System
 from .plugins import (
-    WappaCorePlugin,
     AuthPlugin,
     CORSPlugin,
+    CustomMiddlewarePlugin,
     DatabasePlugin,
-    RedisPlugin,
     RateLimitPlugin,
-    CustomMiddlewarePlugin,
+    RedisPlugin,
+    WappaCorePlugin,
     WebhookPlugin,
 )
 
@@ -50,16 +50,14 @@ from .wappa_app import Wappa
 __all__ = [
     # Configuration
     "settings",
-    
     # Logging
-    "get_logger", 
+    "get_logger",
     "get_app_logger",
     "setup_app_logging",
-    
     # Event System
     "WappaEventHandler",
     "WappaEventDispatcher",
-    "DefaultMessageHandler", 
+    "DefaultMessageHandler",
     "DefaultStatusHandler",
     "DefaultErrorHandler",
     "DefaultHandlerFactory",
@@ -67,23 +65,20 @@ __all__ = [
     "StatusLogStrategy",
     "ErrorLogStrategy",
     "WebhookURLFactory",
-    "WebhookEndpointType", 
+    "WebhookEndpointType",
     "webhook_url_factory",
-    
     # Factory System
     "WappaBuilder",
-    "WappaPlugin", 
-    
+    "WappaPlugin",
     # Plugin System
     "WappaCorePlugin",
     "AuthPlugin",
-    "CORSPlugin", 
+    "CORSPlugin",
     "DatabasePlugin",
     "RedisPlugin",
     "RateLimitPlugin",
     "CustomMiddlewarePlugin",
     "WebhookPlugin",
-    
     # Core Application
     "Wappa",
 ]

wappa/core/config/settings.py

@@ -45,7 +45,7 @@ def _get_version_from_pyproject() -> str:
 def _is_cli_context() -> bool:
     """
     Detect if we're running in CLI context (help, init, examples) vs server context (dev, prod).
-    
+
     Returns:
         True if running CLI commands that don't need WhatsApp credentials
     """
@@ -53,12 +53,12 @@ def _is_cli_context() -> bool:
     if len(sys.argv) > 1:
         # Direct CLI commands that don't need credentials
         cli_only_commands = {"--help", "-h", "init", "examples"}
-        
+
         # Check for help flag or CLI-only commands
         for arg in sys.argv[1:]:
             if arg in cli_only_commands:
                 return True
-        
+
         # Check if we're running wappa command directly (not through uvicorn)
         if any("wappa" in arg for arg in sys.argv):
             # If no server commands (dev/prod) are present, assume CLI context
@@ -66,7 +66,7 @@ def _is_cli_context() -> bool:
             has_server_command = any(cmd in sys.argv for cmd in server_commands)
             if not has_server_command:
                 return True
-    
+
     return False
 
 
@@ -129,7 +129,7 @@ class Settings:
 
         # Apply validation (skip WhatsApp validation for CLI-only commands)
         self._validate_settings()
-        
+
         # Only validate WhatsApp credentials for server operations
         if not _is_cli_context():
             self._validate_whatsapp_credentials()
@@ -156,6 +156,8 @@ class Settings:
             raise ValueError("WP_PHONE_ID is required")
         if not self.wp_bid:
             raise ValueError("WP_BID is required")
+        if not self.whatsapp_webhook_verify_token:
+            raise ValueError("WHATSAPP_WEBHOOK_VERIFY_TOKEN is required")
 
     @property
     def owner_id(self) -> str:

wappa/core/events/default_handlers.py

@@ -116,7 +116,7 @@ class DefaultMessageHandler:
         self._update_stats(webhook)
 
         # Get logger with tenant context
-        tenant_id = webhook.tenant.get_tenant_key() if webhook.tenant else "unknown"
+        webhook.tenant.get_tenant_key() if webhook.tenant else "unknown"
         logger = get_logger(__name__)
 
         # Log based on strategy