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

django_cfg/apps/maintenance/admin/site_admin.py

@@ -4,24 +4,21 @@ CloudflareSite admin using Django Admin Utilities.
 Enhanced site management with Material Icons and optimized queries.
 """
 
+
 from django.contrib import admin, messages
-from django.urls import reverse
-from django.http import HttpRequest
-from django.shortcuts import redirect
-from django.db import models
 from django.db.models import Count, Q
-from typing import Any
+from django.http import HttpRequest
 from unfold.admin import ModelAdmin, TabularInline
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    StatusBadgeConfig,
+    ActionVariant,
     DateTimeDisplayConfig,
+    DisplayMixin,
     Icons,
-    ActionVariant,
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    action,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -31,7 +28,7 @@ from ..services import MaintenanceService
 
 class MaintenanceLogInline(TabularInline):
     """Inline for recent maintenance logs."""
-    
+
     model = MaintenanceLog
     verbose_name = "Recent Log"
     verbose_name_plural = "📋 Recent Maintenance Logs"
@@ -39,16 +36,16 @@ class MaintenanceLogInline(TabularInline):
     max_num = 5
     can_delete = False
     show_change_link = True
-    
+
     fields = ['status_display', 'action', 'created_at', 'duration_seconds', 'error_preview']
     readonly_fields = ['status_display', 'action', 'created_at', 'duration_seconds', 'error_preview']
-    
+
     def has_add_permission(self, request, obj=None):
         return False
-    
+
     def has_change_permission(self, request, obj=None):
         return False
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Display status with badge."""
@@ -58,44 +55,44 @@ class MaintenanceLogInline(TabularInline):
             MaintenanceLog.Status.PENDING: 'warning'
         }
         variant = status_variants.get(obj.status, 'secondary')
-        
+
         status_icons = {
             MaintenanceLog.Status.SUCCESS: Icons.CHECK_CIRCLE,
             MaintenanceLog.Status.FAILED: Icons.CANCEL,
             MaintenanceLog.Status.PENDING: Icons.SCHEDULE
         }
         icon = status_icons.get(obj.status, Icons.HELP)
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=icon)
         return StatusBadge.create(
             text=obj.get_status_display(),
             variant=variant,
             config=config
         )
-    
+
     @display(description="Error")
     def error_preview(self, obj):
         """Show error message preview."""
         if not obj.error_message:
             return "—"
-        
+
         preview = obj.error_message[:50]
         if len(obj.error_message) > 50:
             preview += "..."
-        
+
         return preview
 
 
 @admin.register(CloudflareSite)
 class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Admin for CloudflareSite using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['api_key']
-    
+
     list_display = [
         'status_display',
-        'name_display', 
+        'name_display',
         'domain_display',
         'subdomain_config_display',
         'maintenance_display',
@@ -120,7 +117,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'last_maintenance_at',
         'logs_preview'
     ]
-    
+
     fieldsets = [
         ('🌐 Site Information', {
             'fields': ['name', 'domain', 'zone_id'],
@@ -147,9 +144,9 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'classes': ('tab', 'collapse')
         })
     ]
-    
+
     inlines = [MaintenanceLogInline]
-    
+
     actions = [
         'enable_maintenance_action',
         'disable_maintenance_action',
@@ -157,7 +154,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'deactivate_sites_action',
         'sync_with_cloudflare_action'
     ]
-    
+
     @display(description="Status")
     def status_display(self, obj: CloudflareSite) -> str:
         """Display site status with maintenance indicator."""
@@ -182,7 +179,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
                 variant="secondary",
                 config=config
             )
-    
+
     @display(description="Name", ordering="name")
     def name_display(self, obj: CloudflareSite) -> str:
         """Display site name."""
@@ -192,7 +189,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="primary",
             config=config
         )
-    
+
     @display(description="Domain", ordering="domain")
     def domain_display(self, obj: CloudflareSite) -> str:
         """Display domain."""
@@ -202,7 +199,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="info",
             config=config
         )
-    
+
     @display(description="Subdomains")
     def subdomain_config_display(self, obj: CloudflareSite) -> str:
         """Display subdomain configuration."""
