django-cfg 1.2.29__py3-none-any.whl → 1.2.31__py3-none-any.whl

django_cfg/apps/payments/views/templates/base.py

@@ -9,9 +9,9 @@ from django.utils.decorators import method_decorator
 from django.db.models import Q, Count, Sum
 from django.utils import timezone
 from datetime import timedelta
-import logging
+from django_cfg.modules.django_logger import get_logger
 
-logger = logging.getLogger(__name__)
+logger = get_logger("view_base")
 
 
 def superuser_required(function=None):
@@ -103,13 +103,15 @@ class PaymentStatsMixin:
             total_volume=Sum('amount_usd')
         )
         
-        # Convert Decimal to float for JSON serialization
-        if stats['total_volume']:
-            stats['total_volume'] = float(stats['total_volume'])
-        else:
-            stats['total_volume'] = 0.0
-            
-        return stats
+        # Convert to template format
+        return {
+            'total_payments_count': stats['total_count'] or 0,
+            'pending_payments_count': stats['pending_count'] or 0,
+            'confirming_payments_count': stats['confirming_count'] or 0,
+            'completed_payments_count': stats['completed_count'] or 0,
+            'failed_payments_count': stats['failed_count'] or 0,
+            'total_volume': float(stats['total_volume'] or 0),
+        }
     
     def get_provider_stats(self, queryset=None):
         """Get provider-specific statistics."""
@@ -123,7 +125,8 @@ class PaymentStatsMixin:
             completed_count=Count('id', filter=Q(status='completed')),
         ).order_by('-volume')
         
-        # Calculate success rate
+        # Calculate success rate and convert to list of dicts
+        stats_list = []
         for stat in provider_stats:
             if stat['count'] > 0:
                 stat['success_rate'] = (stat['completed_count'] / stat['count']) * 100
@@ -135,8 +138,10 @@ class PaymentStatsMixin:
                 stat['volume'] = float(stat['volume'])
             else:
                 stat['volume'] = 0.0
+                
+            stats_list.append(stat)
         
-        return provider_stats
+        return stats_list
     
     def get_time_range_stats(self, days=30):
         """Get statistics for a specific time range."""
@@ -160,8 +165,11 @@ class PaymentContextMixin:
         """Get common context data used across multiple views."""
         from ...models import PaymentEvent
         
