django-cfg 1.4.120__py3-none-any.whl → 1.5.2__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/rq/__init__.py

@@ -0,0 +1,9 @@
+"""
+Django-RQ integration for django-cfg.
+
+Provides REST API endpoints for monitoring and managing RQ task queues.
+"""
+
+default_app_config = 'django_cfg.apps.rq.apps.RQAppConfig'
+
+__version__ = '1.0.0'

django_cfg/apps/rq/apps.py

@@ -0,0 +1,80 @@
+"""
+AppConfig for Django-RQ integration with monitoring and API capabilities.
+
+This app provides REST API endpoints for Django-RQ task queue monitoring,
+management, and statistics. It wraps django-rq's functionality with modern
+DRF ViewSets and unified django-cfg patterns.
+
+Features:
+- REST API for monitoring queues, workers, and jobs
+- Prometheus metrics integration
+- Enhanced monitoring interfaces
+- Job management (view, requeue, delete)
+- Integration with django-cfg ecosystem (Centrifugo, auth)
+"""
+
+from django.apps import AppConfig
+
+
+class RQAppConfig(AppConfig):
+    """
+    AppConfig for Django-RQ monitoring and management application.
+
+    Provides:
+    - REST API endpoints for monitoring
+    - Prometheus metrics export
+    - Job and queue management
+    - Worker statistics
+    - Integration with django-cfg authentication
+
+    Usage:
+        Add to INSTALLED_APPS:
+        INSTALLED_APPS = [
+            ...
+            'django_rq',  # Required: django-rq core
+            'django_cfg.apps.rq',  # Django-CFG RQ monitoring
+        ]
+
+        Configure in django-cfg config:
+        class MyConfig(BaseConfig):
+            django_rq: DjangoRQConfig = DjangoRQConfig(
+                enabled=True,
+                queues={
+                    'default': {
+                        'host': 'localhost',
+                        'port': 6379,
+                        'db': 0,
+                    }
+                },
+                prometheus_enabled=True,
+            )
+    """
+
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'django_cfg.apps.rq'
+    verbose_name = 'Django-CFG RQ Monitoring'
+    label = 'django_cfg_rq'
+
+    def ready(self):
+        """
+        Initialize the app when Django starts.
+
+        Registers:
+        - Admin interfaces (if not already registered)
+        - Signal handlers for monitoring
+        - Scheduled jobs from config
+        """
+        # Import admin to register custom admin classes
+        try:
+            from . import admin  # noqa: F401
+        except ImportError:
+            pass
+
+        # Register scheduled jobs from config (runs once on startup)
+        try:
+            from .services import register_schedules_from_config
+            register_schedules_from_config()
+        except Exception as e:
+            from django_cfg.modules.django_logging import get_logger
+            logger = get_logger("rq.apps")
+            logger.warning(f"Failed to register schedules: {e}")

django_cfg/apps/rq/management/__init__.py

@@ -0,0 +1 @@
+"""Management commands for Django-RQ integration."""

django_cfg/apps/rq/management/commands/__init__.py

@@ -0,0 +1 @@
+"""Django-RQ management commands for django-cfg."""

django_cfg/apps/rq/management/commands/rqscheduler.py

@@ -0,0 +1,31 @@
+"""
+Django-CFG wrapper for django-rq rqscheduler command.
+
+Runs the RQ scheduler daemon for scheduled/periodic jobs.
+
+Example:
+    python manage.py rqscheduler
+    python manage.py rqscheduler --queue default
+"""
+
+from django_rq.management.commands.rqscheduler import Command as DjangoRQSchedulerCommand
+
+
+class Command(DjangoRQSchedulerCommand):
+    """
+    Runs the RQ scheduler daemon.
+
+    The scheduler handles:
+    - Scheduled jobs (enqueue at specific time)
+    - Periodic jobs (cron-like scheduling)
+    - Delayed job execution
+
+    Inherits all functionality from django-rq's rqscheduler command.
+
+    Common options:
+        --queue QUEUE        Queue to schedule jobs on (default: 'default')
+        --interval SECONDS   Polling interval (default: 1)
+        --pid FILE          Write PID to file
+    """
+
+    help = 'Runs RQ scheduler daemon for django-cfg (wrapper for django-rq rqscheduler)'

django_cfg/apps/rq/management/commands/rqstats.py

