benjamin5607 commited on
Commit
7b1f98a
·
verified ·
1 Parent(s): 17c53c6

Update streamlit_app.py

Browse files
Files changed (1) hide show
  1. streamlit_app.py +23 -70
streamlit_app.py CHANGED
@@ -20,56 +20,32 @@ else:
20
  st.stop()
21
 
22
  # ==============================================================================
23
- # 🕵️ [생존 기술] 웹 검색으로 가격 강제 추출 (Last Resort)
24
  # ==============================================================================
25
  def scrape_price_from_web(name, ticker):
26
- """
27
- 야후/FDR 모두 실패했을 때, 검색 엔진을 돌려서 가격을 텍스트에서 뜯어냄.
28
- """
29
  try:
30
  with DDGS() as ddgs:
31
- # 검색어: "Vinamilk stock price today"
32
  query = f"{name} {ticker} stock price quote today"
33
  results = ddgs.text(query, max_results=3)
34
-
35
- # 검색 결과 텍스트 합치기
36
  text_blob = " ".join([r['body'] for r in results])
37
-
38
- # 정규표현식으로 숫자 찾기 (간단한 로직)
39
- # 예: "trading at 45,000" 또는 "Price: 123.45"
40
- # (정밀도는 AI보다 낮지만 속도를 위해 정규식 사용)
41
- # 베트남 동(VND) 같은 큰 숫자나 소수점 숫자 매칭
42
  match = re.search(r'(\d{1,3}(,\d{3})*(\.\d+)?)', text_blob)
43
-
44
  if match:
45
- price_str = match.group(0)
46
- # 쉼표 제거 후 float 변환 시도
47
- try:
48
- price = float(price_str.replace(",", ""))
49
- return price, 0.0 # 등락률은 찾기 어려우므로 0으로 둠
50
- except: pass
51
-
52
  return None, None
53
- except:
54
- return None, None
55
 
56
  # ==============================================================================
57
- # 🛠️ [핵심 엔진] 3단계 데이터 수집 (FDR -> Yahoo -> Web)
58
  # ==============================================================================
59
  def get_price_data_robust(ticker, name):
60
- """
61
- 1. FDR (Investing.com/Naver) -> 베트남/한국에 강력
62
- 2. Yahoo (미국/일본에 강력)
63
- 3. Web Search (최후의 수단)
64
- """
65
- # [1단계] FinanceDataReader (동남아/한국 우선)
66
  try:
67
  fdr_symbol = ticker
68
- if ".VN" in ticker: fdr_symbol = ticker.split('.')[0] # 베트남 (HOSE)
69
- elif ".JK" in ticker: fdr_symbol = f"IDX:{ticker.split('.')[0]}" # 인도네시아
70
- elif ".KS" in ticker or ".KQ" in ticker: fdr_symbol = ticker.split('.')[0] # 한국
71
 
72
- # 최근 5일치만 가져옴 (속도 최적화)
73
  hist = fdr.DataReader(fdr_symbol, start=(datetime.datetime.now() - datetime.timedelta(days=10)))
74
  if not hist.empty:
75
  curr = hist['Close'].iloc[-1]
@@ -78,10 +54,9 @@ def get_price_data_robust(ticker, name):
78
  return curr, pct, "FDR"
79
  except: pass
80
 
81
- # [2단계] Yahoo Finance (미국/일본 우선)
82
  try:
83
  stock = yf.Ticker(ticker)
84
- # fast_info가 더 빠름
85
  price = stock.fast_info.last_price
86
  prev = stock.fast_info.previous_close
87
  if price and prev:
@@ -89,22 +64,20 @@ def get_price_data_robust(ticker, name):
89
  return price, pct, "Yahoo"
90
  except: pass
91
 
92
- # [3단계] 최후의 수단: 웹 검색 (Qwen이 시킨 검색)
93
- # 차트 데이터는 없지만 스캐너 빈칸은 채워야 함
94
  price, pct = scrape_price_from_web(name, ticker)
95
- if price is not None:
96
- return price, pct if pct else 0.0, "Web Search 🕵️"
97
 
98
  return None, None, "Fail"
99
 
100
  # ==============================================================================
101
- # 🧠 [엔진 1] AI 지능형 검색
102
  # ==============================================================================
103
  def identify_target_with_ai(user_query):
104
  try:
