Update app.py

app.py

@@ -1,16 +1,14 @@
 import streamlit as st
-import yfinance as yf
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 import pandas as pd
 import twstock
 from datetime import datetime, timedelta
 
-def plot_stock_data(stock_symbols, period='1y'):
+def plot_stock_data(stock_symbols):
     """
     繪製股票價格圖表
     :param stock_symbols: 股票代號列表
-    :param period: 時間區間
     :return: Plotly figure
     """
     # 創建子圖
@@ -26,13 +24,28 @@ def plot_stock_data(stock_symbols, period='1y'):
     for idx, symbol in enumerate(stock_symbols, 1):
         try:
             # 獲取股票數據
-            stock = yf.Ticker(symbol)
-            df = stock.history(period=period)
+            stock = twstock.Stock(symbol)
+            recent_data = stock.fetch_31()  # 抓取最近 31 天的交易數據
 
-            if df.empty:
+            if not recent_data:
                 st.warning(f"無法找到 {symbol} 的股票數據")
                 continue
 
+            # 準備繪圖數據
+            df = pd.DataFrame([
+                {
+                    "Date": data.date,
+                    "Open": data.open,
+                    "High": data.high,
+                    "Low": data.low,
+                    "Close": data.close,
+                    "Volume": data.transaction
+                }
+                for data in recent_data
+            ])
+            df['Date'] = pd.to_datetime(df['Date'])
+            df.set_index('Date', inplace=True)
+
             # 添加蠟燭圖
             fig.add_trace(
                 go.Candlestick(
@@ -59,7 +72,7 @@ def plot_stock_data(stock_symbols, period='1y'):
             )
 
             # 添加移動平均線
-            for ma_days in [5, 20, 60]:
+            for ma_days in [5, 20]:
                 ma = df['Close'].rolling(window=ma_days).mean()
                 fig.add_trace(
                     go.Scatter(
@@ -136,15 +149,8 @@ def main():
         # 股票代碼輸入
         stock_input = st.text_input(
             "股票代號 (用逗號分隔)",
-            value="2330.TW,2454.TW",
-            placeholder="例如: 2330.TW,2454.TW"
-        )
-        
-        # 時間區間選擇
-        period_select = st.selectbox(
-            "選擇時間區間",
-            ["1mo", "3mo", "6mo", "1y", "2y", "5y", "max"],
-            index=3  # 預設為 1y
+            value="2330,2454",
+            placeholder="例如: 2330,2454"
         )
 
     # 股票分析頁籤
@@ -155,10 +161,9 @@ def main():
         if st.button("繪製股價走勢圖"):
             # 處理股票代號
             stocks = [s.strip() for s in stock_input.split(',')]
-            stocks = [f"{s}.TW" if not s.endswith('.TW') and s.isdigit() else s for s in stocks]
             
             # 創建圖表
-            fig = plot_stock_data(stocks, period_select)
+            fig = plot_stock_data(stocks)
             st.plotly_chart(fig, use_container_width=True)
 
     with tab2: