django-cfg 1.4.21__py3-none-any.whl → 1.4.23__py3-none-any.whl

django_cfg/modules/django_twilio/exceptions.py

@@ -5,7 +5,7 @@ Following CRITICAL_REQUIREMENTS.md - proper exception handling with specific typ
 No exception suppression, all errors must be properly typed and handled.
 """
 
-from typing import Optional, Dict, Any, List
+from typing import Any, Dict, List, Optional
 
 
 class TwilioError(Exception):
@@ -15,10 +15,10 @@ class TwilioError(Exception):
     All Twilio module exceptions inherit from this base class to allow
     for specific exception handling patterns.
     """
-    
+
     def __init__(
-        self, 
-        message: str, 
+        self,
+        message: str,
         error_code: Optional[str] = None,
         context: Optional[Dict[str, Any]] = None,
         suggestions: Optional[List[str]] = None
@@ -37,22 +37,22 @@ class TwilioError(Exception):
         self.error_code = error_code
         self.context = context or {}
         self.suggestions = suggestions or []
-    
+
     def __str__(self) -> str:
         """Return formatted error message with context."""
         parts = [self.message]
-        
+
         if self.error_code:
             parts.append(f"Error Code: {self.error_code}")
-        
+
         if self.context:
             context_str = ", ".join(f"{k}={v}" for k, v in self.context.items())
             parts.append(f"Context: {context_str}")
-        
+
         if self.suggestions:
             suggestions_str = "; ".join(self.suggestions)
             parts.append(f"Suggestions: {suggestions_str}")
-        
+
         return " | ".join(parts)
 
 
@@ -66,7 +66,7 @@ class TwilioConfigurationError(TwilioError):
     - Missing environment variables
     - Incorrect service setup
     """
-    
+
     def __init__(
         self,
         message: str,
@@ -84,23 +84,23 @@ class TwilioConfigurationError(TwilioError):
             **kwargs: Additional context passed to base class
         """
         context = kwargs.get("context", {})
-        
+
         if missing_fields:
             context["missing_fields"] = missing_fields
         if invalid_fields:
             context["invalid_fields"] = invalid_fields
-        
+
         kwargs["context"] = context
-        
+
         # Add default suggestions for configuration errors
         suggestions = kwargs.get("suggestions", [])
         if missing_fields:
             suggestions.append(f"Set environment variables: {', '.join(missing_fields)}")
         if invalid_fields:
             suggestions.append(f"Check configuration for fields: {', '.join(invalid_fields)}")
-        
+
         kwargs["suggestions"] = suggestions
-        
+
         super().__init__(message, **kwargs)
 
 
@@ -114,7 +114,7 @@ class TwilioVerificationError(TwilioError):
     - Too many verification attempts
     - Verification service unavailable
     """
-    
+
     def __init__(
         self,
         message: str,
@@ -136,7 +136,7 @@ class TwilioVerificationError(TwilioError):
             **kwargs: Additional context passed to base class
         """
         context = kwargs.get("context", {})
-        
+
         if verification_sid:
             context["verification_sid"] = verification_sid
         if phone_number:
@@ -151,9 +151,9 @@ class TwilioVerificationError(TwilioError):
                 context["email"] = masked_email
         if attempts_remaining is not None:
             context["attempts_remaining"] = attempts_remaining
-        
+
         kwargs["context"] = context
-        
+
         super().__init__(message, **kwargs)
 
 
@@ -168,7 +168,7 @@ class TwilioSendError(TwilioError):
     - Network connectivity issues
     - Service rate limits exceeded
     """
-    
+
     def __init__(
         self,
         message: str,
@@ -190,7 +190,7 @@ class TwilioSendError(TwilioError):
             **kwargs: Additional context passed to base class
         """
         context = kwargs.get("context", {})
-        
+
         if channel:
             context["channel"] = channel
         if recipient:
@@ -207,9 +207,9 @@ class TwilioSendError(TwilioError):
             context["twilio_error_code"] = twilio_error_code
         if twilio_error_message:
             context["twilio_error_message"] = twilio_error_message
-        
+
         kwargs["context"] = context
-        
+
         # Add channel-specific suggestions
         suggestions = kwargs.get("suggestions", [])
         if channel == "whatsapp":
@@ -230,9 +230,9 @@ class TwilioSendError(TwilioError):
                 "Check if sender email is verified in SendGrid",
                 "Verify recipient email format"
             ])
-        
+
         kwargs["suggestions"] = suggestions
-        
+
         super().__init__(message, **kwargs)
 
 