@@ -0,0 +1,33 @@
+"""
+Django-CFG wrapper for django-rq rqstats command.
+
+Displays real-time statistics about RQ queues and workers.
+
+Example:
+    python manage.py rqstats
+    python manage.py rqstats --interval 5
+"""
+
+from django_rq.management.commands.rqstats import Command as DjangoRQStatsCommand
+
+
+class Command(DjangoRQStatsCommand):
+    """
+    Displays real-time RQ statistics in terminal.
+
+    Shows:
+    - Queue sizes (queued, started, finished, failed)
+    - Worker count and status
+    - Job processing rates
+    - Updates in real-time
+
+    Inherits all functionality from django-rq's rqstats command.
+
+    Common options:
+        --interval SECONDS   Update interval (default: 1)
+        --raw               Show raw numbers (no colors)
+        --only-queues       Show only queue statistics
+        --only-workers      Show only worker statistics
+    """
+
+    help = 'Shows real-time RQ statistics for django-cfg (wrapper for django-rq rqstats)'

django_cfg/apps/rq/management/commands/rqworker.py

@@ -0,0 +1,31 @@
+"""
+Django-CFG wrapper for django-rq rqworker command.
+
+This is a simple proxy that inherits all functionality from django-rq's rqworker.
+Allows running: python manage.py rqworker [queues]
+
+Example:
+    python manage.py rqworker default
+    python manage.py rqworker high default low
+    python manage.py rqworker default --with-scheduler
+"""
+
+from django_rq.management.commands.rqworker import Command as DjangoRQWorkerCommand
+
+
+class Command(DjangoRQWorkerCommand):
+    """
+    Runs RQ workers on specified queues.
+
+    Inherits all functionality from django-rq's rqworker command.
+    See django-rq documentation for available options.
+
+    Common options:
+        --burst              Run in burst mode (exit when queue is empty)
+        --with-scheduler     Run worker with embedded scheduler
+        --name NAME          Custom worker name
+        --worker-ttl SEC     Worker timeout (default: 420)
+        --sentry-dsn DSN     Report exceptions to Sentry
+    """
+
+    help = 'Runs RQ workers for django-cfg (wrapper for django-rq rqworker)'

django_cfg/apps/rq/management/commands/rqworker_pool.py

@@ -0,0 +1,27 @@
+"""
+Django-CFG wrapper for django-rq rqworker-pool command.
+
+Runs multiple RQ workers in a pool for better performance.
+
+Example:
+    python manage.py rqworker_pool default --num-workers 4
+    python manage.py rqworker_pool high default --num-workers 8
+"""
+
+from django_rq.management.commands.rqworker_pool import Command as DjangoRQWorkerPoolCommand
+
+
+class Command(DjangoRQWorkerPoolCommand):
+    """
+    Runs a pool of RQ workers for improved throughput.
+
+    Inherits all functionality from django-rq's rqworker-pool command.
+    Creates multiple worker processes to handle jobs in parallel.
+
+    Common options:
+        --num-workers N      Number of worker processes (default: CPU count)
+        --burst              Run in burst mode
+        --name NAME          Worker name prefix
+    """
+
+    help = 'Runs a pool of RQ workers for django-cfg (wrapper for django-rq rqworker-pool)'

django_cfg/apps/rq/serializers/__init__.py

@@ -0,0 +1,40 @@
+"""
+DRF serializers for Django-RQ monitoring API.
+"""
+
+from .health import HealthCheckSerializer, RQConfigSerializer
+from .queue import QueueStatsSerializer, QueueDetailSerializer
+from .worker import WorkerSerializer, WorkerStatsSerializer
+from .job import JobListSerializer, JobDetailSerializer, JobActionResponseSerializer
+from .schedule import (
+    ScheduleCreateSerializer,
+    ScheduledJobSerializer,
+    ScheduleActionResponseSerializer,
+)
+from .testing import (
+    TestScenarioSerializer,
+    RunDemoRequestSerializer,
+    StressTestRequestSerializer,
+    TestingActionResponseSerializer,
+    CleanupRequestSerializer,
+)
+
+__all__ = [
+    'HealthCheckSerializer',
+    'RQConfigSerializer',
+    'QueueStatsSerializer',
+    'QueueDetailSerializer',
+    'WorkerSerializer',
+    'WorkerStatsSerializer',
+    'JobListSerializer',
+    'JobDetailSerializer',
+    'JobActionResponseSerializer',
+    'ScheduleCreateSerializer',
+    'ScheduledJobSerializer',
+    'ScheduleActionResponseSerializer',
+    'TestScenarioSerializer',
+    'RunDemoRequestSerializer',
+    'StressTestRequestSerializer',
+    'TestingActionResponseSerializer',
+    'CleanupRequestSerializer',
+]