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

django_cfg/apps/newsletter/views/emails.py

@@ -2,27 +2,27 @@
 Email views.
 """
 
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics, status
-from rest_framework.response import Response
 from rest_framework.permissions import AllowAny, IsAuthenticated
-from drf_spectacular.utils import extend_schema
+from rest_framework.response import Response
 
 from ..models import EmailLog
-from ..services.email_service import NewsletterEmailService
 from ..serializers import (
-    TestEmailSerializer,
+    BulkEmailResponseSerializer,
     BulkEmailSerializer,
     EmailLogSerializer,
-    BulkEmailResponseSerializer,
+    TestEmailSerializer,
 )
+from ..services.email_service import NewsletterEmailService
 
 
 class TestEmailView(generics.CreateAPIView):
     """Test email sending functionality."""
-    
+
     serializer_class = TestEmailSerializer
     permission_classes = [AllowAny]
-    
+
     @extend_schema(
         summary="Test Email Sending",
         description="Send a test email to verify mailer configuration.",
@@ -36,14 +36,14 @@ class TestEmailView(generics.CreateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         email = serializer.validated_data['email']
         subject = serializer.validated_data['subject']
         message = serializer.validated_data['message']
-        
+
         try:
             email_service = NewsletterEmailService()
-            
+
             result = email_service.send_bulk_email(
                 recipients=[email],
                 subject=subject,
@@ -51,9 +51,9 @@ class TestEmailView(generics.CreateAPIView):
                 main_text=message,
                 main_html_content=f"<p>{message}</p><p>If you received this email, the mailer is working correctly!</p>"
             )
-            
+
             return Response(result, status=status.HTTP_200_OK)
-            
+
         except Exception as e:
             error_response = {
                 'success': False,
@@ -67,10 +67,10 @@ class TestEmailView(generics.CreateAPIView):
 
 class BulkEmailView(generics.CreateAPIView):
     """Send bulk emails."""
-    
+
     serializer_class = BulkEmailSerializer
     permission_classes = [IsAuthenticated]
-    
+
     @extend_schema(
         summary="Send Bulk Email",
         description="Send bulk emails to multiple recipients using base email template.",
@@ -84,10 +84,10 @@ class BulkEmailView(generics.CreateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         try:
             email_service = NewsletterEmailService()
-            
+
             result = email_service.send_bulk_email(
                 recipients=serializer.validated_data['recipients'],
                 subject=serializer.validated_data['subject'],
@@ -98,9 +98,9 @@ class BulkEmailView(generics.CreateAPIView):
                 button_url=serializer.validated_data.get('button_url', ''),
                 secondary_text=serializer.validated_data.get('secondary_text', '')
             )
-            
+
             return Response(result, status=status.HTTP_200_OK)
-            
+
         except Exception as e:
             error_response = {
                 'success': False,
@@ -114,11 +114,11 @@ class BulkEmailView(generics.CreateAPIView):
 
 class EmailLogListView(generics.ListAPIView):
     """List email logs."""
-    
+
     queryset = EmailLog.objects.all()
     serializer_class = EmailLogSerializer
     permission_classes = [IsAuthenticated]
-    
+
     @extend_schema(
         summary="List Email Logs",
         description="Get a list of email sending logs.",

django_cfg/apps/newsletter/views/newsletters.py

@@ -2,9 +2,9 @@
 Newsletter views.
 """
 
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics
 from rest_framework.permissions import AllowAny
-from drf_spectacular.utils import extend_schema
 
 from ..models import Newsletter
 from ..serializers import NewsletterSerializer
@@ -12,11 +12,11 @@ from ..serializers import NewsletterSerializer
 
 class NewsletterListView(generics.ListAPIView):
     """List all active newsletters."""
-    
+
     queryset = Newsletter.objects.filter(is_active=True)
     serializer_class = NewsletterSerializer
     permission_classes = [AllowAny]
