Update app.py

app.py

@@ -15,6 +15,7 @@ def download_data(ticker, start_date='2010-01-01'):
     if 'Adj Close' in data.columns:
         data = data[['Date', 'Adj Close']].copy()
         data.rename(columns={'Date': 'ds', 'Adj Close': 'y'}, inplace=True)
+        data['ds'] = pd.to_datetime(data['ds'])  # Ensure 'ds' is datetime type
     else:
         raise ValueError("Expected 'Adj Close' in columns")
     return data
@@ -31,19 +32,18 @@ def predict_future_prices(ticker, periods=1825):
     forecast = model.predict(future)
     
     # 예측 결과 그래프 생성
-    forecast['ds'] = pd.to_datetime(forecast['ds'])  # Ensure 'ds' is datetime type
     fig_main = go.Figure()
-    fig_main.add_trace(go.Scatter(x=forecast['ds'], y=forecast['yhat'], mode='lines', name='Forecast (Blue)'))
     fig_main.add_trace(go.Scatter(x=data['ds'], y=data['y'], mode='lines', name='Actual (Black)', line=dict(color='black')))
+    fig_main.add_trace(go.Scatter(x=forecast['ds'], y=forecast['yhat'], mode='lines', name='Forecast (Blue)'))
     
     # 연간 및 주간 계절성 그래프 생성
-    forecast['ds'] = forecast['ds'].dt.strftime('%Y-%m-%d')  # Formatting for display
+    # 임시로 matplotlib 플롯 반환을 비활성화하고 결과만 반환
     fig_seasonal = model.plot_components(forecast)
-    forecast['ds'] = pd.to_datetime(forecast['ds'])  # Revert to datetime type for proper handling in Prophet components
-    
-    fig_yearly = px.line(x=pd.to_datetime(fig_seasonal[0]['ds']), y=fig_seasonal[0]['yearly'], labels={'x': 'Date', 'y': 'Yearly Trend'})
-    fig_weekly = px.line(x=fig_seasonal[1]['day'], y=fig_seasonal[1]['weekly'], labels={'x': 'Day of Week', 'y': 'Weekly Trend'})
+    forecast['ds'] = pd.to_datetime(forecast['ds'])  # Revert to datetime type to avoid AttributeError
     
+    fig_yearly = px.line(x=pd.to_datetime(forecast['ds']), y=forecast['yearly'], labels={'x': 'Date', 'y': 'Yearly Trend'})
+    fig_weekly = px.line(x=pd.to_datetime(forecast['ds']), y=forecast['weekly'], labels={'x': 'Date', 'y': 'Weekly Trend'})
+
     return fig_main, forecast[['ds', 'yhat', 'yhat_lower', 'yhat_upper']], fig_yearly, fig_weekly
 
 # Gradio 인터페이스 설정 및 실행