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

django_cfg/apps/business/knowbase/management/commands/knowbase_stats.py

@@ -3,17 +3,19 @@ Knowledge Base statistics command.
 """
 
 from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand
 from django.db import models
 from django.db.models import Avg, Count, ExpressionWrapper, F, Q, Sum
 from django.db.models.functions import Extract
 
+from django_cfg.management.utils import SafeCommand
+
 User = get_user_model()
 
 
-class Command(BaseCommand):
+class Command(SafeCommand):
     """Display Knowledge Base statistics."""
 
+    command_name = 'knowbase_stats'
     help = 'Display Knowledge Base usage statistics'
 
     def add_arguments(self, parser):

django_cfg/apps/business/knowbase/management/commands/setup_knowbase.py

@@ -2,13 +2,15 @@
 Setup command for Knowledge Base application.
 """
 
-from django.core.management.base import BaseCommand
 from django.db import connection
 
+from django_cfg.management.utils import AdminCommand
 
-class Command(BaseCommand):
+
+class Command(AdminCommand):
     """Setup Knowledge Base with pgvector extension and initial data."""
 
+    command_name = 'setup_knowbase'
     help = 'Setup Knowledge Base with pgvector extension and run migrations'
 
     def add_arguments(self, parser):

django_cfg/apps/business/newsletter/management/commands/test_newsletter.py

@@ -3,7 +3,9 @@ Management command to test newsletter sending functionality.
 """
 
 from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import CommandError
+
+from django_cfg.management.utils import SafeCommand
 
 from django_cfg.apps.business.newsletter.models import Newsletter, NewsletterCampaign, NewsletterSubscription
 from django_cfg.apps.business.newsletter.services.email_service import NewsletterEmailService
@@ -11,7 +13,8 @@ from django_cfg.apps.business.newsletter.services.email_service import Newslette
 User = get_user_model()
 
 
-class Command(BaseCommand):
+class Command(SafeCommand):
+    command_name = 'test_newsletter'
     help = 'Test newsletter sending functionality'
 
     def add_arguments(self, parser):

django_cfg/apps/business/payments/management/commands/check_payment_status.py

@@ -7,11 +7,12 @@ Uses questionary for interactive selection or accepts payment ID as argument.
 from uuid import UUID
 
 import questionary
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
+from django_cfg.management.utils import InteractiveCommand
+
 from django_cfg.apps.business.payments.models import Payment
 from django_cfg.apps.business.payments.services import PaymentService, CheckStatusRequest
 from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
@@ -19,7 +20,8 @@ from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(InteractiveCommand):
+    command_name = 'check_payment_status'
     help = 'Check payment status interactively or by payment ID'
 
     def add_arguments(self, parser):

django_cfg/apps/business/payments/management/commands/create_payment.py

@@ -8,11 +8,12 @@ from decimal import Decimal, InvalidOperation
 
 import questionary
 from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
+from django_cfg.management.utils import InteractiveCommand
+
 from django_cfg.apps.business.payments.models import Currency, Payment
 from django_cfg.apps.business.payments.services import PaymentService, CreatePaymentRequest
 from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
@@ -21,7 +22,8 @@ User = get_user_model()
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(InteractiveCommand):
+    command_name = 'create_payment'
     help = 'Create a payment interactively using questionary wizard'
 
     def add_arguments(self, parser):

django_cfg/apps/business/payments/management/commands/sync_currencies.py

@@ -5,19 +5,21 @@ Fetches available currencies from NowPayments and updates local database.
 """
 
 import questionary
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.table import Table
 
+from django_cfg.management.utils import AdminCommand
+
 from django_cfg.apps.business.payments.models import Currency
 from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
 
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(AdminCommand):
+    command_name = 'sync_currencies'
     help = 'Sync currencies from NowPayments provider'
 
     def add_arguments(self, parser):

django_cfg/apps/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.management.utils import AdminCommand
+
 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
 
-logger = logging.getLogger(__name__)
-
 
