django-cfg 1.4.116__py3-none-any.whl → 1.5.14__py3-none-any.whl

django_cfg/apps/{centrifugo → integrations/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/integrations/centrifugo/apps.py

@@ -0,0 +1,100 @@
+"""
+Django app configuration for Centrifugo module.
+
+Provides Centrifugo pub/sub client with ACK tracking.
+"""
+
+from __future__ import annotations
+
+import os
+
+from django.apps import AppConfig
+
+
+class CentrifugoConfig(AppConfig):
+    """
+    Centrifugo application configuration.
+
+    Provides:
+    - Async client for publishing messages to Centrifugo
+    - ACK tracking for delivery confirmation
+    - Logging of all publish operations
+    - Migration-friendly API (mirrors legacy WebSocket solution patterns)
+    """
+
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "django_cfg.apps.integrations.centrifugo"
+    label = "django_cfg_centrifugo"
+    verbose_name = "Centrifugo WebSocket"
+
+    def ready(self):
+        """
+        Initialize app when Django starts.
+
+        Validates that all required Centrifugo dependencies are installed.
+        """
+        from django_cfg.modules.django_logging import get_logger
+
+        logger = get_logger("centrifugo.apps")
+
+        # Check dependencies if needed (only when using Centrifugo features)
+        self._check_dependencies_if_needed()
+
+        logger.info("Centrifugo app initialized")
+
+    def _check_dependencies_if_needed(self):
+        """
+        Check Centrifugo dependencies only when needed.
+
+        Skips check for:
+        - Migrations (makemigrations, migrate)
+        - Shell commands (shell, shell_plus)
+        - Test discovery (test --help)
+        - Django checks (check)
+        - Management command listing (help)
+        """
+        import sys
+
+        # Get command name from sys.argv
+        if len(sys.argv) < 2:
+            return
+
+        command = sys.argv[1]
+
+        # Commands that don't need Centrifugo dependencies
+        skip_commands = [
+            'makemigrations',
+            'migrate',
+            'shell',
+            'shell_plus',
+            'check',
+            'help',
+            'test',
+            'collectstatic',
+            'createsuperuser',
+            'changepassword',
+            'showmigrations',
+            'sqlmigrate',
+            'inspectdb',
+        ]
+
+        # Skip check for these commands
+        if command in skip_commands:
+            return
+
+        # Also skip if running tests (pytest, nose, etc.)
+        if 'test' in sys.argv or 'pytest' in sys.argv[0]:
+            return
+
+        # Skip if DJANGO_SKIP_CENTRIFUGO_CHECK environment variable is set
+        if os.environ.get('DJANGO_SKIP_CENTRIFUGO_CHECK', '').lower() in ('1', 'true', 'yes'):
+            return
+
+        # For commands that may use Centrifugo, perform silent check
+        from ._cfg import check_centrifugo_dependencies
+        try:
+            # Silent check - only validates that checker itself works
+            check_centrifugo_dependencies(raise_on_missing=False)
+        except Exception:
+            # Silently ignore - don't break other commands
+            pass

django_cfg/apps/{centrifugo → integrations/centrifugo}/management/commands/generate_centrifugo_clients.py

@@ -6,25 +6,25 @@ Usage:
     python manage.py generate_centrifugo_clients -o ./clients --python --verbose
 """
 
-import logging
 from pathlib import Path
 from typing import List
 
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import CommandError
 from django.utils.termcolors import colorize
 
-from django_cfg.apps.centrifugo.codegen.discovery import discover_rpc_methods_from_router
-from django_cfg.apps.centrifugo.codegen.generators.python_thin import PythonThinGenerator
-from django_cfg.apps.centrifugo.codegen.generators.typescript_thin import TypeScriptThinGenerator
-from django_cfg.apps.centrifugo.codegen.generators.go_thin import GoThinGenerator
-from django_cfg.apps.centrifugo.router import get_global_router
+from django_cfg.management.utils import AdminCommand
 
-logger = logging.getLogger(__name__)
+from django_cfg.apps.integrations.centrifugo.codegen.discovery import discover_rpc_methods_from_router
+from django_cfg.apps.integrations.centrifugo.codegen.generators.python_thin import PythonThinGenerator
+from django_cfg.apps.integrations.centrifugo.codegen.generators.typescript_thin import TypeScriptThinGenerator
+from django_cfg.apps.integrations.centrifugo.codegen.generators.go_thin import GoThinGenerator
+from django_cfg.apps.integrations.centrifugo.router import get_global_router
 
 
-class Command(BaseCommand):
+class Command(AdminCommand):
     """Generate type-safe client SDKs for Centrifugo WebSocket RPC."""
 
+    command_name = 'generate_centrifugo_clients'
     help = "Generate type-safe client SDKs for Centrifugo WebSocket RPC from @websocket_rpc handlers"
 
     def add_arguments(self, parser):

django_cfg/apps/{centrifugo → integrations/centrifugo}/serializers/__init__.py

@@ -16,13 +16,14 @@ from .admin_api import (
 )
 from .channels import ChannelListSerializer, ChannelStatsSerializer
 from .health import HealthCheckSerializer
-from .publishes import RecentPublishesSerializer
-from .stats import OverviewStatsSerializer
+from .publishes import PublishSerializer, RecentPublishesSerializer
+from .stats import CentrifugoOverviewStatsSerializer
 
 __all__ = [
     # Monitoring API (Django logs)
     "HealthCheckSerializer",
-    "OverviewStatsSerializer",
+    "CentrifugoOverviewStatsSerializer",
+    "PublishSerializer",
     "RecentPublishesSerializer",
     "ChannelStatsSerializer",
     "ChannelListSerializer",

django_cfg/apps/integrations/centrifugo/serializers/publishes.py

@@ -0,0 +1,38 @@
+"""
+Publishes serializers for Centrifugo monitoring API.
+"""
+
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, Field
+from rest_framework import serializers
+
+
+class PublishSerializer(serializers.Serializer):
+    """Single publish item for DRF pagination."""
+
+    message_id = serializers.CharField()
+    channel = serializers.CharField()
+    status = serializers.CharField()
+    wait_for_ack = serializers.BooleanField()
+    acks_received = serializers.IntegerField()
+    acks_expected = serializers.IntegerField()
+    duration_ms = serializers.FloatField(allow_null=True)
+    created_at = serializers.DateTimeField()
+    completed_at = serializers.DateTimeField(allow_null=True)
+    error_code = serializers.CharField(allow_null=True)
+    error_message = serializers.CharField(allow_null=True)
+
+
+class RecentPublishesSerializer(BaseModel):
+    """Recent publishes list (DEPRECATED - use DRF pagination instead)."""
+
+    publishes: list[dict] = Field(description="List of recent publishes")
+    count: int = Field(description="Number of publishes returned")
+    total_available: int = Field(description="Total publishes available")
+    offset: int = Field(default=0, description="Current offset for pagination")
+    has_more: bool = Field(default=False, description="Whether more results are available")
+
+
+__all__ = ["PublishSerializer", "RecentPublishesSerializer"]

django_cfg/apps/{centrifugo → integrations/centrifugo}/serializers/stats.py

@@ -5,7 +5,7 @@ Statistics serializers for Centrifugo monitoring API.
 from pydantic import BaseModel, Field
 
 
-class OverviewStatsSerializer(BaseModel):
+class CentrifugoOverviewStatsSerializer(BaseModel):
     """Overview statistics for Centrifugo publishes."""
 
     total: int = Field(description="Total publishes in period")
@@ -18,4 +18,4 @@ class OverviewStatsSerializer(BaseModel):
     period_hours: int = Field(description="Statistics period in hours")
 
 
-__all__ = ["OverviewStatsSerializer"]
+__all__ = ["CentrifugoOverviewStatsSerializer"]

django_cfg/apps/{centrifugo → integrations/centrifugo}/services/client/client.py

@@ -54,7 +54,7 @@ class CentrifugoClient:
     - Mirrors DjangoCfgRPCClient interface for migration
 
     Example:
-        >>> from django_cfg.apps.centrifugo import get_centrifugo_client
+        >>> from django_cfg.apps.integrations.centrifugo import get_centrifugo_client
         >>>
         >>> client = get_centrifugo_client()
         >>>
@@ -525,7 +525,7 @@ def get_centrifugo_client(force_new: bool = False) -> CentrifugoClient:
         CentrifugoClient instance
 
     Example:
-        >>> from django_cfg.apps.centrifugo import get_centrifugo_client
+        >>> from django_cfg.apps.integrations.centrifugo import get_centrifugo_client
         >>> client = get_centrifugo_client()
         >>> result = await client.publish_with_ack(...)
     """

django_cfg/apps/{centrifugo → integrations/centrifugo}/services/client/config.py

@@ -17,7 +17,7 @@ class DjangoCfgCentrifugoConfig(BaseModel):
 
     Example:
         >>> from django_cfg import DjangoConfig
-        >>> from django_cfg.apps.centrifugo import DjangoCfgCentrifugoConfig
+        >>> from django_cfg.apps.integrations.centrifugo import DjangoCfgCentrifugoConfig
         >>>
         >>> config = DjangoConfig(
         ...     centrifugo=DjangoCfgCentrifugoConfig(

django_cfg/apps/{centrifugo → integrations/centrifugo}/views/monitoring.py

@@ -19,10 +19,11 @@ from rest_framework.response import Response
 from django_cfg.mixins import AdminAPIMixin
 from ..models import CentrifugoLog
 from ..serializers import (
+    CentrifugoOverviewStatsSerializer,
     ChannelListSerializer,
     ChannelStatsSerializer,
     HealthCheckSerializer,
-    OverviewStatsSerializer,
+    PublishSerializer,
     RecentPublishesSerializer,
 )
 from ..services import get_centrifugo_config
@@ -30,18 +31,20 @@ from ..services import get_centrifugo_config
 logger = get_logger("centrifugo.monitoring")
 
 
-class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
+class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.GenericViewSet):
     """
     ViewSet for Centrifugo monitoring and statistics.
 
     Provides comprehensive monitoring data for Centrifugo publishes including:
     - Health checks
     - Overview statistics
-    - Recent publishes
+    - Recent publishes (with DRF pagination)
     - Channel-level statistics
     Requires admin authentication (JWT, Session, or Basic Auth).
     """
 
+    serializer_class = PublishSerializer
+
     @extend_schema(
         tags=["Centrifugo Monitoring"],
         summary="Get Centrifugo health status",
@@ -94,7 +97,7 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
             ),
         ],
         responses={
-            200: OverviewStatsSerializer,
+            200: CentrifugoOverviewStatsSerializer,
             400: {"description": "Invalid parameters"},
         },
     )
