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

django_cfg/modules/django_currency/core/converter.py

@@ -5,9 +5,9 @@ Main currency converter with intelligent routing.
 import logging
 from typing import Optional
 
-from .models import Rate, ConversionRequest, ConversionResult, SupportedCurrencies, YFinanceCurrencies, CoinGeckoCurrencies
+from .models import Rate, ConversionRequest, ConversionResult
 from .exceptions import ConversionError, CurrencyNotFoundError
-from ..clients import YFinanceClient, CoinGeckoClient
+from ..clients import YahooFinanceClient, CoinPaprikaClient
 from ..utils.cache import CacheManager
 
 logger = logging.getLogger(__name__)
@@ -23,8 +23,8 @@ class CurrencyConverter:
         Args:
             cache_ttl: Cache TTL in seconds
         """
-        self.yfinance = YFinanceClient()
-        self.coingecko = CoinGeckoClient()
+        self.yahoo = YahooFinanceClient(cache_ttl=cache_ttl)
+        self.coinpaprika = CoinPaprikaClient(cache_ttl=cache_ttl)
         self.cache = CacheManager(ttl=cache_ttl)
         
     def convert(self, amount: float, from_currency: str, to_currency: str) -> ConversionResult:
@@ -95,28 +95,28 @@ class CurrencyConverter:
             CurrencyNotFoundError: If no provider supports the pair
         """
         # Try cache first
-        for source in ["yfinance", "coingecko"]:
+        for source in ["yahoo", "coinpaprika"]:
             cached_rate = self.cache.get_rate(base, quote, source)
             if cached_rate:
                 return cached_rate
         
-        # Try YFinance first (good for fiat and major crypto)
-        if self.yfinance.supports_pair(base, quote):
+        # Try CoinPaprika first (excellent for crypto, no rate limits)
+        if self.coinpaprika.supports_pair(base, quote):
             try:
-                rate = self.yfinance.fetch_rate(base, quote)
+                rate = self.coinpaprika.fetch_rate(base, quote)
                 self.cache.set_rate(rate)
                 return rate
             except Exception as e:
-                logger.warning(f"YFinance failed for {base}/{quote}: {e}")
+                logger.warning(f"CoinPaprika failed for {base}/{quote}: {e}")
         
-        # Try CoinGecko (good for crypto)
-        if self.coingecko.supports_pair(base, quote):
+        # Try Yahoo Finance next (good for fiat and major forex pairs)
+        if self.yahoo.supports_pair(base, quote):
             try:
-                rate = self.coingecko.fetch_rate(base, quote)
+                rate = self.yahoo.fetch_rate(base, quote)
                 self.cache.set_rate(rate)
                 return rate
             except Exception as e:
-                logger.warning(f"CoinGecko failed for {base}/{quote}: {e}")
+                logger.warning(f"Yahoo Finance failed for {base}/{quote}: {e}")
         
         # Try indirect conversion via USD
         if base != "USD" and quote != "USD":
@@ -156,14 +156,9 @@ class CurrencyConverter:
             rate=combined_rate
         )
     
-    def get_supported_currencies(self) -> SupportedCurrencies:
+    def get_supported_currencies(self) -> dict:
         """Get list of supported currencies by provider."""
-        return SupportedCurrencies(
-            yfinance=YFinanceCurrencies(
-                fiat=list(self.yfinance.get_fiat_currencies())
-            ),
-            coingecko=CoinGeckoCurrencies(
-                crypto=list(self.coingecko.get_crypto_ids().keys()),
-                vs_currencies=list(self.coingecko.get_vs_currencies())
-            )
-        )
+        return {
+            "yahoo": self.yahoo.get_all_supported_currencies(),
+            "coinpaprika": self.coinpaprika.get_all_supported_currencies()
+        }

django_cfg/modules/django_currency/core/models.py

@@ -1,16 +1,16 @@
 """
-Simple data models for currency conversion.
+Data models for currency conversion and API responses.
 """
 
 from datetime import datetime
-from typing import Optional, List, Set
-from pydantic import BaseModel, Field
+from typing import Optional, List, Set, Dict, Any
+from pydantic import BaseModel, Field, RootModel
 
 
 class Rate(BaseModel):
     """Currency exchange rate model."""
     
-    source: str = Field(description="Data source (yfinance, coingecko)")
+    source: str = Field(description="Data source (yahoo, coinpaprika)")
     base_currency: str = Field(description="Base currency code")
     quote_currency: str = Field(description="Quote currency code") 
     rate: float = Field(description="Exchange rate")
@@ -34,21 +34,132 @@ class ConversionResult(BaseModel):
     path: Optional[str] = Field(default=None, description="Conversion path if indirect")
 
 
-class YFinanceCurrencies(BaseModel):
-    """YFinance supported currencies model."""
+class YahooFinanceCurrencies(BaseModel):
+    """Yahoo Finance supported currencies model."""
     
     fiat: List[str] = Field(description="Supported fiat currencies")
 
 
-class CoinGeckoCurrencies(BaseModel):
-    """CoinGecko supported currencies model."""
+class CoinPaprikaCurrencies(BaseModel):
+    """CoinPaprika supported currencies model."""
     
     crypto: List[str] = Field(description="Supported cryptocurrencies")