@@ -211,7 +208,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             return StatusBadge.create(text="Includes Subdomains", variant="info", config=config)
         else:
             return "Domain Only"
-    
+
     @display(description="Maintenance")
     def maintenance_display(self, obj: CloudflareSite) -> str:
         """Display maintenance status."""
@@ -221,7 +218,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         else:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.CHECK_CIRCLE)
             return StatusBadge.create(text="Inactive", variant="success", config=config)
-    
+
     @display(description="Active")
     def active_display(self, obj: CloudflareSite) -> str:
         """Display active status."""
@@ -231,7 +228,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         else:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.CANCEL)
             return StatusBadge.create(text="Inactive", variant="secondary", config=config)
-    
+
     @display(description="Last Maintenance")
     def last_maintenance_display(self, obj: CloudflareSite) -> str:
         """Display last maintenance time."""
@@ -239,7 +236,7 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             return "Never"
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'last_maintenance_at', config)
-    
+
     @display(description="Logs")
     def logs_count(self, obj: CloudflareSite) -> str:
         """Display count of maintenance logs."""
@@ -247,35 +244,35 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         if count > 0:
             return f"{count} logs"
         return "No logs"
-    
+
     @display(description="API Key")
     def api_key_display(self, obj: CloudflareSite) -> str:
         """Display API key."""
         if not obj.api_key:
             return "—"
         return self.display_user_simple(obj.api_key, field_name='name')
-    
+
     def logs_preview(self, obj: CloudflareSite) -> str:
         """Show recent maintenance logs."""
         logs = obj.maintenancelog_set.all()[:5]
-        
+
         if not logs:
             return "No maintenance logs yet"
-        
+
         log_list = []
         for log in logs:
             status_emoji = "✅" if log.status == MaintenanceLog.Status.SUCCESS else "❌" if log.status == MaintenanceLog.Status.FAILED else "⏳"
             log_list.append(f"{status_emoji} {log.action} - {log.created_at.strftime('%Y-%m-%d %H:%M')}")
-        
+
         return "\n".join(log_list)
-    
+
     @action(description="Enable maintenance mode", variant=ActionVariant.WARNING)
     def enable_maintenance_action(self, request: HttpRequest, queryset) -> None:
         """Enable maintenance mode for selected sites."""
         service = MaintenanceService()
         success_count = 0
         error_count = 0
-        
+
         for site in queryset:
             try:
                 service.enable_maintenance(site)
@@ -283,19 +280,19 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             except Exception as e:
                 error_count += 1
                 messages.error(request, f"Failed to enable maintenance for {site.name}: {str(e)}")
-        
+
         if success_count > 0:
             messages.success(request, f"Successfully enabled maintenance for {success_count} sites.")
         if error_count > 0:
             messages.error(request, f"Failed to enable maintenance for {error_count} sites.")
-    
+
     @action(description="Disable maintenance mode", variant=ActionVariant.SUCCESS)
     def disable_maintenance_action(self, request: HttpRequest, queryset) -> None:
         """Disable maintenance mode for selected sites."""
         service = MaintenanceService()
         success_count = 0
         error_count = 0
-        
+
         for site in queryset:
             try:
                 service.disable_maintenance(site)
@@ -303,33 +300,33 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             except Exception as e:
                 error_count += 1
                 messages.error(request, f"Failed to disable maintenance for {site.name}: {str(e)}")
-        
+
         if success_count > 0:
             messages.success(request, f"Successfully disabled maintenance for {success_count} sites.")
         if error_count > 0:
             messages.error(request, f"Failed to disable maintenance for {error_count} sites.")
-    
+
     @action(description="Activate sites", variant=ActionVariant.SUCCESS)
     def activate_sites_action(self, request: HttpRequest, queryset) -> None:
         """Activate selected sites."""
         count = queryset.update(is_active=True)
         messages.success(request, f"Successfully activated {count} sites.")
-    
+
     @action(description="Deactivate sites", variant=ActionVariant.DANGER)
     def deactivate_sites_action(self, request: HttpRequest, queryset) -> None:
         """Deactivate selected sites."""
         count = queryset.update(is_active=False)
         messages.warning(request, f"Successfully deactivated {count} sites.")
