django-cfg 1.3.7__py3-none-any.whl → 1.3.11__py3-none-any.whl

django_cfg/modules/django_currency/database/database_loader.py

@@ -12,7 +12,7 @@ from pydantic import BaseModel, Field, validator
 from cachetools import TTLCache
 
 # Our new clients
-from ..clients import YahooFinanceClient, CoinPaprikaClient
+from ..clients import HybridCurrencyClient, CoinPaprikaClient
 
 logger = logging.getLogger(__name__)
 
@@ -28,11 +28,12 @@ class CoinPaprikaCoinInfo(BaseModel):
     name: str = Field(description="Full coin name")
 
 
-class YahooFinanceCurrencyInfo(BaseModel):
-    """Single fiat currency information."""
+class HybridCurrencyInfo(BaseModel):
+    """Single currency information from hybrid client."""
     code: str = Field(description="Currency code (e.g., USD)")
     name: str = Field(description="Full currency name")
     symbol: str = Field(default="", description="Currency symbol (e.g., $)")
+    currency_type: str = Field(description="Currency type (fiat, crypto, metal)")
 
 
 class CurrencyRateInfo(BaseModel):
@@ -93,7 +94,7 @@ class CurrencyDatabaseLoader:
         self.config = config or DatabaseLoaderConfig()
         
         # Initialize clients
-        self.yahoo = YahooFinanceClient(cache_ttl=self.config.cache_ttl_hours * 3600)
+        self.hybrid = HybridCurrencyClient(cache_ttl=self.config.cache_ttl_hours * 3600)
         self.coinpaprika = CoinPaprikaClient(cache_ttl=self.config.cache_ttl_hours * 3600)
         
         # Rate limiters
@@ -107,36 +108,48 @@ class CurrencyDatabaseLoader:
         
         logger.info(f"Initialized CurrencyDatabaseLoader with config: {self.config}")
     
-    def get_fiat_currency_list(self) -> List[YahooFinanceCurrencyInfo]:
+    def get_hybrid_currency_list(self) -> List[HybridCurrencyInfo]:
         """
-        Get list of supported fiat currencies.
+        Get list of supported currencies from hybrid client.
         
         Returns:
-            List of fiat currency info objects
+            List of currency info objects
         """
-        cache_key = "fiat_currencies"
+        cache_key = "hybrid_currencies"
         
         if cache_key in self.fiat_cache:
-            logger.debug("Retrieved fiat currencies from cache")
+            logger.debug("Retrieved hybrid currencies from cache")
             return self.fiat_cache[cache_key]
         
-        # Get supported currencies from Yahoo
-        supported_currencies = self.yahoo.get_all_supported_currencies()
+        # Get supported currencies from Hybrid client
+        supported_currencies = self.hybrid.get_all_supported_currencies()
         
