django-cfg 1.1.50__tar.gz → 1.1.51__tar.gz

{django_cfg-1.1.50 → django_cfg-1.1.51}/.gitignore

@@ -76,3 +76,5 @@ package-lock.json
 *.bak
 *.tmp
 *.temp
+
+/cache

{django_cfg-1.1.50 → django_cfg-1.1.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.1.50
+Version: 1.1.51
 Summary: 🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience
 Project-URL: Homepage, https://github.com/markolofsen/django-cfg
 Project-URL: Documentation, https://django-cfg.readthedocs.io

{django_cfg-1.1.50 → django_cfg-1.1.51}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.1.50"
+version = "1.1.51"
 description = "🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience"
 readme = "README.md"
 license = {text = "MIT"}

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/__init__.py

@@ -38,7 +38,7 @@ default_app_config = "django_cfg.apps.DjangoCfgConfig"
 from typing import TYPE_CHECKING
 
 # Version information
-__version__ = "1.1.50"
+__version__ = "1.1.51"
 __author__ = "ReformsAI Team"
 __email__ = "info@reforms.ai"
 __license__ = "MIT"

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/apps/accounts/admin/__init__.py

@@ -7,6 +7,7 @@ from .otp import OTPSecretAdmin
 from .registration_source import RegistrationSourceAdmin, UserRegistrationSourceAdmin
 from .activity import UserActivityAdmin
 from .group import GroupAdmin
+from .twilio_response import TwilioResponseAdmin
 
 __all__ = [
     'CustomUserAdmin',
@@ -15,4 +16,5 @@ __all__ = [
     'UserRegistrationSourceAdmin',
     'UserActivityAdmin',
     'GroupAdmin',
+    'TwilioResponseAdmin',
 ]

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/apps/accounts/admin/filters.py

@@ -96,3 +96,57 @@ class ActivityTypeFilter(admin.SimpleListFilter):
         elif self.value():
             return queryset.filter(activity_type=self.value())
         return queryset
+
+
+class TwilioResponseStatusFilter(admin.SimpleListFilter):
+    title = "Response Status"
+    parameter_name = "twilio_status"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("successful", "Successful"),
+            ("failed", "Failed"),
+            ("pending", "Pending"),
+            ("with_errors", "With Errors"),
+            ("recent", "Recent (24h)"),
+        )
+
+    def queryset(self, request, queryset):
+        now = timezone.now()
+        if self.value() == "successful":
+            return queryset.filter(
+                status__in=['sent', 'delivered', 'approved'],
+                error_code__isnull=True
+            )
+        elif self.value() == "failed":
+            return queryset.filter(
+                status__in=['failed', 'undelivered', 'rejected']
+            )
+        elif self.value() == "pending":
+            return queryset.filter(status='pending')
+        elif self.value() == "with_errors":
+            return queryset.exclude(error_code__isnull=True)
+        elif self.value() == "recent":
+            return queryset.filter(created_at__gte=now - timedelta(hours=24))
+        return queryset
+
+
+class TwilioResponseTypeFilter(admin.SimpleListFilter):
+    title = "Response Type"
+    parameter_name = "twilio_response_type"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("api_send", "API Send"),
+            ("api_verify", "API Verify"),
+            ("webhook_status", "Webhook Status"),
+            ("webhook_delivery", "Webhook Delivery"),
+            ("otp_related", "OTP Related"),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == "otp_related":
+            return queryset.filter(otp_secret__isnull=False)
+        elif self.value():
+            return queryset.filter(response_type=self.value())
+        return queryset

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/apps/accounts/admin/otp.py

@@ -8,16 +8,18 @@ from unfold.admin import ModelAdmin
 
 from ..models import OTPSecret
 from .filters import OTPStatusFilter
+from .twilio_response import TwilioResponseInline
 
 
 @admin.register(OTPSecret)
 class OTPSecretAdmin(ModelAdmin):
-    list_display = ["recipient", "channel_type", "secret", "status", "created", "expires"]
+    list_display = ["recipient", "channel_type", "secret", "status", "twilio_responses_count", "created", "expires"]
     list_display_links = ["recipient", "secret"]
     list_filter = [OTPStatusFilter, "channel_type", "is_used", "created_at"]
     search_fields = ["recipient", "secret"]
     readonly_fields = ["created_at", "expires_at"]
     ordering = ["-created_at"]
+    inlines = [TwilioResponseInline]
 
     fieldsets = (
         (
@@ -57,3 +59,12 @@ class OTPSecretAdmin(ModelAdmin):
         return naturaltime(obj.expires_at)
 
     expires.short_description = "Expires"
+
+    def twilio_responses_count(self, obj):
+        """Count of related Twilio responses."""
+        count = obj.twilio_responses.count()
+        if count == 0:
+            return "—"
+        return f"{count} response{'s' if count != 1 else ''}"
+
+    twilio_responses_count.short_description = "Twilio"

django_cfg-1.1.51/src/django_cfg/apps/accounts/admin/twilio_response.py

@@ -0,0 +1,222 @@
+"""
+Twilio Response admin configuration.
+"""
+
+from django.contrib import admin
+from django.contrib.humanize.templatetags.humanize import naturaltime
+from django.utils.html import format_html
+from unfold.admin import ModelAdmin
+
+from ..models import TwilioResponse
+from .filters import TwilioResponseStatusFilter, TwilioResponseTypeFilter
+
+
+class TwilioResponseInline(admin.TabularInline):
+    """Inline for showing Twilio responses in related models."""
+    model = TwilioResponse
+    extra = 0
+    readonly_fields = ['created_at', 'status', 'message_sid', 'error_code']
+    fields = ['response_type', 'service_type', 'status', 'message_sid', 'error_code', 'created_at']
+    
+    def has_add_permission(self, request, obj=None):
+        return False
+
+
+@admin.register(TwilioResponse)
+class TwilioResponseAdmin(ModelAdmin):
+    list_display = [
+        'identifier', 
+        'service_type', 
+        'response_type', 
+        'status_display', 
+        'recipient', 
+        'price_display',
+        'created_display',
+        'has_error_display'
+    ]
+    list_display_links = ['identifier']
+    list_filter = [
+        TwilioResponseStatusFilter,
+        TwilioResponseTypeFilter,
+        'service_type',
+        'response_type',
+        'created_at',
+    ]
+    search_fields = [
+        'message_sid', 
+        'verification_sid', 
+        'to_number', 
+        'error_message',
+        'otp_secret__recipient'
+    ]
+    readonly_fields = [
+        'created_at', 
+        'updated_at', 
+        'twilio_created_at',
+        'response_data_display',
+        'request_data_display'
+    ]
+    ordering = ['-created_at']
+    
+    fieldsets = (
+        (
+            'Basic Information',
+            {
+                'fields': (
+                    'response_type',
+                    'service_type', 
+                    'status',
+                    'otp_secret'
+                ),
+            },
+        ),
+        (
+            'Twilio Identifiers',
+            {
+                'fields': (
+                    'message_sid',
+                    'verification_sid',
+                ),
+            },
+        ),
+        (
+            'Recipients',
+            {
+                'fields': (
+                    'to_number',
+                    'from_number',
+                ),
+            },
+        ),
+        (
+            'Error Information',
+            {
+                'fields': (
+                    'error_code',
+                    'error_message',
+                ),
+                'classes': ('collapse',),
+            },
+        ),
+        (
+            'Pricing',
+            {
+                'fields': (
+                    'price',
+                    'price_unit',
+                ),
+                'classes': ('collapse',),
+            },
+        ),
+        (
+            'Request/Response Data',
+            {
+                'fields': (
+                    'request_data_display',
+                    'response_data_display',
+                ),
+                'classes': ('collapse',),
+            },
+        ),
+        (
+            'Timestamps',
+            {
+                'fields': (
+                    'created_at',
+                    'updated_at',
+                    'twilio_created_at',
+                ),
+                'classes': ('collapse',),
+            },
+        ),
+    )
+
+    def identifier(self, obj):
+        """Get the main identifier for the response."""
+        return obj.message_sid or obj.verification_sid or '—'
+    identifier.short_description = 'Identifier'
+
+    def status_display(self, obj):
+        """Display status with color coding."""
+        if obj.has_error:
+            return format_html(
+                '<span style="color: #dc3545;">❌ {}</span>',
+                obj.status or 'Error'
+            )
+        elif obj.is_successful:
+            return format_html(
+                '<span style="color: #28a745;">✅ {}</span>',
+                obj.status or 'Success'
+            )
+        else:
+            return format_html(
+                '<span style="color: #ffc107;">⏳ {}</span>',
+                obj.status or 'Unknown'
+            )
+    status_display.short_description = 'Status'
+
+    def recipient(self, obj):
+        """Display recipient with masking for privacy."""
+        if not obj.to_number:
+            return '—'
+        
+        # Mask phone numbers and emails for privacy
+        recipient = obj.to_number
+        if '@' in recipient:
+            # Email masking
+            local, domain = recipient.split('@', 1)
+            masked_local = local[:2] + '*' * (len(local) - 2)
+            return f"{masked_local}@{domain}"
+        else:
+            # Phone masking
+            return f"***{recipient[-4:]}" if len(recipient) > 4 else "***"
+    recipient.short_description = 'Recipient'
+
+    def price_display(self, obj):
+        """Display price with currency."""
+        if obj.price and obj.price_unit:
+            return f"{obj.price} {obj.price_unit.upper()}"
+        return '—'
+    price_display.short_description = 'Price'
+
+    def created_display(self, obj):
+        """Display created time with natural time."""
+        return naturaltime(obj.created_at)
+    created_display.short_description = 'Created'
+
+    def has_error_display(self, obj):
+        """Display error status."""
+        if obj.has_error:
+            return format_html('<span style="color: #dc3545;">❌</span>')
+        return format_html('<span style="color: #28a745;">✅</span>')
+    has_error_display.short_description = 'Error'
+
+    def request_data_display(self, obj):
+        """Display formatted request data."""
+        if not obj.request_data:
+            return '—'
+        
+        import json
+        try:
+            formatted = json.dumps(obj.request_data, indent=2, ensure_ascii=False)
+            return format_html('<pre style="font-size: 12px;">{}</pre>', formatted)
+        except (TypeError, ValueError):
+            return str(obj.request_data)
+    request_data_display.short_description = 'Request Data'
+
+    def response_data_display(self, obj):
+        """Display formatted response data."""
+        if not obj.response_data:
+            return '—'
+        
+        import json
+        try:
+            formatted = json.dumps(obj.response_data, indent=2, ensure_ascii=False)
+            return format_html('<pre style="font-size: 12px;">{}</pre>', formatted)
+        except (TypeError, ValueError):
+            return str(obj.response_data)
+    response_data_display.short_description = 'Response Data'
+
+    def get_queryset(self, request):
+        """Optimize queryset with select_related."""
+        return super().get_queryset(request).select_related('otp_secret')

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/apps/accounts/managers/user_manager.py

@@ -246,6 +246,11 @@ class UserManager(UserManager):
             return user.first_name
         elif user.last_name:
             return user.last_name
+        
+        # For phone users with temp email, use display_username instead
+        if user.email and user.email.startswith('phone_') and '@temp.' in user.email:
+            return self.get_display_username(user)
+        
         return user.email
 
     def get_initials(self, user) -> str:
@@ -262,6 +267,17 @@ class UserManager(UserManager):
             return user.first_name[0].upper()
         elif user.last_name:
             return user.last_name[0].upper()
+        
+        # For phone users with temp email, use username initials instead
+        if user.email and user.email.startswith('phone_') and '@temp.' in user.email:
+            if user.username:
+                # Take first two characters of username
+                clean_username = user.username.replace("_", "").replace("-", "").replace(".", "")
+                if len(clean_username) >= 2:
+                    return f"{clean_username[0]}{clean_username[1]}".upper()
+                elif len(clean_username) == 1:
+                    return clean_username[0].upper()
+        
         return user.email[0].upper()
 
     def get_display_username(self, user) -> str:

django_cfg-1.1.51/src/django_cfg/apps/accounts/migrations/0003_twilioresponse.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.6 on 2025-09-16 09:23
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_cfg_accounts', '0002_add_phone_otp_clean'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TwilioResponse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('response_type', models.CharField(choices=[('api_send', 'API Send Request'), ('api_verify', 'API Verify Request'), ('webhook_status', 'Webhook Status Update'), ('webhook_delivery', 'Webhook Delivery Report')], max_length=20)),
+                ('service_type', models.CharField(choices=[('whatsapp', 'WhatsApp'), ('sms', 'SMS'), ('voice', 'Voice'), ('email', 'Email'), ('verify', 'Verify API')], max_length=10)),
+                ('message_sid', models.CharField(blank=True, help_text='Twilio Message SID', max_length=34)),
+                ('verification_sid', models.CharField(blank=True, help_text='Twilio Verification SID', max_length=34)),
+                ('request_data', models.JSONField(default=dict, help_text='Original request parameters')),
+                ('response_data', models.JSONField(default=dict, help_text='Twilio API response')),
+                ('status', models.CharField(blank=True, help_text='Message/Verification status', max_length=20)),
+                ('error_code', models.CharField(blank=True, help_text='Twilio error code', max_length=10)),
+                ('error_message', models.TextField(blank=True, help_text='Error description')),
+                ('to_number', models.CharField(blank=True, help_text='Recipient phone/email', max_length=20)),
+                ('from_number', models.CharField(blank=True, help_text='Sender phone/email', max_length=20)),
+                ('price', models.DecimalField(blank=True, decimal_places=6, max_digits=10, null=True)),
+                ('price_unit', models.CharField(blank=True, help_text='Currency code', max_length=3)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('twilio_created_at', models.DateTimeField(blank=True, help_text='Timestamp from Twilio', null=True)),
+                ('otp_secret', models.ForeignKey(blank=True, help_text='Related OTP if applicable', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='twilio_responses', to='django_cfg_accounts.otpsecret')),
+            ],
+            options={
+                'verbose_name': 'Twilio Response',
+                'verbose_name_plural': 'Twilio Responses',
+                'ordering': ['-created_at'],
+                'indexes': [models.Index(fields=['message_sid'], name='django_cfg__message_c37dcd_idx'), models.Index(fields=['verification_sid'], name='django_cfg__verific_7de689_idx'), models.Index(fields=['status', 'created_at'], name='django_cfg__status_95d8c8_idx'), models.Index(fields=['response_type', 'service_type'], name='django_cfg__respons_20ca26_idx')],
+            },
+        ),
+    ]

{django_cfg-1.1.50 → django_cfg-1.1.51}/src/django_cfg/apps/accounts/models.py

@@ -203,6 +203,99 @@ class OTPSecret(models.Model):
         ]
 
 