-        # Get recent events for activity feed
-        recent_events = PaymentEvent.objects.select_related('payment').order_by('-created_at')[:10]
+        # Get recent events for activity feed (if any exist)
+        try:
+            recent_events = PaymentEvent.objects.order_by('-created_at')[:10]
+        except Exception:
+            recent_events = []
         
         return {
             'recent_events': recent_events,

django_cfg/apps/payments/views/templates/payment_detail.py

@@ -41,7 +41,7 @@ class PaymentDetailView(
         log_view_access('payment_detail', self.request.user, payment_id=payment.id)
         
         # Get payment events for this payment
-        events = PaymentEvent.objects.filter(payment=payment).order_by('-created_at')
+        events = PaymentEvent.objects.filter(payment_id=payment.id).order_by('-created_at')
         
         # Get related payments (same user, similar amount range)
         related_payments = UniversalPayment.objects.filter(

django_cfg/apps/payments/views/templates/payment_management.py

@@ -4,6 +4,7 @@ Payment management views.
 Provides list, create, and management functionality for payments.
 """
 
+import json
 from django.views.generic import TemplateView, ListView
 from .base import (
     SuperuserRequiredMixin,
@@ -11,7 +12,8 @@ from .base import (
     PaymentContextMixin,
     log_view_access
 )
-from ...models import UniversalPayment
+from ...models import UniversalPayment, Currency, PaymentProvider
+from ...services.providers.registry import ProviderRegistry
 
 
 class PaymentCreateView(
@@ -46,9 +48,20 @@ class PaymentCreateView(
         # Get common context
         common_context = self.get_common_context()
         
+        # Provider enum with defaults (serialize to JSON for JavaScript)
+        provider_defaults = {
+            PaymentProvider.NOWPAYMENTS.value: 'USDTTRC20',
+            PaymentProvider.CRYPTAPI.value: 'BTC', 
+            PaymentProvider.CRYPTOMUS.value: 'USDTTRC20',
+            PaymentProvider.STRIPE.value: 'USD'
+        }
+        provider_defaults_json = json.dumps(provider_defaults)
+        
         context.update({
             'providers': providers,
             'currencies': currencies,
+            'provider_enum': PaymentProvider,
+            'provider_defaults_json': provider_defaults_json,
             'default_amount': 10.0,  # Default test amount
             **common_context
         })
@@ -56,44 +69,27 @@ class PaymentCreateView(
         return context
     
     def _get_available_providers(self):
-        """Get list of available payment providers."""
-        try:
-            from ...services.providers.registry import ProviderRegistry
-            providers = []
-            for provider_name, provider_class in ProviderRegistry.get_all_providers().items():
-                providers.append({
-                    'name': provider_name,
-                    'display_name': provider_name.title(),
-                    'is_crypto': provider_name in ['nowpayments', 'cryptapi', 'cryptomus'],
-                    'description': getattr(provider_class, '__doc__', ''),
-                })
-            return providers
-        except Exception:
-            # Fallback if registry is not available
-            return [
-                {'name': 'nowpayments', 'display_name': 'NowPayments', 'is_crypto': True},
-                {'name': 'cryptapi', 'display_name': 'CryptAPI', 'is_crypto': True},
-                {'name': 'cryptomus', 'display_name': 'Cryptomus', 'is_crypto': True},
-                {'name': 'stripe', 'display_name': 'Stripe', 'is_crypto': False},
-            ]
+        """Get list of available payment providers from registry."""
+        registry = ProviderRegistry()
+        provider_names = registry.list_providers()
+        
+        providers = []
+        for provider_name in provider_names:
+            provider_instance = registry.get_provider(provider_name)
+            providers.append({
+                'name': provider_name,
+                'display_name': provider_name.title(),
+                'is_crypto': provider_name in ['nowpayments', 'cryptapi', 'cryptomus'],
+                'description': getattr(provider_instance.__class__, '__doc__', '') if provider_instance else '',
+            })
+        return providers
     
     def _get_available_currencies(self):
-        """Get list of available currencies."""
-        from ...models import Currency
-        
-        try:
-            # Get currencies from database
-            currencies = Currency.objects.filter(is_active=True).order_by('code')
-            return [{'code': c.code, 'name': c.name} for c in currencies]
-        except Exception:
-            # Fallback list
-            return [
-                {'code': 'USD', 'name': 'US Dollar'},
-                {'code': 'EUR', 'name': 'Euro'},
-                {'code': 'BTC', 'name': 'Bitcoin'},
-                {'code': 'ETH', 'name': 'Ethereum'},
-                {'code': 'LTC', 'name': 'Litecoin'},
-            ]
+        """Get list of available currencies from database."""
+        # Get all active currencies - both fiat and crypto
+        return Currency.objects.all().order_by('currency_type', 'code')
+    
+    
 
 
 class PaymentListView(
@@ -147,9 +143,7 @@ class PaymentListView(
     
     def _get_filter_options(self):
         """Get available options for filter dropdowns."""
-        from django.db.models import Value
-        from django.db.models.functions import Concat
-        
+
         # Get unique statuses
         statuses = UniversalPayment.objects.values_list('status', flat=True).distinct()
         status_choices = [(status, status.title()) for status in statuses if status]

django_cfg/apps/payments/views/templates/stats.py

@@ -207,11 +207,15 @@ class PaymentStatsView(
         }
         
         # Convert seconds to human readable format
-        for key in metrics:
-            if metrics[key] > 0:
-                metrics[f"{key}_formatted"] = self._format_duration(metrics[key])
+        formatted_metrics = {}
+        for key, value in metrics.items():
+            if value > 0:
+                formatted_metrics[f"{key}_formatted"] = self._format_duration(value)
             else:
-                metrics[f"{key}_formatted"] = "N/A"
+                formatted_metrics[f"{key}_formatted"] = "N/A"
+        
+        # Add formatted metrics to the original metrics
+        metrics.update(formatted_metrics)
         
         return metrics
     

django_cfg/apps/payments/views/webhook_views.py

@@ -3,7 +3,7 @@ Webhook processing views with signature validation.
 """
 
 import json
-import logging
+from django_cfg.modules.django_logger import get_logger
 from typing import Dict, Any
 
 from django.http import JsonResponse, HttpResponse
@@ -20,7 +20,7 @@ from ..tasks.webhook_processing import process_webhook_with_fallback
 from ..services.security.webhook_validator import webhook_validator
 from ..services.security.error_handler import error_handler, SecurityError, ValidationError
 
-logger = logging.getLogger(__name__)
+logger = get_logger("webhook_views")
 
 
 @csrf_exempt

django_cfg/apps/payments/viewsets.py

@@ -19,7 +19,7 @@ from .views import (
     UserAPIKeyViewSet, APIKeyViewSet,
     
     # Currency ViewSets
-    CurrencyViewSet, CurrencyNetworkViewSet,
+    CurrencyViewSet, NetworkViewSet, ProviderCurrencyViewSet,
     
     # Tariff ViewSets
     TariffViewSet, TariffEndpointGroupViewSet,
@@ -49,7 +49,8 @@ class PaymentSystemRouter:
         
         # Currency and pricing
         self.router.register(r'currencies', CurrencyViewSet, basename='currency')
-        self.router.register(r'currency-networks', CurrencyNetworkViewSet, basename='currency-network')
+        self.router.register(r'networks', NetworkViewSet, basename='network')
+        self.router.register(r'provider-currencies', ProviderCurrencyViewSet, basename='provider-currency')
         self.router.register(r'tariffs', TariffViewSet, basename='tariff')
         self.router.register(r'tariff-groups', TariffEndpointGroupViewSet, basename='tariff-group')
     

django_cfg/apps/tasks/urls.py

@@ -18,6 +18,4 @@ urlpatterns = [
     # RESTful API endpoints using ViewSets
     path('api/', include(router.urls)),
     
-    # Dashboard view
-    path('dashboard/', views.dashboard_view, name='dashboard'),
 ]

django_cfg/apps/tasks/urls_admin.py

@@ -0,0 +1,14 @@
+"""
+URLs for Django CFG Tasks app.
+
+Provides RESTful endpoints for task queue management and monitoring using ViewSets and routers.
+"""
+
+from django.urls import path
+from . import views
+
+urlpatterns = [
+
+    # Dashboard view
+    path('dashboard/', views.dashboard_view, name='dashboard'),
+]

django_cfg/apps/urls.py

@@ -46,14 +46,14 @@ def get_django_cfg_urlpatterns() -> List[URLPattern]:
         
         # Tasks app - enabled when knowbase or agents are enabled
         if base_module.should_enable_tasks():
-            patterns.append(path('tasks/', include('django_cfg.apps.tasks.urls')))
+            patterns.append(path('admin/django_cfg_tasks/admin/', include('django_cfg.apps.tasks.urls_admin')))
         
         # Maintenance app - multi-site maintenance mode with Cloudflare
-        if base_module.is_maintenance_enabled():
-            patterns.append(path('maintenance/', include('django_cfg.apps.maintenance.urls')))
+        # if base_module.is_maintenance_enabled():
+        #     patterns.append(path('admin/django_cfg_maintenance/', include('django_cfg.apps.maintenance.urls_admin')))
 
         if base_module.is_payments_enabled():
-            patterns.append(path('payments/admin/', include('django_cfg.apps.payments.urls_templates')))
+            patterns.append(path('admin/django_cfg_payments/admin/', include('django_cfg.apps.payments.urls_admin')))
             
     except Exception:
         # Fallback: include all URLs if config is not available

django_cfg/core/config.py

@@ -11,6 +11,7 @@ Following CRITICAL_REQUIREMENTS.md:
 from typing import Dict, List, Optional, Any, Union
 from pathlib import Path
 from pydantic import BaseModel, Field, field_validator, model_validator, PrivateAttr
+from enum import Enum
 import os
 from pathlib import Path
 from urllib.parse import urlparse
@@ -66,6 +67,18 @@ DEFAULT_APPS = [
 ]
 
 
+class EnvironmentMode(str, Enum):
+    """Environment mode enumeration."""
+    DEVELOPMENT = "development" 
+    PRODUCTION = "production"
+    TEST = "test"
+    
+    @classmethod
+    def from_debug(cls, debug: bool) -> "EnvironmentMode":
+        """Get environment mode from debug flag."""
+        return cls.DEVELOPMENT if debug else cls.PRODUCTION
+
+
 class DjangoConfig(BaseModel):
     """
     Base configuration class for Django projects.
@@ -105,6 +118,12 @@ class DjangoConfig(BaseModel):
         "str_strip_whitespace": True,
     }
 
+    # === Environment Configuration ===
+    env_mode: EnvironmentMode = Field(
+        default=EnvironmentMode.PRODUCTION,
+        description="Environment mode: development, production, or test",
+    )
+
     # === Project Information ===
     project_name: str = Field(
         ...,
@@ -401,6 +420,22 @@ class DjangoConfig(BaseModel):
 
         return self
 
+    # === Environment Mode Properties ===
+    @property
+    def is_development(self) -> bool:
+        """Check if running in development mode."""
+        return self.env_mode == EnvironmentMode.DEVELOPMENT
+
+    @property  
+    def is_production(self) -> bool:
+        """Check if running in production mode."""
+        return self.env_mode == EnvironmentMode.PRODUCTION
+
+    @property
+    def is_test(self) -> bool:
+        """Check if running in test mode."""
+        return self.env_mode == EnvironmentMode.TEST
+
     def _detect_environment(self) -> None:
         """Detect current environment from various sources."""
         from django_cfg.core.environment import EnvironmentDetector

django_cfg/models/payments.py

@@ -457,7 +457,6 @@ class PaymentsConfig(BaseModel):
 # Helper function for easy provider configuration
 def create_nowpayments_config(
     api_key: str,
-    sandbox: bool = True,
     ipn_secret: Optional[str] = None,
     **kwargs
 ) -> NowPaymentsConfig:
@@ -465,7 +464,6 @@ def create_nowpayments_config(
     return NowPaymentsConfig(
         name="nowpayments",
         api_key=SecretStr(api_key),
-        sandbox=sandbox,
         ipn_secret=SecretStr(ipn_secret) if ipn_secret else None,
         **kwargs
     )
@@ -489,16 +487,14 @@ def create_stripe_config(
     api_key: str,
     publishable_key: Optional[str] = None,
     webhook_endpoint_secret: Optional[str] = None,
-    sandbox: bool = True,
     **kwargs
 ) -> StripeConfig:
-    """Helper to create Stripe configuration."""
+    """Helper to create Stripe configuration with automatic sandbox detection."""
     return StripeConfig(
         name="stripe",
         api_key=SecretStr(api_key),
         publishable_key=publishable_key,
         webhook_endpoint_secret=SecretStr(webhook_endpoint_secret) if webhook_endpoint_secret else None,
-        sandbox=sandbox,
         **kwargs
     )
 
@@ -506,13 +502,12 @@ def create_stripe_config(
 def create_cryptomus_config(
     api_key: str,
     merchant_uuid: str,
-    sandbox: bool = True,
     callback_url: Optional[str] = None,
     success_url: Optional[str] = None,
     fail_url: Optional[str] = None,
     **kwargs
 ):
-    """Helper to create Cryptomus configuration."""
+    """Helper to create Cryptomus configuration with automatic sandbox detection."""
     # Import here to avoid circular imports
     from django_cfg.apps.payments.config.providers import CryptomusConfig
     
@@ -520,7 +515,6 @@ def create_cryptomus_config(
         name="cryptomus",
         api_key=SecretStr(api_key),
         merchant_uuid=merchant_uuid,
-        sandbox=sandbox,
         callback_url=callback_url,
         success_url=success_url,
         fail_url=fail_url,

django_cfg/modules/django_currency/__init__.py

@@ -11,9 +11,6 @@ from .core import (
     Rate,
     ConversionRequest,
     ConversionResult,
-    SupportedCurrencies,
-    YFinanceCurrencies,
-    CoinGeckoCurrencies,
     CurrencyError,
     CurrencyNotFoundError,
     RateFetchError,
@@ -25,7 +22,7 @@ from .core import (
 from .utils import CacheManager
 
 # Clients
-from .clients import YFinanceClient, CoinGeckoClient
+from .clients import YahooFinanceClient, CoinPaprikaClient
 
 # Database tools
 from .database import (
@@ -35,6 +32,17 @@ from .database import (
     load_currencies_to_database_format
 )
 
+# Shared global converter instance for caching efficiency
+_global_converter = None
+
+def _get_converter() -> CurrencyConverter:
+    """Get or create shared converter instance."""
+    global _global_converter
+    if _global_converter is None:
+        _global_converter = CurrencyConverter(cache_ttl=3600)  # 1 hour cache
+    return _global_converter
+
+
 # Simple public API
 def convert_currency(amount: float, from_currency: str, to_currency: str) -> float:
     """
@@ -48,7 +56,7 @@ def convert_currency(amount: float, from_currency: str, to_currency: str) -> flo
     Returns:
         Converted amount
     """
-    converter = CurrencyConverter()
+    converter = _get_converter()
     result = converter.convert(amount, from_currency, to_currency)
     return result.result
 
@@ -64,7 +72,7 @@ def get_exchange_rate(base: str, quote: str) -> float:
     Returns:
         Exchange rate
     """
-    converter = CurrencyConverter()
+    converter = _get_converter()
     result = converter.convert(1.0, base, quote)
     return result.rate.rate
 
@@ -75,9 +83,6 @@ __all__ = [
     "Rate", 
     "ConversionRequest",
     "ConversionResult",
-    "SupportedCurrencies",
-    "YFinanceCurrencies", 
-    "CoinGeckoCurrencies",
     
     # Exceptions
     "CurrencyError",
@@ -90,8 +95,8 @@ __all__ = [
     "CacheManager",
     
     # Clients
-    "YFinanceClient",
-    "CoinGeckoClient",
+    "YahooFinanceClient",
+    "CoinPaprikaClient",
     
     # Database tools
     "CurrencyDatabaseLoader",

django_cfg/modules/django_currency/clients/__init__.py

@@ -2,10 +2,10 @@
 Currency data clients for fetching rates from external APIs.
 """
 
-from .yfinance_client import YFinanceClient
-from .coingecko_client import CoinGeckoClient
+from .yahoo_client import YahooFinanceClient
+from .coinpaprika_client import CoinPaprikaClient
 
 __all__ = [
-    'YFinanceClient', 
-    'CoinGeckoClient'
+    'YahooFinanceClient', 
+    'CoinPaprikaClient'
 ]