-        # Convert to our format and limit count
-        fiat_currencies = []
-        for code, name in list(supported_currencies.items())[:self.config.max_fiat_currencies]:
-            currency_info = YahooFinanceCurrencyInfo(
+        # Convert to our format
+        hybrid_currencies = []
+        for code, name in supported_currencies.items():
+            # Determine currency type based on code
+            if code in ['BTC', 'ETH', 'BNB', 'XRP', 'ADA', 'SOL', 'DOT', 'MATIC', 
+                       'LTC', 'BCH', 'LINK', 'UNI', 'ATOM', 'XLM', 'VET', 'FIL',
+                       'TRX', 'ETC', 'THETA', 'AAVE', 'MKR', 'COMP', 'SUSHI',
+                       'USDT', 'USDC', 'BUSD', 'DAI', 'TUSD', 'USDP']:
+                currency_type = "crypto"
+            elif code in ['XAU', 'XAG', 'XPT', 'XPD']:
+                currency_type = "metal"
+            else:
+                currency_type = "fiat"
+            
+            currency_info = HybridCurrencyInfo(
                 code=code,
                 name=name,
-                symbol=""  # Yahoo doesn't provide symbols
+                symbol="$" if code == "USD" else "",  # Basic symbol mapping
+                currency_type=currency_type
             )
-            fiat_currencies.append(currency_info)
+            hybrid_currencies.append(currency_info)
         
-        self.fiat_cache[cache_key] = fiat_currencies
-        logger.info(f"Loaded {len(fiat_currencies)} fiat currencies")
+        self.fiat_cache[cache_key] = hybrid_currencies
+        logger.info(f"Loaded {len(hybrid_currencies)} currencies from hybrid client")
         
-        return fiat_currencies
+        return hybrid_currencies
     
     def get_cryptocurrency_list(self) -> List[CoinPaprikaCoinInfo]:
         """
@@ -233,7 +246,7 @@ class CurrencyDatabaseLoader:
         self.yahoo_limiter()
         
         try:
-            rate_obj = self.yahoo.fetch_rate(base, quote)
+            rate_obj = self.hybrid.fetch_rate(base, quote)
             return rate_obj.rate
         except Exception as e:
             logger.debug(f"Failed to get fiat rate {base}/{quote}: {e}")
@@ -241,48 +254,72 @@ class CurrencyDatabaseLoader:
     
     def build_currency_database_data(self) -> List[CurrencyRateInfo]:
         """
-        Build complete currency database data combining fiat and crypto.
+        Build complete currency database data using hybrid client.
         
         Returns:
             List of currency rate info objects
         """
         currencies = []
         
-        # Get fiat currencies
-        logger.info("Loading fiat currencies...")
-        fiat_currencies = self.get_fiat_currency_list()
+        # Get currencies from hybrid client
+        logger.info("Loading currencies from hybrid client...")
+        hybrid_currencies = self.get_hybrid_currency_list()
         
-        for fiat in fiat_currencies:
+        for currency in hybrid_currencies:
             # Get USD rate
-            if fiat.code == 'USD':
+            if currency.code == 'USD':
                 usd_rate = 1.0
             else:
-                usd_rate = self.get_fiat_rate(fiat.code, 'USD')
+                usd_rate = self.get_fiat_rate(currency.code, 'USD')
                 if usd_rate is None:
-                    logger.warning(f"Could not get USD rate for {fiat.code}")
+                    logger.warning(f"Could not get USD rate for {currency.code}")
                     continue
             
+            # Set decimal places based on currency type and value
+            if currency.currency_type == "fiat":
+                decimal_places = 2
+                min_payment = 1.0
+            elif currency.currency_type == "crypto":
+                if usd_rate >= 1:
+                    decimal_places = 2
+                elif usd_rate >= 0.01:
+                    decimal_places = 4
+                else:
+                    decimal_places = 8
+                min_payment = max(1.0 / usd_rate, 0.000001)
+            else:  # metal
+                decimal_places = 4
+                min_payment = 0.001
+            
             currency_info = CurrencyRateInfo(
-                code=fiat.code,
-                name=fiat.name,
-                symbol=fiat.symbol or "$" if fiat.code == "USD" else "",
-                currency_type="fiat",
-                decimal_places=2,
+                code=currency.code,
+                name=currency.name,
+                symbol=currency.symbol,
+                currency_type=currency.currency_type,
+                decimal_places=decimal_places,
                 usd_rate=usd_rate,
-                min_payment_amount=1.0
+                min_payment_amount=min_payment
             )
             currencies.append(currency_info)
         
-        # Get cryptocurrencies
-        logger.info("Loading cryptocurrencies...")
+        # Get additional cryptocurrencies from CoinPaprika (for extended crypto coverage)
+        logger.info("Loading additional cryptocurrencies from CoinPaprika...")
         crypto_currencies = self.get_cryptocurrency_list()
         
+        # Filter out cryptos that are already in hybrid client
+        hybrid_crypto_codes = {c.code for c in hybrid_currencies if c.currency_type == "crypto"}
+        
         if crypto_currencies:
             # Get rates for all cryptos
-            crypto_symbols = [crypto.symbol for crypto in crypto_currencies]
+            crypto_symbols = [crypto.symbol for crypto in crypto_currencies 
+                            if crypto.symbol not in hybrid_crypto_codes]
             rates = self.get_currency_rates(crypto_symbols, 'usd')
             
             for crypto in crypto_currencies:
+                # Skip if already covered by hybrid client
+                if crypto.symbol in hybrid_crypto_codes:
+                    continue
+                    
                 if crypto.symbol in rates:
                     usd_rate = rates[crypto.symbol]
                     
@@ -313,13 +350,27 @@ class CurrencyDatabaseLoader:
     
     def get_statistics(self) -> Dict[str, int]:
         """Get loader statistics."""
-        fiat_count = len(self.get_fiat_currency_list())
-        crypto_count = len(self.get_cryptocurrency_list())
+        hybrid_currencies = self.get_hybrid_currency_list()
+        coinpaprika_cryptos = self.get_cryptocurrency_list()
+        
+        # Count by type from hybrid client
+        fiat_count = len([c for c in hybrid_currencies if c.currency_type == "fiat"])
+        hybrid_crypto_count = len([c for c in hybrid_currencies if c.currency_type == "crypto"])
+        metal_count = len([c for c in hybrid_currencies if c.currency_type == "metal"])
+        
+        # Additional cryptos from CoinPaprika (excluding duplicates)
+        hybrid_crypto_codes = {c.code for c in hybrid_currencies if c.currency_type == "crypto"}
+        additional_crypto_count = len([c for c in coinpaprika_cryptos if c.symbol not in hybrid_crypto_codes])
+        
+        total_crypto_count = hybrid_crypto_count + additional_crypto_count
         
         return {
             'total_fiat_currencies': fiat_count,
-            'total_cryptocurrencies': crypto_count,
-            'total_currencies': fiat_count + crypto_count,
+            'total_cryptocurrencies': total_crypto_count,
+            'total_metal_currencies': metal_count,
+            'hybrid_crypto_currencies': hybrid_crypto_count,
+            'coinpaprika_crypto_currencies': additional_crypto_count,
+            'total_currencies': fiat_count + total_crypto_count + metal_count,
             'max_cryptocurrencies': self.config.max_cryptocurrencies,
             'max_fiat_currencies': self.config.max_fiat_currencies,
             'min_market_cap_usd': self.config.min_market_cap_usd

django_cfg/modules/django_llm/llm/client.py

@@ -76,8 +76,16 @@ class LLMClient(BaseCfgModule):
         django_config = self.get_config()
         if django_config:
             if apikey_openai is None:
-                apikey_openai = getattr(django_config, 'openai_api_key', None)
-            # Add other API keys as needed
+                # Try new api_keys system first, then fallback to old attribute
+                if hasattr(django_config, 'api_keys') and django_config.api_keys:
+                    apikey_openai = django_config.api_keys.get_openai_key()
+                else:
+                    apikey_openai = getattr(django_config, 'openai_api_key', None)
+            
+            if apikey_openrouter is None:
+                # Try new api_keys system first
+                if hasattr(django_config, 'api_keys') and django_config.api_keys:
+                    apikey_openrouter = django_config.api_keys.get_openrouter_key()
         
         # Store API keys and preferred provider
         self.apikey_openrouter = apikey_openrouter

django_cfg/modules/django_tasks.py

@@ -86,29 +86,49 @@ class DjangoTasks(BaseCfgModule):
         return True
     
     def get_redis_url(self) -> Optional[str]:
-        """Get Redis URL from Django-CFG cache configuration."""
+        """Get Redis URL using the same logic as Dramatiq settings generation."""
         if self._redis_url is None:
+            # Use BaseCfgModule to get config (same as generate_dramatiq_settings_from_config)
+            config = self.get_config()
+            
+            if not config:
+                raise RuntimeError("No Django-CFG configuration available")
+            
+            # Get Redis URL from cache config (same logic as generate_dramatiq_settings_from_config)
+            if hasattr(config, 'cache_default') and config.cache_default:
+                self._redis_url = getattr(config.cache_default, 'redis_url', None)
+                if self._redis_url:
+                    logger.debug(f"Got Redis URL from cache config: {self._redis_url}")
+                    return self._redis_url
+            
+            # If no cache_default, try to get from Django cache settings
             try:
-                from django_cfg.core.config import get_current_config
-                django_config = get_current_config()
-                
-                if not django_config:
-                    try:
-                        from api.config import config
-                        django_config = config
-                    except ImportError:
-                        logger.warning("Could not import config from api.config")
-                
-                if django_config and hasattr(django_config, 'cache_default') and django_config.cache_default:
-                    cache_config = django_config.cache_default
-                    if hasattr(cache_config, 'redis_url') and cache_config.redis_url:
-                        self._redis_url = cache_config.redis_url
-                        logger.debug(f"Got Redis URL: {self._redis_url}")
-                    elif hasattr(cache_config, 'location') and cache_config.location:
-                        self._redis_url = cache_config.location
-                        logger.debug(f"Got Redis URL from location: {self._redis_url}")
+                from django.conf import settings
+                if hasattr(settings, 'CACHES') and 'default' in settings.CACHES:
+                    cache_config = settings.CACHES['default']
+                    if cache_config.get('BACKEND') == 'django_redis.cache.RedisCache':
+                        self._redis_url = cache_config.get('LOCATION')
+                        if self._redis_url:
+                            logger.debug(f"Got Redis URL from Django cache settings: {self._redis_url}")
+                            return self._redis_url
             except Exception as e:
-                logger.warning(f"Failed to get Redis URL: {e}")
+                logger.debug(f"Could not get Redis URL from Django settings: {e}")
+            
+            # Try to get from DRAMATIQ_BROKER settings
+            try:
+                from django.conf import settings
+                if hasattr(settings, 'DRAMATIQ_BROKER'):
+                    dramatiq_config = settings.DRAMATIQ_BROKER
+                    if isinstance(dramatiq_config, dict) and 'OPTIONS' in dramatiq_config:
+                        self._redis_url = dramatiq_config['OPTIONS'].get('url')
+                        if self._redis_url:
+                            logger.debug(f"Got Redis URL from DRAMATIQ_BROKER settings: {self._redis_url}")
+                            return self._redis_url
+            except Exception as e:
+                logger.debug(f"Could not get Redis URL from DRAMATIQ_BROKER settings: {e}")
+            
+            # If still no Redis URL found, raise error (no fallbacks)
+            raise RuntimeError("No Redis URL found in cache configuration, Django settings, or DRAMATIQ_BROKER")
         
         return self._redis_url
     
@@ -120,10 +140,23 @@ class DjangoTasks(BaseCfgModule):
         
         try:
             parsed = urlparse(redis_url)
+            
+            # Extract database from URL path, fallback to config or default
+            db = 1  # Default
+            if parsed.path and parsed.path != "/":
+                try:
+                    db = int(parsed.path.lstrip('/'))
+                except ValueError:
+                    pass
+            elif self.config and self.config.dramatiq:
+                db = self.config.dramatiq.redis_db
+            
+            logger.debug(f"Using Redis DB: {db} from URL: {redis_url}")
+            
             return redis.Redis(
                 host=parsed.hostname or 'localhost',
                 port=parsed.port or 6379,
-                db=self.config.dramatiq.redis_db if self.config else 1,
+                db=db,
                 password=parsed.password,
                 socket_timeout=5
             )

django_cfg/modules/django_unfold/callbacks/actions.py

@@ -6,7 +6,7 @@ import logging
 from typing import List
 
 from ..models.dashboard import QuickAction
-from ..icons import Icons
+from django_cfg.modules.django_admin.icons import Icons
 from .base import get_user_admin_urls
 
 logger = logging.getLogger(__name__)

django_cfg/modules/django_unfold/callbacks/statistics.py

@@ -12,7 +12,7 @@ from django.contrib.auth import get_user_model
 from django.apps import apps
 
 from ..models.dashboard import StatCard
-from ..icons import Icons
+from django_cfg.modules.django_admin.icons import Icons
 
 logger = logging.getLogger(__name__)
 

django_cfg/modules/django_unfold/dashboard.py

@@ -9,7 +9,7 @@ from typing import List, Dict, Any, Optional
 from django.templatetags.static import static
 from django.urls import reverse_lazy
 from ..base import BaseCfgModule
-from .icons import Icons
+from django_cfg.modules.django_admin.icons import Icons
 from .models.navigation import NavigationSection, NavigationItem
 from .models.dashboard import StatCard, StatsCardsWidget
 
@@ -176,29 +176,30 @@ class DashboardManager(BaseCfgModule):
                 
                 # Always show basic admin models (even if payments functionality is disabled)
                 payments_items.extend([
-                    NavigationItem(title="Payments", icon=Icons.ACCOUNT_BALANCE, link="/admin/payments/universalpayment/"),
+                    NavigationItem(title="Universal Payments", icon=Icons.ACCOUNT_BALANCE, link="/admin/payments/universalpayment/"),
                     NavigationItem(title="Currencies", icon=Icons.CURRENCY_BITCOIN, link="/admin/payments/currency/"),
-                    NavigationItem(title="Currency Networks", icon=Icons.LINK, link="/admin/payments/network/"),
+                    NavigationItem(title="Networks", icon=Icons.LINK, link="/admin/payments/network/"),
                     NavigationItem(title="Provider Currencies", icon=Icons.ACCOUNT_CIRCLE, link="/admin/payments/providercurrency/"),
                 ])
                 
                 # Add advanced features only if payments functionality is enabled
                 if config.enabled:
-                    payments_items.append(
-                        NavigationItem(title="Webhook Dashboard", icon=Icons.WEBHOOK, link="/cfg/admin/django_cfg_payments/admin/webhooks/")
-                    )
-                    payments_items.append(
-                        NavigationItem(title="Create Payment", icon=Icons.ADD, link="/cfg/admin/django_cfg_payments/admin/payments/create/")
-                    )
-                    payments_items.append(
-                        NavigationItem(title="Currency Converter", icon=Icons.CURRENCY_EXCHANGE, link="/cfg/admin/django_cfg_payments/admin/tools/converter/")
-                    )
+                    # payments_items.append(
+                    #     NavigationItem(title="Webhook Dashboard", icon=Icons.WEBHOOK, link="/cfg/admin/django_cfg_payments/admin/webhooks/")
+                    # )
+                    # payments_items.append(
+                    #     NavigationItem(title="Create Payment", icon=Icons.ADD, link="/cfg/admin/django_cfg_payments/admin/payments/create/")
+                    # )
+                    # payments_items.append(
+                    #     NavigationItem(title="Currency Converter", icon=Icons.CURRENCY_EXCHANGE, link="/cfg/admin/django_cfg_payments/admin/tools/converter/")
+                    # )
                     
                     # Show subscription features only if enabled
                     if config.show_subscription_management():
                         payments_items.extend([
                             NavigationItem(title="Subscriptions", icon=Icons.PERSON_ADD, link="/admin/payments/subscription/"),
                             NavigationItem(title="Tariffs", icon=Icons.PRICE_CHANGE, link="/admin/payments/tariff/"),
+                            NavigationItem(title="Tariff Endpoint Groups", icon=Icons.GROUP, link="/admin/payments/tariffendpointgroup/"),
                         ])
                     
                     # Show API management only if enabled
@@ -223,7 +224,7 @@ class DashboardManager(BaseCfgModule):
                 # Fallback
                 payments_items = [
                     NavigationItem(title="Payment Dashboard", icon=Icons.DASHBOARD, link="/cfg/admin/django_cfg_payments/admin/"),
-                    NavigationItem(title="Payments", icon=Icons.ACCOUNT_BALANCE, link="/admin/payments/universalpayment/"),
+                    NavigationItem(title="Universal Payments", icon=Icons.ACCOUNT_BALANCE, link="/admin/payments/universalpayment/"),
                 ]
             
             navigation_sections.append(NavigationSection(

django_cfg/modules/django_unfold/models/config.py

@@ -10,7 +10,7 @@ from ...base import BaseCfgModule
 from .navigation import NavigationSection
 from .dropdown import SiteDropdownItem
 from .tabs import TabConfiguration
-from ..icons import Icons
+from django_cfg.modules.django_admin.icons import Icons
 import logging
 
 logger = logging.getLogger(__name__)

django_cfg/registry/core.py

@@ -35,6 +35,9 @@ CORE_REGISTRY = {
     # Limits models
     "LimitsConfig": ("django_cfg.models.limits", "LimitsConfig"),
     
+    # API Keys models
+    "ApiKeys": ("django_cfg.models.api_keys", "ApiKeys"),
+    
     # JWT models
     "JWTConfig": ("django_cfg.models.jwt", "JWTConfig"),
     
@@ -42,16 +45,11 @@ CORE_REGISTRY = {
     "TaskConfig": ("django_cfg.models.tasks", "TaskConfig"),
     "DramatiqConfig": ("django_cfg.models.tasks", "DramatiqConfig"),
     
-    # Payment system models
+    # Payment system models (BaseCfgAutoModule)
     "PaymentsConfig": ("django_cfg.models.payments", "PaymentsConfig"),
-    "PaymentProviderConfig": ("django_cfg.models.payments", "PaymentProviderConfig"),
-    "NowPaymentsConfig": ("django_cfg.models.payments", "NowPaymentsConfig"),
-    "CryptAPIConfig": ("django_cfg.models.payments", "CryptAPIConfig"),
-    "StripeConfig": ("django_cfg.models.payments", "StripeConfig"),
-    "create_nowpayments_config": ("django_cfg.models.payments", "create_nowpayments_config"),
-    "create_cryptapi_config": ("django_cfg.models.payments", "create_cryptapi_config"),
-    "create_stripe_config": ("django_cfg.models.payments", "create_stripe_config"),
-    "create_cryptomus_config": ("django_cfg.models.payments", "create_cryptomus_config"),
+    "ProviderAPIKeysConfig": ("django_cfg.models.payments", "ProviderAPIKeysConfig"),
+    "BaseProviderConfig": ("django_cfg.models.payments", "BaseProviderConfig"),
+    "NowPaymentsProviderConfig": ("django_cfg.models.payments", "NowPaymentsProviderConfig"),
     
     # Pagination classes
     "DefaultPagination": ("django_cfg.middleware.pagination", "DefaultPagination"),

django_cfg/registry/third_party.py

@@ -47,6 +47,6 @@ THIRD_PARTY_REGISTRY = {
     "NgrokTunnelConfig": ("django_cfg.models.ngrok", "NgrokTunnelConfig"),
     
     # Material Icons
-    "Icons": ("django_cfg.modules.django_unfold.icons", "Icons"),
-    "IconCategories": ("django_cfg.modules.django_unfold.icons", "IconCategories"),
+    "Icons": ("django_cfg.modules.django_admin.icons", "Icons"),
+    "IconCategories": ("django_cfg.modules.django_admin.icons", "IconCategories"),
 }

{django_cfg-1.3.7.dist-info → django_cfg-1.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.3.7
+Version: 1.3.11
 Summary: 🚀 Next-gen Django configuration: type-safety, AI features, blazing-fast setup, and automated best practices — all in one.
 Project-URL: Homepage, https://djangocfg.com
 Project-URL: Documentation, https://docs.djangocfg.com
@@ -60,6 +60,7 @@ Requires-Dist: drf-spectacular<1.0,>=0.28.0
 Requires-Dist: hiredis<4.0,>=2.0.0
 Requires-Dist: loguru<1.0,>=0.7.0
 Requires-Dist: lxml<7.0,>=6.0.0
+Requires-Dist: mypy<2.0.0,>=1.18.2
 Requires-Dist: ngrok>=1.5.1; python_version >= '3.12'
 Requires-Dist: openai<2.0,>=1.107.0
 Requires-Dist: pgvector<1.0,>=0.4.0