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

django_cfg/apps/payments/admin/payment_admin.py

@@ -209,93 +209,69 @@ class PaymentAdmin(PydanticAdmin):
         age = timezone.now() - obj.created_at
         age_text = f"{age.days} days, {age.seconds // 3600} hours"
 
-        # Build details list
-        details = []
-
-        # Basic info
-        details.append(self.html.inline([
-            self.html.span("Internal ID:", "font-semibold"),
-            self.html.span(obj.internal_payment_id, "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Age:", "font-semibold"),
-            self.html.span(age_text, "")
-        ], separator=" "))
-
-        # Provider info
-        if obj.provider_payment_id:
-            details.append(self.html.inline([
-                self.html.span("Provider Payment ID:", "font-semibold"),
-                self.html.span(obj.provider_payment_id, "")
-            ], separator=" "))
-
         # Transaction details
+        transaction_value = None
         if obj.transaction_hash:
             explorer_link = obj.get_explorer_link()
             if explorer_link:
-                details.append(self.html.inline([
-                    self.html.span("Transaction:", "font-semibold"),
-                    self.html.span(f'<a href="{explorer_link}" target="_blank">{obj.transaction_hash[:16]}...</a>', "")
-                ], separator=" "))
+                transaction_value = self.html.link(
+                    explorer_link,
+                    f"{obj.transaction_hash[:16]}...",
+                    target="_blank"
+                )
             else:
