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

django_cfg/__init__.py

@@ -36,8 +36,8 @@ __version__ = "1.4.4"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading
-from .registry import DJANGO_CFG_REGISTRY
 from .config import LIB_NAME
+from .registry import DJANGO_CFG_REGISTRY
 
 # Get author from library config
 __author__ = LIB_NAME
@@ -47,13 +47,13 @@ def __getattr__(name: str):
     """Lazy import mechanism using registry pattern."""
     if name in DJANGO_CFG_REGISTRY:
         module_path, class_name = DJANGO_CFG_REGISTRY[name]
-        
+
         import importlib
         module = importlib.import_module(module_path)
         return getattr(module, class_name)
-    
+
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
 # Export all registered components
-__all__ = list(DJANGO_CFG_REGISTRY.keys())
+__all__ = list(DJANGO_CFG_REGISTRY.keys())

django_cfg/apps/accounts/__init__.py

@@ -1,4 +1,4 @@
 """
 Accounts app for user management.
 """
-default_app_config = 'apps.accounts.apps.AccountsConfig' 
+default_app_config = 'apps.accounts.apps.AccountsConfig'

django_cfg/apps/accounts/__models.py

@@ -1,12 +1,13 @@
-from typing import Optional, List
-from django.contrib.auth.models import AbstractUser
-from django.db import models
-from django.utils import timezone
-from datetime import timedelta
 import random
 import string
+from datetime import timedelta
+from typing import List, Optional
 from urllib.parse import urlparse
 
+from django.contrib.auth.models import AbstractUser
+from django.db import models
+from django.utils import timezone
+
 from .managers.user_manager import UserManager
 
 
@@ -52,7 +53,7 @@ class UserRegistrationSource(models.Model):
     source = models.ForeignKey(RegistrationSource, on_delete=models.CASCADE, related_name='user_registration_sources')
     first_registration = models.BooleanField(default=True, help_text="Whether this was the first registration from this source")
     registration_date = models.DateTimeField(auto_now_add=True)
-    
+
     class Meta:
         app_label = 'django_cfg_accounts'
         unique_together = ['user', 'source']
@@ -170,7 +171,7 @@ class UserActivity(models.Model):
     """
     User activity log.
     """
-    
+
     ACTIVITY_TYPES = [
         ('login', 'Login'),
         ('logout', 'Logout'),
@@ -179,39 +180,39 @@ class UserActivity(models.Model):
         ('profile_updated', 'Profile Updated'),
         ('registration', 'Registration'),
     ]
-    
+
     user = models.ForeignKey('CustomUser', on_delete=models.CASCADE, related_name='activities')
     activity_type = models.CharField(max_length=20, choices=ACTIVITY_TYPES)
     description = models.TextField(blank=True)
     ip_address = models.GenericIPAddressField(null=True, blank=True)
     user_agent = models.TextField(blank=True)
-    
+
     # Related objects (generic foreign key could be used here)
     object_id = models.PositiveIntegerField(null=True, blank=True)
     object_type = models.CharField(max_length=50, blank=True)
-    
+
     created_at = models.DateTimeField(auto_now_add=True)
-    
+
     class Meta:
         app_label = 'django_cfg_accounts'
         verbose_name = 'User Activity'
         verbose_name_plural = 'User Activities'
         ordering = ['-created_at']
-    
+
     def __str__(self):
         return f"{self.user.username} - {self.get_activity_type_display()}"
 
 
 class TwilioResponse(models.Model):
     """Model for storing Twilio API responses and webhook data."""
-    
+
     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'),
@@ -219,46 +220,46 @@ class TwilioResponse(models.Model):
         ('email', 'Email'),
         ('verify', 'Verify API'),
     ]
-    
+
     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 and error handling
     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")
-    
+
     # Contact information
     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, 
+        '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'
@@ -270,15 +271,15 @@ class TwilioResponse(models.Model):
             models.Index(fields=['status', 'created_at']),
             models.Index(fields=['response_type', 'service_type']),
         ]