105
  prompt = f"""
106
  [ROLE] Financial Entity Resolver. [QUERY] "{user_query}"
107
- [TASK] Identify company, ticker, and news keyword.
108
  [OUTPUT JSON] {{ "name": "English Name", "ticker": "TICKER", "search_keyword": "Keyword" }}
109
  """
110
  messages = [{"role": "user", "content": prompt}]
@@ -113,7 +86,6 @@ def identify_target_with_ai(user_query):
113
  return json.loads(content)
114
  except: return None
115
 
116
- # 뉴스 검색
117
  def get_news(keyword):
118
  summary = ""
119
  try:
@@ -127,7 +99,7 @@ def parse_stream(stream):
127
  for chunk in stream:
128
  if chunk.choices: yield chunk.choices[0].delta.content or ""
129
 
130
- # 차트 (분석용)
131
  def get_chart_data(ticker):
132
  try:
133
  fdr_symbol = ticker
@@ -135,8 +107,7 @@ def get_chart_data(ticker):
135
  elif ".JK" in ticker: fdr_symbol = f"IDX:{ticker.split('.')[0]}"
136
  start = (datetime.datetime.now() - datetime.timedelta(days=90)).strftime('%Y-%m-%d')
137
  hist = fdr.DataReader(fdr_symbol, start)
138
- if not hist.empty:
139
- return hist.rename(columns={'Close':'Close', 'Open':'Open', 'High':'High', 'Low':'Low'}), "FDR"
140
  except: pass
141
  try:
142
  hist = yf.Ticker(ticker).history(period="3mo")
@@ -144,7 +115,7 @@ def get_chart_data(ticker):
144
  except: pass
145
  return pd.DataFrame(), "None"
146
 
147
- # 시각화 함수
148
  def plot_candle_chart(hist, title, source):
149
  fig = go.Figure(data=[go.Candlestick(x=hist.index, open=hist['Open'], high=hist['High'], low=hist['Low'], close=hist['Close'], name="Price")])
150
  fig.update_layout(title=f"{title} ({source})", height=350, margin=dict(l=10, r=10, t=30, b=10), template="plotly_dark", paper_bgcolor='rgba(0,0,0,0)')
@@ -159,7 +130,6 @@ def plot_bar_chart(df):
159
  # ==============================================================================
160
  # 💾 [데이터]
161
  # ==============================================================================
162
- # 매핑 데이터 (스캐너 표시용)
163
  TICKER_NAMES = {
164
  "AAPL": "Apple", "NVDA": "NVIDIA", "TSLA": "Tesla", "AMZN": "Amazon", "MSFT": "Microsoft",
165
  "005930.KS": "Samsung Elec", "000660.KS": "SK Hynix", "207940.KS": "Samsung Bio",
@@ -203,7 +173,7 @@ if menu == "🔍 AI 스마트 검색":
203
  name, ticker, key = info.get('name'), info.get('ticker'), info.get('search_keyword')
204
  st.info(f"타겟: **{name} ({ticker})** | 키워드: {key}")
205
 
206
- h, src = get_chart_data(ticker) # 차트용 데이터
207
  news = get_news(key)
208
 
209
  curr, pct = "N/A", 0
@@ -212,7 +182,6 @@ if menu == "🔍 AI 스마트 검색":
212
  pct = ((curr - h['Close'].iloc[-2])/h['Close'].iloc[-2])*100
213
  status.update(label="✅ 분석 완료", state="complete", expanded=False)
214
  else:
215
- # 차트 없으면 웹 검색 시도
216
  c_web, p_web, s_web = get_price_data_robust(ticker, name)
217
  if c_web:
218
  curr, pct, src = c_web, p_web, s_web
@@ -237,11 +206,9 @@ if menu == "🔍 AI 스마트 검색":
237
  st.write_stream(parse_stream(stream))
238
  else: st.error("인식 실패")
239
 
240
- # --- 2. 글로벌 시장 스캐너 (Total War Mode) ---
241
  elif menu == "📡 글로벌 시장 스캐너":
242
- st.subheader("📡 글로벌 시장 전광판 (Total War Mode)")
243
- st.caption("야후 -> FDR -> 웹 검색 3단계를 거쳐 빈칸 없이 데이터를 채웁니다. (속도가 조금 느릴 수 있습니다)")
244
-
245
  c1, c2 = st.columns([3, 1])
246
  with c1: target = st.selectbox("국가", list(MARKET_SAMPLES.keys()))
247
  with c2: scan = st.button("스캔 시작")
@@ -249,16 +216,10 @@ elif menu == "📡 글로벌 시장 스캐너":
249
  if scan:
250
  tickers = MARKET_SAMPLES[target]
251
  results = []
252
-
253
- # 프로그레스 바
254
  bar = st.progress(0)
255
- status_text = st.empty()
256
 
257
  for i, t in enumerate(tickers):
258
  name_display = TICKER_NAMES.get(t, t)
259
- status_text.text(f"Scanning {name_display} ({t})...")
260
-
261
- # [핵심] 3단계 집요한 데이터 수집 함수 호출
262
  price, pct, src = get_price_data_robust(t, name_display)
263
 
264
  if price is not None:
@@ -267,24 +228,16 @@ elif menu == "📡 글로벌 시장 스캐너":
267
  'Ticker': t,
268
  'Price': price,
269
  'Change(%)': pct,
270
- 'Source': src # 출처도 기록 (FDR, Yahoo, Web...)
271
  })
