django-cfg 1.4.120__py3-none-any.whl → 1.5.2__py3-none-any.whl

django_cfg/__init__.py

@@ -32,11 +32,11 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.4.120"
+__version__ = "1.5.2"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading
-from .config import LIB_NAME
+from .config import LIB_NAME, is_feature_available, require_feature, register_feature
 from .registry import DJANGO_CFG_REGISTRY
 
 # Get author from library config
@@ -55,5 +55,9 @@ def __getattr__(name: str):
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
-# Export all registered components
-__all__ = list(DJANGO_CFG_REGISTRY.keys())
+# Export all registered components + feature detection
+__all__ = list(DJANGO_CFG_REGISTRY.keys()) + [
+    "is_feature_available",
+    "require_feature",
+    "register_feature",
+]

django_cfg/apps/centrifugo/admin/centrifugo_log.py

@@ -96,7 +96,7 @@ class CentrifugoLogAdmin(PydanticAdmin):
 
         try:
             formatted = json.dumps(obj.data, indent=2)
-            return f'<pre style="background: #f5f5f5; padding: 10px; border-radius: 4px; max-height: 400px; overflow: auto; font-size: 12px; line-height: 1.5;">{formatted}</pre>'
+            return self.html.code_block(formatted, language="json", max_height="400px")
         except Exception:
             return str(obj.data)
 
@@ -106,37 +106,22 @@ class CentrifugoLogAdmin(PydanticAdmin):
         """Display error information if publish failed."""
         if obj.is_successful or obj.status == "pending":
             return self.html.inline(
-                [
-                    self.html.icon(Icons.CHECK_CIRCLE, size="sm"),
-                    self.html.span("No errors", "text-green-600"),
-                ]
+                self.html.icon(Icons.CHECK_CIRCLE, size="sm"),
+                self.html.text("No errors", variant="success"),
+                separator=" "
             )
 
-        details = []
-
-        if obj.error_code:
-            details.append(
-                self.html.inline(
-                    [
-                        self.html.span("Error Code:", "font-semibold"),
-                        self.html.badge(obj.error_code, variant="danger", icon=Icons.ERROR),
-                    ],
-                    separator=" ",
-                )
-            )
+        error_code_line = self.html.key_value(
+            "Error Code",
+            self.html.badge(obj.error_code, variant="danger", icon=Icons.ERROR)
+        ) if obj.error_code else None
 
-        if obj.error_message:
-            details.append(
-                self.html.inline(
-                    [
-                        self.html.span("Message:", "font-semibold"),
-                        self.html.span(obj.error_message, "text-red-600"),
-                    ],
-                    separator=" ",
-                )
-            )
+        error_msg_line = self.html.key_value(
+            "Message",
+            self.html.text(obj.error_message, variant="danger")
+        ) if obj.error_message else None
 
-        return "<br>".join(details) if details else self.html.empty()
+        return self.html.breakdown(error_code_line, error_msg_line) if (error_code_line or error_msg_line) else self.html.empty()
 
     error_details_display.short_description = "Error Details"
 
@@ -145,57 +130,34 @@ class CentrifugoLogAdmin(PydanticAdmin):
         if not obj.wait_for_ack:
             return self.html.empty("No ACK tracking")
 
-        stats = []
-
         # ACK timeout
-        if obj.ack_timeout:
-            stats.append(
-                self.html.inline(
-                    [
-                        self.html.span("Timeout:", "font-semibold"),
-                        self.html.span(f"{obj.ack_timeout}s", "text-gray-600"),
-                    ],
-                    separator=" ",
-                )
-            )
+        timeout_line = self.html.key_value(
+            "Timeout",
+            f"{obj.ack_timeout}s"
+        ) if obj.ack_timeout else None
 
         # ACKs received