@@ -245,7 +245,7 @@ class TwilioRateLimitError(TwilioSendError):
     - SendGrid rate limits are exceeded
     - Too many requests in a time window
     """
-    
+
     def __init__(
         self,
         message: str,
@@ -261,12 +261,12 @@ class TwilioRateLimitError(TwilioSendError):
             **kwargs: Additional context passed to base class
         """
         context = kwargs.get("context", {})
-        
+
         if retry_after:
             context["retry_after_seconds"] = retry_after
-        
+
         kwargs["context"] = context
-        
+
         suggestions = kwargs.get("suggestions", [])
         suggestions.extend([
             f"Wait {retry_after} seconds before retrying" if retry_after else "Wait before retrying",
@@ -274,7 +274,7 @@ class TwilioRateLimitError(TwilioSendError):
             "Consider upgrading Twilio plan for higher limits"
         ])
         kwargs["suggestions"] = suggestions
-        
+
         super().__init__(message, **kwargs)
 
 
@@ -288,7 +288,7 @@ class TwilioNetworkError(TwilioError):
     - DNS resolution failures
     - Timeout errors
     """
-    
+
     def __init__(
         self,
         message: str,
@@ -306,14 +306,14 @@ class TwilioNetworkError(TwilioError):
             **kwargs: Additional context passed to base class
         """
         context = kwargs.get("context", {})
-        
+
         if service:
             context["service"] = service
         if timeout:
             context["timeout_seconds"] = timeout
-        
+
         kwargs["context"] = context
-        
+
         suggestions = kwargs.get("suggestions", [])
         suggestions.extend([
             "Check internet connectivity",
@@ -322,7 +322,7 @@ class TwilioNetworkError(TwilioError):
             "Check Twilio/SendGrid service status"
         ])
         kwargs["suggestions"] = suggestions
-        
+
         super().__init__(message, **kwargs)
 
 