@@ -108,7 +111,7 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
             stats = CentrifugoLog.objects.get_statistics(hours=hours)
             stats["period_hours"] = hours
 
-            serializer = OverviewStatsSerializer(**stats)
+            serializer = CentrifugoOverviewStatsSerializer(**stats)
             return Response(serializer.model_dump())
 
         except ValueError as e:
@@ -126,13 +129,20 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
     @extend_schema(
         tags=["Centrifugo Monitoring"],
         summary="Get recent publishes",
-        description="Returns a list of recent Centrifugo publishes with their details.",
+        description="Returns a paginated list of recent Centrifugo publishes with their details. Uses standard DRF pagination.",
         parameters=[
             OpenApiParameter(
-                name="count",
+                name="page",
                 type=OpenApiTypes.INT,
                 location=OpenApiParameter.QUERY,
-                description="Number of publishes to return (default: 50, max: 200)",
+                description="Page number",
+                required=False,
+            ),
+            OpenApiParameter(
+                name="page_size",
+                type=OpenApiTypes.INT,
+                location=OpenApiParameter.QUERY,
+                description="Items per page (default: 10, max: 100)",
                 required=False,
             ),
             OpenApiParameter(
@@ -149,16 +159,9 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
                 description="Filter by status (success, failed, timeout, pending, partial)",
                 required=False,
             ),
-            OpenApiParameter(
-                name="offset",
-                type=OpenApiTypes.INT,
-                location=OpenApiParameter.QUERY,
-                description="Offset for pagination (default: 0)",
-                required=False,
-            ),
         ],
         responses={
-            200: RecentPublishesSerializer,
+            200: PublishSerializer(many=True),
             400: {"description": "Invalid parameters"},
         },
     )
@@ -166,28 +169,23 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
     def publishes(self, request):
         """Get recent Centrifugo publishes."""
         try:
-            count = int(request.GET.get("count", 50))
-            count = min(count, 200)  # Max 200
-
             channel = request.GET.get("channel")
-            status_filter = request.GET.get("status")  # NEW: status filter
-            offset = int(request.GET.get("offset", 0))  # NEW: offset for pagination
+            status_filter = request.GET.get("status")
 
             queryset = CentrifugoLog.objects.all()
 
             if channel:
                 queryset = queryset.filter(channel=channel)
 
-            # NEW: Filter by status
+            # Filter by status
             if status_filter and status_filter in ["success", "failed", "timeout", "pending", "partial"]:
                 queryset = queryset.filter(status=status_filter)
 
-            # Get total count before slicing
-            total = queryset.count()
+            queryset = queryset.order_by("-created_at")
 
-            # NEW: Apply offset and limit
+            # Convert queryset to list of dicts for serialization
             publishes_list = list(
-                queryset.order_by("-created_at")[offset:offset + count].values(
+                queryset.values(
                     "message_id",
                     "channel",
                     "status",
@@ -202,23 +200,10 @@ class CentrifugoMonitorViewSet(AdminAPIMixin, viewsets.ViewSet):
                 )
             )
 
-            # Convert datetime to ISO format
-            for pub in publishes_list:
-                if pub["created_at"]:
-                    pub["created_at"] = pub["created_at"].isoformat()
-                if pub["completed_at"]:
-                    pub["completed_at"] = pub["completed_at"].isoformat()
-
-            response_data = {
-                "publishes": publishes_list,
-                "count": len(publishes_list),
-                "total_available": total,
-                "offset": offset,  # NEW: for pagination
-                "has_more": (offset + count) < total,  # NEW: pagination helper
-            }
-
-            serializer = RecentPublishesSerializer(**response_data)
-            return Response(serializer.model_dump())
+            # Use DRF pagination
+            page = self.paginate_queryset(publishes_list)
+            serializer = PublishSerializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
 
         except ValueError as e:
             logger.warning(f"Recent publishes validation error: {e}")

django_cfg/apps/integrations/grpc/__init__.py

@@ -0,0 +1,9 @@
+"""
+django_cfg.apps.integrations.grpc
+
+gRPC integration for django-cfg with Django ORM, JWT auth, monitoring, and admin interface.
+"""
+
+default_app_config = 'django_cfg.apps.integrations.grpc.apps.GRPCAppConfig'
+
+__version__ = '1.0.0'