Update app.py

app.py

@@ -4,8 +4,7 @@ import requests
 import pytz
 import yaml
 from tools.final_answer import FinalAnswerTool
-import yfinance as yf
-from typing import Any, Optional
+#import yfinance as yf
 
 from Gradio_UI import GradioUI
 
@@ -40,46 +39,94 @@ final_answer = FinalAnswerTool()
 
 
 @tool
-def get_current_stock_price(ticker_symbol: str) -> Optional[dict]:
+import requests
+import logging
+from typing import Optional, Dict, Any
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
+
+
+def get_current_stock_price(ticker_symbol: str) -> Optional[Dict[str, Any]]:
     """
-    Get the latest stock price for the given ticker symbol and calculates
-    the price change over the last 5 days and retrun current stock price , 
-    price change and percentage change. 
+    Get the latest stock price for the given ticker symbol by querying Yahoo Finance directly,
+    then calculate the price change over the last 5 days (percentage and absolute).
+
     Args:
         ticker_symbol: The stock ticker symbol to fetch the price for.
+
     Returns:
-        price -> dict: A dictionary containing the current stock price, the price change
-              over the last 5 days, and the percentage change. 
-              Returns None if there's an error or no data is available.
+        A dictionary containing:
+            - "price"                : current closing price (float)
+            - "price_change"         : absolute change over 5 days (float)
+            - "price_change_percent" : percent change over 5 days (float)
+
+        If there's an error or no data is available, returns a dict with an "error" key, e.g.
+            {"error": "No historical data available for TSLA"}
+        Or returns None for unexpected issues.
     """
     try:
-        # Fetch stock data
-        stock = yf.Ticker(ticker_symbol)
-        stock_data = stock.history(period="5d")  # Fetch data for the last 5 days
-        
-        if stock_data.empty:
-            return {"error": f"No historical data available for {ticker_symbol}"}
-        
-        # Get the current price (last close price)
-        current_price = stock_data['Close'].iloc[-1]
-        
-        # Calculate the price change over the last 5 days
-        price_change = current_price - stock_data['Close'].iloc[0]
-        price_change_percent = (price_change / stock_data['Close'].iloc[0]) * 100
-
-        # Round all values to 2 decimal places
-        price =  {
+        # Build the Yahoo Finance “chart” API URL for the last 5 calendar days.
+        url = f"https://query1.finance.yahoo.com/v8/finance/chart/{ticker_symbol}"
+        params = {
+            "range": "5d",
+            "interval": "1d",
+            # We only need daily closes, so the default interval=1d is fine.
+        }
+
+        resp = requests.get(url, params=params, timeout=10)
+        resp.raise_for_status()
+        data = resp.json()
+
+        # Drill into the JSON structure:
+        #   data["chart"]["result"][0]["indicators"]["quote"][0]["close"]
+        chart = data.get("chart", {})
+        if not chart or chart.get("error"):
+            return {"error": f"Yahoo Finance returned an error for {ticker_symbol}."}
+
+        result_list = chart.get("result", [])
+        if not result_list:
+            return {"error": f"No chart result found for {ticker_symbol}."}
+
+        quote_section = result_list[0].get("indicators", {}).get("quote", [])
+        if not quote_section:
+            return {"error": f"No quote information in chart for {ticker_symbol}."}
+
+        closes = quote_section[0].get("close", [])
+        # The “close” array may contain nulls if the market was closed on a given day.
+        # Filter out any None values:
+        closes = [c for c in closes if (c is not None)]
+
+        if len(closes) < 2:
+            return {"error": f"Not enough close‐price data (need at least 2 days) for {ticker_symbol}."}
+
+        # The “closes” list is chronological; last element is the most recent closing price:
+        first_price = closes[0]
+        current_price = closes[-1]
+
+        # Calculate changes:
+        price_change = current_price - first_price
+        price_change_percent = (price_change / first_price) * 100 if first_price != 0 else 0.0
+
+        # Round everything to two decimals:
+        return {
             "price": round(current_price, 2),
             "price_change": round(price_change, 2),
-            "price_change_percent": round(price_change_percent, 2)
+            "price_change_percent": round(price_change_percent, 2),
         }
-        return price 
 
-    except yf.exceptions.YFinanceException as yf_err:
-        logger.error(f"YFinance error for {ticker_symbol}: {str(yf_err)}")
+    except requests.HTTPError as http_err:
+        logger.error(f"HTTP error while fetching {ticker_symbol} data: {http_err}")
+        return {"error": f"HTTPError fetching data for {ticker_symbol}: {http_err}"}
+    except requests.RequestException as req_err:
+        logger.error(f"Request exception for {ticker_symbol}: {req_err}")
+        return {"error": f"RequestException fetching data for {ticker_symbol}: {req_err}"}
+    except (KeyError, IndexError, ValueError) as parse_err:
+        logger.error(f"Parsing error for {ticker_symbol}: {parse_err}")
+        return {"error": f"Parsing error for {ticker_symbol}: {parse_err}"}
     except Exception as e:
-        logger.error(f"Unexpected error fetching price for {ticker_symbol}: {str(e)}")
-    return None
+        logger.error(f"Unexpected error fetching price for {ticker_symbol}: {e}")
+        return None
 
 final_answer = FinalAnswerTool()