-                details.append(self.html.inline([
-                    self.html.span("Transaction Hash:", "font-semibold"),
-                    self.html.span(obj.transaction_hash, "")
-                ], separator=" "))
-
-        if obj.confirmations_count > 0:
-            details.append(self.html.inline([
-                self.html.span("Confirmations:", "font-semibold"),
+                transaction_value = self.html.code(obj.transaction_hash)
+
+        return self.html.breakdown(
+            self.html.key_value("Internal ID", obj.internal_payment_id),
+            self.html.key_value("Age", age_text),
+            self.html.key_value(
+                "Provider Payment ID",
+                obj.provider_payment_id
+            ) if obj.provider_payment_id else None,
+            self.html.key_value(
+                "Transaction",
+                transaction_value
+            ) if obj.transaction_hash else None,
+            self.html.key_value(
+                "Confirmations",
                 self.html.badge(str(obj.confirmations_count), variant="info", icon=Icons.CHECK_CIRCLE)
-            ], separator=" "))
-
-        if obj.pay_address:
-            details.append(self.html.inline([
-                self.html.span("Pay Address:", "font-semibold"),
-                self.html.span(f'<code>{obj.pay_address}</code>', "")
-            ], separator=" "))
-
-        if obj.pay_amount:
-            details.append(self.html.inline([
-                self.html.span("Pay Amount:", "font-semibold"),
-                self.html.span(f'{obj.pay_amount:.8f} {obj.currency.token}', "")
-            ], separator=" "))
-
-        if obj.actual_amount:
-            details.append(self.html.inline([
-                self.html.span("Actual Amount:", "font-semibold"),
-                self.html.span(f'{obj.actual_amount:.8f} {obj.currency.token}', "")
-            ], separator=" "))
-
-        # URLs
-        if obj.payment_url:
-            details.append(self.html.inline([
-                self.html.span("Payment URL:", "font-semibold"),
-                self.html.span(f'<a href="{obj.payment_url}" target="_blank">Open</a>', "")
-            ], separator=" "))
-
-        # Expiration
-        if obj.expires_at:
-            if obj.is_expired:
-                details.append(self.html.inline([
-                    self.html.span("Expired:", "font-semibold"),
-                    self.html.badge(f"Yes ({obj.expires_at})", variant="danger", icon=Icons.ERROR)
-                ], separator=" "))
-            else:
-                details.append(self.html.inline([
-                    self.html.span("Expires At:", "font-semibold"),
-                    self.html.span(str(obj.expires_at), "")
-                ], separator=" "))
-
-        # Description
-        if obj.description:
-            details.append(self.html.inline([
-                self.html.span("Description:", "font-semibold"),
-                self.html.span(obj.description, "")
-            ], separator=" "))
-
-        return "<br>".join(details)
+            ) if obj.confirmations_count > 0 else None,
+            self.html.key_value(
+                "Pay Address",
+                self.html.code(obj.pay_address)
+            ) if obj.pay_address else None,
+            self.html.key_value(
+                "Pay Amount",
+                self.html.inline(
+                    self.html.number(obj.pay_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.pay_amount else None,
+            self.html.key_value(
+                "Actual Amount",
+                self.html.inline(
+                    self.html.number(obj.actual_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.actual_amount else None,
+            self.html.key_value(
+                "Payment URL",
+                self.html.link(obj.payment_url, "Open", target="_blank")
+            ) if obj.payment_url else None,
+            self.html.key_value(
+                "Expired",
+                self.html.badge(f"Yes ({obj.expires_at})", variant="danger", icon=Icons.ERROR)
+            ) if obj.expires_at and obj.is_expired else (
+                self.html.key_value("Expires At", str(obj.expires_at)) if obj.expires_at else None
+            ),
+            self.html.key_value(
+                "Description",
+                obj.description
+            ) if obj.description else None
+        )
 
     payment_details_display.short_description = "Payment Details"
 
@@ -306,8 +282,12 @@ class PaymentAdmin(PydanticAdmin):
 
         qr_url = obj.get_qr_code_url(size=200)
         if qr_url:
-            return (
-                f'<img src="{qr_url}" alt="QR Code" style="max-width:200px;"><br>'
-                f'<small>Scan to pay: <code>{obj.pay_address}</code></small>'
+            from django.utils.html import format_html
+            img_html = format_html('<img src="{}" alt="QR Code" style="max-width:200px;">', qr_url)
+            caption = self.html.inline(
+                self.html.text("Scan to pay:", size="sm"),
+                self.html.code(obj.pay_address),
+                separator=" "
             )
-        return self.html.span(f"Address: {obj.pay_address}", "text-sm")
+            return self.html.breakdown(img_html, caption)
+        return self.html.text(f"Address: {obj.pay_address}", size="sm")

django_cfg/apps/payments/admin/withdrawal_admin.py

@@ -251,105 +251,70 @@ class WithdrawalRequestAdmin(PydanticAdmin):
         if not obj.pk:
             return "Save to see details"
 
-        # Build details list
-        details = []
-
-        details.append(self.html.inline([
-            self.html.span("Withdrawal ID:", "font-semibold"),
-            self.html.span(str(obj.id), "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("User:", "font-semibold"),
-            self.html.span(f"{obj.user.username} ({obj.user.email})", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Amount:", "font-semibold"),
-            self.html.span(f"${obj.amount_usd:.2f} USD", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Currency:", "font-semibold"),
-            self.html.span(obj.currency.code, "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Wallet Address:", "font-semibold"),
-            self.html.span(f"<code>{obj.wallet_address}</code>", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Status:", "font-semibold"),
-            self.html.span(obj.get_status_display(), "")
-        ], separator=" "))
-
-        if obj.network_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Network Fee:", "font-semibold"),
-                self.html.span(f"${obj.network_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.service_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Service Fee:", "font-semibold"),
-                self.html.span(f"${obj.service_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.total_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Total Fee:", "font-semibold"),
-                self.html.span(f"${obj.total_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.final_amount_usd:
-            details.append(self.html.inline([
-                self.html.span("Final Amount:", "font-semibold"),
-                self.html.span(f"${obj.final_amount_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.admin_user:
-            details.append(self.html.inline([
-                self.html.span("Approved By:", "font-semibold"),
-                self.html.span(obj.admin_user.username, "")
-            ], separator=" "))
-
-        if obj.admin_notes:
-            details.append(self.html.inline([
-                self.html.span("Admin Notes:", "font-semibold"),
-                self.html.span(obj.admin_notes, "")
-            ], separator=" "))
-
-        if obj.transaction_hash:
-            details.append(self.html.inline([
-                self.html.span("Transaction Hash:", "font-semibold"),
-                self.html.span(f"<code>{obj.transaction_hash}</code>", "")
-            ], separator=" "))
-
-        if obj.crypto_amount:
-            details.append(self.html.inline([
-                self.html.span("Crypto Amount:", "font-semibold"),
-                self.html.span(f"{obj.crypto_amount:.8f} {obj.currency.token}", "")
-            ], separator=" "))
-
-        if obj.approved_at:
-            details.append(self.html.inline([
-                self.html.span("Approved At:", "font-semibold"),
-                self.html.span(str(obj.approved_at), "")
-            ], separator=" "))
-
-        if obj.completed_at:
-            details.append(self.html.inline([
-                self.html.span("Completed At:", "font-semibold"),
-                self.html.span(str(obj.completed_at), "")
-            ], separator=" "))
-
-        if obj.rejected_at:
-            details.append(self.html.inline([
-                self.html.span("Rejected At:", "font-semibold"),
-                self.html.span(str(obj.rejected_at), "")
-            ], separator=" "))
-
-        return "<br>".join(details)
+        return self.html.breakdown(
+            self.html.key_value("Withdrawal ID", str(obj.id)),
+            self.html.key_value(
+                "User",
+                f"{obj.user.username} ({obj.user.email})"
+            ),
+            self.html.key_value(
+                "Amount",
+                self.html.number(obj.amount_usd, precision=2, prefix="$", suffix=" USD")
+            ),
+            self.html.key_value("Currency", obj.currency.code),
+            self.html.key_value(
+                "Wallet Address",
+                self.html.code(obj.wallet_address)
+            ),
+            self.html.key_value("Status", obj.get_status_display()),
+            self.html.key_value(
+                "Network Fee",
+                self.html.number(obj.network_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.network_fee_usd else None,
+            self.html.key_value(
+                "Service Fee",
+                self.html.number(obj.service_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.service_fee_usd else None,
+            self.html.key_value(
+                "Total Fee",
+                self.html.number(obj.total_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.total_fee_usd else None,
+            self.html.key_value(
+                "Final Amount",
+                self.html.number(obj.final_amount_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.final_amount_usd else None,
+            self.html.key_value(
+                "Approved By",
+                obj.admin_user.username
+            ) if obj.admin_user else None,
+            self.html.key_value(
+                "Admin Notes",
+                obj.admin_notes
+            ) if obj.admin_notes else None,
+            self.html.key_value(
+                "Transaction Hash",
+                self.html.code(obj.transaction_hash)
+            ) if obj.transaction_hash else None,
+            self.html.key_value(
+                "Crypto Amount",
+                self.html.inline(
+                    self.html.number(obj.crypto_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.crypto_amount else None,
+            self.html.key_value(
+                "Approved At",
+                str(obj.approved_at)
+            ) if obj.approved_at else None,
+            self.html.key_value(
+                "Completed At",
+                str(obj.completed_at)
+            ) if obj.completed_at else None,
+            self.html.key_value(
+                "Rejected At",
+                str(obj.rejected_at)
+            ) if obj.rejected_at else None
+        )
 
     withdrawal_details_display.short_description = "Withdrawal Details"

django_cfg/apps/tasks/admin/task_log.py

@@ -104,7 +104,7 @@ class TaskLogAdmin(PydanticAdmin):
                 data["kwargs"] = obj.kwargs
 
             formatted = json.dumps(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(data)
 
@@ -114,20 +114,18 @@ class TaskLogAdmin(PydanticAdmin):
         """Display error information if task failed."""
         if obj.is_successful or obj.status in ["queued", "in_progress"]:
             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=" "
             )
 
         if not obj.error_message:
             return self.html.empty("No error message")
 
         return self.html.inline(
-            [
-                self.html.icon(Icons.ERROR, size="sm"),
-                self.html.span(obj.error_message, "text-red-600 font-mono text-sm"),
-            ]
+            self.html.icon(Icons.ERROR, size="sm"),
+            self.html.code(obj.error_message, css_class="text-font-danger-light dark:text-font-danger-dark text-sm"),
+            separator=" "
         )
 
     error_details_display.short_description = "Error Details"
@@ -136,10 +134,9 @@ class TaskLogAdmin(PydanticAdmin):
         """Display retry information."""
         if obj.retry_count == 0:
             return self.html.inline(
-                [
-                    self.html.icon(Icons.CHECK_CIRCLE, size="sm"),
-                    self.html.span("No retries", "text-gray-600"),
-                ]
+                self.html.icon(Icons.CHECK_CIRCLE, size="sm"),
+                self.html.text("No retries", muted=True),
+                separator=" "
             )
 
         # Show retry count with warning if high
@@ -153,59 +150,35 @@ class TaskLogAdmin(PydanticAdmin):
             variant = "info"
             icon = Icons.TIMER
 
-        return self.html.inline(
-            [
-                self.html.badge(f"{obj.retry_count} retries", variant=variant, icon=icon),
-            ]
-        )
+        return self.html.badge(f"{obj.retry_count} retries", variant=variant, icon=icon)
 
     retry_info_display.short_description = "Retry Info"
 
     def performance_summary(self, obj):
         """Display performance summary."""
-        stats = []
-
         # Duration
+        duration_line = None
         if obj.duration_ms is not None:
             if obj.duration_ms < 1000:
                 duration_str = f"{obj.duration_ms}ms"
             else:
                 duration_str = f"{obj.duration_ms / 1000:.2f}s"
-            stats.append(
-                self.html.inline(
-                    [
-                        self.html.span("Duration:", "font-semibold"),
-                        self.html.span(duration_str, "text-gray-600"),
-                    ],
-                    separator=" ",
-                )
-            )
+            duration_line = self.html.key_value("Duration", duration_str)
 
         # Retry count
+        retry_line = None
         if obj.retry_count > 0:
-            stats.append(
-                self.html.inline(
-                    [
-                        self.html.span("Retries:", "font-semibold"),
-                        self.html.badge(str(obj.retry_count), variant="warning"),
-                    ],
-                    separator=" ",
-                )
+            retry_line = self.html.key_value(
+                "Retries",
+                self.html.badge(str(obj.retry_count), variant="warning")
             )
 
         # Worker ID
+        worker_line = None
         if obj.worker_id:
-            stats.append(
-                self.html.inline(
-                    [
-                        self.html.span("Worker:", "font-semibold"),
-                        self.html.span(obj.worker_id, "text-gray-600 font-mono text-xs"),
-                    ],
-                    separator=" ",
-                )
-            )
+            worker_line = self.html.key_value("Worker", self.html.code(obj.worker_id, css_class="text-xs"))
 
-        return "<br>".join(stats) if stats else self.html.empty()
+        return self.html.breakdown(duration_line, retry_line, worker_line) if (duration_line or retry_line or worker_line) else self.html.empty()
 
     performance_summary.short_description = "Performance"
 

django_cfg/apps/urls.py

@@ -53,6 +53,9 @@ def get_enabled_cfg_apps() -> List[str]:
     if base_module.is_centrifugo_enabled():
         enabled_apps.append("django_cfg.apps.centrifugo")
 
+    if base_module.is_grpc_enabled():
+        enabled_apps.append("django_cfg.apps.grpc")
+
     return enabled_apps
 
 
@@ -84,7 +87,7 @@ def get_default_cfg_group():
         name="cfg",
         apps=get_enabled_cfg_apps(),
         title="Django-CFG API",
-        description="Authentication (OTP), Support, Newsletter, Leads, Knowledge Base, AI Agents, Tasks, Payments, Dashboard",
+        description="Authentication (OTP), Support, Newsletter, Leads, Knowledge Base, AI Agents, Tasks, Payments, Centrifugo, gRPC, Dashboard",
         version="1.0.0",
     )
 
@@ -183,6 +186,9 @@ APP_URL_MAP = {
     "django_cfg.apps.centrifugo": [
         ("cfg/centrifugo/", "django_cfg.apps.centrifugo.urls"),
     ],
+    "django_cfg.apps.grpc": [
+        ("cfg/grpc/", "django_cfg.apps.grpc.urls"),
+    ],
 }
 
 # Register URLs for enabled apps only

django_cfg/config.py

@@ -45,3 +45,109 @@ def get_default_dropdown_items() -> List[SiteDropdownItem]:
             link=LIB_SITE_URL,
         ),
     ]
+
+
+# ==============================================================================
+# Feature Detection System
+# ==============================================================================
+
+import logging
+from typing import Dict, Callable
+
+logger = logging.getLogger(__name__)
+
+# Feature registry
+FEATURES: Dict[str, Callable[[], bool]] = {}
+
+
+def register_feature(name: str, check_func: Callable[[], bool]) -> None:
+    """
+    Register a feature check function.
+
+    Args:
+        name: Feature name (e.g., 'grpc', 'graphql')
+        check_func: Function that returns True if feature dependencies are installed
+
+    Example:
+        >>> def check_grpc():
+        ...     try:
+        ...         import grpcio
+        ...         return True
+        ...     except ImportError:
+        ...         return False
+        >>> register_feature('grpc', check_grpc)
+    """
+    FEATURES[name] = check_func
+    logger.debug(f"Registered feature: {name}")
+
+
+def is_feature_available(feature: str) -> bool:
+    """
+    Check if optional feature is available.
+
+    Args:
+        feature: Feature name (e.g., 'grpc', 'graphql')
+
+    Returns:
+        True if feature dependencies are installed, False otherwise
+
+    Example:
+        >>> if is_feature_available('grpc'):
+        ...     from django_cfg.models.api.grpc import GRPCConfig
+    """
+    check_func = FEATURES.get(feature)
+    if not check_func:
+        logger.warning(f"Unknown feature: {feature}")
+        return False
+
+    try:
+        result = check_func()
+        logger.debug(f"Feature '{feature}' available: {result}")
+        return result
+    except Exception as e:
+        logger.debug(f"Feature '{feature}' not available: {e}")
+        return False
+
+
+def require_feature(feature: str, error_message: str = None) -> None:
+    """
+    Require a feature or raise ImportError.
+
+    Args:
+        feature: Feature name
+        error_message: Custom error message
+
+    Raises:
+        ImportError: If feature not available
+
+    Example:
+        >>> require_feature('grpc')  # Raises if not installed
+        >>> from django_cfg.models.api.grpc import GRPCConfig  # Safe to import
+    """
+    if not is_feature_available(feature):
+        if error_message is None:
+            error_message = (
+                f"Feature '{feature}' requires additional dependencies. "
+                f"Install with: pip install django-cfg[{feature}]"
+            )
+        raise ImportError(error_message)
+
+
+# ==============================================================================
+# Built-in Feature Checks
+# ==============================================================================
+
+def _check_grpc_available() -> bool:
+    """Check if gRPC dependencies are installed."""
+    try:
+        import grpc as _grpc  # noqa: F401
+        import grpc_tools as _grpc_tools  # noqa: F401
+        import django_grpc_framework as _dgf  # noqa: F401
+        import google.protobuf as _protobuf  # noqa: F401
+        return True
+    except ImportError:
+        return False
+
+
+# Register built-in features
+register_feature('grpc', _check_grpc_available)

django_cfg/core/base/config_model.py

@@ -30,6 +30,7 @@ from ...models import (
     TelegramConfig,
     UnfoldConfig,
 )
+from ...models.api.grpc import GRPCConfig
 from ...models.ngrok import NgrokConfig
 from ...models.payments import PaymentsConfig
 from ...models.tasks import TaskConfig
@@ -352,6 +353,11 @@ class DjangoConfig(BaseModel):
         description="Extended DRF Spectacular configuration (supplements OpenAPI Client)",
     )
 
+    grpc: Optional[GRPCConfig] = Field(
+        default=None,
+        description="gRPC framework configuration (server, authentication, proto generation)",
+    )
+
     # === Limits Configuration ===
     limits: Optional[LimitsConfig] = Field(
         default=None,

django_cfg/core/builders/apps_builder.py

@@ -140,6 +140,9 @@ class InstalledAppsBuilder:
         if self.config.centrifugo and self.config.centrifugo.enabled:
             apps.append("django_cfg.apps.centrifugo")
 
+        if self.config.grpc and self.config.grpc.enabled:
+            apps.append("django_cfg.apps.grpc")
+
         if self.config.crypto_fields and self.config.crypto_fields.enabled:
             apps.append("django_crypto_fields.apps.AppConfig")