-        stats.append(
-            self.html.inline(
-                [
-                    self.html.span("ACKs Received:", "font-semibold"),
-                    self.html.badge(str(obj.acks_received), variant="info"),
-                ],
-                separator=" ",
-            )
+        received_line = self.html.key_value(
+            "ACKs Received",
+            self.html.badge(str(obj.acks_received), variant="info")
         )
 
         # ACKs expected (if known)
-        if obj.acks_expected:
-            stats.append(
-                self.html.inline(
-                    [
-                        self.html.span("ACKs Expected:", "font-semibold"),
-                        self.html.span(str(obj.acks_expected), "text-gray-600"),
-                    ],
-                    separator=" ",
-                )
+        expected_line = self.html.key_value(
+            "ACKs Expected",
+            str(obj.acks_expected)
+        ) if obj.acks_expected else None
+
+        # Delivery rate
+        rate_line = None
+        if obj.acks_expected and obj.delivery_rate is not None:
+            rate_pct = obj.delivery_rate * 100
+            rate_line = self.html.key_value(
+                "Delivery Rate",
+                self.html.number(rate_pct, precision=1, suffix="%")
             )
 
-            # Delivery rate
-            if obj.delivery_rate is not None:
-                rate_pct = obj.delivery_rate * 100
-                stats.append(
-                    self.html.inline(
-                        [
-                            self.html.span("Delivery Rate:", "font-semibold"),
-                            self.html.span(f"{rate_pct:.1f}%", "text-blue-600"),
-                        ],
-                        separator=" ",
-                    )
-                )
-
-        return "<br>".join(stats) if stats else self.html.empty()
+        return self.html.breakdown(timeout_line, received_line, expected_line, rate_line)
 
     delivery_stats_display.short_description = "Delivery Statistics"
 

django_cfg/apps/dashboard/TRANSACTION_FIX.md

@@ -0,0 +1,73 @@
+# PostgreSQL Transaction Error Fix
+
+## Problem
+
+Error: **"current transaction is aborted, commands ignored until end of transaction block"**
+
+### Root Causes:
+1. Using `.extra()` for raw SQL queries in PostgreSQL
+2. Calling `.count()` on models whose tables don't exist in the database
+
+## Solution
+
+### 1. Replaced `.extra()` with `TruncDate()` in `charts_service.py`
+
+**Before:**
+```python
+.extra({'date': "date(date_joined)"})  # ❌ Raw SQL
+```
+
+**After:**
+```python
+from django.db.models.functions import TruncDate
+.annotate(date=TruncDate('date_joined'))  # ✅ Django ORM
+```
+
+### 2. Added table existence check in `statistics_service.py`
+
+**Problem:** `model.objects.count()` was called on ALL models, including those without database tables (e.g., migrations not run).
+
+**Solution:** Check if table exists before querying:
+
+```python
+def _get_model_stats(self, model) -> Optional[Dict[str, Any]]:
+    try:
+        from django.db import connection, OperationalError, ProgrammingError
+
+        # Check if table exists before querying
+        table_name = model._meta.db_table
+        with connection.cursor() as cursor:
+            cursor.execute(f"SELECT COUNT(*) FROM {connection.ops.quote_name(table_name)} LIMIT 1")
+
+        # Now safe to call model.objects.count()
+        model_stats = {
+            "count": model.objects.count(),
+            ...
+        }
+        return model_stats
+
+    except (OperationalError, ProgrammingError):
+        # Table doesn't exist - skip this model
+        return None
+```
+
+## Modified Files
+
+- ✅ `services/charts_service.py` - replaced all `.extra()` with `TruncDate()`
+- ✅ `services/statistics_service.py` - added table existence check
+- ✅ `views/overview_views.py` - simplified, removed complex transaction logic
+
+## Key Lessons
+
+1. **Don't use `.extra()`** - always use Django ORM functions
+2. **Check table existence** before querying models
+3. **Don't overcomplicate** - let Django handle transactions
+4. **Catch specific exceptions** - `OperationalError`, `ProgrammingError` for DB issues
+
+## Conclusion
+
+Keep it simple! The issue was two simple bugs:
+- Using raw SQL (`.extra()`)
+- Querying non-existent tables
+
+Fixed by using proper Django ORM and checking table existence.

django_cfg/apps/dashboard/serializers/__init__.py

@@ -22,12 +22,6 @@ from .commands import (
     CommandHelpResponseSerializer,
 )
 from .apizones import APIZoneSerializer, APIZonesSummarySerializer
-from .django_q2 import (
-    DjangoQ2ScheduleSerializer,
-    DjangoQ2TaskSerializer,
-    DjangoQ2StatusSerializer,
-    DjangoQ2SummarySerializer,
-)
 
 __all__ = [
     # Base
@@ -65,10 +59,4 @@ __all__ = [
     # API Zones
     'APIZoneSerializer',
     'APIZonesSummarySerializer',
-
-    # Django-Q2
-    'DjangoQ2ScheduleSerializer',
-    'DjangoQ2TaskSerializer',
-    'DjangoQ2StatusSerializer',
-    'DjangoQ2SummarySerializer',
 ]

django_cfg/apps/dashboard/serializers/activity.py

@@ -19,7 +19,7 @@ class QuickActionSerializer(serializers.Serializer):
     icon = serializers.CharField(help_text="Material icon name")
     link = serializers.CharField(help_text="Action URL")
     color = serializers.ChoiceField(
-        choices=['primary', 'success', 'warning', 'danger', 'secondary'],
+        choices=['primary', 'success', 'warning', 'danger', 'secondary', 'info', 'default'],
         default='primary',
         help_text="Button color theme"
     )

django_cfg/apps/dashboard/services/__init__.py

@@ -11,7 +11,6 @@ from .charts_service import ChartsService
 from .commands_service import CommandsService
 from .apizones_service import APIZonesService
 from .overview_service import OverviewService
-from .django_q2_service import DjangoQ2Service
 
 __all__ = [
     'StatisticsService',
@@ -20,5 +19,4 @@ __all__ = [
     'CommandsService',
     'APIZonesService',
     'OverviewService',
-    'DjangoQ2Service',
 ]

django_cfg/apps/dashboard/services/charts_service.py

@@ -11,6 +11,7 @@ from typing import Any, Dict, List
 
 from django.contrib.auth import get_user_model
 from django.db.models import Count
+from django.db.models.functions import TruncDate
 from django.utils import timezone
 
 logger = logging.getLogger(__name__)
@@ -78,7 +79,7 @@ class ChartsService:
             # Get registration counts by date
             registration_data = (
                 User.objects.filter(date_joined__date__gte=start_date)
-                .extra({'date': "date(date_joined)"})
+                .annotate(date=TruncDate('date_joined'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')
@@ -138,7 +139,7 @@ class ChartsService:
             # Get login activity (users who logged in each day)
             activity_data = (
                 User.objects.filter(last_login__date__gte=start_date, last_login__isnull=False)
-                .extra({'date': "date(last_login)"})
+                .annotate(date=TruncDate('last_login'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')
@@ -192,7 +193,7 @@ class ChartsService:
             # Get activity data by date
             activity_data = (
                 User.objects.filter(last_login__date__gte=start_date, last_login__isnull=False)
-                .extra({'date': "date(last_login)"})
+                .annotate(date=TruncDate('last_login'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')

django_cfg/apps/dashboard/services/statistics_service.py

@@ -64,7 +64,7 @@ class StatisticsService:
                 'superusers': superusers,
             }
         except Exception as e:
-            self.logger.error(f"Error getting user statistics: {e}")
+            self.logger.error(f"Error getting user statistics: {e}", exc_info=True)
             return {
                 'total_users': 0,
                 'active_users': 0,
@@ -145,20 +145,29 @@ class StatisticsService:
 
     def _get_model_stats(self, model) -> Optional[Dict[str, Any]]:
         """Get statistics for a specific model."""
+        from django.db import OperationalError, ProgrammingError
+
         try:
+            # Just try to count - if table doesn't exist, exception will be caught
+            count = model.objects.count()
+
             # Get basic model info
             model_stats = {
                 "name": model._meta.verbose_name_plural
                 or model._meta.verbose_name
                 or model._meta.model_name,
-                "count": model.objects.count(),
+                "count": count,
                 "fields_count": len(model._meta.fields),
                 "admin_url": f"admin:{model._meta.app_label}_{model._meta.model_name}_changelist",
             }
 
             return model_stats
 
+        except (OperationalError, ProgrammingError):
+            # Table doesn't exist or other DB error - skip this model silently
+            return None
         except Exception:
+            # Any other error - skip this model silently
             return None
 
     def get_stat_cards(self) -> List[Dict[str, Any]]:

django_cfg/apps/dashboard/services/system_health_service.py

@@ -9,6 +9,7 @@ import logging
 from datetime import datetime
 from typing import Any, Dict, List, Literal
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -105,7 +106,7 @@ class SystemHealthService:
 
     def check_queue_health(self) -> Dict[str, Any]:
         """
-        Check task queue (ReArq) health via Redis connection.
+        Check task queue (Django-RQ) health via Redis connection.
 
         Returns:
             Health status dictionary
@@ -191,90 +192,6 @@ class SystemHealthService:
                 'health_percentage': 0,
             }
 
-    def check_django_q2_health(self) -> Dict[str, Any]:
-        """
-        Check Django-Q2 task scheduling configuration and status.
-
-        Returns:
-            Health status dictionary with schedule count and cluster status
-        """
-        try:
-            from django_cfg.core.config import get_current_config
-
-            config = get_current_config()
-
-            # Check if django_q2 is configured
-            if not hasattr(config, 'django_q2') or not config.django_q2:
-                return {
-                    'component': 'django_q2',
-                    'status': 'info',
-                    'description': 'Django-Q2 scheduling not configured',
-                    'last_check': datetime.now().isoformat(),
-                    'health_percentage': 100,
-                    'details': {
-                        'enabled': False,
-                        'schedules_count': 0,
-                    }
-                }
-
-            django_q2_config = config.django_q2
-
-            # Check if enabled
-            if not django_q2_config.enabled:
-                return {
-                    'component': 'django_q2',
-                    'status': 'warning',
-                    'description': 'Django-Q2 scheduling is disabled',
-                    'last_check': datetime.now().isoformat(),
-                    'health_percentage': 50,
-                    'details': {
-                        'enabled': False,
-                        'schedules_count': len(django_q2_config.schedules) if django_q2_config.schedules else 0,
-                    }
-                }
-
-            # Count schedules
-            schedules_count = len(django_q2_config.schedules) if django_q2_config.schedules else 0
-
-            # Try to check cluster status from database
-            cluster_running = False
-            try:
-                from django_q.models import Schedule, Task
-                from django.utils import timezone
-                from datetime import timedelta
-
-                # Check for recent task activity
-                recent_task = Task.objects.filter(
-                    started__gte=timezone.now() - timedelta(minutes=5)
-                ).exists()
-                cluster_running = recent_task
-            except Exception:
-                pass
-
-            return {
-                'component': 'django_q2',
-                'status': 'healthy',
-                'description': f'{schedules_count} schedule(s) configured, cluster {"running" if cluster_running else "idle"}',
-                'last_check': datetime.now().isoformat(),
-                'health_percentage': 100,
-                'details': {
-                    'enabled': True,
-                    'schedules_count': schedules_count,
-                    'cluster_running': cluster_running,
-                    'workers': django_q2_config.workers,
-                }
-            }
-
-        except Exception as e:
-            self.logger.error(f"Django-Q2 health check failed: {e}")
-            return {
-                'component': 'django_q2',
-                'status': 'error',
-                'description': f'Django-Q2 check error: {str(e)}',
-                'last_check': datetime.now().isoformat(),
-                'health_percentage': 0,
-            }
-
     def get_all_health_checks(self) -> List[Dict[str, Any]]:
         """
         Run all health checks and return aggregated results.
@@ -289,7 +206,6 @@ class SystemHealthService:
             self.check_cache_health(),
             self.check_queue_health(),
             self.check_storage_health(),
-            self.check_django_q2_health(),
         ]
 
         return checks
@@ -328,42 +244,84 @@ class SystemHealthService:
         Get quick action buttons for dashboard.
 
         Returns:
-            List of quick action dictionaries
+            List of quick action dictionaries with safe URL resolution
 
-        %%AI_HINT: Actions link to admin pages or trigger common tasks%%
+        %%AI_HINT: Actions link to admin pages or API endpoints%%
         """
+        from django.urls import reverse, NoReverseMatch
+
+        def safe_reverse(url_name: str, fallback: str) -> str:
+            """Safely reverse URL with fallback."""
+            try:
+                return reverse(url_name)
+            except NoReverseMatch:
+                self.logger.debug(f"Could not reverse URL '{url_name}', using fallback: {fallback}")
+                return fallback
+
         actions = [
+            {
+                'title': 'Admin Panel',
+                'description': 'Open Django admin interface',
+                'icon': 'admin_panel_settings',
+                'link': safe_reverse('admin:index', '/admin/'),
+                'color': 'primary',
+                'category': 'admin',
+            },
             {
                 'title': 'User Management',
                 'description': 'Manage users and permissions',
                 'icon': 'people',
-                'link': '/admin/auth/user/',
+                'link': safe_reverse('admin:auth_user_changelist', '/admin/auth/user/'),
                 'color': 'primary',
                 'category': 'admin',
             },
             {
-                'title': 'View Logs',
-                'description': 'Check system logs',
-                'icon': 'description',
-                'link': '/admin/django_cfg/logs/',
+                'title': 'Settings',
+                'description': 'Configure application settings',
+                'icon': 'settings',
+                'link': safe_reverse('admin:constance_config_changelist', '/admin/constance/config/'),
+                'color': 'default',
+                'category': 'admin',
+            },
+            {
+                'title': 'System Health',
+                'description': 'Check system health status',
+                'icon': 'favorite',
+                'link': '/cfg/dashboard/api/system/health/',
+                'color': 'success',
+                'category': 'monitoring',
+            },
+            {
+                'title': 'RQ Workers',
+                'description': 'Monitor task queue workers',
+                'icon': 'work',
+                'link': '/cfg/rq/workers/',
+                'color': 'info',
+                'category': 'monitoring',
+            },
+            {
+                'title': 'RQ Jobs',
+                'description': 'View and manage background jobs',
+                'icon': 'assignment',
+                'link': '/cfg/rq/jobs/',
                 'color': 'secondary',
-                'category': 'system',
+                'category': 'monitoring',
             },
             {
-                'title': 'Clear Cache',
-                'description': 'Clear application cache',
-                'icon': 'refresh',
-                'link': '/cfg/admin/cache/clear/',
-                'color': 'warning',
-                'category': 'system',
+                'title': 'RQ Schedules',
+                'description': 'Manage scheduled tasks',
+                'icon': 'schedule',
+                'link': '/cfg/rq/schedules/',
+                'color': 'info',
+                'category': 'monitoring',
             },
             {
-                'title': 'Run Backup',
-                'description': 'Create system backup',
-                'icon': 'backup',
-                'link': '/cfg/admin/backup/create/',
-                'color': 'success',
-                'category': 'system',
+                'title': 'Commands',
+                'description': 'Execute Django management commands',
+                'icon': 'terminal',
+                'link': '/cfg/dashboard/api/commands/',
+                'color': 'warning',
+                'category': 'admin',
             },
         ]
 

django_cfg/apps/dashboard/urls.py

@@ -21,7 +21,6 @@ from .views import (
     ChartsViewSet,
     CommandsViewSet,
     APIZonesViewSet,
-    DjangoQ2ViewSet,
 )
 
 app_name = 'django_cfg_dashboard'
@@ -35,7 +34,6 @@ router.register(r'activity', ActivityViewSet, basename='activity')
 router.register(r'charts', ChartsViewSet, basename='charts')
 router.register(r'commands', CommandsViewSet, basename='commands')
 router.register(r'zones', APIZonesViewSet, basename='zones')
-router.register(r'django_q2', DjangoQ2ViewSet, basename='django_q2')
 
 urlpatterns = [
     # RESTful API endpoints using ViewSets

django_cfg/apps/dashboard/views/__init__.py

@@ -11,7 +11,6 @@ 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
 
 __all__ = [
     'OverviewViewSet',
@@ -21,5 +20,4 @@ __all__ = [
     'ChartsViewSet',
     'CommandsViewSet',
     'APIZonesViewSet',
-    'DjangoQ2ViewSet',
 ]

django_cfg/apps/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