-    
+
     @extend_schema(
         summary="List Active Newsletters",
         description="Get a list of all active newsletters available for subscription.",
@@ -29,11 +29,11 @@ class NewsletterListView(generics.ListAPIView):
 
 class NewsletterDetailView(generics.RetrieveAPIView):
     """Retrieve a specific newsletter."""
-    
+
     queryset = Newsletter.objects.filter(is_active=True)
     serializer_class = NewsletterSerializer
     permission_classes = [AllowAny]
-    
+
     @extend_schema(
         summary="Get Newsletter Details",
         description="Retrieve details of a specific newsletter.",

django_cfg/apps/newsletter/views/subscriptions.py

@@ -2,28 +2,28 @@
 Subscription views.
 """
 
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics, status
-from rest_framework.response import Response
 from rest_framework.permissions import AllowAny, IsAuthenticated
-from drf_spectacular.utils import extend_schema
+from rest_framework.response import Response
 
 from ..models import Newsletter, NewsletterSubscription
 from ..serializers import (
+    ErrorResponseSerializer,
     NewsletterSubscriptionSerializer,
-    SubscribeSerializer,
-    UnsubscribeSerializer,
     SubscribeResponseSerializer,
+    SubscribeSerializer,
     SuccessResponseSerializer,
-    ErrorResponseSerializer,
+    UnsubscribeSerializer,
 )
 
 
 class SubscribeView(generics.CreateAPIView):
     """Handle newsletter subscriptions."""
-    
+
     serializer_class = SubscribeSerializer
     permission_classes = [AllowAny]
-    
+
     @extend_schema(
         summary="Subscribe to Newsletter",
         description="Subscribe an email address to a newsletter.",
@@ -38,27 +38,27 @@ class SubscribeView(generics.CreateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         newsletter_id = serializer.validated_data['newsletter_id']
         email = serializer.validated_data['email']
-        
+
         try:
             newsletter = Newsletter.objects.get(id=newsletter_id, is_active=True)
-            
+
             # Create or reactivate subscription
             subscription, created = NewsletterSubscription.objects.get_or_create(
                 newsletter=newsletter,
                 email=email,
                 defaults={'is_active': True}
             )
-            
+
             if not created and not subscription.is_active:
                 # Reactivate subscription
                 subscription.is_active = True
                 subscription.unsubscribed_at = None
                 subscription.save()
                 created = True
-            
+
             if created:
                 response_data = {
                     'success': True,
@@ -72,7 +72,7 @@ class SubscribeView(generics.CreateAPIView):
                     'message': 'Already subscribed to this newsletter'
                 }
                 return Response(response_data, status=status.HTTP_400_BAD_REQUEST)
-                
+
         except Newsletter.DoesNotExist:
             return Response(
                 {'success': False, 'message': 'Newsletter not found'},
@@ -82,10 +82,10 @@ class SubscribeView(generics.CreateAPIView):
 
 class UnsubscribeView(generics.UpdateAPIView):
     """Handle newsletter unsubscriptions."""
-    
+
     serializer_class = UnsubscribeSerializer
     permission_classes = [AllowAny]
-    
+
     @extend_schema(
         summary="Unsubscribe from Newsletter",
         description="Unsubscribe from a newsletter using subscription ID.",
@@ -99,24 +99,24 @@ class UnsubscribeView(generics.UpdateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         subscription_id = serializer.validated_data['subscription_id']
-        
+
         try:
             subscription = NewsletterSubscription.objects.get(
-                id=subscription_id, 
+                id=subscription_id,
                 is_active=True
             )
-            
+
             newsletter_title = subscription.newsletter.title
             subscription.unsubscribe()
-            
+
             response_data = {
                 'success': True,
                 'message': f'Successfully unsubscribed from {newsletter_title}'
             }
             return Response(response_data, status=status.HTTP_200_OK)
-            
+
         except NewsletterSubscription.DoesNotExist:
             return Response(
                 {'success': False, 'message': 'Subscription not found'},
@@ -126,16 +126,16 @@ class UnsubscribeView(generics.UpdateAPIView):
 
 class SubscriptionListView(generics.ListAPIView):
     """List user's subscriptions."""
-    
+
     serializer_class = NewsletterSubscriptionSerializer
     permission_classes = [IsAuthenticated]
-    
+
     def get_queryset(self):
         return NewsletterSubscription.objects.filter(
             user=self.request.user,
             is_active=True
         )
-    
+
     @extend_schema(
         summary="List User Subscriptions",
         description="Get a list of current user's active newsletter subscriptions.",

django_cfg/apps/newsletter/views/tracking.py

@@ -3,11 +3,12 @@ Email tracking views.
 """
 
 import uuid
+
 from django.http import HttpResponse, HttpResponseRedirect
-from django.views.decorators.cache import never_cache
-from django.views.decorators.csrf import csrf_exempt
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.cache import never_cache
+from django.views.decorators.csrf import csrf_exempt
 
 from ..models import EmailLog
 
@@ -18,7 +19,7 @@ class TrackEmailOpenView(View):
     """
     Track email opens using a 1x1 pixel image.
     """
-    
+
     def get(self, request, email_log_id):
         """Handle tracking pixel request."""
         try:
@@ -37,7 +38,7 @@ class TrackEmailOpenView(View):
         except (ValueError, TypeError):
             # Silently fail for invalid UUID format
             pass
-        
+
         # Return 1x1 transparent pixel
         pixel_data = b'\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x04\x01\x00\x3B'
         return HttpResponse(pixel_data, content_type='image/gif')
@@ -49,7 +50,7 @@ class TrackEmailClickView(View):
     """
     Track email link clicks and redirect to target URL.
     """
-    
+
     def get(self, request, email_log_id):
         """Handle click tracking and redirect."""
         redirect_url = request.GET.get('url', '/')

django_cfg/apps/payments/admin/__init__.py

@@ -6,15 +6,16 @@ Modern, clean admin interfaces with Material Icons and no HTML duplication.
 
 from django.contrib import admin
 
-# Import all admin classes
-from .balance_admin import UserBalanceAdmin, TransactionAdmin
-from .payments_admin import UniversalPaymentAdmin
 from .api_keys_admin import APIKeyAdmin
+
+# Import all admin classes
+from .balance_admin import TransactionAdmin, UserBalanceAdmin
 from .currencies_admin import CurrencyAdmin  # Use working version
+from .endpoint_groups_admin import EndpointGroupAdmin
+from .networks_admin import NetworkAdmin, ProviderCurrencyAdmin
+from .payments_admin import UniversalPaymentAdmin
 from .subscriptions_admin import SubscriptionAdmin
 from .tariffs_admin import TariffAdmin, TariffEndpointGroupAdmin
-from .networks_admin import NetworkAdmin, ProviderCurrencyAdmin
-from .endpoint_groups_admin import EndpointGroupAdmin
 
 # All models are registered in their respective admin files using @admin.register
 # This provides:

django_cfg/apps/payments/admin/api_keys_admin.py

@@ -4,23 +4,20 @@ API Keys Admin interface using Django Admin Utilities.
 Clean API key management with security features.
 """
 
+
 from django.contrib import admin
-from django.db.models import Count, Q
 from django.utils import timezone
-from datetime import timedelta
-
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    UserDisplayConfig,
-    StatusBadgeConfig,
+    ActionVariant,
     DateTimeDisplayConfig,
+    DisplayMixin,
     Icons,
-    display,
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
     action,
-    ActionVariant
+    display,
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 from django_cfg.modules.django_logging import get_logger
@@ -41,13 +38,13 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     - Activity monitoring
     - Clean utilities integration
     """
-    
+
     # Performance optimization
     select_related_fields = ['user']
     annotations = {}
     # Note: Annotations disabled until proper usage tracking is implemented
     # 'usage_count': Count('usage_logs') or similar
-    
+
     # List configuration
     list_display = [
         'key_display',
@@ -57,20 +54,20 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'usage_display',
         'created_display'
     ]
-    
+
     list_filter = [
         'is_active',
         'created_at',
         'last_used_at'
     ]
-    
+
     search_fields = [
         'name',
         'user__username',
         'user__email',
         'key'  # Be careful with this in production
     ]
-    
+
     readonly_fields = [
         'key',
         'created_at',
@@ -78,10 +75,10 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'last_used_at',
         'key_details_display'
     ]
-    
+
     # Register actions
     actions = ['activate_selected_keys', 'deactivate_selected_keys', 'regenerate_selected_keys']
-    
+
     # Display methods using utilities
     @display(description="API Key")
     def key_display(self, obj):
@@ -89,33 +86,33 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         if not obj.key:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.KEY_OFF)
             return StatusBadge.create(text="No Key", variant="secondary", config=config)
-        
+
         # Show first 8 and last 4 characters
         masked_key = f"{obj.key[:8]}...{obj.key[-4:]}"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.KEY)
         return StatusBadge.create(
             text=masked_key,
             variant="info",
             config=config
         )
-    
+
     @display(description="User", header=True)
     def user_display(self, obj):
         """User display with avatar."""
         return self.display_user_with_avatar(obj, 'user')
-    
+
     @display(description="Name")
     def name_display(self, obj):
         """API key name display."""
         if not obj.name:
             return StatusBadge.create(text="Unnamed", variant="secondary")
-        
+
         return StatusBadge.create(
             text=obj.name,
             variant="primary"
         )
-    
+
     @display(description="Status", label=True)
     def status_display(self, obj):
         """Status display with activity level."""
@@ -125,14 +122,14 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
                 'status',
                 StatusBadgeConfig(custom_mappings={'Inactive': 'danger'})
             )
-        
+
         # Determine activity level based on last usage
         if not obj.last_used_at:
             status = "Active (Unused)"
             variant = "info"
         else:
             days_since_use = (timezone.now() - obj.last_used_at).days
-            
+
             if days_since_use <= 1:
                 status = "Active (Recent)"
                 variant = "success"
@@ -145,31 +142,31 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             else:
                 status = "Active (Idle)"
                 variant = "secondary"
-        
+
         config = StatusBadgeConfig(
             custom_mappings={status: variant},
             show_icons=True
         )
-        
+
         return self.display_status_auto(
             type('obj', (), {'status': status})(),
             'status',
             config
         )
-    
+
     @display(description="Usage")
     def usage_display(self, obj):
         """Usage count display."""
         # This would need actual usage tracking implementation
         usage_count = getattr(obj, 'usage_count', 0)
-        
+
         return self.display_count_simple(
             type('obj', (), {'usage_count': usage_count})(),
             'usage_count',
             'requests',
             CounterBadgeConfig(use_humanize=True)
         )
-    
+
     @display(description="Created")
     def created_display(self, obj):
         """Created time display."""
@@ -178,21 +175,22 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'created_at',
             DateTimeDisplayConfig(show_relative=True, show_seconds=False)
         )
-    
+
     # Readonly field displays
     def key_details_display(self, obj):
         """Detailed API key information for detail view."""
         if not obj.pk:
             return "Save to see details"
-        
+
         from django.utils.html import format_html
+
         from django_cfg.modules.django_admin.utils.displays import DateTimeDisplay
-        
+
         details = []
-        
+
         # Full key (be careful in production!)
         details.append(f"<strong>Full Key:</strong> <code>{obj.key}</code>")
-        
+
         # Usage statistics
         if obj.last_used_at:
             last_used_html = DateTimeDisplay.relative(
@@ -202,24 +200,24 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             details.append(f"<strong>Last Used:</strong> {last_used_html}")
         else:
             details.append("<strong>Last Used:</strong> Never")
-        
+
         # Age calculation
         age = timezone.now() - obj.created_at
         age_text = f"{age.days} days old"
         details.append(f"<strong>Age:</strong> {age_text}")
-        
+
         # Security info
         if obj.is_active:
             security_status = '<span class="text-green-600">🔓 Active</span>'
         else:
             security_status = '<span class="text-red-600">🔒 Inactive</span>'
-        
+
         details.append(f"<strong>Security Status:</strong> {security_status}")
-        
+
         return format_html("<br>".join(details))
-    
+
     key_details_display.short_description = "Key Details"
-    
+
     # Actions
     @action(description="Activate selected keys", variant=ActionVariant.SUCCESS)
     def activate_keys(self, request, queryset):
@@ -230,7 +228,7 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             f"Successfully activated {updated} API key(s).",
             level='SUCCESS'
         )
-    
+
     @action(description="Deactivate selected keys", variant=ActionVariant.WARNING)
     def deactivate_keys(self, request, queryset):
         """Deactivate selected API keys."""
@@ -240,23 +238,23 @@ class APIKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             f"Successfully deactivated {updated} API key(s).",
             level='WARNING'
         )
-    
+
     @action(description="Regenerate selected keys", variant=ActionVariant.DANGER)
     def regenerate_keys(self, request, queryset):
         """Regenerate selected API keys."""
         import secrets
         import string
-        
+
         updated_count = 0
         for api_key in queryset:
             # Generate new key
             alphabet = string.ascii_letters + string.digits
             new_key = ''.join(secrets.choice(alphabet) for _ in range(32))
-            
+
             api_key.key = new_key
             api_key.save()
             updated_count += 1
-        
+
         self.message_user(
             request,
             f"Successfully regenerated {updated_count} API key(s).",