news sentiment combine

app.py

@@ -303,6 +303,51 @@ class TradingApp:
         self.data = self.analyzer.get_historical_data(self.analyzer.symbols)
         self.auto_trade_log = []  # Store automatic trade actions
 
+    def get_newsapi_sentiment_and_headlines(self, symbol):
+        """Get sentiment and headlines using NewsAPI for a symbol."""
+        sentiment_result = None
+        article_headlines = []
+        try:
+            sentiment_dict = self.sentiment.get_news_sentiment([symbol])
+            sentiment_result = sentiment_dict.get(symbol)
+            articles = self.sentiment.newsapi.get_everything(q=symbol, language='en', sort_by='publishedAt', page=1)
+            article_headlines = [a['title'] for a in articles.get('articles', [])[:5]]
+        except Exception as e:
+            logger.error(f"NewsAPI sentiment/headlines error for {symbol}: {e}")
+        return sentiment_result, article_headlines
+
+    def get_yfinance_sentiment_and_headlines(self, symbol):
+        """Get sentiment and headlines using yfinance for a symbol."""
+        sentiment_result = None
+        article_headlines = []
+        try:
+            ticker = yf.Ticker(symbol)
+            news_items = ticker.news if hasattr(ticker, "news") else []
+            article_headlines = [item.get('title') for item in news_items[:5] if item.get('title')]
+            # Use VADER on yfinance headlines if available
+            if article_headlines:
+                compound_score = 0
+                for title in article_headlines:
+                    score = self.sentiment.sia.polarity_scores(title)['compound']
+                    compound_score += score
+                avg_score = compound_score / len(article_headlines)
+                if avg_score > 0.1:
+                    sentiment_result = 'Positive'
+                elif avg_score < -0.1:
+                    sentiment_result = 'Negative'
+                else:
+                    sentiment_result = 'Neutral'
+        except Exception as e:
+            logger.error(f"yfinance sentiment/headlines error for {symbol}: {e}")
+        return sentiment_result, article_headlines
+
+    def get_combined_sentiment_and_headlines(self, symbol):
+        """Try NewsAPI first, fallback to yfinance if needed."""
+        sentiment_result, article_headlines = self.get_newsapi_sentiment_and_headlines(symbol)
+        if not article_headlines:
+            sentiment_result, article_headlines = self.get_yfinance_sentiment_and_headlines(symbol)
+        return sentiment_result, article_headlines
+
     def display_charts(self):
         # Dynamically adjust columns based on number of stocks and available width
         symbols = list(self.data.keys())
@@ -357,32 +402,12 @@ class TradingApp:
             st.header("Manual Trade")
             symbol = st.text_input('Enter stock symbol')
 
-            # --- Sentiment Check Feature (moved up) ---
+            # --- Sentiment Check Feature (refactored) ---
             sentiment_result = None
             article_headlines = []
             if st.button("Check Sentiment"):
                 if symbol:
-                    try:
-                        # Use NewsSentiment to get sentiment
-                        sentiment_dict = self.sentiment.get_news_sentiment([symbol])
-                        sentiment_result = sentiment_dict.get(symbol)
-                        # Try NewsAPI headlines first, fallback to yfinance if fails
-                        try:
-                            articles = self.sentiment.newsapi.get_everything(q=symbol, language='en', sort_by='publishedAt', page=1)
-                            article_headlines = [a['title'] for a in articles.get('articles', [])[:5]]
-                            if not article_headlines:
-                                raise Exception("No NewsAPI headlines")
-                        except Exception:
-                            # Fallback to yfinance headlines
-                            try:
-                                ticker = yf.Ticker(symbol)
-                                news_items = ticker.news if hasattr(ticker, "news") else []
-                                article_headlines = [item.get('title') for item in news_items[:5] if item.get('title')]
-                            except Exception:
-                                article_headlines = []
-                    except Exception as e:
-                        sentiment_result = None
-                        article_headlines = []
+                    sentiment_result, article_headlines = self.get_combined_sentiment_and_headlines(symbol)
                 else:
                     sentiment_result = None
                     article_headlines = []
@@ -458,6 +483,26 @@ class TradingApp:
                 else:
                     st.error("Please enter a valid stock symbol and trade details.")
 
+            # Display portfolio information in the sidebar (restored)
+            st.header("Alpaca Cash Portfolio")
+
+            def refresh_portfolio():
+                account = self.alpaca.alpaca.get_account()
+                portfolio_data = {
+                    "Metric": ["Cash Balance", "Buying Power", "Equity", "Portfolio Value"],
+                    "Value": [
+                        f"${int(float(account.cash)):,.0f}",
+                        f"${int(float(account.buying_power)):,.0f}",
+                        f"${int(float(account.equity)):,.0f}",
+                        f"${int(float(account.portfolio_value)):,.0f}"
+                    ]
+                }
+                df = pd.DataFrame(portfolio_data)
+                st.table(df.to_dict(orient="records"))  # Convert DataFrame to a list of dictionaries
+
+            refresh_portfolio()
+            st.button("Refresh Portfolio", on_click=refresh_portfolio)
+
     def auto_trade_based_on_sentiment(self, sentiment):
         """Execute trades based on sentiment analysis and return actions taken."""
         actions = self._execute_sentiment_trades(sentiment)
@@ -470,6 +515,9 @@ class TradingApp:
         actions = []
         symbol_to_name = self.analyzer.symbol_to_name
         for symbol, sentiment_value in sentiment.items():
+            # Use refactored sentiment logic for each symbol
+            if sentiment_value is None or sentiment_value not in ['Positive', 'Negative', 'Neutral']:
+                sentiment_value, _ = self.get_combined_sentiment_and_headlines(symbol)
             action = None
             is_market_open = self.alpaca.get_market_status()
             if sentiment_value == 'Positive':
@@ -556,7 +604,7 @@ def get_market_times(alpaca_api):
 
 def main():
     st.title("Ben's Stock Trading Application")
-    st.markdown("This is a fun stock trading application that uses Alpaca API for trading and News API for sentiment analysis. Come and trade my money! Well, it's a paper account, so it's not real money. But still, have fun!")
+    st.markdown("This is a fun stock trading application that uses a combination of key frameworks like Alpaca API, yfinance, and News API for stock information and trading. Come and trade my money! Well, it's a paper account, so it's not real money. But still, have fun!")
 
     if not st.secrets['ALPACA_API_KEY'] or not st.secrets['NEWS_API_KEY']:
         st.error("Please configure your ALPACA_API_KEY and NEWS_API_KEY")