-    
+
     def __str__(self):
         return f"{self.get_response_type_display()} - {self.get_service_type_display()}"
-    
+
     @property
     def has_error(self):
         """Check if response has error."""
         return bool(self.error_code or self.error_message)
-    
+
     @property
     def is_successful(self):
         """Check if response is successful."""

django_cfg/apps/accounts/admin/__init__.py

@@ -5,15 +5,26 @@ Modern, clean admin interfaces with Material Icons and consistent styling.
 """
 
 from django.contrib import admin
+from django.contrib.auth.models import Group
 
-# Import all admin classes
-from .user_admin import CustomUserAdmin
 from .activity_admin import UserActivityAdmin
+from .group_admin import GroupAdmin
 from .otp_admin import OTPSecretAdmin
 from .registration_admin import RegistrationSourceAdmin, UserRegistrationSourceAdmin
-from .group_admin import GroupAdmin
 from .twilio_admin import TwilioResponseAdmin, TwilioResponseInline
 
+# Import all admin classes
+from .user_admin import CustomUserAdmin
+
+# Re-register Group with our custom admin (replaces Django's default)
+# This needs to be in a ready() method or use try/except because Django's auth
+# admin might register it first
+try:
+    admin.site.unregister(Group)
+except admin.sites.NotRegistered:
+    pass
+admin.site.register(Group, GroupAdmin)
+
 # All models are registered in their respective admin files using @admin.register
 # This provides:
 # - Clean separation of concerns

django_cfg/apps/accounts/admin/activity_admin.py

@@ -8,13 +8,13 @@ from django.contrib import admin
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    UserDisplayConfig,
     DateTimeDisplayConfig,
-    StatusBadgeConfig,
+    DisplayMixin,
     Icons,
-    display
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    UserDisplayConfig,
+    display,
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -25,10 +25,10 @@ from .filters import ActivityTypeFilter
 @admin.register(UserActivity)
 class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Enhanced admin for UserActivity model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['user']
-    
+
     list_display = [
         'user_display',
         'activity_type_display',
@@ -42,7 +42,7 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     readonly_fields = ['created_at']
     date_hierarchy = 'created_at'
     ordering = ['-created_at']
-    
+
     fieldsets = (
         ('Activity', {
             'fields': ('user', 'activity_type', 'description')
@@ -60,7 +60,7 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'fields': ('created_at',)
         }),
     )
-    
+
     @display(description="User")
     def user_display(self, obj):
         """Enhanced user display with avatar."""
@@ -70,7 +70,7 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             show_email=False
         )
         return self.display_user_simple(obj.user, config)
-    
+
     @display(description="Activity")
     def activity_type_display(self, obj):
         """Activity type with appropriate icons."""
@@ -82,7 +82,7 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'profile_updated': Icons.EDIT,
             'registration': Icons.PERSON_ADD,
         }
-        
+
         activity_variants = {
             'login': 'success',
             'logout': 'info',
@@ -91,22 +91,22 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'profile_updated': 'info',
             'registration': 'primary',
         }
-        
+
         icon = activity_icons.get(obj.activity_type, Icons.DESCRIPTION)
         variant = activity_variants.get(obj.activity_type, 'info')
-        
+
         config = StatusBadgeConfig(
             show_icons=True,
             icon=icon,
             custom_mappings={obj.get_activity_type_display(): variant}
         )
-        
+
         return StatusBadge.create(
             text=obj.get_activity_type_display(),
             variant=variant,
             config=config
         )
-    
+
     @display(description="Description")
     def description_display(self, obj):
         """Truncated description with full text in tooltip."""
@@ -118,27 +118,27 @@ class UserActivityAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
                 variant="secondary",
                 config=config
             )
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.DESCRIPTION)
         return StatusBadge.create(
             text=obj.description,
             variant="info",
             config=config
         )
-    
+
     @display(description="IP Address")
     def ip_address_display(self, obj):
         """IP address with network icon."""
         if not obj.ip_address:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.PUBLIC)
         return StatusBadge.create(
             text=obj.ip_address,
             variant="secondary",
             config=config
         )
-    
+
     @display(description="When")
     def created_at_display(self, obj):
         """Created time with relative display."""

django_cfg/apps/accounts/admin/filters.py

@@ -4,11 +4,12 @@ Custom admin filters for Accounts app.
 Enhanced filters with better organization and performance.
 """
 
