fix data downloader

portfolio_calculator.py

@@ -40,27 +40,21 @@ MAX_TICKERS = 20
     retry=retry_if_exception_type((ConnectionError, TimeoutError)),  # Only retry on network errors
     reraise=True
 )
-def _fetch_with_retry(ticker_obj, method: str, period: str = "1y"):
+def _fetch_with_retry(ticker_obj, period: str):
     """
     Internal function with retry logic for fetching data.
 
+    IMPORTANT: Only uses 'period' parameter (not start/end dates) to avoid
+    yfinance timezone request that incorrectly handles 429 errors.
+
     Args:
         ticker_obj: yfinance Ticker object
-        method: Which method to use ('period', 'short', 'dates')
-        period: Time period
+        period: Time period (e.g., '1y', '6mo', '3mo', '1mo')
 
     Returns:
         Historical data or None
     """
-    if method == 'period':
-        return ticker_obj.history(period=period)
-    elif method == 'short':
-        return ticker_obj.history(period="6mo")
-    else:  # dates
-        import datetime
-        end_date = datetime.datetime.now()
-        start_date = end_date - datetime.timedelta(days=365)
-        return ticker_obj.history(start=start_date, end=end_date)
+    return ticker_obj.history(period=period)
 
 
 def fetch_single_ticker(ticker: str, period: str = "1y") -> Tuple[str, Optional[pd.Series], Optional[str]]:
@@ -70,9 +64,12 @@ def fetch_single_ticker(ticker: str, period: str = "1y") -> Tuple[str, Optional[
     This function runs in a separate process for parallel execution.
     Uses tenacity for exponential backoff and ratelimit for request throttling.
 
+    IMPORTANT: Only uses 'period' parameter (not start/end dates) to avoid
+    yfinance timezone request that incorrectly handles 429 errors.
+
     Args:
         ticker: Ticker symbol
-        period: Time period for historical data
+        period: Time period for historical data (default: '1y')
 
     Returns:
         Tuple of (ticker, price_series, error_message)
@@ -81,35 +78,26 @@ def fetch_single_ticker(ticker: str, period: str = "1y") -> Tuple[str, Optional[
         # Create fresh Ticker object in this process
         ticker_obj = yf.Ticker(ticker)
 
-        # Try Method 1: Standard period with retry logic
-        try:
-            hist = _fetch_with_retry(ticker_obj, 'period', period)
-            if not hist.empty:
-                logger.info(f"✅ {ticker}: Fetched {len(hist)} days (method: period)")
-                return ticker, hist['Close'], None
-        except Exception as e:
-            logger.warning(f"⚠️ {ticker}: Method 1 failed - {str(e)}")
-
-        # Try Method 2: Shorter period
-        try:
-            hist = _fetch_with_retry(ticker_obj, 'short', period)
-            if not hist.empty:
-                logger.info(f"✅ {ticker}: Fetched {len(hist)} days (method: short)")
-                return ticker, hist['Close'], None
-        except Exception as e:
-            logger.warning(f"⚠️ {ticker}: Method 2 failed - {str(e)}")
-
-        # Try Method 3: Explicit dates (most reliable)
-        try:
-            hist = _fetch_with_retry(ticker_obj, 'dates', period)
-            if not hist.empty:
-                logger.info(f"✅ {ticker}: Fetched {len(hist)} days (method: dates)")
-                return ticker, hist['Close'], None
-        except Exception as e:
-            logger.warning(f"⚠️ {ticker}: Method 3 failed - {str(e)}")
-
-        # All methods failed
-        logger.error(f"❌ {ticker}: All methods exhausted")
+        # Fallback periods to try (from longest to shortest)
+        # Avoid 'max' as it may trigger timezone request
+        periods_to_try = [period, '6mo', '3mo', '1mo']
+
+        for idx, try_period in enumerate(periods_to_try, 1):
+            try:
+                hist = _fetch_with_retry(ticker_obj, try_period)
+                if not hist.empty and len(hist) > 0:
+                    logger.info(f"✅ {ticker}: Fetched {len(hist)} days (period: {try_period})")
+                    return ticker, hist['Close'], None
+            except Exception as e:
+                logger.warning(f"⚠️ {ticker}: Period '{try_period}' failed - {str(e)}")
+                if idx == len(periods_to_try):
+                    # Last attempt failed
+                    logger.error(f"❌ {ticker}: All periods exhausted")
+                    return ticker, None, f"All periods failed. Last error: {str(e)}"
+                # Continue to next period
+
+        # All periods failed
+        logger.error(f"❌ {ticker}: No data available after trying all periods")
         return ticker, None, "No data available after all retry attempts"
 
     except Exception as e: