django-cfg 1.4.114__py3-none-any.whl → 1.5.8__py3-none-any.whl

django_cfg/apps/{dashboard → system/dashboard}/views/__init__.py

@@ -11,7 +11,7 @@ from .activity_views import ActivityViewSet
 from .charts_views import ChartsViewSet
 from .commands_views import CommandsViewSet
 from .apizones_views import APIZonesViewSet
-from .django_q2_views import DjangoQ2ViewSet
+from .config_views import ConfigViewSet
 
 __all__ = [
     'OverviewViewSet',
@@ -21,5 +21,5 @@ __all__ = [
     'ChartsViewSet',
     'CommandsViewSet',
     'APIZonesViewSet',
-    'DjangoQ2ViewSet',
+    'ConfigViewSet',
 ]

django_cfg/apps/{dashboard → system/dashboard}/views/commands_views.py

@@ -12,14 +12,12 @@ import json
 import logging
 
 from django.http import StreamingHttpResponse
+from django_cfg.mixins import SuperAdminAPIMixin
 from drf_spectacular.utils import extend_schema
 from rest_framework import status, viewsets
-from rest_framework.authentication import BasicAuthentication, SessionAuthentication
 from rest_framework.decorators import action
 from rest_framework.response import Response
-from rest_framework_simplejwt.authentication import JWTAuthentication
 
-from ..permissions import IsSuperAdmin
 from ..services import CommandsService
 from ..serializers import (
     CommandSerializer,
@@ -31,15 +29,14 @@ from ..serializers import (
 logger = logging.getLogger(__name__)
 
 
-class CommandsViewSet(viewsets.GenericViewSet):
+class CommandsViewSet(SuperAdminAPIMixin, viewsets.GenericViewSet):
     """
     Commands ViewSet
 
     Provides endpoints for Django management commands discovery.
+    Requires superuser privileges for all operations.
     """
 
-    authentication_classes = [JWTAuthentication, SessionAuthentication, BasicAuthentication]
-    permission_classes = [IsSuperAdmin]  # Only superusers can access commands
     serializer_class = CommandSerializer
     pagination_class = None  # Disable pagination for commands list
 

django_cfg/apps/system/dashboard/views/config_views.py

@@ -0,0 +1,69 @@
+"""
+Config ViewSet
+
+Endpoint for viewing Django configuration:
+- GET /config/ - Get DjangoConfig and Django settings
+"""
+
+import logging
+
+from django.db import transaction
+from drf_spectacular.utils import extend_schema
+from rest_framework import status, viewsets
+
+from django_cfg.mixins import AdminAPIMixin
+from rest_framework.decorators import action
+from rest_framework.response import Response
+
+from ..services import ConfigService
+from ..serializers import ConfigDataSerializer
+
+logger = logging.getLogger(__name__)
+
+
+class ConfigViewSet(AdminAPIMixin, viewsets.GenericViewSet):
+    """
+    Configuration ViewSet
+
+    Provides endpoint to view user's DjangoConfig settings and Django settings.
+    Requires admin authentication (JWT, Session, or Basic Auth).
+    """
+
+    serializer_class = ConfigDataSerializer
+
+    @transaction.non_atomic_requests
+    def dispatch(self, request, *args, **kwargs):
+        """Disable atomic requests for this viewset."""
+        return super().dispatch(request, *args, **kwargs)
+
+    @extend_schema(
+        summary="Get configuration data",
+        description="Retrieve user's DjangoConfig settings and complete Django settings (sanitized)",
+        responses={200: ConfigDataSerializer},
+        tags=["Dashboard - Config"]
+    )
+    @action(detail=False, methods=['get'], url_path='', url_name='config')
+    def config(self, request):
+        """Get configuration data with validation."""
+        try:
+            config_service = ConfigService()
+
+            django_config = config_service.get_config_data()
+            django_settings = config_service.get_django_settings()
+
+            # Validate serializer against actual config
+            validation_result = config_service.validate_serializer(django_config)
+
+            data = {
+                'django_config': django_config,
+                'django_settings': django_settings,
+                '_validation': validation_result,
+            }
+
+            return Response(data)
+
+        except Exception as e:
+            logger.error(f"Config API error: {e}", exc_info=True)
+            return Response({
+                'error': str(e)
+            }, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

django_cfg/apps/{dashboard → system/dashboard}/views/overview_views.py

@@ -8,6 +8,7 @@ Endpoint for complete dashboard overview:
 import logging
 from datetime import datetime
 
+from django.db import transaction
 from drf_spectacular.utils import extend_schema
 from rest_framework import status, viewsets
 
@@ -32,6 +33,11 @@ class OverviewViewSet(AdminAPIMixin, viewsets.GenericViewSet):
 
     serializer_class = DashboardOverviewSerializer
 
+    @transaction.non_atomic_requests
+    def dispatch(self, request, *args, **kwargs):
+        """Disable atomic requests for this viewset."""
+        return super().dispatch(request, *args, **kwargs)
+
     @extend_schema(
         summary="Get dashboard overview",
         description="Retrieve complete dashboard data including stats, health, actions, and metrics",
@@ -40,24 +46,19 @@ class OverviewViewSet(AdminAPIMixin, viewsets.GenericViewSet):
     )
     @action(detail=False, methods=['get'], url_path='', url_name='overview')
     def overview(self, request):
-        """
-        Get complete dashboard overview.
-
-        Returns all dashboard data in a single request:
-        - Statistics cards
-        - System health status
-        - Quick actions
-        - Recent activity
-        - System metrics
-        - User statistics
-        """
+        """Get complete dashboard overview."""
         try:
             stats_service = StatisticsService()
             health_service = SystemHealthService()
             charts_service = ChartsService()
 
-            # Get app statistics and convert to list format
-            app_stats_dict = stats_service.get_app_statistics()
+            # Get app statistics - wrapped in try/except since it queries all models
+            try:
+                app_stats_dict = stats_service.get_app_statistics()
+            except Exception as e:
+                logger.error(f"Error getting app stats: {e}")
+                app_stats_dict = {'apps': {}}
+
             app_statistics_list = [
                 {
                     'app_name': app_label,

django_cfg/apps/{frontend → system/frontend}/__init__.py

@@ -1,6 +1,6 @@
 """Django CFG Frontend App - Serves Next.js static builds."""
 
-default_app_config = 'django_cfg.apps.frontend.apps.FrontendConfig'
+default_app_config = 'django_cfg.apps.system.frontend.apps.FrontendConfig'
 
 # Convenience imports
 from .setup import (

django_cfg/apps/{frontend → system/frontend}/apps.py

@@ -7,7 +7,7 @@ class FrontendConfig(AppConfig):
     """Configuration for Django CFG Frontend app."""
 
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'django_cfg.apps.frontend'
+    name = 'django_cfg.apps.system.frontend'
     verbose_name = 'Frontend Applications'
 
     def ready(self):

django_cfg/apps/{frontend → system/frontend}/setup.py

@@ -19,7 +19,7 @@ def setup_frontend_serving(settings: 'Settings' = None) -> dict:
 
     Usage in settings.py:
     ```python
-    from django_cfg.apps.frontend.setup import setup_frontend_serving
+    from django_cfg.apps.system.frontend.setup import setup_frontend_serving
 
     # Apply frontend configuration
     frontend_config = setup_frontend_serving()
@@ -36,7 +36,7 @@ def setup_frontend_serving(settings: 'Settings' = None) -> dict:
 
     config = {
         'INSTALLED_APPS': [
-            'django_cfg.apps.frontend',
+            'django_cfg.apps.system.frontend',
         ],
     }
 
@@ -54,7 +54,7 @@ def get_frontend_path(app_name: str = 'admin') -> Path:
         Path: Absolute path to the frontend build directory
 
     Example:
-        >>> from django_cfg.apps.frontend.setup import get_frontend_path
+        >>> from django_cfg.apps.system.frontend.setup import get_frontend_path
         >>> admin_path = get_frontend_path('admin')
         >>> print(admin_path)
         /path/to/django_cfg/static/frontend/admin
@@ -84,7 +84,7 @@ def get_frontend_urls():
 
     Usage in urls.py:
     ```python
-    from django_cfg.apps.frontend.setup import get_frontend_urls
+    from django_cfg.apps.system.frontend.setup import get_frontend_urls
 
     urlpatterns = [
         # Your URLs here
@@ -101,5 +101,5 @@ def get_frontend_urls():
     from django.urls import path, include
 
     return [
-        path('', include('django_cfg.apps.frontend.urls', namespace='frontend')),
+        path('', include('django_cfg.apps.system.frontend.urls', namespace='frontend')),
     ]

django_cfg/apps/{frontend → system/frontend}/views.py

@@ -22,7 +22,8 @@ from django.views.static import serve
 from django.views import View
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.utils.decorators import method_decorator
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.contrib.auth.mixins import UserPassesTestMixin
 from rest_framework_simplejwt.tokens import RefreshToken
 
 logger = logging.getLogger(__name__)
@@ -356,6 +357,20 @@ class NextJSStaticView(ZipExtractionMixin, View):
             logger.error(f"Failed to inject JWT tokens for user {request.user.pk}: {e}", exc_info=True)
 
 
-class AdminView(NextJSStaticView):
-    """Serve Next.js Admin Panel."""
+class AdminView(UserPassesTestMixin, NextJSStaticView):
+    """Serve Next.js Admin Panel. Only accessible to admin users."""
     app_name = 'admin'
+
+    def test_func(self):
+        """Check if user is admin (staff or superuser)."""
+        return self.request.user.is_authenticated and (
+            self.request.user.is_staff or self.request.user.is_superuser
+        )
+
+    def handle_no_permission(self):
+        """Redirect to admin login if not authenticated, otherwise 403."""
+        if not self.request.user.is_authenticated:
+            from django.contrib.auth.views import redirect_to_login
+            return redirect_to_login(self.request.get_full_path())
+        # User is authenticated but not admin - show 403
+        return render(self.request, 'frontend/403.html', status=403)

django_cfg/apps/system/maintenance/__init__.py

@@ -0,0 +1,56 @@
+"""
+Simplified Django-CFG Maintenance Application.
+
+A simple maintenance mode management app with Cloudflare integration.
+Refactored from 119 files to ~10 files following KISS principles.
+
+Proper structure:
+- models/ - CloudflareSite and MaintenanceLog models
+- services/ - MaintenanceService for Cloudflare operations
+- admin/ - Simple admin interfaces
+- management/commands/ - CLI commands
+"""
+
+__version__ = "2.0.0"
+__author__ = "Django-CFG Team"
+
+# Lazy import registry to avoid Django initialization issues
+_LAZY_IMPORTS = {
+    # Models
+    'CloudflareApiKey': ('django_cfg.apps.system.maintenance.models', 'CloudflareApiKey'),
+    'CloudflareSite': ('django_cfg.apps.system.maintenance.models', 'CloudflareSite'),
+    'MaintenanceLog': ('django_cfg.apps.system.maintenance.models', 'MaintenanceLog'),
+    'ScheduledMaintenance': ('django_cfg.apps.system.maintenance.models', 'ScheduledMaintenance'),
+
+    # Services
+    'MaintenanceService': ('django_cfg.apps.system.maintenance.services', 'MaintenanceService'),
+    'SiteSyncService': ('django_cfg.apps.system.maintenance.services', 'SiteSyncService'),
+    'BulkOperationsService': ('django_cfg.apps.system.maintenance.services', 'BulkOperationsService'),
+    'ScheduledMaintenanceService': ('django_cfg.apps.system.maintenance.services', 'ScheduledMaintenanceService'),
+    'bulk_operations': ('django_cfg.apps.system.maintenance.services', 'bulk_operations'),
+    'scheduled_maintenance_service': ('django_cfg.apps.system.maintenance.services', 'scheduled_maintenance_service'),
+    'enable_maintenance_for_domain': ('django_cfg.apps.system.maintenance.services', 'enable_maintenance_for_domain'),
+    'disable_maintenance_for_domain': ('django_cfg.apps.system.maintenance.services', 'disable_maintenance_for_domain'),
+    'sync_site_from_cloudflare': ('django_cfg.apps.system.maintenance.services', 'sync_site_from_cloudflare'),
+    'enable_maintenance_for_domains': ('django_cfg.apps.system.maintenance.services', 'enable_maintenance_for_domains'),
+    'disable_maintenance_for_domains': ('django_cfg.apps.system.maintenance.services', 'disable_maintenance_for_domains'),
+    'bulk_sync_all_sites': ('django_cfg.apps.system.maintenance.services', 'bulk_sync_all_sites'),
+    'get_maintenance_status_report': ('django_cfg.apps.system.maintenance.services', 'get_maintenance_status_report'),
+    'schedule_maintenance_for_sites': ('django_cfg.apps.system.maintenance.services', 'schedule_maintenance_for_sites'),
+    'process_scheduled_maintenances': ('django_cfg.apps.system.maintenance.services', 'process_scheduled_maintenances'),
+}
+
+
+def __getattr__(name: str):
+    """Lazy import mechanism to avoid Django initialization issues."""
+    if name in _LAZY_IMPORTS:
+        module_path, attr_name = _LAZY_IMPORTS[name]
+
+        import importlib
+        module = importlib.import_module(module_path)
+        return getattr(module, attr_name)
+
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
+__all__ = list(_LAZY_IMPORTS.keys())

django_cfg/apps/{maintenance → system/maintenance}/admin/api_key_admin.py

@@ -143,19 +143,19 @@ cloudflare_apikey_config = AdminConfig(
             name="make_default",
             description="Make default API key",
             variant="primary",
-            handler="django_cfg.apps.maintenance.admin.actions.make_default_key"
+            handler="django_cfg.apps.system.maintenance.admin.actions.make_default_key"
         ),
         ActionConfig(
             name="activate_keys",
             description="Activate API keys",
             variant="success",
-            handler="django_cfg.apps.maintenance.admin.actions.activate_keys"
+            handler="django_cfg.apps.system.maintenance.admin.actions.activate_keys"
         ),
         ActionConfig(
             name="deactivate_keys",
             description="Deactivate API keys",
             variant="warning",
-            handler="django_cfg.apps.maintenance.admin.actions.deactivate_keys"
+            handler="django_cfg.apps.system.maintenance.admin.actions.deactivate_keys"
         ),
     ],
 
@@ -177,18 +177,16 @@ class CloudflareApiKeyAdmin(PydanticAdmin):
         if not sites:
             return "No sites using this key"
 
-        site_list = []
-        for site in sites:
-            status_emoji = "Maintenance" if site.maintenance_active else "Active"
-            site_list.append(f"{status_emoji} {site.name} ({site.domain})")
-
-        result = "\n".join(site_list)
+        # Declarative site list generation
+        site_items = [
+            f"{'🔧 Maintenance' if site.maintenance_active else '✅ Active'} {site.name} ({site.domain})"
+            for site in sites
+        ]
 
         total_count = obj.cloudflaresite_set.count()
-        if total_count > 10:
-            result += f"\n... and {total_count - 10} more sites"
+        overflow_item = [f"... and {total_count - 10} more sites"] if total_count > 10 else []
 
-        return result
+        return "\n".join(site_items + overflow_item)
     sites_using_key.short_description = "Sites Using This Key"
 
     def changelist_view(self, request, extra_context=None):

django_cfg/apps/{maintenance → system/maintenance}/admin/scheduled_admin.py

@@ -156,19 +156,19 @@ scheduled_maintenance_config = AdminConfig(
             name="execute_maintenance",
             description="Execute maintenance",
             variant="info",
-            handler="django_cfg.apps.maintenance.admin.actions.execute_maintenance"
+            handler="django_cfg.apps.system.maintenance.admin.actions.execute_maintenance"
         ),
         ActionConfig(
             name="cancel_maintenance",
             description="Cancel maintenance",
             variant="warning",
-            handler="django_cfg.apps.maintenance.admin.actions.cancel_maintenance"
+            handler="django_cfg.apps.system.maintenance.admin.actions.cancel_maintenance"
         ),
         ActionConfig(
             name="reschedule_maintenance",
             description="Reschedule maintenance",
             variant="primary",
-            handler="django_cfg.apps.maintenance.admin.actions.reschedule_maintenance"
+            handler="django_cfg.apps.system.maintenance.admin.actions.reschedule_maintenance"
         ),
     ],
 

django_cfg/apps/{maintenance → system/maintenance}/admin/site_admin.py

@@ -208,31 +208,31 @@ cloudflare_site_config = AdminConfig(
             name="enable_maintenance",
             description="Enable maintenance mode",
             variant="warning",
-            handler="django_cfg.apps.maintenance.admin.actions.enable_maintenance_mode"
+            handler="django_cfg.apps.system.maintenance.admin.actions.enable_maintenance_mode"
         ),
         ActionConfig(
             name="disable_maintenance",
             description="Disable maintenance mode",
             variant="success",
-            handler="django_cfg.apps.maintenance.admin.actions.disable_maintenance_mode"
+            handler="django_cfg.apps.system.maintenance.admin.actions.disable_maintenance_mode"
         ),
         ActionConfig(
             name="activate_sites",
             description="Activate sites",
             variant="success",
-            handler="django_cfg.apps.maintenance.admin.actions.activate_sites"
+            handler="django_cfg.apps.system.maintenance.admin.actions.activate_sites"
         ),
         ActionConfig(
             name="deactivate_sites",
             description="Deactivate sites",
             variant="warning",
-            handler="django_cfg.apps.maintenance.admin.actions.deactivate_sites"
+            handler="django_cfg.apps.system.maintenance.admin.actions.deactivate_sites"
         ),
         ActionConfig(
             name="sync_with_cloudflare",
             description="Sync with Cloudflare",
             variant="info",
-            handler="django_cfg.apps.maintenance.admin.actions.sync_with_cloudflare"
+            handler="django_cfg.apps.system.maintenance.admin.actions.sync_with_cloudflare"
         ),
     ],
 
@@ -256,10 +256,11 @@ class CloudflareSiteAdmin(PydanticAdmin):
         if not logs:
             return "No maintenance logs yet"
 
-        log_list = []
-        for log in logs:
-            status_text = "Success" if log.status == MaintenanceLog.Status.SUCCESS else "Failed" if log.status == MaintenanceLog.Status.FAILED else "Pending"
-            log_list.append(f"{status_text} {log.action} - {log.created_at.strftime('%Y-%m-%d %H:%M')}")
+        # Declarative log list generation
+        log_list = [
+            f"{('✅ Success' if log.status == MaintenanceLog.Status.SUCCESS else '❌ Failed' if log.status == MaintenanceLog.Status.FAILED else '⏳ Pending')} {log.action} - {log.created_at.strftime('%Y-%m-%d %H:%M')}"
+            for log in logs
+        ]
 
         return "\n".join(log_list)
     logs_preview.short_description = "Recent Logs"

django_cfg/apps/{maintenance → system/maintenance}/apps.py

@@ -9,7 +9,7 @@ class MaintenanceConfig(AppConfig):
     """Configuration for the simplified maintenance app."""
 
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'django_cfg.apps.maintenance'
+    name = 'django_cfg.apps.system.maintenance'
     verbose_name = 'Maintenance Mode'
 
     def ready(self):

django_cfg/apps/{maintenance → system/maintenance}/models/__init__.py

@@ -7,10 +7,10 @@ Uses lazy imports to avoid Django initialization issues.
 
 # Lazy import registry to avoid Django initialization issues
 _LAZY_IMPORTS = {
-    'CloudflareApiKey': ('django_cfg.apps.maintenance.models.cloudflare_api_key', 'CloudflareApiKey'),
-    'CloudflareSite': ('django_cfg.apps.maintenance.models.cloudflare_site', 'CloudflareSite'),
-    'MaintenanceLog': ('django_cfg.apps.maintenance.models.maintenance_log', 'MaintenanceLog'),
-    'ScheduledMaintenance': ('django_cfg.apps.maintenance.models.scheduled_maintenance', 'ScheduledMaintenance'),
+    'CloudflareApiKey': ('django_cfg.apps.system.maintenance.models.cloudflare_api_key', 'CloudflareApiKey'),
+    'CloudflareSite': ('django_cfg.apps.system.maintenance.models.cloudflare_site', 'CloudflareSite'),
+    'MaintenanceLog': ('django_cfg.apps.system.maintenance.models.maintenance_log', 'MaintenanceLog'),
+    'ScheduledMaintenance': ('django_cfg.apps.system.maintenance.models.scheduled_maintenance', 'ScheduledMaintenance'),
 }
 
 

django_cfg/apps/system/maintenance/services/__init__.py

@@ -0,0 +1,42 @@
+"""
+Simplified maintenance services.
+
+Clean imports for the service classes with lazy loading.
+"""
+
+# Lazy import registry to avoid Django initialization issues
+_LAZY_IMPORTS = {
+    # Services
+    'MaintenanceService': ('django_cfg.apps.system.maintenance.services.maintenance_service', 'MaintenanceService'),
+    'SiteSyncService': ('django_cfg.apps.system.maintenance.services.site_sync_service', 'SiteSyncService'),
+    'BulkOperationsService': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'BulkOperationsService'),
+    'ScheduledMaintenanceService': ('django_cfg.apps.system.maintenance.services.scheduled_maintenance_service', 'ScheduledMaintenanceService'),
+
+    # Service functions
+    'enable_maintenance_for_domain': ('django_cfg.apps.system.maintenance.services.maintenance_service', 'enable_maintenance_for_domain'),
+    'disable_maintenance_for_domain': ('django_cfg.apps.system.maintenance.services.maintenance_service', 'disable_maintenance_for_domain'),
+    'sync_site_from_cloudflare': ('django_cfg.apps.system.maintenance.services.site_sync_service', 'sync_site_from_cloudflare'),
+    'bulk_operations': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'bulk_operations'),
+    'scheduled_maintenance_service': ('django_cfg.apps.system.maintenance.services.scheduled_maintenance_service', 'scheduled_maintenance_service'),
+    'enable_maintenance_for_domains': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'enable_maintenance_for_domains'),
+    'disable_maintenance_for_domains': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'disable_maintenance_for_domains'),
+    'bulk_sync_all_sites': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'bulk_sync_all_sites'),
+    'get_maintenance_status_report': ('django_cfg.apps.system.maintenance.services.bulk_operations_service', 'get_maintenance_status_report'),
+    'schedule_maintenance_for_sites': ('django_cfg.apps.system.maintenance.services.scheduled_maintenance_service', 'schedule_maintenance_for_sites'),
+    'process_scheduled_maintenances': ('django_cfg.apps.system.maintenance.services.scheduled_maintenance_service', 'process_scheduled_maintenances'),
+}
+
+
+def __getattr__(name: str):
+    """Lazy import mechanism to avoid Django initialization issues."""
+    if name in _LAZY_IMPORTS:
+        module_path, attr_name = _LAZY_IMPORTS[name]
+
+        import importlib
+        module = importlib.import_module(module_path)
+        return getattr(module, attr_name)
+
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
+__all__ = list(_LAZY_IMPORTS.keys())