@@ -330,7 +330,7 @@ class TwilioNetworkError(TwilioError):
 __all__ = [
     "TwilioError",
     "TwilioConfigurationError",
-    "TwilioVerificationError", 
+    "TwilioVerificationError",
     "TwilioSendError",
     "TwilioRateLimitError",
     "TwilioNetworkError",

django_cfg/modules/django_twilio/management/commands/test_twilio.py

@@ -5,9 +5,8 @@ Tests Twilio messaging functionality using django_cfg configuration.
 """
 
 from django.core.management.base import BaseCommand
-from django_cfg.modules.django_logging import get_logger
-
 
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger('test_twilio')
 
@@ -57,10 +56,10 @@ class Command(BaseCommand):
         try:
             from django_cfg.modules.django_twilio import SimpleTwilioService
             twilio_service = SimpleTwilioService()
-            
+
             if is_whatsapp:
                 self.stdout.write(f"\n📱 Sending WhatsApp message to {to_number}...")
-                
+
                 if content_sid:
                     # Send with template
                     result = twilio_service.send_whatsapp_message(
@@ -86,13 +85,13 @@ class Command(BaseCommand):
                 self.stdout.write(self.style.SUCCESS("✅ SMS message sent!"))
 
             # Show result details
-            self.stdout.write(f"\n📊 Message Details:")
+            self.stdout.write("\n📊 Message Details:")
             self.stdout.write(f"  SID: {result['sid']}")
             self.stdout.write(f"  Status: {result['status']}")
             self.stdout.write(f"  To: {result['to']}")
             self.stdout.write(f"  From: {result['from']}")
             self.stdout.write(f"  Created: {result['date_created']}")
-            
+
             if result.get('price'):
                 self.stdout.write(f"  Price: {result['price']} {result['price_unit']}")
 
@@ -101,7 +100,7 @@ class Command(BaseCommand):
         except ImportError as e:
             self.stdout.write(self.style.ERROR(f"\n❌ Twilio dependencies not installed: {e}"))
             self.stdout.write("💡 Install with: pip install twilio")
-            
+
         except Exception as e:
             self.stdout.write(self.style.ERROR(f"\n❌ Failed to send message: {e}"))
             self.stdout.write("\n💡 Troubleshooting:")

django_cfg/modules/django_twilio/models.py

@@ -8,9 +8,10 @@ Following CRITICAL_REQUIREMENTS.md:
 - Comprehensive validation and error handling
 """
 
-from typing import Optional, Dict, Any, List, Literal
-from pydantic import BaseModel, Field, field_validator, model_validator, SecretStr
 from enum import Enum
+from typing import Any, Dict, List, Optional
+
+from pydantic import BaseModel, Field, SecretStr, field_validator, model_validator
 
 from django_cfg.modules.django_twilio.exceptions import TwilioConfigurationError
 
@@ -43,13 +44,13 @@ class TwilioVerifyConfig(BaseModel):
     
     Handles OTP verification across multiple channels with smart fallbacks.
     """
-    
+
     model_config = {
         "str_strip_whitespace": True,
         "validate_assignment": True,
         "extra": "forbid",
     }
-    
+
     # Core Verify service settings
     service_sid: str = Field(
         ...,
@@ -58,26 +59,26 @@ class TwilioVerifyConfig(BaseModel):
         max_length=34,
         pattern=r"^VA[a-f0-9]{32}$",
     )
-    
+
     service_name: str = Field(
         default="OTP Verification",
         description="Human-readable service name for OTP messages",
         min_length=1,
         max_length=50,
     )
-    
+
     # Channel configuration
     default_channel: TwilioChannelType = Field(
         default=TwilioChannelType.SMS,
         description="Default channel for OTP delivery",
     )
-    
+
     fallback_channels: List[TwilioChannelType] = Field(
         default_factory=lambda: [TwilioChannelType.SMS],
         description="Fallback channels if primary channel fails",
         min_length=1,
     )
-    
+
     # OTP settings
     code_length: int = Field(
         default=6,
@@ -85,21 +86,21 @@ class TwilioVerifyConfig(BaseModel):
         ge=4,
         le=10,
     )
-    
+
     ttl_seconds: int = Field(
         default=600,  # 10 minutes
         description="Time-to-live for OTP codes in seconds",
         ge=60,  # Minimum 1 minute
         le=3600,  # Maximum 1 hour
     )
-    
+
     max_attempts: int = Field(
         default=5,
         description="Maximum verification attempts per code",
         ge=1,
         le=10,
     )
-    
+
     # Rate limiting
     rate_limit_per_phone: int = Field(
         default=5,
@@ -107,14 +108,14 @@ class TwilioVerifyConfig(BaseModel):
         ge=1,
         le=20,
     )
-    
+
     rate_limit_per_ip: int = Field(
         default=10,
         description="Maximum OTP requests per IP address per hour",
         ge=1,
         le=50,
     )
-    
+
     @field_validator("fallback_channels")
     @classmethod
     def validate_fallback_channels(cls, v: List[TwilioChannelType]) -> List[TwilioChannelType]:
@@ -130,13 +131,13 @@ class SendGridConfig(BaseModel):
     
     Handles email OTP delivery with template support and deliverability optimization.
     """
-    
+
     model_config = {
         "str_strip_whitespace": True,
         "validate_assignment": True,
         "extra": "forbid",
     }
-    
+
     # Core SendGrid settings
     api_key: SecretStr = Field(
         ...,
@@ -144,32 +145,32 @@ class SendGridConfig(BaseModel):
         min_length=69,  # SendGrid API keys are 69 characters
         max_length=69,
     )
-    
+
     from_email: str = Field(
         ...,
         description="Verified sender email address",
         pattern=r"^[^@]+@[^@]+\.[^@]+$",
     )
-    
+
     from_name: str = Field(
         default="OTP Service",
         description="Sender name displayed in emails",
         min_length=1,
         max_length=100,
     )
-    
+
     # Template configuration
     otp_template_id: Optional[str] = Field(
         default=None,
         description="SendGrid dynamic template ID for OTP emails",
         pattern=r"^d-[a-f0-9]{32}$",
     )
-    
+
     template_type: SendGridTemplateType = Field(
         default=SendGridTemplateType.DYNAMIC,
         description="Type of SendGrid template to use",
     )
-    
+
     # Email content settings (used when no template is specified)
     default_subject: str = Field(
         default="Your verification code",
@@ -177,25 +178,25 @@ class SendGridConfig(BaseModel):
         min_length=1,
         max_length=200,
     )
-    
+
     # Deliverability settings
     reply_to_email: Optional[str] = Field(
         default=None,
         description="Reply-to email address",
         pattern=r"^[^@]+@[^@]+\.[^@]+$",
     )
-    
+
     tracking_enabled: bool = Field(
         default=True,
         description="Enable email open and click tracking",
     )
-    
+
     # Template data customization
     custom_template_data: Dict[str, Any] = Field(
         default_factory=dict,
         description="Additional data to pass to email templates",
     )
-    
+
     @field_validator("api_key")
     @classmethod
     def validate_api_key(cls, v: SecretStr) -> SecretStr:
@@ -213,14 +214,14 @@ class TwilioConfig(BaseModel):
     Provides type-safe configuration for all Twilio services including
     Verify API, WhatsApp, SMS, and SendGrid email integration.
     """
-    
+
     model_config = {
         "str_strip_whitespace": True,
         "validate_assignment": True,
         "extra": "forbid",
         "validate_default": True,
     }
-    
+
     # Core Twilio credentials
     account_sid: str = Field(
         ...,
@@ -229,48 +230,48 @@ class TwilioConfig(BaseModel):
         max_length=34,
         pattern=r"^AC[a-f0-9]{32}$",
     )
-    
+
     auth_token: SecretStr = Field(
         ...,
         description="Twilio Auth Token",
         min_length=32,
         max_length=32,
     )
-    
+
     # Service configuration
     verify: Optional[TwilioVerifyConfig] = Field(
         default=None,
         description="Twilio Verify service configuration for OTP",
     )
-    
+
     sendgrid: Optional[SendGridConfig] = Field(
         default=None,
         description="SendGrid email service configuration",
     )
-    
+
     # Global settings
     region: TwilioRegion = Field(
         default=TwilioRegion.US,
         description="Twilio service region for compliance and performance",
     )
-    
+
     webhook_url: Optional[str] = Field(
         default=None,
         description="Webhook URL for delivery status callbacks",
         pattern=r"^https?://[^\s]+$",
     )
-    
+
     # Debug and testing
     test_mode: bool = Field(
         default=False,
         description="Enable test mode (uses Twilio test credentials)",
     )
-    
+
     debug_logging: bool = Field(
         default=False,
         description="Enable detailed logging for debugging",
     )
-    
+
     # Timeout settings
     request_timeout: int = Field(
         default=30,
@@ -278,7 +279,7 @@ class TwilioConfig(BaseModel):
         ge=5,
         le=300,
     )
-    
+
     # Retry configuration
     max_retries: int = Field(
         default=3,
@@ -286,14 +287,14 @@ class TwilioConfig(BaseModel):
         ge=0,
         le=10,
     )
-    
+
     retry_delay: float = Field(
         default=1.0,
         description="Base delay between retries in seconds",
         ge=0.1,
         le=60.0,
     )
-    
+
     @model_validator(mode="after")
     def validate_service_configuration(self) -> "TwilioConfig":
         """Validate service configuration - allow basic messaging without services."""
@@ -309,10 +310,10 @@ class TwilioConfig(BaseModel):
                     context={"enabled_channels": [ch.value for ch in all_channels]},
                     suggestions=["Configure SendGrid settings for email OTP delivery"]
                 )
-        
+
         return self
-    
-    
+
+
     def get_client_config(self) -> Dict[str, Any]:
         """
         Get configuration for Twilio client initialization.
@@ -325,12 +326,12 @@ class TwilioConfig(BaseModel):
             "password": self.auth_token.get_secret_value(),
             "region": self.region.value,
         }