-    
+
     @action(description="Sync with Cloudflare", variant=ActionVariant.INFO)
     def sync_with_cloudflare_action(self, request: HttpRequest, queryset) -> None:
         """Sync selected sites with Cloudflare."""
         messages.info(request, f"Cloudflare sync initiated for {queryset.count()} sites.")
-    
+
     def changelist_view(self, request, extra_context=None):
         """Add site statistics to changelist."""
         extra_context = extra_context or {}
-        
+
         queryset = self.get_queryset(request)
         stats = queryset.aggregate(
             total_sites=Count('id'),
@@ -337,12 +334,12 @@ class CloudflareSiteAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             maintenance_sites=Count('id', filter=Q(maintenance_active=True)),
             subdomain_sites=Count('id', filter=Q(include_subdomains=True))
         )
-        
+
         extra_context['site_stats'] = {
             'total_sites': stats['total_sites'] or 0,
             'active_sites': stats['active_sites'] or 0,
             'maintenance_sites': stats['maintenance_sites'] or 0,
             'subdomain_sites': stats['subdomain_sites'] or 0
         }
-        
+
         return super().changelist_view(request, extra_context)

django_cfg/apps/maintenance/apps.py

@@ -7,11 +7,11 @@ from django.apps import AppConfig
 
 class MaintenanceConfig(AppConfig):
     """Configuration for the simplified maintenance app."""
-    
+
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'django_cfg.apps.maintenance'
     verbose_name = 'Maintenance Mode'
-    
+
     def ready(self):
         """Initialize app when Django starts."""
         # No complex signals or initialization needed

django_cfg/apps/maintenance/management/commands/maintenance.py

@@ -5,9 +5,10 @@ Single command instead of 2+ complex commands.
 Usage: python manage.py maintenance enable/disable/status/sync domain.com
 """
 
+from typing import Any
+
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from typing import Any, Optional
 
 from ...models import CloudflareSite, MaintenanceLog
 from ...services import MaintenanceService
@@ -15,9 +16,9 @@ from ...services import MaintenanceService
 
 class Command(BaseCommand):
     """Simple maintenance management command."""
-    
+
     help = 'Manage maintenance mode for Cloudflare sites'
-    
+
     def add_arguments(self, parser) -> None:
         """Add command arguments."""
         parser.add_argument(
@@ -25,31 +26,31 @@ class Command(BaseCommand):
             choices=['enable', 'disable', 'status', 'sync', 'list'],
             help='Action to perform'
         )
-        
+
         parser.add_argument(
             'domain',
             nargs='?',
             help='Domain to operate on (required for enable/disable/status/sync)'
         )
-        
+
         parser.add_argument(
             '--reason',
             default='Maintenance via CLI',
             help='Reason for enabling maintenance (default: "Maintenance via CLI")'
         )
-        
+
         parser.add_argument(
             '--force',
             action='store_true',
             help='Skip confirmation prompts'
         )
-        
+
         parser.add_argument(
             '--verbose',
             action='store_true',
             help='Show detailed output'
         )
-    
+
     def handle(self, *args: Any, **options: Any) -> None:
         """Handle the command."""
         action = options['action']
@@ -57,11 +58,11 @@ class Command(BaseCommand):
         reason = options['reason']
         force = options['force']
         verbose = options['verbose']
-        
+
         # Validate arguments
         if action in ['enable', 'disable', 'status', 'sync'] and not domain:
             raise CommandError(f"Domain is required for '{action}' action")
-        
+
         try:
             if action == 'list':
                 self._handle_list(verbose)
@@ -73,36 +74,36 @@ class Command(BaseCommand):
                 self._handle_disable(domain, force, verbose)
             elif action == 'sync':
                 self._handle_sync(domain, verbose)
-                
+
         except CloudflareSite.DoesNotExist:
             raise CommandError(f"Site '{domain}' not found. Use 'list' action to see available sites.")
         except Exception as e:
             raise CommandError(f"Operation failed: {str(e)}")
-    
+
     def _handle_list(self, verbose: bool) -> None:
         """List all sites."""
         sites = CloudflareSite.objects.all().order_by('name')
-        
+
         if not sites:
             self.stdout.write(self.style.WARNING("No sites configured"))
             return
-        
+
         self.stdout.write(self.style.SUCCESS(f"Found {sites.count()} sites:"))
         self.stdout.write("")
-        
+
         for site in sites:
             status_style = self.style.WARNING if site.maintenance_active else self.style.SUCCESS
             status_text = "🔧 MAINTENANCE" if site.maintenance_active else "🟢 ACTIVE"
-            
+
             self.stdout.write(f"  {status_style(status_text)} {site.name} ({site.domain})")
-            
+
             if verbose:
                 self.stdout.write(f"    Zone ID: {site.zone_id}")
                 self.stdout.write(f"    Account ID: {site.account_id}")
                 self.stdout.write(f"    Created: {site.created_at.strftime('%Y-%m-%d %H:%M')}")
                 if site.last_maintenance_at:
                     self.stdout.write(f"    Last Maintenance: {site.last_maintenance_at.strftime('%Y-%m-%d %H:%M')}")
-                
+
                 # Show recent logs
                 recent_logs = site.logs.all()[:3]
                 if recent_logs:
@@ -113,30 +114,30 @@ class Command(BaseCommand):
                             MaintenanceLog.Status.FAILED: "❌",
                             MaintenanceLog.Status.PENDING: "⏳"
                         }.get(log.status, "❓")
-                        
+
                         self.stdout.write(f"      {status_emoji} {log.get_action_display()} - {log.created_at.strftime('%m-%d %H:%M')}")
-                
+
                 self.stdout.write("")
-    
+
     def _handle_status(self, domain: str, verbose: bool) -> None:
         """Show status for specific site."""
         site = CloudflareSite.objects.get(domain=domain)
-        
+
         status_style = self.style.WARNING if site.maintenance_active else self.style.SUCCESS
         status_text = "🔧 MAINTENANCE ACTIVE" if site.maintenance_active else "🟢 ACTIVE"
-        
+
         self.stdout.write(f"Status for {site.name} ({domain}):")
         self.stdout.write(f"  {status_style(status_text)}")
-        
+
         if verbose:
             self.stdout.write(f"  Zone ID: {site.zone_id}")
             self.stdout.write(f"  Account ID: {site.account_id}")
             self.stdout.write(f"  Created: {site.created_at.strftime('%Y-%m-%d %H:%M')}")
             self.stdout.write(f"  Updated: {site.updated_at.strftime('%Y-%m-%d %H:%M')}")
-            
+
             if site.last_maintenance_at:
                 self.stdout.write(f"  Last Maintenance: {site.last_maintenance_at.strftime('%Y-%m-%d %H:%M')}")
-            
+
             # Show recent logs
             recent_logs = site.logs.all()[:5]
             if recent_logs:
@@ -147,115 +148,115 @@ class Command(BaseCommand):
                         MaintenanceLog.Status.FAILED: "❌",
                         MaintenanceLog.Status.PENDING: "⏳"
                     }.get(log.status, "❓")
-                    
+
                     duration_text = f" ({log.duration_seconds}s)" if log.duration_seconds else ""
                     self.stdout.write(f"    {status_emoji} {log.get_action_display()}{duration_text} - {log.created_at.strftime('%Y-%m-%d %H:%M')}")
-                    
+
                     if log.error_message and verbose:
                         self.stdout.write(f"      Error: {log.error_message[:100]}")
-    
+
     def _handle_enable(self, domain: str, reason: str, force: bool, verbose: bool) -> None:
         """Enable maintenance for site."""
         site = CloudflareSite.objects.get(domain=domain)
-        
+
         if site.maintenance_active:
             self.stdout.write(self.style.WARNING(f"Maintenance is already active for {domain}"))
             return
-        
+
         # Confirmation
         if not force:
             confirm = input(f"Enable maintenance for {site.name} ({domain})? [y/N]: ")
             if confirm.lower() not in ['y', 'yes']:
                 self.stdout.write("Cancelled")
                 return
-        
+
         self.stdout.write(f"Enabling maintenance for {domain}...")
         if verbose:
             self.stdout.write(f"Reason: {reason}")
-        
+
         try:
             with transaction.atomic():
                 service = MaintenanceService(site)
                 log_entry = service.enable_maintenance(reason)
-            
+
             if log_entry.status == MaintenanceLog.Status.SUCCESS:
                 duration_text = f" ({log_entry.duration_seconds}s)" if log_entry.duration_seconds else ""
                 self.stdout.write(self.style.SUCCESS(f"✅ Maintenance enabled successfully{duration_text}"))
-                
+
                 if verbose and log_entry.cloudflare_response:
                     self.stdout.write("Cloudflare response:")
                     import json
                     self.stdout.write(json.dumps(log_entry.cloudflare_response, indent=2))
             else:
                 self.stdout.write(self.style.ERROR(f"❌ Failed to enable maintenance: {log_entry.error_message}"))
-                
+
         except Exception as e:
             self.stdout.write(self.style.ERROR(f"❌ Error: {str(e)}"))
-    
+
     def _handle_disable(self, domain: str, force: bool, verbose: bool) -> None:
         """Disable maintenance for site."""
         site = CloudflareSite.objects.get(domain=domain)
-        
+
         if not site.maintenance_active:
             self.stdout.write(self.style.WARNING(f"Maintenance is not active for {domain}"))
             return
-        
+
         # Confirmation
         if not force:
             confirm = input(f"Disable maintenance for {site.name} ({domain})? [y/N]: ")
             if confirm.lower() not in ['y', 'yes']:
                 self.stdout.write("Cancelled")
                 return
-        
+
         self.stdout.write(f"Disabling maintenance for {domain}...")
-        
+
         try:
             with transaction.atomic():
                 service = MaintenanceService(site)
                 log_entry = service.disable_maintenance()
-            
+
             if log_entry.status == MaintenanceLog.Status.SUCCESS:
                 duration_text = f" ({log_entry.duration_seconds}s)" if log_entry.duration_seconds else ""
                 self.stdout.write(self.style.SUCCESS(f"✅ Maintenance disabled successfully{duration_text}"))
-                
+
                 if verbose and log_entry.cloudflare_response:
                     self.stdout.write("Cloudflare response:")
                     import json
                     self.stdout.write(json.dumps(log_entry.cloudflare_response, indent=2))
             else:
                 self.stdout.write(self.style.ERROR(f"❌ Failed to disable maintenance: {log_entry.error_message}"))
-                
+
         except Exception as e:
             self.stdout.write(self.style.ERROR(f"❌ Error: {str(e)}"))
-    
+
     def _handle_sync(self, domain: str, verbose: bool) -> None:
         """Sync site from Cloudflare."""
         site = CloudflareSite.objects.get(domain=domain)
-        
+
         self.stdout.write(f"Syncing {domain} from Cloudflare...")
-        
+
         try:
             service = MaintenanceService(site)
             log_entry = service.sync_site_from_cloudflare()
-            
+
             if log_entry.status == MaintenanceLog.Status.SUCCESS:
                 duration_text = f" ({log_entry.duration_seconds}s)" if log_entry.duration_seconds else ""
                 self.stdout.write(self.style.SUCCESS(f"✅ Sync completed successfully{duration_text}"))
-                
+
                 if verbose and log_entry.cloudflare_response:
                     response = log_entry.cloudflare_response
                     if 'updated_fields' in response and response['updated_fields']:
                         self.stdout.write(f"Updated fields: {', '.join(response['updated_fields'])}")
-                    
+
                     maintenance_status = response.get('maintenance_active', 'unknown')
                     self.stdout.write(f"Current maintenance status: {maintenance_status}")
-                    
+
                     if verbose:
                         import json
                         self.stdout.write("Full Cloudflare response:")
                         self.stdout.write(json.dumps(response, indent=2))
             else:
                 self.stdout.write(self.style.ERROR(f"❌ Sync failed: {log_entry.error_message}"))
-                
+
         except Exception as e:
             self.stdout.write(self.style.ERROR(f"❌ Error: {str(e)}"))