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

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

@@ -32,23 +32,6 @@ logger = get_logger("centrifugo.testing_api")
 # ========================================================================
 
 
-class ConnectionTokenRequest(BaseModel):
-    """Request model for connection token generation."""
-
-    user_id: str = Field(..., description="User ID for the connection")
-    channels: list[str] = Field(
-        default_factory=list, description="List of channels to authorize"
-    )
-
-
-class ConnectionTokenResponse(BaseModel):
-    """Response model for connection token."""
-
-    token: str = Field(..., description="JWT token for WebSocket connection")
-    centrifugo_url: str = Field(..., description="Centrifugo WebSocket URL")
-    expires_at: str = Field(..., description="Token expiration time (ISO 8601)")
-
-
 class PublishTestRequest(BaseModel):
     """Request model for test message publishing."""
 
@@ -132,68 +115,6 @@ class CentrifugoTestingAPIViewSet(AdminAPIMixin, viewsets.ViewSet):
 
         return self._http_client
 
-    @extend_schema(
-        tags=["Centrifugo Testing"],
-        summary="Generate connection token",
-        description="Generate JWT token for WebSocket connection to Centrifugo.",
-        request=ConnectionTokenRequest,
-        responses={
-            200: ConnectionTokenResponse,
-            400: {"description": "Invalid request"},
-            500: {"description": "Server error"},
-        },
-    )
-    @action(detail=False, methods=["post"], url_path="connection-token")
-    def connection_token(self, request):
-        """
-        Generate JWT token for WebSocket connection.
-
-        Returns token that can be used to connect to Centrifugo from browser.
-        """
-        try:
-            config = get_centrifugo_config()
-            if not config:
-                return Response(
-                    {"error": "Centrifugo not configured"},
-                    status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                )
-
-            # Parse request
-            req_data = ConnectionTokenRequest(**request.data)
-
-            # Generate JWT token
-            now = int(time.time())
-            exp = now + 3600  # 1 hour
-
-            payload = {
-                "sub": req_data.user_id,
-                "exp": exp,
-                "iat": now,
-            }
-
-            # Add channels if provided
-            if req_data.channels:
-                payload["channels"] = req_data.channels
-
-            # Use HMAC secret from config or Django SECRET_KEY
-            secret = config.centrifugo_token_hmac_secret or settings.SECRET_KEY
-
-            token = jwt.encode(payload, secret, algorithm="HS256")
-
-            response = ConnectionTokenResponse(
-                token=token,
-                centrifugo_url=config.centrifugo_url,
-                expires_at=datetime.utcfromtimestamp(exp).isoformat() + "Z",
-            )
-
-            return Response(response.model_dump())
-
-        except Exception as e:
-            logger.error(f"Failed to generate connection token: {e}", exc_info=True)
-            return Response(
-                {"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR
-            )
-
     @extend_schema(
         tags=["Centrifugo Testing"],
         summary="Publish test message",

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

@@ -0,0 +1,101 @@
+"""
+Centrifugo Token API
+
+Provides endpoint for generating Centrifugo JWT tokens with user permissions.
+"""
+
+import logging
+
+from drf_spectacular.utils import extend_schema
+from pydantic import BaseModel, Field
+from rest_framework import status, viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from rest_framework.permissions import IsAuthenticated
+
+from ..services import generate_centrifugo_token
+
+logger = logging.getLogger(__name__)
+
+
+# ========================================================================
+# Response Models
+# ========================================================================
+
+
+class ConnectionTokenResponse(BaseModel):
+    """Response model for Centrifugo connection token."""
+
+    token: str = Field(..., description="JWT token for Centrifugo connection")
+    centrifugo_url: str = Field(..., description="Centrifugo WebSocket URL")
+    expires_at: str = Field(..., description="Token expiration time (ISO 8601)")
+    channels: list[str] = Field(..., description="List of allowed channels")
+
+
+class CentrifugoTokenViewSet(viewsets.ViewSet):
+    """
+    Centrifugo Token API ViewSet.
+
+    Provides endpoint for authenticated users to get Centrifugo JWT token
+    with their allowed channels based on permissions.
+    """
+
+    permission_classes = [IsAuthenticated]
+
+    @extend_schema(
+        tags=["Centrifugo Auth"],
+        summary="Get Centrifugo connection token",
+        description=(
+            "Generate JWT token for WebSocket connection to Centrifugo. "
+            "Token includes user's allowed channels based on their permissions. "
+            "Requires authentication."
+        ),
+        responses={
+            200: ConnectionTokenResponse,
+            401: {"description": "Unauthorized - authentication required"},
+            500: {"description": "Server error"},
+        },
+    )
+    @action(detail=False, methods=["get"], url_path="token")
+    def get_token(self, request):
+        """
+        Get Centrifugo connection token for authenticated user.
+
+        Returns JWT token with user's allowed channels that can be used
+        to connect to Centrifugo WebSocket.
+        """
+        try:
+            user = request.user
+
+            # Generate token with user's channels
+            token_data = generate_centrifugo_token(user)
+
+            logger.debug(
+                f"Generated Centrifugo token for user {user.email} (ID: {user.id}) "
+                f"with {len(token_data['channels'])} channels: {token_data['channels']}"
+            )
+
+            # Format expires_at as ISO 8601 string
+            return Response({
+                "token": token_data["token"],
+                "centrifugo_url": token_data["centrifugo_url"],
+                "expires_at": token_data["expires_at"].isoformat() + "Z",
+                "channels": token_data["channels"],
+            })
+
+        except ValueError as e:
+            # Centrifugo not configured or disabled
+            logger.warning(f"Centrifugo token generation failed: {e}")
+            return Response(
+                {"error": str(e)},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )
+        except Exception as e:
+            logger.error(f"Failed to generate Centrifugo token: {e}", exc_info=True)
+            return Response(
+                {"error": "Failed to generate token"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )
+
+
+__all__ = ["CentrifugoTokenViewSet"]

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

@@ -0,0 +1,257 @@
+"""
+Centrifugo Wrapper API.
+
+Provides /api/publish endpoint that acts as a proxy to Centrifugo
+with ACK tracking and database logging.
+"""
+
+import asyncio
+import time
+import uuid
+from typing import Any, Dict
+
+import httpx
+from django.http import JsonResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.csrf import csrf_exempt
+from django_cfg.modules.django_logging import get_logger
+from pydantic import BaseModel, Field
+
+from ..services import get_centrifugo_config
+from ..services.logging import CentrifugoLogger
+
+logger = get_logger("centrifugo.wrapper")
+
+
+# ========================================================================
+# Request/Response Models
+# ========================================================================
+
+
+class PublishRequest(BaseModel):
+    """Request model for publish endpoint."""
+
+    channel: str = Field(..., description="Target channel name")
+    data: Dict[str, Any] = Field(..., description="Message data")
+    wait_for_ack: bool = Field(default=False, description="Wait for client ACK")
+    ack_timeout: int = Field(default=10, description="ACK timeout in seconds")
+    message_id: str | None = Field(default=None, description="Optional message ID")
+
+
+class PublishResponse(BaseModel):
+    """Response model for publish endpoint."""
+
+    published: bool = Field(..., description="Whether message was published")
+    message_id: str = Field(..., description="Unique message ID")
+    channel: str = Field(..., description="Target channel")
+    delivered: bool = Field(default=False, description="Whether message was delivered")
+    acks_received: int = Field(default=0, description="Number of ACKs received")
+
+
+# ========================================================================
+# Wrapper View
+# ========================================================================
+
+
+@method_decorator(csrf_exempt, name='dispatch')
+class PublishWrapperView(View):
+    """
+    Centrifugo publish wrapper endpoint.
+
+    Provides /api/publish endpoint that:
+    - Accepts publish requests from CentrifugoClient
+    - Logs to database (CentrifugoLog)
+    - Proxies to Centrifugo HTTP API
+    - Returns publish result with ACK tracking
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._http_client = None
+
+    @property
+    def http_client(self) -> httpx.AsyncClient:
+        """Get or create HTTP client for Centrifugo API calls."""
+        if self._http_client is None:
+            config = get_centrifugo_config()
+            if not config:
+                raise ValueError("Centrifugo not configured")
+
+            headers = {"Content-Type": "application/json"}
+
+            # Add Centrifugo API key for server-to-server auth
+            if config.centrifugo_api_key:
+                headers["Authorization"] = f"apikey {config.centrifugo_api_key}"
+
+            # Use Centrifugo API URL (not wrapper URL)
+            base_url = config.centrifugo_api_url.rstrip("/api").rstrip("/")
+
+            self._http_client = httpx.AsyncClient(
+                base_url=base_url,
+                headers=headers,
+                timeout=httpx.Timeout(config.http_timeout),
+                verify=config.verify_ssl,
+            )
+
+        return self._http_client
+
+    async def _publish_to_centrifugo(
+        self, channel: str, data: Dict[str, Any], wait_for_ack: bool, ack_timeout: int, message_id: str
+    ) -> Dict[str, Any]:
+        """
+        Publish message to Centrifugo API.
+
+        Args:
+            channel: Target channel
+            data: Message data
+            wait_for_ack: Whether to wait for ACK
+            ack_timeout: ACK timeout in seconds
+            message_id: Message ID
+
+        Returns:
+            Publish result dict
+        """
+        start_time = time.time()
+
+        # Create log entry
+        log_entry = await CentrifugoLogger.create_log_async(
+            message_id=message_id,
+            channel=channel,
+            data=data,
+            wait_for_ack=wait_for_ack,
+            ack_timeout=ack_timeout if wait_for_ack else None,
+            is_notification=True,
+            user=None,  # Can extract from request if needed
+        )
+
+        try:
+            # Centrifugo API format: POST /api with method in body
+            payload = {
+                "method": "publish",
+                "params": {
+                    "channel": channel,
+                    "data": data,
+                },
+            }
+
+            response = await self.http_client.post("/api", json=payload)
+            response.raise_for_status()
+            result = response.json()
+
+            # Check for Centrifugo error
+            if "error" in result and result["error"]:
+                raise Exception(f"Centrifugo error: {result['error']}")
+
+            # Calculate duration
+            duration_ms = int((time.time() - start_time) * 1000)
+
+            # Mark as success
+            if log_entry:
+                await CentrifugoLogger.mark_success_async(
+                    log_entry,
+                    acks_received=0,  # ACK tracking would be implemented separately
+                    duration_ms=duration_ms,
+                )
+
+            # Return wrapper-compatible response
+            return {
+                "published": True,
+                "message_id": message_id,
+                "channel": channel,
+                "acks_received": 0,
+                "delivered": True,  # Centrifugo confirms publish, not delivery
+            }
+
+        except Exception as e:
+            # Calculate duration
+            duration_ms = int((time.time() - start_time) * 1000)
+
+            # Mark as failed
+            if log_entry:
+                from asgiref.sync import sync_to_async
+                from ..models import CentrifugoLog
+
+                await sync_to_async(CentrifugoLog.objects.mark_failed)(
+                    log_instance=log_entry,
+                    error_code=type(e).__name__,
+                    error_message=str(e),
+                    duration_ms=duration_ms,
+                )
+
+            raise
+
+    def post(self, request):
+        """
+        Handle POST /api/publish request.
+
+        Request body:
+            {
+                "channel": "test#demo",
+                "data": {"key": "value"},
+                "wait_for_ack": false,
+                "ack_timeout": 10,
+                "message_id": "optional-uuid"
+            }
+
+        Response:
+            {
+                "published": true,
+                "message_id": "uuid",
+                "channel": "test#demo",
+                "delivered": true,
+                "acks_received": 0
+            }
+        """
+        try:
+            import json
+
+            # Parse request body
+            body = json.loads(request.body)
+            req_data = PublishRequest(**body)
+
+            # Generate message ID if not provided
+            message_id = req_data.message_id or str(uuid.uuid4())
+
+            # Publish to Centrifugo
+            result = asyncio.run(
+                self._publish_to_centrifugo(
+                    channel=req_data.channel,
+                    data=req_data.data,
+                    wait_for_ack=req_data.wait_for_ack,
+                    ack_timeout=req_data.ack_timeout,
+                    message_id=message_id,
+                )
+            )
+
+            response = PublishResponse(**result)
+            return JsonResponse(response.model_dump(), status=200)
+
+        except Exception as e:
+            logger.error(f"Failed to publish via wrapper: {e}", exc_info=True)
+            return JsonResponse(
+                {
+                    "published": False,
+                    "message_id": "",
+                    "channel": body.get("channel", "") if "body" in locals() else "",
+                    "delivered": False,
+                    "acks_received": 0,
+                    "error": str(e),
+                },
+                status=500,
+            )
+
+    def __del__(self):
+        """Cleanup HTTP client on deletion."""
+        if self._http_client:
+            try:
+                loop = asyncio.get_event_loop()
+                if loop.is_running():
+                    loop.create_task(self._http_client.aclose())
+                else:
+                    loop.run_until_complete(self._http_client.aclose())
+            except Exception:
+                pass
+
+
+__all__ = ["PublishWrapperView"]

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"]