Update models/technical_analysis.py

models/technical_analysis.py

@@ -6,31 +6,53 @@ import ta
 class EnhancedTechnicalAnalysis:
     def __init__(self, data: pd.DataFrame):
         self.data = data.copy()
-    
+        # Ensure the data is properly formatted
+        self.data.set_index('Date', inplace=True)
+        
     def calculate_all_indicators(self) -> pd.DataFrame:
         """Calculate all technical indicators."""
-        # Trend Indicators
-        self.data['SMA_20'] = ta.trend.sma_indicator(self.data['Close'], window=20)
-        self.data['SMA_50'] = ta.trend.sma_indicator(self.data['Close'], window=50)
-        self.data['EMA_20'] = ta.trend.ema_indicator(self.data['Close'], window=20)
-        self.data['MACD'] = ta.trend.MACD(self.data['Close']).macd()
-        self.data['MACD_Signal'] = ta.trend.MACD(self.data['Close']).macd_signal()
-        
-        # Momentum Indicators
-        self.data['RSI'] = ta.momentum.RSIIndicator(self.data['Close']).rsi()
-        self.data['Stoch'] = ta.momentum.StochasticOscillator(
-            self.data['High'], self.data['Low'], self.data['Close']
-        ).stoch()
-        
-        # Volatility Indicators
-        bb = ta.volatility.BollingerBands(self.data['Close'])
-        self.data['BB_Upper'] = bb.bollinger_hband()
-        self.data['BB_Lower'] = bb.bollinger_lband()
-        self.data['BB_Middle'] = bb.bollinger_mavg()
-        
-        # Volume Indicators
-        self.data['OBV'] = ta.volume.OnBalanceVolumeIndicator(
-            self.data['Close'], self.data['Volume']
-        ).on_balance_volume()
-        
-        return self.data
+        try:
+            # Ensure we're working with float values
+            self.data['Close'] = pd.to_numeric(self.data['Close'], errors='coerce')
+            self.data['High'] = pd.to_numeric(self.data['High'], errors='coerce')
+            self.data['Low'] = pd.to_numeric(self.data['Low'], errors='coerce')
+            self.data['Volume'] = pd.to_numeric(self.data['Volume'], errors='coerce')
+            
+            # Trend Indicators
+            self.data['SMA_20'] = ta.trend.sma_indicator(close=self.data['Close'].values, window=20)
+            self.data['SMA_50'] = ta.trend.sma_indicator(close=self.data['Close'].values, window=50)
+            self.data['EMA_20'] = ta.trend.ema_indicator(close=self.data['Close'].values, window=20)
+            
+            macd = ta.trend.MACD(close=self.data['Close'].values)
+            self.data['MACD'] = macd.macd()
+            self.data['MACD_Signal'] = macd.macd_signal()
+            
+            # Momentum Indicators
+            self.data['RSI'] = ta.momentum.RSIIndicator(close=self.data['Close'].values).rsi()
+            self.data['Stoch'] = ta.momentum.StochasticOscillator(
+                high=self.data['High'].values,
+                low=self.data['Low'].values,
+                close=self.data['Close'].values
+            ).stoch()
+            
+            # Volatility Indicators
+            bb = ta.volatility.BollingerBands(close=self.data['Close'].values)
+            self.data['BB_Upper'] = bb.bollinger_hband()
+            self.data['BB_Lower'] = bb.bollinger_lband()
+            self.data['BB_Middle'] = bb.bollinger_mavg()
+            
+            # Volume Indicators
+            self.data['OBV'] = ta.volume.OnBalanceVolumeIndicator(
+                close=self.data['Close'].values,
+                volume=self.data['Volume'].values
+            ).on_balance_volume()
+            
+            # Reset index to include Date column
+            self.data.reset_index(inplace=True)
+            
+            return self.data
+            
+        except Exception as e:
+            print(f"Error calculating indicators: {str(e)}")
+            # Return original data if calculation fails
+            return self.data