+class TwilioResponse(models.Model):
+    """
+    Store Twilio API responses and webhook events.
+    
+    This model tracks all interactions with Twilio including:
+    - API responses from sending messages/OTP
+    - Webhook events for delivery status updates
+    - Error tracking and debugging information
+    """
+    
+    RESPONSE_TYPES = [
+        ('api_send', 'API Send Request'),
+        ('api_verify', 'API Verify Request'),
+        ('webhook_status', 'Webhook Status Update'),
+        ('webhook_delivery', 'Webhook Delivery Report'),
+    ]
+    
+    SERVICE_TYPES = [
+        ('whatsapp', 'WhatsApp'),
+        ('sms', 'SMS'),
+        ('voice', 'Voice'),
+        ('email', 'Email'),
+        ('verify', 'Verify API'),
+    ]
+    
+    # Basic info
+    response_type = models.CharField(max_length=20, choices=RESPONSE_TYPES)
+    service_type = models.CharField(max_length=10, choices=SERVICE_TYPES)
+    
+    # Twilio identifiers
+    message_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Message SID")
+    verification_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Verification SID")
+    
+    # Request/Response data
+    request_data = models.JSONField(default=dict, help_text="Original request parameters")
+    response_data = models.JSONField(default=dict, help_text="Twilio API response")
+    
+    # Status tracking
+    status = models.CharField(max_length=20, blank=True, help_text="Message/Verification status")
+    error_code = models.CharField(max_length=10, blank=True, help_text="Twilio error code")
+    error_message = models.TextField(blank=True, help_text="Error description")
+    
+    # Recipient info
+    to_number = models.CharField(max_length=20, blank=True, help_text="Recipient phone/email")
+    from_number = models.CharField(max_length=20, blank=True, help_text="Sender phone/email")
+    
+    # Pricing
+    price = models.DecimalField(max_digits=10, decimal_places=6, null=True, blank=True)
+    price_unit = models.CharField(max_length=3, blank=True, help_text="Currency code")
+    
+    # Timestamps
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    twilio_created_at = models.DateTimeField(null=True, blank=True, help_text="Timestamp from Twilio")
+    
+    # Relations
+    otp_secret = models.ForeignKey(
+        'OTPSecret', 
+        on_delete=models.SET_NULL, 
+        null=True, 
+        blank=True,
+        related_name='twilio_responses',
+        help_text="Related OTP if applicable"
+    )
+    
+    class Meta:
+        app_label = 'django_cfg_accounts'
+        verbose_name = 'Twilio Response'
+        verbose_name_plural = 'Twilio Responses'
+        ordering = ['-created_at']
+        indexes = [
+            models.Index(fields=['message_sid']),
+            models.Index(fields=['verification_sid']),
+            models.Index(fields=['status', 'created_at']),
+            models.Index(fields=['response_type', 'service_type']),
+        ]
+    
+    def __str__(self):
+        identifier = self.message_sid or self.verification_sid or 'Unknown'
+        return f"{self.get_service_type_display()} {self.get_response_type_display()} - {identifier}"
+    
+    @property
+    def is_successful(self):
+        """Check if the response indicates success."""
+        success_statuses = ['sent', 'delivered', 'pending', 'approved']
+        return self.status.lower() in success_statuses if self.status else False
+    
+    @property
+    def has_error(self):
+        """Check if the response has an error."""
+        return bool(self.error_code or self.error_message)
+
+
 class UserActivity(models.Model):
     """
     User activity log.

django_cfg-1.1.51/src/django_cfg/apps/accounts/serializers/webhook.py

@@ -0,0 +1,94 @@
+"""
+Twilio Webhook Serializers
+
+Serializers for validating and processing Twilio webhook data.
+"""
+
+from rest_framework import serializers
+
+
+class TwilioWebhookSerializer(serializers.Serializer):
+    """
+    Serializer for Twilio webhook data.
+    
+    This handles both message status webhooks and verification webhooks
+    from Twilio. The fields are optional because different webhook types
+    send different data.
+    """
+    
+    # Message-related fields (SMS/WhatsApp)
+    MessageSid = serializers.CharField(required=False, help_text="Twilio Message SID")
+    MessageStatus = serializers.CharField(required=False, help_text="Message status (sent, delivered, failed, etc.)")
+    To = serializers.CharField(required=False, help_text="Recipient phone number")
+    From = serializers.CharField(required=False, help_text="Sender phone number")
+    Body = serializers.CharField(required=False, help_text="Message body")
+    
+    # Error fields
+    ErrorCode = serializers.CharField(required=False, help_text="Twilio error code")
+    ErrorMessage = serializers.CharField(required=False, help_text="Error message description")
+    
+    # Pricing fields
+    Price = serializers.DecimalField(max_digits=10, decimal_places=6, required=False, help_text="Message price")
+    PriceUnit = serializers.CharField(required=False, help_text="Currency code")
+    
+    # Verification-related fields (Verify API)
+    VerificationSid = serializers.CharField(required=False, help_text="Twilio Verification SID")
+    VerificationStatus = serializers.CharField(required=False, help_text="Verification status (approved, canceled, etc.)")
+    Channel = serializers.CharField(required=False, help_text="Verification channel (sms, whatsapp, call)")
+    
+    # Timestamp fields
+    DateCreated = serializers.DateTimeField(required=False, help_text="When the message was created")
+    DateSent = serializers.DateTimeField(required=False, help_text="When the message was sent")
+    DateUpdated = serializers.DateTimeField(required=False, help_text="When the status was last updated")
+    
+    # Account information
+    AccountSid = serializers.CharField(required=False, help_text="Twilio Account SID")
+    
+    # Additional fields that might be present
+    Direction = serializers.CharField(required=False, help_text="Message direction (inbound/outbound)")
+    ApiVersion = serializers.CharField(required=False, help_text="Twilio API version")
+    
+    # Alternative field names (some webhooks use different casing)
+    message_sid = serializers.CharField(required=False, help_text="Alternative field name for MessageSid")
+    message_status = serializers.CharField(required=False, help_text="Alternative field name for MessageStatus")
+    verification_sid = serializers.CharField(required=False, help_text="Alternative field name for VerificationSid")
+    verification_status = serializers.CharField(required=False, help_text="Alternative field name for VerificationStatus")
+    
+    def validate(self, data):
+        """
+        Ensure that we have at least one of the required identifiers.
+        """
+        message_sid = data.get('MessageSid') or data.get('message_sid')
+        verification_sid = data.get('VerificationSid') or data.get('verification_sid')
+        
+        if not message_sid and not verification_sid:
+            raise serializers.ValidationError(
+                "Either MessageSid or VerificationSid must be provided"
+            )
+        
+        return data
+    
+    def to_internal_value(self, data):
+        """
+        Convert the webhook data to internal format.
+        
+        This handles the fact that Twilio webhooks are sent as form data,
+        not JSON, so we need to be flexible about the input format.
+        """
+        if hasattr(data, 'items'):
+            # Convert QueryDict or dict to regular dict
+            data = dict(data.items()) if hasattr(data, 'items') else data
+        
+        return super().to_internal_value(data)
+
+
+class TwilioWebhookResponseSerializer(serializers.Serializer):
+    """Response serializer for webhook endpoints."""
+    status = serializers.CharField(help_text="Processing status")
+    message = serializers.CharField(required=False, help_text="Optional message")
+
+
+class TwilioWebhookErrorSerializer(serializers.Serializer):
+    """Error response serializer for webhook endpoints."""
+    error = serializers.CharField(help_text="Error description")
+    details = serializers.DictField(required=False, help_text="Additional error details")