django-cfg 1.4.21__py3-none-any.whl → 1.4.24__py3-none-any.whl

django_cfg/apps/payments/signals/balance_signals.py

@@ -5,15 +5,17 @@ Minimal signals focused on cache invalidation and notifications.
 Business logic stays in UserBalanceManager and TransactionManager.
 """
 
-from django.db.models.signals import post_save, post_delete, pre_save
-from django.dispatch import receiver
+from decimal import Decimal
+
 from django.core.cache import cache
+from django.db.models.signals import post_delete, post_save, pre_save
+from django.dispatch import receiver
 from django.utils import timezone
-from decimal import Decimal
 
-from ..models import UserBalance, Transaction
 from django_cfg.modules.django_logging import get_logger
 
+from ..models import Transaction, UserBalance
+
 logger = get_logger("balance_signals")
 
 
@@ -39,7 +41,7 @@ def handle_balance_change(sender, instance: UserBalance, created: bool, **kwargs
     Business logic (analytics, calculations) stays in managers.
     """
     if created:
-        logger.info(f"New balance created", extra={
+        logger.info("New balance created", extra={
             'user_id': instance.user.id,
             'initial_balance': instance.balance_usd
         })
@@ -49,25 +51,25 @@ def handle_balance_change(sender, instance: UserBalance, created: bool, **kwargs
             # Ensure both values are Decimal for consistent arithmetic
             old_balance = Decimal(str(instance._original_balance or 0.0))
             new_balance = Decimal(str(instance.balance_usd))
-            
+
             if old_balance != new_balance:
                 balance_change = new_balance - old_balance
-                
-                logger.info(f"Balance changed", extra={
+
+                logger.info("Balance changed", extra={
                     'user_id': instance.user.id,
                     'old_balance': old_balance,
                     'new_balance': new_balance,
                     'change_amount': balance_change
                 })
-                
+
                 # Check for low balance warning (notification only)
                 if new_balance < 10.0 and old_balance >= 10.0:
                     _trigger_low_balance_warning(instance)
-                
+
                 # Check for zero balance (notification only)
                 if new_balance <= 0.0 and old_balance > 0.0:
                     _handle_zero_balance(instance)
-    
+
     # Clear balance-related caches
     _clear_balance_caches(instance.user.id)
 
@@ -80,14 +82,14 @@ def handle_transaction_creation(sender, instance: Transaction, created: bool, **
     Business logic (analytics, balance updates) stays in managers.
     """
     if created:
-        logger.info(f"New transaction created", extra={
+        logger.info("New transaction created", extra={
             'transaction_id': str(instance.id),
             'user_id': instance.user.id,
             'transaction_type': instance.transaction_type,
             'amount': instance.amount_usd,
             'payment_id': str(instance.payment_id) if instance.payment_id else None
         })
-        
+
         # Clear related caches
         _clear_balance_caches(instance.user.id)
 
@@ -95,14 +97,14 @@ def handle_transaction_creation(sender, instance: Transaction, created: bool, **
 @receiver(post_delete, sender=Transaction)
 def handle_transaction_deletion(sender, instance: Transaction, **kwargs):
     """Handle transaction deletion (should be rare)."""
-    logger.warning(f"Transaction deleted", extra={
+    logger.warning("Transaction deleted", extra={
         'transaction_id': str(instance.id),
         'user_id': instance.user.id,
         'transaction_type': instance.transaction_type,
         'amount': instance.amount,
         'deletion_timestamp': timezone.now().isoformat()
     })
-    
+
     # Clear caches
     _clear_balance_caches(instance.user.id)
 
@@ -112,12 +114,12 @@ def handle_transaction_deletion(sender, instance: Transaction, **kwargs):
 def _trigger_low_balance_warning(balance: UserBalance):
     """Trigger low balance warning for user (notification only)."""
     try:
-        logger.warning(f"Low balance warning", extra={
+        logger.warning("Low balance warning", extra={
             'user_id': balance.user.id,
             'current_balance': balance.balance_usd,
             'threshold': 10.0
         })
-        
+
         # Set warning flag in cache for frontend
         cache.set(
             f"low_balance_warning:{balance.user.id}",
@@ -128,7 +130,7 @@ def _trigger_low_balance_warning(balance: UserBalance):
             },
             timeout=86400  # 24 hours
         )
-        
+
     except Exception as e:
         logger.error(f"Failed to trigger low balance warning: {e}")
 
@@ -136,11 +138,11 @@ def _trigger_low_balance_warning(balance: UserBalance):
 def _handle_zero_balance(balance: UserBalance):
     """Handle zero balance situation (notification only)."""
     try:
-        logger.warning(f"Zero balance reached", extra={
+        logger.warning("Zero balance reached", extra={
             'user_id': balance.user.id,
             'previous_balance': getattr(balance, '_original_balance', 'unknown')
         })
-        
+
         # Set zero balance flag in cache
         cache.set(
             f"zero_balance:{balance.user.id}",
@@ -150,7 +152,7 @@ def _handle_zero_balance(balance: UserBalance):
             },
             timeout=86400 * 7  # 7 days
         )
-        
+
     except Exception as e:
         logger.error(f"Failed to handle zero balance: {e}")
 
@@ -165,13 +167,13 @@ def _clear_balance_caches(user_id: int):
             f"balance_history:{user_id}",
             f"transaction_stats:{user_id}",
         ]
-        
+
         cache.delete_many(cache_keys)
-        
-        logger.debug(f"Cleared balance caches", extra={
+
+        logger.debug("Cleared balance caches", extra={
             'user_id': user_id,
             'cache_keys_cleared': len(cache_keys)
         })
-        
+
     except Exception as e:
-        logger.warning(f"Failed to clear balance caches: {e}")
+        logger.warning(f"Failed to clear balance caches: {e}")

django_cfg/apps/payments/signals/payment_signals.py

@@ -5,14 +5,15 @@ Minimal signals focused on cache invalidation and notifications.
 Business logic stays in PaymentManager.
 """
 
+from django.core.cache import cache
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
-from django.core.cache import cache
 from django.utils import timezone
 
-from ..models import UniversalPayment
 from django_cfg.modules.django_logging import get_logger
 
+from ..models import UniversalPayment
+
 logger = get_logger("payment_signals")
 
 
@@ -28,16 +29,16 @@ def handle_status_changes(sender, instance: UniversalPayment, **kwargs):
         try:
             original = UniversalPayment.objects.get(pk=instance.pk)
             instance._original_status = original.status
-            
+
             # Check if status has changed
             if original.status != instance.status:
                 instance.status_changed_at = timezone.now()
-                
+
                 # Set completed_at if status changed to completed
                 if instance.status == 'completed' and not instance.completed_at:
                     instance.completed_at = timezone.now()
-                
-                logger.debug(f"Status change detected in pre_save", extra={
+
+                logger.debug("Status change detected in pre_save", extra={
                     'payment_id': str(instance.id),
                     'old_status': original.status,
                     'new_status': instance.status,
@@ -50,8 +51,8 @@ def handle_status_changes(sender, instance: UniversalPayment, **kwargs):
         instance._original_status = None
         if instance.status and not instance.status_changed_at:
             instance.status_changed_at = timezone.now()
-            
-            logger.debug(f"New payment status set in pre_save", extra={
+
+            logger.debug("New payment status set in pre_save", extra={
                 'payment_id': 'new',
                 'status': instance.status,
                 'status_changed_at': instance.status_changed_at.isoformat()
@@ -66,7 +67,7 @@ def handle_payment_changes(sender, instance: UniversalPayment, created: bool, **
     Business logic (balance updates, etc.) handled by managers.
     """
     if created:
-        logger.info(f"New payment created", extra={
+        logger.info("New payment created", extra={
             'payment_id': str(instance.id),
             'user_id': instance.user.id,
             'amount_usd': instance.amount_usd,
@@ -78,23 +79,23 @@ def handle_payment_changes(sender, instance: UniversalPayment, created: bool, **
         if hasattr(instance, '_original_status'):
             old_status = instance._original_status
             new_status = instance.status
-            
+
             if old_status != new_status:
-                logger.info(f"Payment status changed", extra={
+                logger.info("Payment status changed", extra={
                     'payment_id': str(instance.id),
                     'user_id': instance.user.id,
                     'old_status': old_status,
                     'new_status': new_status
                 })
-                
+
                 # Handle completed payment
                 if new_status == 'completed' and old_status != 'completed':
                     _handle_payment_completed(instance)
-                
+
                 # Handle failed payment
                 elif new_status in ['failed', 'expired', 'cancelled'] and old_status not in ['failed', 'expired', 'cancelled']:
                     _handle_payment_failed(instance)
-    
+
     # Clear payment-related caches
     _clear_payment_caches(instance)
 
@@ -106,7 +107,7 @@ def _handle_payment_completed(payment: UniversalPayment):
     try:
         # Use manager method which has all the business logic
         from ..models import UserBalance
-        
+
         transaction_record = UserBalance.objects.add_funds_to_user(
             user=payment.user,
             amount=payment.amount_usd,
@@ -114,20 +115,20 @@ def _handle_payment_completed(payment: UniversalPayment):
             description=f"Payment completed: {payment.id}",
             payment_id=payment.id
         )
-        
+
         # Mark payment as processed
         payment.completed_at = timezone.now()
         payment.save(update_fields=['completed_at', 'updated_at'])
-        
-        logger.info(f"Payment completed and processed", extra={
+
+        logger.info("Payment completed and processed", extra={
             'payment_id': str(payment.id),
             'user_id': payment.user.id,
             'amount_usd': payment.amount_usd,
             'transaction_id': str(transaction_record.id)
         })
-        
+
     except Exception as e:
-        logger.error(f"Failed to process completed payment", extra={
+        logger.error("Failed to process completed payment", extra={
             'payment_id': str(payment.id),
             'user_id': payment.user.id,
             'error': str(e)
@@ -139,14 +140,14 @@ def _handle_payment_failed(payment: UniversalPayment):
     Handle failed payment - just logging and notifications.
     """
     try:
-        logger.warning(f"Payment failed", extra={
+        logger.warning("Payment failed", extra={
             'payment_id': str(payment.id),
             'user_id': payment.user.id,
             'amount_usd': payment.amount_usd,
             'status': payment.status,
             'provider': payment.provider
         })
-        
+
         # Set failure notification in cache
         cache.set(
             f"payment_failed:{payment.user.id}:{payment.id}",
@@ -158,9 +159,9 @@ def _handle_payment_failed(payment: UniversalPayment):
             },
             timeout=86400 * 7  # 7 days
         )
-        
+
     except Exception as e:
-        logger.error(f"Failed to handle payment failure", extra={
+        logger.error("Failed to handle payment failure", extra={
             'payment_id': str(payment.id),
             'error': str(e)
         })
@@ -175,14 +176,14 @@ def _clear_payment_caches(payment: UniversalPayment):
             f"payment_summary:{payment.user.id}",
             f"provider_stats:{payment.provider}",
         ]
-        
+
         cache.delete_many(cache_keys)
-        
-        logger.debug(f"Cleared payment caches", extra={
+
+        logger.debug("Cleared payment caches", extra={
             'payment_id': str(payment.id),
             'user_id': payment.user.id,
             'cache_keys_cleared': len(cache_keys)
         })
-        
+
     except Exception as e:
         logger.warning(f"Failed to clear payment caches: {e}")

django_cfg/apps/payments/signals/subscription_signals.py

@@ -5,14 +5,15 @@ Minimal signals focused on cache invalidation and notifications.
 Business logic stays in SubscriptionManager.
 """
 
-from django.db.models.signals import post_save, post_delete, pre_save
-from django.dispatch import receiver
 from django.core.cache import cache
+from django.db.models.signals import post_delete, post_save, pre_save
+from django.dispatch import receiver
 from django.utils import timezone
 
-from ..models import Subscription
 from django_cfg.modules.django_logging import get_logger
 
+from ..models import Subscription
+
 logger = get_logger("subscription_signals")
 
 
@@ -43,66 +44,66 @@ def handle_subscription_changes(sender, instance: Subscription, created: bool, *
     Business logic (API key management, etc.) stays in managers.
     """
     if created:
-        logger.info(f"New subscription created", extra={
+        logger.info("New subscription created", extra={
             'subscription_id': str(instance.id),
             'user_id': instance.user.id,
             'tier': instance.tier,
             'status': instance.status
         })
-        
+
         # Create default API key for new subscription (delegate to manager)
         _create_default_api_key(instance)
-        
+
     else:
         # Check for status changes
         if hasattr(instance, '_original_status'):
             old_status = instance._original_status
             new_status = instance.status
-            
+
             if old_status != new_status:
-                logger.info(f"Subscription status changed", extra={
+                logger.info("Subscription status changed", extra={
                     'subscription_id': str(instance.id),
                     'user_id': instance.user.id,
                     'old_status': old_status,
                     'new_status': new_status
                 })
-                
+
                 # Handle activation
                 if new_status == 'active' and old_status != 'active':
                     _handle_subscription_activated(instance)
-                
+
                 # Handle suspension/cancellation
                 elif new_status in ['suspended', 'cancelled'] and old_status not in ['suspended', 'cancelled']:
                     _handle_subscription_deactivated(instance)
-        
+
         # Check for tier changes
         if hasattr(instance, '_original_tier'):
             old_tier = instance._original_tier
             new_tier = instance.tier
-            
+
             if old_tier != new_tier:
-                logger.info(f"Subscription tier changed", extra={
+                logger.info("Subscription tier changed", extra={
                     'subscription_id': str(instance.id),
                     'user_id': instance.user.id,
                     'old_tier': old_tier,
                     'new_tier': new_tier
                 })
-                
+
                 _handle_tier_change(instance, old_tier, new_tier)
-        
+
         # Check for expiration changes
         if hasattr(instance, '_original_expires_at'):
             old_expires = instance._original_expires_at
             new_expires = instance.expires_at
-            
+
             if old_expires != new_expires:
-                logger.info(f"Subscription expiration changed", extra={
+                logger.info("Subscription expiration changed", extra={
                     'subscription_id': str(instance.id),
                     'user_id': instance.user.id,
                     'old_expires': old_expires.isoformat() if old_expires else None,
                     'new_expires': new_expires.isoformat() if new_expires else None
                 })
-    
+
     # Clear subscription-related caches
     _clear_subscription_caches(instance)
 
@@ -110,14 +111,14 @@ def handle_subscription_changes(sender, instance: Subscription, created: bool, *
 @receiver(post_delete, sender=Subscription)
 def handle_subscription_deletion(sender, instance: Subscription, **kwargs):
     """Handle subscription deletion."""
-    logger.warning(f"Subscription deleted", extra={
+    logger.warning("Subscription deleted", extra={
         'subscription_id': str(instance.id),
         'user_id': instance.user.id,
         'tier': instance.tier,
         'status': instance.status,
         'deletion_timestamp': timezone.now().isoformat()
     })
-    
+
     # Clear caches
     _clear_subscription_caches(instance)
 
@@ -128,22 +129,22 @@ def _create_default_api_key(subscription: Subscription):
     """Create default API key for new subscription (delegate to manager)."""
     try:
         from ..models import APIKey
-        
+
         # Use manager method which has all the business logic
         api_key = APIKey.objects.create_api_key_for_user(
             user=subscription.user,
             name=f"Default API Key ({subscription.tier})",
             expires_in_days=None  # No expiration for default key
         )
-        
-        logger.info(f"Created default API key for subscription", extra={
+
+        logger.info("Created default API key for subscription", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'api_key_id': str(api_key.id)
         })
-        
+
     except Exception as e:
-        logger.error(f"Failed to create default API key", extra={
+        logger.error("Failed to create default API key", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'error': str(e)
@@ -153,12 +154,12 @@ def _create_default_api_key(subscription: Subscription):
 def _handle_subscription_activated(subscription: Subscription):
     """Handle subscription activation (notification only)."""
     try:
-        logger.info(f"Subscription activated", extra={
+        logger.info("Subscription activated", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'tier': subscription.tier
         })
-        
+
         # Set activation notification in cache
         cache.set(
             f"subscription_activated:{subscription.user.id}",
@@ -169,7 +170,7 @@ def _handle_subscription_activated(subscription: Subscription):
             },
             timeout=86400  # 24 hours
         )
-        
+
     except Exception as e:
         logger.error(f"Failed to handle subscription activation: {e}")
 
@@ -177,13 +178,13 @@ def _handle_subscription_activated(subscription: Subscription):
 def _handle_subscription_deactivated(subscription: Subscription):
     """Handle subscription deactivation (notification only)."""
     try:
-        logger.warning(f"Subscription deactivated", extra={
+        logger.warning("Subscription deactivated", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'status': subscription.status,
             'tier': subscription.tier
         })
-        
+
         # Set deactivation notification in cache
         cache.set(
             f"subscription_deactivated:{subscription.user.id}",
@@ -195,7 +196,7 @@ def _handle_subscription_deactivated(subscription: Subscription):
             },
             timeout=86400 * 7  # 7 days
         )
-        
+
     except Exception as e:
         logger.error(f"Failed to handle subscription deactivation: {e}")
 
@@ -203,13 +204,13 @@ def _handle_subscription_deactivated(subscription: Subscription):
 def _handle_tier_change(subscription: Subscription, old_tier: str, new_tier: str):
     """Handle subscription tier change (notification only)."""
     try:
-        logger.info(f"Subscription tier changed", extra={
+        logger.info("Subscription tier changed", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'old_tier': old_tier,
             'new_tier': new_tier
         })
-        
+
         # Set tier change notification in cache
         cache.set(
             f"tier_changed:{subscription.user.id}",
@@ -221,7 +222,7 @@ def _handle_tier_change(subscription: Subscription, old_tier: str, new_tier: str
             },
             timeout=86400  # 24 hours
         )
-        
+
     except Exception as e:
         logger.error(f"Failed to handle tier change: {e}")
 
@@ -235,14 +236,14 @@ def _clear_subscription_caches(subscription: Subscription):
             f"subscription_stats:{subscription.user.id}",
             f"tier_limits:{subscription.tier}",
         ]
-        
+
         cache.delete_many(cache_keys)
-        
-        logger.debug(f"Cleared subscription caches", extra={
+
+        logger.debug("Cleared subscription caches", extra={
             'subscription_id': str(subscription.id),
             'user_id': subscription.user.id,
             'cache_keys_cleared': len(cache_keys)
         })
-        
+
     except Exception as e:
         logger.warning(f"Failed to clear subscription caches: {e}")

django_cfg/apps/payments/static/payments/js/ngrok-status.js

@@ -16,15 +16,22 @@ function ngrokStatus() {
 
         async init() {
             await this.refreshStatus();
-            // Auto-refresh every 10 seconds
-            setInterval(() => this.refreshStatus(), 10000);
+            // Don't auto-refresh since endpoint doesn't exist
+            // setInterval(() => this.refreshStatus(), 10000);
         },
 
         async refreshStatus() {
             this.loading = true;
             try {
-                const data = await PaymentAPI.ngrok.status();
-                this.status = { ...this.status, ...data };
+                // Webhook health endpoint doesn't exist, so just show as inactive
+                this.status = {
+                    active: false,
+                    public_url: '',
+                    webhook_url: '',
+                    error: 'Ngrok tunnel not active. Run server with: python manage.py runserver_ngrok',
+                    region: 'us',
+                    proto: 'https'
+                };
             } catch (error) {
                 console.error('Failed to fetch ngrok status:', error);
                 this.status.active = false;
@@ -34,8 +41,6 @@ function ngrokStatus() {
             }
         },
 
-
-
         copyUrl() {
             if (this.status.public_url) {
                 PaymentAPI.utils.copyToClipboard(this.status.public_url);
@@ -52,7 +57,6 @@ function ngrokStatus() {
             if (this.status.public_url) {
                 window.open(this.status.public_url, '_blank');
             }
-        },
-
+        }
     };
 }

django_cfg/apps/payments/static/payments/js/payment-detail.js

@@ -162,6 +162,6 @@ function paymentDetail() {
 // Auto-initialize if PaymentAPI is available
 document.addEventListener('DOMContentLoaded', function() {
     if (typeof PaymentAPI === 'undefined') {
-        console.warn('PaymentAPI not found. Make sure api-client.js is loaded before payment-detail.js');
+        console.warn('PaymentAPI not found. Make sure the generated MJS client is loaded in base.html');
     }
 });

django_cfg/apps/payments/static/payments/js/payment-form.js

@@ -86,8 +86,8 @@ function paymentForm() {
                     return;
                 }
                 
-                // Use the provider-currencies API endpoint directly
-                const response = await PaymentAPI.request(`/api/payments/provider-currencies/by_provider/?provider=${this.form.provider}`);
+                // Use the PaymentAPI wrapper method
+                const response = await PaymentAPI.currencies.byProvider(this.form.provider);
                 console.log('📊 Provider currencies API response:', response);
                 
                 // Extract currencies for the specific provider
@@ -224,7 +224,7 @@ function paymentForm() {
             try {
                 const data = await PaymentAPI.admin.payments.create(this.form);
                 PaymentAPI.utils.showNotification('Payment created successfully!', 'success');
-                window.location.href = `/cfg/admin/django_cfg_payments/admin/payments/${data.id}/`;
+                window.location.href = `/cfg/payments/admin/payments/${data.id}/`;
             } catch (error) {
                 console.error('Error:', error);