-from django.contrib import admin
-from django.utils import timezone
 from datetime import timedelta
+
+from django.contrib import admin
 from django.db import models
 from django.db.models import Count
+from django.utils import timezone
 
 
 class UserStatusFilter(admin.SimpleListFilter):
@@ -56,7 +57,7 @@ class OTPStatusFilter(admin.SimpleListFilter):
     def queryset(self, request, queryset):
         now = timezone.now()
         today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
-        
+
         if self.value() == "valid":
             return queryset.filter(is_used=False, expires_at__gt=now)
         elif self.value() == "used":
@@ -115,7 +116,7 @@ class ActivityTypeFilter(admin.SimpleListFilter):
     def queryset(self, request, queryset):
         now = timezone.now()
         today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
-        
+
         if self.value() == "recent":
             return queryset.filter(created_at__gte=now - timedelta(hours=24))
         elif self.value() == "today":
@@ -140,12 +141,12 @@ class TwilioResponseStatusFilter(admin.SimpleListFilter):
 
     def queryset(self, request, queryset):
         now = timezone.now()
-        
+
         if self.value() == "success":
             return queryset.filter(error_code__isnull=True, error_message__isnull=True)
         elif self.value() == "error":
             return queryset.filter(
-                models.Q(error_code__isnull=False) | 
+                models.Q(error_code__isnull=False) |
                 models.Q(error_message__isnull=False)
             )
         elif self.value() == "pending":

django_cfg/apps/accounts/admin/group_admin.py

@@ -9,23 +9,17 @@ from django.contrib.auth.models import Group
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
     DisplayMixin,
-    StatusBadgeConfig,
     Icons,
-    display
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    display,
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
-
-# Unregister the default Group admin
-admin.site.unregister(Group)
-
-
-@admin.register(Group)
 class GroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Enhanced admin for Group model using Django Admin Utilities."""
-    
+
     list_display = [
         'name_display',
         'users_count_display',
@@ -35,7 +29,7 @@ class GroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     search_fields = ['name']
     filter_horizontal = ['permissions']
     ordering = ['name']
-    
+
     fieldsets = (
         ('Group Details', {
             'fields': ('name',)
@@ -45,7 +39,7 @@ class GroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'classes': ('collapse',)
         }),
     )
-    
+
     @display(description="Group Name")
     def name_display(self, obj):
         """Group name display with group icon."""
@@ -55,21 +49,21 @@ class GroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="primary",
             config=config
         )
-    
+
     @display(description="Users")
     def users_count_display(self, obj):
         """Count of users in this group."""
         count = obj.user_set.count()
         if count == 0:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.PEOPLE)
         return StatusBadge.create(
             text=f"{count} user{'s' if count != 1 else ''}",
             variant="info",
             config=config
         )
-    
+
     @display(description="Permissions")
     def permissions_count_display(self, obj):
         """Count of permissions in this group."""
@@ -77,7 +71,7 @@ class GroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         if count == 0:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.SECURITY)
             return StatusBadge.create(text="No permissions", variant="secondary", config=config)
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.SECURITY)
         return StatusBadge.create(
             text=f"{count} permission{'s' if count != 1 else ''}",

django_cfg/apps/accounts/admin/inlines.py

@@ -6,9 +6,11 @@ Enhanced inline classes with better organization and conditional loading.
 
 from unfold.admin import TabularInline
 
-from django_cfg.modules.base import BaseCfgModule    
 from django_cfg.apps.support.models import Ticket
-from ..models import UserRegistrationSource, UserActivity
+from django_cfg.modules.base import BaseCfgModule
+
+from ..models import UserActivity, UserRegistrationSource
+
 
 class UserRegistrationSourceInline(TabularInline):
     """Enhanced inline for user registration sources."""
@@ -54,7 +56,7 @@ class UserActivityInline(TabularInline):
     ordering = ["-created_at"]
     verbose_name = "Activity"
     verbose_name_plural = "Recent Activities"
-    
+
     # Show only recent activities to avoid performance issues
     def get_queryset(self, request):
         qs = super().get_queryset(request)
@@ -70,13 +72,13 @@ class UserActivityInline(TabularInline):
 
 class UserEmailLogInline(TabularInline):
     """Enhanced inline for viewing user's email logs."""
