alpaca news

app.py

@@ -129,10 +129,20 @@ class NewsSentiment:
         self.newsapi = NewsApiClient(api_key=API_KEY)
         self.sia = SentimentIntensityAnalyzer()
         self.alpha_vantage_api_key = st.secrets.get("ALPHA_VANTAGE_API_KEY")
+        # Try to get Alpaca API for news fallback
+        try:
+            self.alpaca_api = alpaca.REST(
+                st.secrets.get("ALPACA_API_KEY"),
+                st.secrets.get("ALPACA_SECRET_KEY"),
+                "https://paper-api.alpaca.markets"
+            )
+        except Exception as e:
+            logger.error(f"Could not initialize Alpaca API for news fallback: {e}")
+            self.alpaca_api = None
 
     def get_sentiment_and_headlines(self, symbol):
         """
-        Try NewsAPI first, fallback to Alpha Vantage if needed.
+        Try NewsAPI first, fallback to Alpha Vantage, then Alpaca news if needed.
         Returns (sentiment, headlines, source, avg_score).
         """
         # Try NewsAPI
@@ -151,28 +161,40 @@ class NewsSentiment:
 
         # Fallback to Alpha Vantage
         try:
-            if not self.alpha_vantage_api_key:
-                logger.error("Alpha Vantage API key not found in Streamlit secrets.")
-                return None, [], "AlphaVantage", None
-            import requests
-            url = (
-                f"https://www.alphavantage.co/query?function=NEWS_SENTIMENT&tickers={symbol}"
-                f"&apikey={self.alpha_vantage_api_key}"
-            )
-            resp = requests.get(url)
-            data = resp.json()
-            headlines = [item.get("title") for item in data.get("feed", [])[:5] if item.get("title")]
-            if headlines:
-                sentiment, avg_score = self._calculate_sentiment(headlines, return_score=True)
-                logger.info(f"Alpha Vantage sentiment for {symbol}: {sentiment} | Headlines: {headlines}")
-                return sentiment, headlines, "AlphaVantage", avg_score
-            else:
-                logger.warning(f"Alpha Vantage returned no headlines for {symbol}.")
+            if self.alpha_vantage_api_key:
+                import requests
+                url = (
+                    f"https://www.alphavantage.co/query?function=NEWS_SENTIMENT&tickers={symbol}"
+                    f"&apikey={self.alpha_vantage_api_key}"
+                )
+                resp = requests.get(url)
+                data = resp.json()
+                headlines = [item.get("title") for item in data.get("feed", [])[:5] if item.get("title")]
+                if headlines:
+                    sentiment, avg_score = self._calculate_sentiment(headlines, return_score=True)
+                    logger.info(f"Alpha Vantage sentiment for {symbol}: {sentiment} | Headlines: {headlines}")
+                    return sentiment, headlines, "AlphaVantage", avg_score
+                else:
+                    logger.warning(f"Alpha Vantage returned no headlines for {symbol}.")
         except Exception as e:
             logger.error(f"Alpha Vantage error for {symbol}: {e}")
 
+        # Fallback to Alpaca News API
+        try:
+            if self.alpaca_api:
+                news_items = self.alpaca_api.get_news(symbol, limit=5)
+                headlines = [item.headline for item in news_items if hasattr(item, "headline")]
+                if headlines:
+                    sentiment, avg_score = self._calculate_sentiment(headlines, return_score=True)
+                    logger.info(f"Alpaca News sentiment for {symbol}: {sentiment} | Headlines: {headlines}")
+                    return sentiment, headlines, "AlpacaNews", avg_score
+                else:
+                    logger.warning(f"Alpaca News returned no headlines for {symbol}.")
+        except Exception as e:
+            logger.error(f"Alpaca News error for {symbol}: {e}")
+
         logger.info(
-            f"No sentiment/headlines available for {symbol} from either NewsAPI or Alpha Vantage."
+            f"No sentiment/headlines available for {symbol} from NewsAPI, Alpha Vantage, or Alpaca News."
         )
         return None, [], None, None
 
@@ -205,12 +227,12 @@ class NewsSentiment:
                     sentiment[symbol] = (s, "NewsAPI")
                 else:
                     # fallback to Alpha Vantage
-                    s, _, src = self.get_sentiment_and_headlines(symbol)
+                    s, _, src, _ = self.get_sentiment_and_headlines(symbol)
                     sentiment[symbol] = (s, src)
             except Exception as e:
                 logger.error(f"Error getting news for {symbol}: {e}")
                 # fallback to Alpha Vantage
-                s, _, src = self.get_sentiment_and_headlines(symbol)
+                s, _, src, _ = self.get_sentiment_and_headlines(symbol)
                 sentiment[symbol] = (s, src)
         return sentiment