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

wappa/persistence/redis/ops.py

@@ -33,7 +33,7 @@ async def set(
         try:
             # Ensure value is a type redis-py can handle directly (str, bytes, int, float)
             # Assuming decode_responses=True, strings are preferred.
-            if not isinstance(value, (str, bytes, int, float)):
+            if not isinstance(value, str | bytes | int | float):
                 # Log a warning if a complex type is passed unexpectedly
                 logger.warning(
                     f"RedisCoreMethods.set received non-primitive type for key '{key}'. Attempting str conversion. Type: {type(value)}"
@@ -62,7 +62,7 @@ async def setex(
     """
     async with RedisClient.connection(alias=alias) as redis:
         try:
-            if not isinstance(value, (str, bytes, int, float)):
+            if not isinstance(value, str | bytes | int | float):
                 logger.warning(
                     f"RedisCoreMethods.setex received non-primitive type for key '{key}'. Attempting str conversion. Type: {type(value)}"
                 )
@@ -185,7 +185,7 @@ async def hset_with_expire(
                 # Ensure mapping values are suitable primitive types
                 checked_mapping = {}
                 for k, v in mapping.items():
-                    if not isinstance(v, (str, bytes, int, float)):
+                    if not isinstance(v, str | bytes | int | float):
                         logger.warning(
                             f"RedisCoreMethods.hset_with_expire received non-primitive type for field '{k}' in mapping for key '{key}'. Attempting str conversion. Type: {type(v)}"
                         )
@@ -288,7 +288,7 @@ async def rpush_and_sadd(
             # Ensure values/members are primitive types
             checked_list_values = []
             for v in list_values:
-                if not isinstance(v, (str, bytes, int, float)):
+                if not isinstance(v, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.rpush_and_sadd received non-primitive type in list_values for key '{list_key}'. Attempting str conversion. Type: {type(v)}"
                     )
@@ -298,7 +298,7 @@ async def rpush_and_sadd(
 
             checked_set_members = []
             for m in set_members:
-                if not isinstance(m, (str, bytes, int, float)):
+                if not isinstance(m, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.rpush_and_sadd received non-primitive type in set_members for key '{set_key}'. Attempting str conversion. Type: {type(m)}"
                     )
@@ -355,7 +355,7 @@ async def scan_keys(
     # redis-py >= 4.2 prefers int cursor, older versions might use bytes/str
     # Let's try to stick to int/str representation for broader compatibility
     current_cursor: str | int = (
-        cursor if isinstance(cursor, (str, int)) else str(int(cursor))
+        cursor if isinstance(cursor, str | int) else str(int(cursor))
     )  # Prefer string '0' if bytes 'b0' is passed. Assume int 0 is start.
 
     async with RedisClient.connection(alias=alias) as redis:
@@ -482,7 +482,7 @@ async def hset(
                 # Ensure mapping values are strings (or bytes/int/float)
                 checked_mapping = {}
                 for k, v in mapping.items():
-                    if not isinstance(v, (str, bytes, int, float)):
+                    if not isinstance(v, str | bytes | int | float):
                         logger.warning(
                             f"RedisCoreMethods.hset received non-primitive type for field '{k}' in mapping for key '{key}'. Attempting str conversion. Type: {type(v)}"
                         )
@@ -492,7 +492,7 @@ async def hset(
                 return await redis.hset(key, mapping=checked_mapping)
             else:
                 # Handle single field/value
-                if not isinstance(value, (str, bytes, int, float)):
+                if not isinstance(value, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.hset received non-primitive type for field '{field}' for key '{key}'. Attempting str conversion. Type: {type(value)}"
                     )
@@ -646,7 +646,7 @@ async def rpush(key: str, *values: str, alias: PoolAlias = "default") -> int:
             # Ensure values are primitive types suitable for redis-py
             checked_values = []
             for v in values:
-                if not isinstance(v, (str, bytes, int, float)):
+                if not isinstance(v, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.rpush received non-primitive type in values for key '{key}'. Attempting str conversion. Type: {type(v)}"
                     )
@@ -780,7 +780,7 @@ async def sadd(key: str, *members: str, alias: PoolAlias = "default") -> int:
             # Ensure members are primitive types suitable for redis-py
             checked_members = []
             for m in members:
-                if not isinstance(m, (str, bytes, int, float)):
+                if not isinstance(m, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.sadd received non-primitive type in members for key '{key}'. Attempting str conversion. Type: {type(m)}"
                     )
@@ -834,7 +834,7 @@ async def srem(key: str, *members: str, alias: PoolAlias = "default") -> int:
             # Ensure members are primitive types suitable for redis-py
             checked_members = []
             for m in members:
-                if not isinstance(m, (str, bytes, int, float)):
+                if not isinstance(m, str | bytes | int | float):
                     logger.warning(
                         f"RedisCoreMethods.srem received non-primitive type in members for key '{key}'. Attempting str conversion. Type: {type(m)}"
                     )

wappa/persistence/redis/redis_client.py

@@ -102,9 +102,7 @@ class RedisClient:
         if missing:
             raise ValueError(f"Missing required pool aliases: {missing}")
 
-        extra = set(str(k) for k in urls) - set(
-            str(k) for k in POOL_DB_MAPPING
-        )
+        extra = {str(k) for k in urls} - {str(k) for k in POOL_DB_MAPPING}
         if extra:
             raise ValueError(
                 f"Unknown pool aliases: {extra}. Only {list(POOL_DB_MAPPING.keys())} are allowed."
@@ -202,7 +200,7 @@ A fork-safe, asyncio-native helper with **3 predefined Redis pools** for Wappa c
 
 | Pool         | Database | Purpose                    |
 |--------------|----------|----------------------------|
-| users        | 0        | User-specific cache data   |  
+| users        | 0        | User-specific cache data   |
 | state_handler| 1        | Handler state cache data   |
 | table        | 2        | Table/data cache           |
 
@@ -215,14 +213,14 @@ RedisClient.setup_single_url("redis://localhost:6379")
 # Option 2: Explicit URLs per pool
 RedisClient.setup_multiple_urls({
     "users": "redis://localhost:6379/0",
-    "state_handler": "redis://cache:6379/1", 
+    "state_handler": "redis://cache:6379/1",
     "table": "redis://localhost:6379/2"
 })
 
 # Usage
 async with RedisClient.connection("state_handler") as r:
     await r.set("key", "value")
-    
+
 redis = await RedisClient.get("users")
 await redis.hset("user:123", "name", "Alice")
 ```

wappa/persistence/redis/redis_manager.py

@@ -50,7 +50,9 @@ class RedisManager:
             url = redis_url or settings.redis_url
             connections = max_connections or settings.redis_max_connections
 
-            logger.info(f"Setting up Redis pools from {url} (max_connections: {connections})")
+            logger.info(
+                f"Setting up Redis pools from {url} (max_connections: {connections})"
+            )
 
             # Use Wappa's RedisClient.setup_single_url
             RedisClient.setup_single_url(
@@ -66,7 +68,9 @@ class RedisManager:
 
             # Success confirmation with pool details
             pool_count = len(POOL_DB_MAPPING)
-            pool_details = ", ".join(f"{alias}:db{db}" for alias, db in POOL_DB_MAPPING.items())
+            pool_details = ", ".join(
+                f"{alias}:db{db}" for alias, db in POOL_DB_MAPPING.items()
+            )
             logger.info(f"✅ Redis pools ready: {pool_count} pools ({pool_details})")
 
         except Exception as e:
@@ -89,10 +93,14 @@ class RedisManager:
                 redis = await RedisClient.get(pool_alias)
                 await redis.ping()
                 successful_pools.append(f"{alias}:db{POOL_DB_MAPPING[alias]}")
-                logger.debug(f"✅ Redis pool '{alias}' (db{POOL_DB_MAPPING[alias]}) health check passed")
+                logger.debug(
+                    f"✅ Redis pool '{alias}' (db{POOL_DB_MAPPING[alias]}) health check passed"
+                )
             except Exception as e:
                 failed_pools.append(f"{alias}:db{POOL_DB_MAPPING[alias]}")
-                logger.error(f"❌ Redis pool '{alias}' (db{POOL_DB_MAPPING[alias]}) health check failed: {e}")
+                logger.error(
+                    f"❌ Redis pool '{alias}' (db{POOL_DB_MAPPING[alias]}) health check failed: {e}"
+                )
 
         if failed_pools:
             raise ConnectionError(f"Failed Redis pools: {', '.join(failed_pools)}")

wappa/processors/factory.py

@@ -116,7 +116,7 @@ class PlatformDetector:
 
     @classmethod
     def detect_platform(
-        self,
+        cls,
         payload: dict[str, Any],
         url_path: str | None = None,
         headers: dict[str, str] | None = None,
@@ -136,19 +136,19 @@ class PlatformDetector:
             ProcessorError: If platform cannot be detected
         """
         # Try payload detection first (most reliable)
-        platform = self.detect_from_payload(payload)
+        platform = cls.detect_from_payload(payload)
         if platform:
             return platform
 
         # Try URL path detection
         if url_path:
-            platform = self.detect_from_url(url_path)
+            platform = cls.detect_from_url(url_path)
             if platform:
                 return platform
 
         # Try header detection
         if headers:
-            platform = self.detect_from_headers(headers)
+            platform = cls.detect_from_headers(headers)
             if platform:
                 return platform
 
@@ -371,7 +371,7 @@ class ProcessorFactory:
         """
         return {
             "cached_processors": len(self._processors),
-            "cached_platforms": [p.value for p in self._processors.keys()],
+            "cached_platforms": [p.value for p in self._processors],
             "supported_platforms": [p.value for p in self.get_supported_platforms()],
             "cache_size_bytes": sum(
                 len(str(processor)) for processor in self._processors.values()

wappa/schemas/factory.py

@@ -183,7 +183,7 @@ class MessageSchemaRegistry:
         for platform, schemas in self._message_schemas.items():
             stats["platforms"][platform.value] = {
                 "message_types": len(schemas),
-                "supported_types": [mt.value for mt in schemas.keys()],
+                "supported_types": [mt.value for mt in schemas],
             }
 
         return stats
@@ -720,10 +720,7 @@ class SchemaFactory:
                 return False
 
             # Should have metadata at minimum
-            if "metadata" not in value:
-                return False
-
-            return True
+            return "metadata" in value
 
         except (KeyError, IndexError, TypeError):
             return False

wappa/schemas/whatsapp/message_types/errors.py

@@ -91,10 +91,7 @@ class WhatsAppWebhookError(BaseModel):
         This is a heuristic and may need adjustment based on documentation.
         """
         # System errors often start with 1, API errors with other digits
-        for code in self.error_codes:
-            if 100000 <= code <= 199999:  # System error range (heuristic)
-                return True
-        return False
+        return any(100000 <= code <= 199999 for code in self.error_codes)
 
     def is_app_error(self) -> bool:
         """
@@ -103,10 +100,7 @@ class WhatsAppWebhookError(BaseModel):
         App errors typically relate to configuration or permissions.
         """
         # App/permission errors often in different ranges
-        for code in self.error_codes:
-            if 200000 <= code <= 299999:  # App error range (heuristic)
-                return True
-        return False
+        return any(200000 <= code <= 299999 for code in self.error_codes)
 
     def is_account_error(self) -> bool:
         """
@@ -115,10 +109,7 @@ class WhatsAppWebhookError(BaseModel):
         Account errors typically relate to quotas, limits, or account status.
         """
         # Account errors often in different ranges
-        for code in self.error_codes:
-            if 300000 <= code <= 399999:  # Account error range (heuristic)
-                return True
-        return False
+        return any(300000 <= code <= 399999 for code in self.error_codes)
 
     def get_error_severity(self) -> str:
         """

wappa/schemas/whatsapp/validators.py

@@ -417,11 +417,11 @@ class WhatsAppErrorHandler:
             True if error is recoverable, False otherwise
         """
         # Validation errors are not recoverable
-        if isinstance(error, (ValidationError, WhatsAppValidationError)):
+        if isinstance(error, ValidationError | WhatsAppValidationError):
             return False
 
         # Network/timeout errors might be recoverable
-        if isinstance(error, (ConnectionError, TimeoutError)):
+        if isinstance(error, ConnectionError | TimeoutError):
             return True
 
         # Generic exceptions might be recoverable
@@ -446,7 +446,7 @@ class WhatsAppErrorHandler:
             # WhatsApp-specific validation errors are medium priority
             return "medium"
 
-        if isinstance(error, (ConnectionError, TimeoutError)):
+        if isinstance(error, ConnectionError | TimeoutError):
             # Network issues are high priority - service availability
             return "high"
 

wappa/webhooks/__init__.py

@@ -1,7 +1,7 @@
 """
 Wappa Webhook Schemas and Universal Interfaces
 
-Provides clean access to webhook schemas and universal interfaces for 
+Provides clean access to webhook schemas and universal interfaces for
 processing incoming webhooks from different messaging platforms.
 
 Clean Architecture: Domain models and platform-agnostic interfaces.
@@ -9,41 +9,41 @@ Clean Architecture: Domain models and platform-agnostic interfaces.
 Usage:
     # Universal webhook interfaces (user requested: quick access to webhook schemas)
     from wappa.webhooks import IncomingMessageWebhook, StatusWebhook, ErrorWebhook
-    
-    # WhatsApp webhook schemas  
+
+    # WhatsApp webhook schemas
     from wappa.webhooks.whatsapp import WhatsAppWebhook, WhatsAppMetadata
-    
+
     # Message type schemas
     from wappa.webhooks.whatsapp.message_types import TextMessage, ImageMessage
 """
 
 # Universal Webhook Interfaces (User Request: Quick access to these)
-from .core.types import UniversalMessageData, PlatformType, WebhookType
+from .core.base_webhook import BaseContact, BaseWebhook, BaseWebhookMetadata
+from .core.types import PlatformType, UniversalMessageData, WebhookType
 from .core.webhook_interfaces.universal_webhooks import (
     ErrorWebhook,
     IncomingMessageWebhook,
-    StatusWebhook, 
+    StatusWebhook,
     UniversalWebhook,
 )
-from .core.base_webhook import BaseWebhook, BaseWebhookMetadata, BaseContact
-
-# WhatsApp Webhook Schemas  
-from .whatsapp.webhook_container import WhatsAppWebhook
 from .whatsapp.base_models import (
-    WhatsAppMetadata,
-    WhatsAppContact,
     ContactProfile,
+    Conversation,
+    ErrorData,
     MessageContext,
     MessageError,
-    ErrorData,
     Pricing,
-    Conversation,
+    WhatsAppContact,
+    WhatsAppMetadata,
 )
 
+# WhatsApp Webhook Schemas
+from .whatsapp.webhook_container import WhatsAppWebhook
+
 __all__ = [
     # Universal Interfaces (Clean Access as Requested)
     "UniversalWebhook",
-    "IncomingMessageWebhook", 
+    "IncomingMessageWebhook",
     "StatusWebhook",
     "ErrorWebhook",
     "UniversalMessageData",
@@ -52,13 +52,12 @@ __all__ = [
     "BaseWebhook",
     "BaseWebhookMetadata",
     "BaseContact",
-    
-    # WhatsApp Core Schemas  
+    # WhatsApp Core Schemas
     "WhatsAppWebhook",
     "WhatsAppMetadata",
     "WhatsAppContact",
     "ContactProfile",
-    "MessageContext", 
+    "MessageContext",
     "MessageError",
     "ErrorData",
     "Pricing",

wappa/webhooks/factory.py

@@ -11,6 +11,7 @@ from wappa.core.logging.logger import get_logger
 from wappa.webhooks.core.base_message import BaseMessage
 from wappa.webhooks.core.base_webhook import BaseWebhook
 from wappa.webhooks.core.types import MessageType, PlatformType
+from wappa.webhooks.core.webhook_interfaces.universal_webhooks import UniversalWebhook
 
 
 class SchemaRegistryError(Exception):
@@ -183,7 +184,7 @@ class MessageSchemaRegistry:
         for platform, schemas in self._message_schemas.items():
             stats["platforms"][platform.value] = {
                 "message_types": len(schemas),
-                "supported_types": [mt.value for mt in schemas.keys()],
+                "supported_types": [mt.value for mt in schemas],
             }
 
         return stats
@@ -720,10 +721,7 @@ class SchemaFactory:
                 return False
 
             # Should have metadata at minimum
-            if "metadata" not in value:
-                return False
-
-            return True
+            return "metadata" in value
 
         except (KeyError, IndexError, TypeError):
             return False

wappa/webhooks/whatsapp/__init__.py

@@ -12,47 +12,44 @@ Usage:
 """
 
 # Main webhook container
-from .webhook_container import WhatsAppWebhook
-
 # Base models and metadata
 from .base_models import (
-    WhatsAppMetadata,
-    WhatsAppContact,
     ContactProfile,
+    Conversation,
+    ErrorData,
     MessageContext,
     MessageError,
-    ErrorData,
     Pricing,
-    Conversation,
+    WhatsAppContact,
+    WhatsAppMetadata,
 )
 
 # Status models
 from .status_models import (
-    MessageStatus,
-    StatusType,
     DeliveryStatus,
+    FailedStatus,
+    MessageStatus,
     ReadStatus,
     SentStatus,
-    FailedStatus,
+    StatusType,
 )
+from .webhook_container import WhatsAppWebhook
 
 __all__ = [
     # Main webhook
     "WhatsAppWebhook",
-    
     # Base models
     "WhatsAppMetadata",
-    "WhatsAppContact", 
+    "WhatsAppContact",
     "ContactProfile",
     "MessageContext",
     "MessageError",
     "ErrorData",
     "Pricing",
     "Conversation",
-    
     # Status models
     "MessageStatus",
-    "StatusType", 
+    "StatusType",
     "DeliveryStatus",
     "ReadStatus",
     "SentStatus",

wappa/webhooks/whatsapp/message_types/audio.py

@@ -303,10 +303,6 @@ class WhatsAppAudioMessage(BaseAudioMessage):
 
     # Implement abstract methods from BaseMediaMessage
 
-    @property
-    def media_id(self) -> str:
-        return self.audio.id
-
     @property
     def media_type(self) -> MediaType:
         mime_str = self.audio.mime_type

wappa/webhooks/whatsapp/message_types/document.py

@@ -372,11 +372,7 @@ class WhatsAppDocumentMessage(BaseDocumentMessage):
             },
         }
 
-    # Implement abstract methods from BaseMediaMessage
-
-    @property
-    def media_id(self) -> str:
-        return self.document.id
+    # Abstract methods already implemented above
 
     @property
     def media_type(self) -> MediaType:
@@ -396,10 +392,6 @@ class WhatsAppDocumentMessage(BaseDocumentMessage):
     def file_size(self) -> int | None:
         return None  # WhatsApp doesn't provide file size in webhooks
 
-    @property
-    def caption(self) -> str | None:
-        return self.document.caption
-
     def get_download_info(self) -> dict[str, Any]:
         return {
             "media_id": self.media_id,

wappa/webhooks/whatsapp/message_types/errors.py

@@ -91,10 +91,7 @@ class WhatsAppWebhookError(BaseModel):
         This is a heuristic and may need adjustment based on documentation.
         """
         # System errors often start with 1, API errors with other digits
-        for code in self.error_codes:
-            if 100000 <= code <= 199999:  # System error range (heuristic)
-                return True
-        return False
+        return any(100000 <= code <= 199999 for code in self.error_codes)
 
     def is_app_error(self) -> bool:
         """
@@ -103,10 +100,7 @@ class WhatsAppWebhookError(BaseModel):
         App errors typically relate to configuration or permissions.
         """
         # App/permission errors often in different ranges
-        for code in self.error_codes:
-            if 200000 <= code <= 299999:  # App error range (heuristic)
-                return True
-        return False
+        return any(200000 <= code <= 299999 for code in self.error_codes)
 
     def is_account_error(self) -> bool:
         """
@@ -115,10 +109,7 @@ class WhatsAppWebhookError(BaseModel):
         Account errors typically relate to quotas, limits, or account status.
         """
         # Account errors often in different ranges
-        for code in self.error_codes:
-            if 300000 <= code <= 399999:  # Account error range (heuristic)
-                return True
-        return False
+        return any(300000 <= code <= 399999 for code in self.error_codes)
 
     def get_error_severity(self) -> str:
         """

wappa/webhooks/whatsapp/message_types/location.py

@@ -382,27 +382,7 @@ class WhatsAppLocationMessage(BaseLocationMessage):
             },
         }
 
-    # Implement abstract methods from BaseLocationMessage
-
-    @property
-    def latitude(self) -> float:
-        return self.location.latitude
-
-    @property
-    def longitude(self) -> float:
-        return self.location.longitude
-
-    @property
-    def address(self) -> str | None:
-        return self.location.address
-
-    @property
-    def name(self) -> str | None:
-        return self.location.name
-
-    @property
-    def url(self) -> str | None:
-        return self.location.url
+    # Abstract methods already implemented above
 
     @property
     def location_name(self) -> str | None:

wappa/webhooks/whatsapp/message_types/sticker.py

@@ -288,11 +288,7 @@ class WhatsAppStickerMessage(BaseMediaMessage):
             },
         }
 
-    # Implement abstract methods from BaseMediaMessage
-
-    @property
-    def media_id(self) -> str:
-        return self.sticker.id
+    # Abstract methods already implemented above
 
     @property
     def media_type(self) -> MediaType:

wappa/webhooks/whatsapp/message_types/text.py

@@ -397,12 +397,6 @@ class WhatsAppTextMessage(BaseTextMessage):
         """Get the text content of the message."""
         return self.text.body
 
-    def get_reply_context(self) -> tuple[str | None, str | None]:
-        """Get reply context information."""
-        if self.is_reply and self.context:
-            return (self.context.from_, self.context.id)
-        return (None, None)
-
     @classmethod
     def from_platform_data(
         cls, data: dict[str, Any], **kwargs

wappa/webhooks/whatsapp/message_types/video.py

@@ -12,7 +12,6 @@ from pydantic import BaseModel, ConfigDict, Field, field_validator, model_valida
 from wappa.webhooks.core.base_message import BaseMessageContext, BaseVideoMessage
 from wappa.webhooks.core.types import (
     ConversationType,
-    MediaType,
     PlatformType,
     UniversalMessageData,
 )
@@ -300,25 +299,7 @@ class WhatsAppVideoMessage(BaseVideoMessage):
             "video_content": self.video.model_dump(),
         }
 
-    # Implement abstract methods from BaseMediaMessage
-    @property
-    def media_id(self) -> str:
-        return self.video.id
-
-    @property
-    def media_type(self) -> MediaType:
-        try:
-            return MediaType(self.video.mime_type)
-        except ValueError:
-            return MediaType.VIDEO_MP4
-
-    @property
-    def file_size(self) -> int | None:
-        return None
-
-    @property
-    def caption(self) -> str | None:
-        return self.video.caption
+    # Abstract methods already implemented above
 
     def get_download_info(self) -> dict[str, Any]:
         return {

wappa/webhooks/whatsapp/status_models.py

@@ -322,9 +322,9 @@ class WhatsAppMessageStatus(BaseMessageStatus):
             )
         return (None, None, None)
 
-    def get_error_info(self) -> list[dict[str, str | int]]:
+    def get_all_errors(self) -> list[dict[str, str | int]]:
         """
-        Get error information for failed messages.
+        Get all error information for failed messages.
 
         Returns:
             List of error dictionaries with code, title, message, and details.

wappa/webhooks/whatsapp/validators.py

@@ -417,11 +417,11 @@ class WhatsAppErrorHandler:
             True if error is recoverable, False otherwise
         """
         # Validation errors are not recoverable
-        if isinstance(error, (ValidationError, WhatsAppValidationError)):
+        if isinstance(error, ValidationError | WhatsAppValidationError):
             return False
 
         # Network/timeout errors might be recoverable
-        if isinstance(error, (ConnectionError, TimeoutError)):
+        if isinstance(error, ConnectionError | TimeoutError):
             return True
 
         # Generic exceptions might be recoverable
@@ -446,7 +446,7 @@ class WhatsAppErrorHandler:
             # WhatsApp-specific validation errors are medium priority
             return "medium"
 
-        if isinstance(error, (ConnectionError, TimeoutError)):
+        if isinstance(error, ConnectionError | TimeoutError):
             # Network issues are high priority - service availability
             return "high"