-    
+
     def __init__(self, *args, **kwargs):
         # Check if newsletter app is available and enabled
         self.model = None
         try:
             base_module = BaseCfgModule()
-            
+
             # Only import if newsletter is enabled
             if base_module.is_newsletter_enabled():
                 from django_cfg.apps.newsletter.models import EmailLog
@@ -84,11 +86,11 @@ class UserEmailLogInline(TabularInline):
         except (ImportError, Exception):
             # Newsletter app not available or not enabled
             pass
-        
+
         # Only call super if we have a valid model
         if self.model:
             super().__init__(*args, **kwargs)
-    
+
     extra = 0
     max_num = 15  # Limit to 15 most recent emails
     readonly_fields = ["newsletter", "campaign", "recipient", "subject", "status", "created_at", "sent_at"]
@@ -96,7 +98,7 @@ class UserEmailLogInline(TabularInline):
     ordering = ["-created_at"]
     verbose_name = "Email Log"
     verbose_name_plural = "Email History"
-    
+
     # Show only recent emails to avoid performance issues
     def get_queryset(self, request):
         if not self.model:
@@ -104,13 +106,13 @@ class UserEmailLogInline(TabularInline):
         qs = super().get_queryset(request)
         # Don't slice here - let Django handle formset filtering first
         return qs.order_by('-created_at')
-    
+
     def has_add_permission(self, request, obj=None):
         return False
-    
+
     def has_delete_permission(self, request, obj=None):
         return False
-    
+
     def has_view_permission(self, request, obj=None):
         # Only show if newsletter app is enabled and model exists
         if not self.model:
@@ -124,24 +126,24 @@ class UserEmailLogInline(TabularInline):
 
 class UserSupportTicketsInline(TabularInline):
     """Enhanced inline for viewing user's support tickets."""
-    
+
     def __init__(self, *args, **kwargs):
         # Check if support app is available and enabled
         self.model = None
         try:
             base_module = BaseCfgModule()
-            
+
             # Only import if support is enabled
             if base_module.is_support_enabled():
                 self.model = Ticket
         except (ImportError, Exception):
             # Support app not available or not enabled
             pass
-        
+
         # Only call super if we have a valid model
         if self.model:
             super().__init__(*args, **kwargs)
-    
+
     extra = 0
     max_num = 10  # Limit to 10 most recent tickets
     readonly_fields = ["uuid", "subject", "status", "created_at"]
@@ -149,7 +151,7 @@ class UserSupportTicketsInline(TabularInline):
     ordering = ["-created_at"]
     verbose_name = "Support Ticket"
     verbose_name_plural = "Support Tickets"
-    
+
     # Show only recent tickets to avoid performance issues
     def get_queryset(self, request):
         if not self.model:
@@ -157,13 +159,13 @@ class UserSupportTicketsInline(TabularInline):
         qs = super().get_queryset(request)
         # Don't slice here - let Django handle formset filtering first
         return qs.order_by('-created_at')
-    
+
     def has_add_permission(self, request, obj=None):
         return False
-    
+
     def has_delete_permission(self, request, obj=None):
         return False
-    
+
     def has_view_permission(self, request, obj=None):
         # Only show if support app is enabled and model exists
         if not self.model: