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

django_cfg/apps/maintenance/services/site_sync_service.py

@@ -5,14 +5,13 @@ Automatically discovers and syncs Cloudflare zones with Django models.
 """
 
 import logging
-from typing import Dict, List, Any, Optional
-from datetime import datetime
+from typing import Any, Dict, List
+
 from django.utils import timezone
-from django.db import transaction
 
 from ..models import CloudflareApiKey, CloudflareSite, MaintenanceLog
+from ..utils.retry_utils import CloudflareRetryError, retry_on_failure
 from .maintenance_service import MaintenanceService
-from ..utils.retry_utils import retry_on_failure, CloudflareRetryError
 
 try:
     from cloudflare import Cloudflare
@@ -28,12 +27,12 @@ class SiteSyncService:
     
     Provides automatic discovery and sync of Cloudflare zones.
     """
-    
+
     def __init__(self, api_key: CloudflareApiKey):
         """Initialize sync service with API key."""
         self.api_key = api_key
         self.client = Cloudflare(api_token=api_key.api_token)
-        
+
     @retry_on_failure(max_retries=3)
     def discover_zones(self) -> List[Dict[str, Any]]:
         """
@@ -43,7 +42,7 @@ class SiteSyncService:
             List of zone data dictionaries
         """
         logger.info(f"Discovering zones for API key: {self.api_key.name}")
-        
+
         try:
             zones = []
             for zone in self.client.zones.list():
@@ -60,16 +59,16 @@ class SiteSyncService:
                     'modified_on': zone.modified_on,
                 }
                 zones.append(zone_data)
-                
+
             logger.info(f"Discovered {len(zones)} zones")
             return zones
-            
+
         except Exception as e:
             logger.error(f"Failed to discover zones: {e}")
             raise CloudflareRetryError(f"Zone discovery failed: {e}")
-    
-    
-    def sync_zones(self, 
+
+
+    def sync_zones(self,
                    force_update: bool = False,
                    dry_run: bool = False) -> Dict[str, Any]:
         """
@@ -83,7 +82,7 @@ class SiteSyncService:
             Dict with sync statistics and results
         """
         logger.info(f"Starting zone sync (dry_run={dry_run}, force_update={force_update})")
-        
+
         stats = {
             'discovered': 0,
             'created': 0,
@@ -92,18 +91,18 @@ class SiteSyncService:
             'errors': 0,
             'sites': []
         }
-        
+
         try:
             # Discover zones from Cloudflare
             cf_zones = self.discover_zones()
             stats['discovered'] = len(cf_zones)
-            
+
             # Get existing sites for this API key
             existing_sites = {
-                site.zone_id: site 
+                site.zone_id: site
                 for site in CloudflareSite.objects.filter(api_key=self.api_key)
             }
-            
+
             # Process each discovered zone
             for zone_data in cf_zones:
                 try:
@@ -113,10 +112,10 @@ class SiteSyncService:
                         force_update=force_update,
                         dry_run=dry_run
                     )
-                    
+
                     stats[result['action']] += 1
                     stats['sites'].append(result)
-                    
+
                 except Exception as e:
                     logger.error(f"Error syncing zone {zone_data['name']}: {e}")
                     stats['errors'] += 1
@@ -125,18 +124,18 @@ class SiteSyncService:
                         'action': 'error',
                         'error': str(e)
                     })
-            
+
             # Mark API key as used
             self.api_key.mark_used()
-            
+
             logger.info(f"Zone sync completed: {stats}")
             return stats
-            
+
         except Exception as e:
             logger.error(f"Zone sync failed: {e}")
             stats['errors'] += 1
             return stats