272
- else:
273
- # 정말 아무리 뒤져도 없으면 N/A로라도 표시
274
- results.append({'Name': name_display, 'Ticker': t, 'Price': 0, 'Change(%)': 0, 'Source': 'Fail'})
275
-
276
  bar.progress((i+1)/len(tickers))
277
 
278
- status_text.empty()
279
-
280
  if results:
281
  df = pd.DataFrame(results).sort_values('Change(%)', ascending=False)
282
-
283
- # 히트맵
284
  st.plotly_chart(plot_bar_chart(df), use_container_width=True)
285
 
286
- # 표시할 컬럼 정리
287
- disp_cols = ['Name', 'Price', 'Change(%)', 'Source']
288
 
289
  c_up, c_down = st.columns(2)
290
  with c_up:
 
20
  st.stop()
21
 
22
  # ==============================================================================
23
+ # 🕵️ [생존 기술] 웹 검색으로 가격 강제 추출
24
  # ==============================================================================
25
  def scrape_price_from_web(name, ticker):
 
 
 
26
  try:
27
  with DDGS() as ddgs:
 
28
  query = f"{name} {ticker} stock price quote today"
29
  results = ddgs.text(query, max_results=3)
 
 
30
  text_blob = " ".join([r['body'] for r in results])
 
 
 
 
 
31
  match = re.search(r'(\d{1,3}(,\d{3})*(\.\d+)?)', text_blob)
 
32
  if match:
33
+ price = float(match.group(0).replace(",", ""))
34
+ return price, 0.0
 
 
 
 
 
35
  return None, None
36
+ except: return None, None
 
37
 
38
  # ==============================================================================
39
+ # 🛠️ [핵심 엔진] 3단계 데이터 수집
40
  # ==============================================================================
41
  def get_price_data_robust(ticker, name):
42
+ # 1. FDR
 
 
 
 
 
43
  try:
44
  fdr_symbol = ticker
45
+ if ".VN" in ticker: fdr_symbol = ticker.split('.')[0]
46
+ elif ".JK" in ticker: fdr_symbol = f"IDX:{ticker.split('.')[0]}"
47
+ elif ".KS" in ticker or ".KQ" in ticker: fdr_symbol = ticker.split('.')[0]
48
 
 
49
  hist = fdr.DataReader(fdr_symbol, start=(datetime.datetime.now() - datetime.timedelta(days=10)))
50
  if not hist.empty:
51
  curr = hist['Close'].iloc[-1]
 
54
  return curr, pct, "FDR"
55
  except: pass
56
 
57
+ # 2. Yahoo
58
  try:
59
  stock = yf.Ticker(ticker)
 
60
  price = stock.fast_info.last_price
61
  prev = stock.fast_info.previous_close
62
  if price and prev:
 
64
  return price, pct, "Yahoo"
65
  except: pass
66
 
67
+ # 3. Web Search
 
68
  price, pct = scrape_price_from_web(name, ticker)
69
+ if price is not None: return price, pct if pct else 0.0, "Web Search 🕵️"
 
70
 
71
  return None, None, "Fail"
72
 
73
  # ==============================================================================
74
+ # 🧠 [엔진] AI 검색 및 뉴스
75
  # ==============================================================================
76
  def identify_target_with_ai(user_query):
77
  try:
78
  prompt = f"""
79
  [ROLE] Financial Entity Resolver. [QUERY] "{user_query}"
80
+ [TASK] Identify company, ticker, news keyword.
81
  [OUTPUT JSON] {{ "name": "English Name", "ticker": "TICKER", "search_keyword": "Keyword" }}
82
  """