-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/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 .publishes import PublishSerializer, RecentPublishesSerializer
 from .stats import CentrifugoOverviewStatsSerializer
 
 __all__ = [
     # Monitoring API (Django logs)
     "HealthCheckSerializer",
     "CentrifugoOverviewStatsSerializer",
+    "PublishSerializer",
     "RecentPublishesSerializer",
     "ChannelStatsSerializer",
     "ChannelListSerializer",

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

@@ -2,11 +2,31 @@
 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."""
+    """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")
@@ -15,4 +35,4 @@ class RecentPublishesSerializer(BaseModel):
     has_more: bool = Field(default=False, description="Whether more results are available")
 
 
-__all__ = ["RecentPublishesSerializer"]
+__all__ = ["PublishSerializer", "RecentPublishesSerializer"]

django_cfg/apps/integrations/centrifugo/views/monitoring.py

@@ -23,6 +23,7 @@ from ..serializers import (
     ChannelListSerializer,
     ChannelStatsSerializer,
     HealthCheckSerializer,
+    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",
@@ -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/admin/__init__.py

@@ -2,10 +2,16 @@
 Admin interface for gRPC app.
 """
 
-from .config import grpcrequestlog_config
+from .config import grpcapikey_config, grpcrequestlog_config, grpcserverstatus_config
+from .grpc_api_key import GrpcApiKeyAdmin
 from .grpc_request_log import GRPCRequestLogAdmin
+from .grpc_server_status import GRPCServerStatusAdmin
 
 __all__ = [
+    "GrpcApiKeyAdmin",
     "GRPCRequestLogAdmin",
+    "GRPCServerStatusAdmin",
+    "grpcapikey_config",
     "grpcrequestlog_config",
+    "grpcserverstatus_config",
 ]

django_cfg/apps/integrations/grpc/admin/config.py

@@ -7,31 +7,33 @@ Declarative AdminConfig using PydanticAdmin patterns.
 from django_cfg.modules.django_admin import (
     AdminConfig,
     BadgeField,
+    BooleanField,
     DateTimeField,
+    FieldsetConfig,
     Icons,
+    TextField,
     UserField,
 )
 
-from ..models import GRPCRequestLog, GRPCServerStatus
+from ..models import GRPCRequestLog, GRPCServerStatus, GrpcApiKey
 
 
 # Declarative configuration for GRPCRequestLog
 grpcrequestlog_config = AdminConfig(
     model=GRPCRequestLog,
     # Performance optimization
-    select_related=["user"],
+    select_related=["user", "api_key"],
 
     # List display
     list_display=[
-        "full_method",
         "service_badge",
         "method_badge",
         "status",
         "grpc_status_code_display",
         "user",
+        "api_key_display",
         "duration_display",
         "created_at",
-        "completed_at"
     ],
 
     # Auto-generated display methods
@@ -54,7 +56,7 @@ grpcrequestlog_config = AdminConfig(
         DateTimeField(name="completed_at", title="Completed", ordering="completed_at"),
     ],
     # Filters
-    list_filter=["status", "grpc_status_code", "service_name", "method_name", "is_authenticated", "created_at"],
+    list_filter=["status", "grpc_status_code", "service_name", "method_name", "is_authenticated", "api_key", "created_at"],
     search_fields=[
         "request_id",
         "service_name",
@@ -62,11 +64,13 @@ grpcrequestlog_config = AdminConfig(
         "full_method",
         "user__username",
         "user__email",
+        "api_key__name",
+        "api_key__key",
         "error_message",
         "client_ip",
     ],
-    # Autocomplete for user field
-    autocomplete_fields=["user"],
+    # Autocomplete for user and api_key fields
+    autocomplete_fields=["user", "api_key"],
     # Readonly fields
     readonly_fields=[
         "id",
@@ -94,7 +98,7 @@ grpcserverstatus_config = AdminConfig(
     list_display=[
         "instance_id",
         "address",
-        "status_badge",
+        "status",
         "pid",
         "hostname",
         "uptime_display",
@@ -141,6 +145,11 @@ grpcserverstatus_config = AdminConfig(
         "updated_at",
         "uptime_display",
         "is_running",
+        "server_config_display",
+        "process_info_display",
+        "registered_services_display",
+        "error_display",
+        "lifecycle_display",
     ],
 
     # Date hierarchy
@@ -154,4 +163,99 @@ grpcserverstatus_config = AdminConfig(
 )
 
 
-__all__ = ["grpcrequestlog_config", "grpcserverstatus_config"]
+# Declarative configuration for GrpcApiKey
+grpcapikey_config = AdminConfig(
+    model=GrpcApiKey,
+
+    # Performance optimization
+    select_related=["user", "created_by"],
+
+    # List display
+    list_display=[
+        "status_indicator",
+        "name",
+        "key_type",
+        "user",
+        "masked_key_display",
+        "request_count_display",
+        "last_used_at",
+        "expires_display",
+        "created_at",
+    ],
+
+    # Auto-generated display methods
+    display_fields=[
+        TextField(name="name", title="Name", ordering="name"),
+        BadgeField(
+            name="key_type",
+            title="Type",
+            label_map={
+                "service": "info",
+                "cli": "primary",
+                "webhook": "warning",
+                "internal": "secondary",
+                "development": "danger",
+            },
+        ),
+        UserField(name="user", title="User", header=True, ordering="user__username"),
+        DateTimeField(name="last_used_at", title="Last Used", ordering="last_used_at"),
+        DateTimeField(name="created_at", title="Created", ordering="created_at"),
+    ],
+
+    # Filters
+    list_filter=["is_active", "key_type", "created_at", "expires_at", "user"],
+    search_fields=["name", "description", "user__username", "user__email", "key"],
+
+    # Readonly fields
+    readonly_fields=[
+        "key_display",
+        "masked_key",
+        "request_count",
+        "last_used_at",
+        "created_at",
+        "updated_at",
+        "created_by",
+    ],
+
+    # Fieldsets
+    fieldsets=[
+        FieldsetConfig(
+            title="Basic Information",
+            fields=["name", "description", "key_type", "is_active"],
+        ),
+        FieldsetConfig(
+            title="API Key",
+            fields=["key_display", "masked_key"],
+        ),
+        FieldsetConfig(
+            title="User Association",
+            fields=["user", "created_by"],
+        ),
+        FieldsetConfig(
+            title="Expiration",
+            fields=["expires_at"],
+        ),
+        FieldsetConfig(
+            title="Usage Statistics",
+            fields=["request_count", "last_used_at"],
+            collapsed=True,
+        ),
+        FieldsetConfig(
+            title="Timestamps",
+            fields=["created_at", "updated_at"],
+            collapsed=True,
+        ),
+    ],
+
+    # Autocomplete for user field
+    autocomplete_fields=["user"],
+
+    # Ordering
+    ordering=["-created_at"],
+
+    # Per page
+    list_per_page=50,
+)
+
+
+__all__ = ["grpcrequestlog_config", "grpcserverstatus_config", "grpcapikey_config"]