-        
+
         if self.webhook_url:
             config["webhook_url"] = self.webhook_url
-            
+
         return config
-    
+
     def get_sendgrid_config(self) -> Optional[Dict[str, Any]]:
         """
         Get configuration for SendGrid client initialization.
@@ -340,7 +341,7 @@ class TwilioConfig(BaseModel):
         """
         if not self.sendgrid:
             return None
-            
+
         return {
             "api_key": self.sendgrid.api_key.get_secret_value(),
             "from_email": self.sendgrid.from_email,
@@ -348,7 +349,7 @@ class TwilioConfig(BaseModel):
             "template_id": self.sendgrid.otp_template_id,
             "tracking_enabled": self.sendgrid.tracking_enabled,
         }
-    
+
     def is_channel_enabled(self, channel: TwilioChannelType) -> bool:
         """
         Check if a specific channel is enabled in the configuration.
@@ -362,14 +363,14 @@ class TwilioConfig(BaseModel):
         # Check email channel separately (SendGrid)
         if channel == TwilioChannelType.EMAIL:
             return self.sendgrid is not None
-        
+
         # Check Verify channels (WhatsApp, SMS, Voice)
         if not self.verify:
             return False
-            
+
         all_channels = [self.verify.default_channel] + self.verify.fallback_channels
         return channel in all_channels
-    
+
     def get_enabled_channels(self) -> List[TwilioChannelType]:
         """
         Get list of all enabled channels.
@@ -378,14 +379,14 @@ class TwilioConfig(BaseModel):
             List of enabled channel types
         """
         channels = []
-        
+
         if self.verify:
             channels.append(self.verify.default_channel)
             channels.extend(self.verify.fallback_channels)
-            
+
         if self.sendgrid and TwilioChannelType.EMAIL not in channels:
             channels.append(TwilioChannelType.EMAIL)
-            
+
         # Remove duplicates while preserving order
         seen = set()
         unique_channels = []
@@ -393,14 +394,14 @@ class TwilioConfig(BaseModel):
             if channel not in seen:
                 seen.add(channel)
                 unique_channels.append(channel)
-                
+
         return unique_channels
 
 
 # Export configuration models
 __all__ = [
     "TwilioConfig",
-    "TwilioVerifyConfig", 
+    "TwilioVerifyConfig",
     "SendGridConfig",
     "TwilioChannelType",
     "TwilioRegion",