-    vs_currencies: List[str] = Field(description="Supported quote currencies")
 
 
 class SupportedCurrencies(BaseModel):
     """All supported currencies model."""
     
-    yfinance: YFinanceCurrencies = Field(description="YFinance currencies")
-    coingecko: CoinGeckoCurrencies = Field(description="CoinGecko currencies")
+    yahoo: YahooFinanceCurrencies = Field(description="Yahoo Finance currencies")
+    coinpaprika: CoinPaprikaCurrencies = Field(description="CoinPaprika currencies")
+
+
+# ============================================================================
+# API RESPONSE MODELS
+# ============================================================================
+
+class YahooFinanceTradingPeriod(BaseModel):
+    """Yahoo Finance trading period."""
+    start: int
+    end: int
+    timezone: str
+    gmtoffset: int
+
+
+class YahooFinanceCurrentTradingPeriod(BaseModel):
+    """Yahoo Finance current trading period."""
+    pre: YahooFinanceTradingPeriod
+    regular: YahooFinanceTradingPeriod
+    post: YahooFinanceTradingPeriod
+
+
+class YahooFinanceMeta(BaseModel):
+    """Yahoo Finance chart meta data."""
+    currency: str
+    symbol: str
+    exchangeName: str
+    fullExchangeName: str
+    instrumentType: str
+    firstTradeDate: int
+    regularMarketTime: int
+    hasPrePostMarketData: bool
+    gmtoffset: int
+    timezone: str
+    exchangeTimezoneName: str
+    regularMarketPrice: float
+    fiftyTwoWeekHigh: Optional[float] = None
+    fiftyTwoWeekLow: Optional[float] = None
+    regularMarketDayHigh: Optional[float] = None
+    regularMarketDayLow: Optional[float] = None
+    regularMarketVolume: Optional[int] = None
+    longName: Optional[str] = None
+    shortName: Optional[str] = None
+    chartPreviousClose: Optional[float] = None
+    previousClose: Optional[float] = None
+    scale: Optional[int] = None
+    priceHint: Optional[int] = None
+    currentTradingPeriod: Optional[YahooFinanceCurrentTradingPeriod] = None
+    tradingPeriods: Optional[List[List[YahooFinanceTradingPeriod]]] = None
+    dataGranularity: Optional[str] = None
+    range: Optional[str] = None
+    validRanges: Optional[List[str]] = None
+
+
+class YahooFinanceResult(BaseModel):
+    """Yahoo Finance chart result."""
+    meta: YahooFinanceMeta
+
+
+class YahooFinanceChart(BaseModel):
+    """Yahoo Finance chart response."""
+    result: List[YahooFinanceResult]
+    error: Optional[str] = None
+
+
+class YahooFinanceResponse(BaseModel):
+    """Complete Yahoo Finance API response."""
+    chart: YahooFinanceChart
+
+
+class CoinPaprikaQuoteUSD(BaseModel):
+    """CoinPaprika USD quote data."""
+    price: float
+    volume_24h: Optional[float] = None
+    volume_24h_change_24h: Optional[float] = None
+    market_cap: Optional[float] = None
+    market_cap_change_24h: Optional[float] = None
+    percent_change_15m: Optional[float] = None
+    percent_change_30m: Optional[float] = None
+    percent_change_1h: Optional[float] = None
+    percent_change_6h: Optional[float] = None
+    percent_change_12h: Optional[float] = None
+    percent_change_24h: Optional[float] = None
+    percent_change_7d: Optional[float] = None
+    percent_change_30d: Optional[float] = None
+    percent_change_1y: Optional[float] = None
+    ath_price: Optional[float] = None
+    ath_date: Optional[str] = None
+    percent_from_price_ath: Optional[float] = None
+
+
+class CoinPaprikaQuotes(BaseModel):
+    """CoinPaprika quotes container."""
+    USD: CoinPaprikaQuoteUSD
+
+
+class CoinPaprikaTicker(BaseModel):
+    """CoinPaprika ticker data."""
+    id: str
+    name: str
+    symbol: str
+    rank: int
+    total_supply: Optional[float] = None
+    max_supply: Optional[float] = None
+    beta_value: Optional[float] = None
+    first_data_at: Optional[str] = None
+    last_updated: str
+    quotes: CoinPaprikaQuotes
+
+
+class CoinPaprikaTickersResponse(RootModel):
+    """CoinPaprika tickers response (list of tickers)."""
+    root: List[CoinPaprikaTicker]

django_cfg/modules/django_currency/database/__init__.py

@@ -5,8 +5,8 @@ Database utilities for currency management.
 from .database_loader import (
     CurrencyDatabaseLoader,
     DatabaseLoaderConfig,
-    CoinGeckoCoinInfo,
-    YFinanceCurrencyInfo,
+    CoinPaprikaCoinInfo,
+    YahooFinanceCurrencyInfo,
     CurrencyRateInfo,
     RateLimiter,
     create_database_loader,
@@ -16,8 +16,8 @@ from .database_loader import (
 __all__ = [
     'CurrencyDatabaseLoader',
     'DatabaseLoaderConfig', 
-    'CoinGeckoCoinInfo',
-    'YFinanceCurrencyInfo',
+    'CoinPaprikaCoinInfo',
+    'YahooFinanceCurrencyInfo',
     'CurrencyRateInfo',
     'RateLimiter',
     'create_database_loader',