-    
+
     def _sync_single_zone(self,
                          zone_data: Dict[str, Any],
                          existing_sites: Dict[str, CloudflareSite],
@@ -145,17 +144,17 @@ class SiteSyncService:
         """Sync a single zone with Django model."""
         zone_id = zone_data['id']
         domain = zone_data['name']
-        
+
         if zone_id in existing_sites:
             # Site exists - check if update needed
             site = existing_sites[zone_id]
-            
+
             needs_update = (
                 force_update or
                 site.domain != domain or
                 site.account_id != zone_data.get('account_id')
             )
-            
+
             if needs_update:
                 if dry_run:
                     return {
@@ -167,7 +166,7 @@ class SiteSyncService:
                     # Update existing site - preserve subdomain settings
                     site.domain = domain
                     site.account_id = zone_data.get('account_id', site.account_id)
-                    
+
                     # Ensure subdomain fields are not reset to None during sync
                     if site.include_subdomains is None:
                         site.include_subdomains = True
@@ -175,16 +174,16 @@ class SiteSyncService:
                         site.subdomain_list = ''
                     if site.maintenance_url is None:
                         site.maintenance_url = ''
-                    
+
                     site.save()
-                    
+
                     # Log the sync
                     MaintenanceLog.log_success(
                         site=site,
                         action=MaintenanceLog.Action.SYNC,
                         reason="Automatic zone sync - updated existing site"
                     )
-                    
+
                     return {
                         'domain': domain,
                         'action': 'updated',
@@ -218,51 +217,51 @@ class SiteSyncService:
                     subdomain_list='',       # Default: empty list
                     maintenance_url=''       # Default: empty URL
                 )
-                
+
                 # Log the creation
                 MaintenanceLog.log_success(
                     site=site,
                     action=MaintenanceLog.Action.SYNC,
                     reason="Automatic zone sync - created new site"
                 )
-                
+
                 return {
                     'domain': domain,
                     'action': 'created',
                     'site_id': site.id
                 }
-    
+
     def _get_site_changes(self, site: CloudflareSite, zone_data: Dict[str, Any]) -> Dict[str, Any]:
         """Get changes that would be made to a site."""
         changes = {}
-        
+
         if site.domain != zone_data['name']:
             changes['domain'] = {
                 'old': site.domain,
                 'new': zone_data['name']
             }
-        
+
         if site.account_id != zone_data.get('account_id'):
             changes['account_id'] = {
                 'old': site.account_id,
                 'new': zone_data.get('account_id')
             }
-        
+
         return changes
-    
+
     def _generate_site_name(self, domain: str) -> str:
         """Generate a friendly site name from domain."""
         # Remove common prefixes and TLD for cleaner name
         name = domain.replace('www.', '').replace('api.', '').replace('app.', '')
-        
+
         # Capitalize first letter
         if '.' in name:
             name = name.split('.')[0].capitalize()
         else:
             name = name.capitalize()
-        
+
         return name
-    
+
     def check_site_status(self, site: CloudflareSite) -> Dict[str, Any]:
         """
         Check current status of a site in Cloudflare.
@@ -276,10 +275,10 @@ class SiteSyncService:
         try:
             # Get zone info
             zone = self.client.zones.get(zone_id=site.zone_id)
-            
+
             # Check if maintenance worker is active
             maintenance_active = self._check_maintenance_worker(site)
-            
+
             status_info = {
                 'zone_status': zone.status,
                 'zone_paused': zone.paused,
@@ -287,11 +286,11 @@ class SiteSyncService:
                 'maintenance_active': maintenance_active,
                 'last_checked': timezone.now().isoformat()
             }
-            
+
             # Update site status - preserve subdomain settings
             site.maintenance_active = maintenance_active
             site.is_active = not zone.paused
-            
+
             # Ensure subdomain fields are not reset to None during status update
             if site.include_subdomains is None:
                 site.include_subdomains = True
@@ -299,39 +298,39 @@ class SiteSyncService:
                 site.subdomain_list = ''
             if site.maintenance_url is None:
                 site.maintenance_url = ''
-                
+
             site.save()
-            
+
             return status_info
-            
+
         except Exception as e:
             logger.error(f"Failed to check status for {site.domain}: {e}")
             return {
                 'error': str(e),
                 'last_checked': timezone.now().isoformat()
             }
-    
+
     @retry_on_failure(max_retries=2)
     def _check_maintenance_worker(self, site: CloudflareSite) -> bool:
         """Check if maintenance worker is active for site."""
         try:
             # List worker routes for the zone
             routes = self.client.workers.routes.list(zone_id=site.zone_id)
-            
+
             # Check if any route matches our maintenance worker pattern
             maintenance_service = MaintenanceService(site)
             worker_name = maintenance_service.worker_name
-            
+
             for route in routes.result:
                 if hasattr(route, 'script') and route.script == worker_name:
                     return True
-            
+
             return False
-            
+
         except Exception as e:
             logger.warning(f"Could not check maintenance worker for {site.domain}: {e}")
             return False
-    
+
     def bulk_sync_all_api_keys(self) -> Dict[str, Any]:
         """
         Sync zones for all active API keys.
@@ -340,7 +339,7 @@ class SiteSyncService:
             Dict with overall sync results
         """
         logger.info("Starting bulk sync for all API keys")
-        
+
         overall_stats = {
             'api_keys_processed': 0,
             'total_discovered': 0,
@@ -350,27 +349,27 @@ class SiteSyncService:
             'total_errors': 0,
             'api_key_results': []
         }
-        
+
         active_api_keys = CloudflareApiKey.objects.filter(is_active=True)
-        
+
         for api_key in active_api_keys:
             try:
                 sync_service = SiteSyncService(api_key)
                 result = sync_service.sync_zones()
-                
+
                 overall_stats['api_keys_processed'] += 1
                 overall_stats['total_discovered'] += result['discovered']
                 overall_stats['total_created'] += result['created']
                 overall_stats['total_updated'] += result['updated']
                 overall_stats['total_skipped'] += result['skipped']
                 overall_stats['total_errors'] += result['errors']
-                
+
                 overall_stats['api_key_results'].append({
                     'api_key_name': api_key.name,
                     'success': True,
                     'stats': result
                 })
-                
+
             except Exception as e:
                 logger.error(f"Failed to sync API key {api_key.name}: {e}")
                 overall_stats['total_errors'] += 1
@@ -379,7 +378,7 @@ class SiteSyncService:
                     'success': False,
                     'error': str(e)
                 })
-        
+
         logger.info(f"Bulk sync completed: {overall_stats}")
         return overall_stats
 
@@ -396,22 +395,22 @@ def sync_site_from_cloudflare(site: CloudflareSite) -> MaintenanceLog:
     """
     try:
         sync_service = SiteSyncService(site.api_key)
-        
+
         # Perform full zone sync to update site data from Cloudflare
         sync_result = sync_service.sync_zones(force_update=True)
-        
+
         # Find the specific site result
         site_result = None
         for site_info in sync_result.get('sites', []):
             if site_info.get('domain') == site.domain:
                 site_result = site_info
                 break
-        
+
         response_data = {
             'sync_result': sync_result,
             'site_result': site_result
         }
-        
+
         if sync_result.get('errors', 0) == 0:
             return MaintenanceLog.log_success(
                 site=site,
@@ -426,7 +425,7 @@ def sync_site_from_cloudflare(site: CloudflareSite) -> MaintenanceLog:
                 error_message=f"Sync completed with {sync_result['errors']} errors",
                 cloudflare_response=response_data
             )
-        
+
     except Exception as e:
         return MaintenanceLog.log_failure(
             site=site,

django_cfg/apps/maintenance/utils/__init__.py

@@ -4,7 +4,7 @@ Maintenance utilities.
 Helper functions and classes for maintenance operations.
 """
 
-from .retry_utils import retry_on_failure, CloudflareRetryError
+from .retry_utils import CloudflareRetryError, retry_on_failure
 
 __all__ = [
     'retry_on_failure',

django_cfg/apps/maintenance/utils/retry_utils.py

@@ -4,11 +4,11 @@ Retry utilities for Cloudflare operations.
 Simple retry logic extracted from the complex old system.
 """
 
-import time
-import random
 import logging
-from typing import Callable, Any, List
+import random
+import time
 from functools import wraps
+from typing import Any, Callable, List
 
 logger = logging.getLogger(__name__)
 
@@ -39,36 +39,36 @@ def retry_on_failure(
     """
     if retry_on_status is None:
         retry_on_status = [429, 502, 503, 504]
-    
+
     def decorator(func: Callable) -> Callable:
         @wraps(func)
         def wrapper(*args, **kwargs) -> Any:
             last_exception = None
-            
+
             for attempt in range(max_retries + 1):
                 try:
                     return func(*args, **kwargs)
-                    
+
                 except Exception as e:
                     last_exception = e
-                    
+
                     # Don't retry on the last attempt
                     if attempt == max_retries:
                         break
-                    
+
                     # Check if we should retry based on the error
                     should_retry = True  # Default to retry
-                    
+
                     # Check for HTTP status codes in the error message
                     error_str = str(e).lower()
-                    
+
                     # Check if any custom retry status codes are in the error
                     has_custom_status = False
                     for status in retry_on_status:
                         if str(status) in error_str:
                             has_custom_status = True
                             break
-                    
+
                     # If we have custom status codes and found one, always retry
                     if has_custom_status:
                         should_retry = True
@@ -79,11 +79,11 @@ def retry_on_failure(
                             'invalid', 'malformed'
                         ]):
                             should_retry = False
-                    
+
                     if not should_retry:
                         # Don't retry on non-retryable errors
                         break
-                    
+
                     # Calculate delay with exponential backoff and optional jitter
                     delay = min(base_delay * (backoff_factor ** attempt), max_delay)
                     if jitter:
@@ -91,19 +91,19 @@ def retry_on_failure(
                         total_delay = delay + jitter_amount
                     else:
                         total_delay = delay
-                    
+
                     logger.warning(
                         f"Attempt {attempt + 1}/{max_retries + 1} failed for {func.__name__}: {e}. "
                         f"Retrying in {total_delay:.2f}s..."
                     )
-                    
+
                     time.sleep(total_delay)
-            
+
             # All retries failed
             raise CloudflareRetryError(
                 f"All {max_retries + 1} attempts failed for {func.__name__}. "
                 f"Last error: {last_exception}"
             ) from last_exception
-        
+
         return wrapper
     return decorator

django_cfg/apps/newsletter/admin/__init__.py

@@ -4,28 +4,24 @@ Newsletter admin interfaces using Django-CFG admin system.
 Refactored admin interfaces with Material Icons and optimized queries.
 """
 
-from .newsletter_admin import (
-    EmailLogAdmin, 
-    NewsletterAdmin, 
-    NewsletterSubscriptionAdmin, 
-    NewsletterCampaignAdmin
-)
 from .filters import (
-    UserEmailFilter, 
-    UserNameFilter, 
-    HasUserFilter, 
-    EmailOpenedFilter, 
-    EmailClickedFilter
+    EmailClickedFilter,
+    EmailOpenedFilter,
+    HasUserFilter,
+    UserEmailFilter,
+    UserNameFilter,
 )
-from .resources import (
-    NewsletterResource, 
-    NewsletterSubscriptionResource, 
-    EmailLogResource
+from .newsletter_admin import (
+    EmailLogAdmin,
+    NewsletterAdmin,
+    NewsletterCampaignAdmin,
+    NewsletterSubscriptionAdmin,
 )
+from .resources import EmailLogResource, NewsletterResource, NewsletterSubscriptionResource
 
 __all__ = [
     'EmailLogAdmin',
-    'NewsletterAdmin', 
+    'NewsletterAdmin',
     'NewsletterSubscriptionAdmin',
     'NewsletterCampaignAdmin',
     'UserEmailFilter',