83
  messages = [{"role": "user", "content": prompt}]
 
86
  return json.loads(content)
87
  except: return None
88
 
 
89
  def get_news(keyword):
90
  summary = ""
91
  try:
 
99
  for chunk in stream:
100
  if chunk.choices: yield chunk.choices[0].delta.content or ""
101
 
102
+ # 차���용 데이터 수집
103
  def get_chart_data(ticker):
104
  try:
105
  fdr_symbol = ticker
 
107
  elif ".JK" in ticker: fdr_symbol = f"IDX:{ticker.split('.')[0]}"
108
  start = (datetime.datetime.now() - datetime.timedelta(days=90)).strftime('%Y-%m-%d')
109
  hist = fdr.DataReader(fdr_symbol, start)
110
+ if not hist.empty: return hist.rename(columns={'Close':'Close', 'Open':'Open', 'High':'High', 'Low':'Low'}), "FDR"
 
111
  except: pass
112
  try:
113
  hist = yf.Ticker(ticker).history(period="3mo")
 
115
  except: pass
116
  return pd.DataFrame(), "None"
117
 
118
+ # 시각화
119
  def plot_candle_chart(hist, title, source):
120
  fig = go.Figure(data=[go.Candlestick(x=hist.index, open=hist['Open'], high=hist['High'], low=hist['Low'], close=hist['Close'], name="Price")])
121
  fig.update_layout(title=f"{title} ({source})", height=350, margin=dict(l=10, r=10, t=30, b=10), template="plotly_dark", paper_bgcolor='rgba(0,0,0,0)')
 
130
  # ==============================================================================
131
  # 💾 [데이터]
132
  # ==============================================================================
 
133
  TICKER_NAMES = {
134
  "AAPL": "Apple", "NVDA": "NVIDIA", "TSLA": "Tesla", "AMZN": "Amazon", "MSFT": "Microsoft",
135
  "005930.KS": "Samsung Elec", "000660.KS": "SK Hynix", "207940.KS": "Samsung Bio",
 
173
  name, ticker, key = info.get('name'), info.get('ticker'), info.get('search_keyword')
174
  st.info(f"타겟: **{name} ({ticker})** | 키워드: {key}")
175
 
176
+ h, src = get_chart_data(ticker)
177
  news = get_news(key)
178
 
179
  curr, pct = "N/A", 0
 
182
  pct = ((curr - h['Close'].iloc[-2])/h['Close'].iloc[-2])*100
183
  status.update(label="✅ 분석 완료", state="complete", expanded=False)
184
  else:
 
185
  c_web, p_web, s_web = get_price_data_robust(ticker, name)
186
  if c_web:
187
  curr, pct, src = c_web, p_web, s_web
 
206
  st.write_stream(parse_stream(stream))
207
  else: st.error("인식 실패")
208
 
209
+ # --- 2. 글로벌 시장 스캐너 ---
210
  elif menu == "📡 글로벌 시장 스캐너":
211
+ st.subheader("📡 글로벌 시장 전광판")
 
 
212
  c1, c2 = st.columns([3, 1])
213
  with c1: target = st.selectbox("국가", list(MARKET_SAMPLES.keys()))
214
  with c2: scan = st.button("스캔 시작")
 
216
  if scan:
217
  tickers = MARKET_SAMPLES[target]
218
  results = []
 
 
219
  bar = st.progress(0)
 
220
 
221
  for i, t in enumerate(tickers):
222
  name_display = TICKER_NAMES.get(t, t)
 
 
 
223
  price, pct, src = get_price_data_robust(t, name_display)
224
 
225
  if price is not None:
 
228
  'Ticker': t,
229
  'Price': price,
230
  'Change(%)': pct,
231
+ 'Source': src
232
  })
 
 
 
 
233
  bar.progress((i+1)/len(tickers))
234
 
 
 
235
  if results:
236
  df = pd.DataFrame(results).sort_values('Change(%)', ascending=False)
 
 
237
  st.plotly_chart(plot_bar_chart(df), use_container_width=True)
238
 
239
+ # [수정됨] 이제 Ticker 컬럼이 포함됩니다!
240
+ disp_cols = ['Name', 'Ticker', 'Price', 'Change(%)', 'Source']
241
 
242
  c_up, c_down = st.columns(2)
243
  with c_up: