diff --git a/stock_monitor.py b/stock_monitor.py index 98ba9bb..7d8c479 100644 --- a/stock_monitor.py +++ b/stock_monitor.py @@ -40,14 +40,14 @@ def send_coin_telegram_message(message_list, header): def buy_ticker(symbole, data): try: - BUY_AMOUNT = 5000 + BUY_AMOUNT = 6000 if data['buy_signal'].iloc[-1] == 'movingaverage': BUY_AMOUNT = 50000 elif data['buy_signal'].iloc[-1] == 'deviation40': - BUY_AMOUNT = 6000 + BUY_AMOUNT = 7000 elif data['buy_signal'].iloc[-1] == 'deviation240': - BUY_AMOUNT = 5000 + BUY_AMOUNT = 6000 _ = hts.buyCoinMarket(symbole, BUY_AMOUNT) except Exception as e: @@ -322,6 +322,7 @@ def get_coin_some_data(symbol, interval): saved_data = get_coin_saved_data(symbol, interval, data) data = pd.concat([data, saved_data, data_1.iloc[[-1]]], ignore_index=True) + #data = pd.concat([data, saved_data], ignore_index=True) data['datetime'] = pd.to_datetime(data['datetime'], format='%Y-%m-%d %H:%M:%S') data = data.set_index('datetime') data = data.sort_index() @@ -373,8 +374,8 @@ def monitor_us_stocks(): recent_data = check_buy_point(data) # Changed to check_buy_point if recent_data['buy_point'].iloc[-1] != 1: continue - print(f" - {US_STOCKS[symbol]} ({symbol}): {recent_data['Close'][-1]:.2f}") - message_list.append(format_message('US', symbol, US_STOCKS[symbol], recent_data['Close'][-1], recent_data['buy_signal'][-1])) + print(f" - {US_STOCKS[symbol]} ({symbol}): {recent_data['Close'].iloc[-1]:.2f}") + message_list.append(format_message('US', symbol, US_STOCKS[symbol], recent_data['Close'].iloc[-1], recent_data['buy_signal'].iloc[-1])) except Exception as e: print(f"Error processing data for {symbol}: {str(e)}") time.sleep(0.5) @@ -404,8 +405,8 @@ def monitor_kr_stocks(): recent_data = check_buy_point(data) # Changed to check_buy_point if recent_data['buy_point'].iloc[-1] != 1: continue - print(f" - {KR_ETFS[symbol]} ({symbol}): {recent_data['Close'][-1]:.2f}") - message_list.append(format_message('KR', symbol, KR_ETFS[symbol], recent_data['Close'][-1])) + print(f" - {KR_ETFS[symbol]} ({symbol}): {recent_data['Close'].iloc[-1]:.2f}") + message_list.append(format_message('KR', symbol, KR_ETFS[symbol], recent_data['Close'].iloc[-1], recent_data['buy_signal'].iloc[-1])) except Exception as e: print(f"Error processing data for {symbol}: {str(e)}") @@ -444,8 +445,8 @@ def monitor_coins(): recent_data = check_buy_point(data) # Changed to check_buy_point if recent_data['buy_point'].iloc[-1] != 1: continue - print(f" - {KR_COINS[symbol]} ({symbol}): {recent_data['Close'][-1]:.2f}") - message_list.append(format_message('COIN', symbol, KR_COINS[symbol], recent_data['Close'][-1], recent_data['buy_signal'][-1])) + print(f" - {KR_COINS[symbol]} ({symbol}): {recent_data['Close'].iloc[-1]:.2f}") + message_list.append(format_message('COIN', symbol, KR_COINS[symbol], recent_data['Close'].iloc[-1], recent_data['buy_signal'].iloc[-1])) # buy buy_ticker(symbol, recent_data) @@ -465,20 +466,6 @@ def monitor_coins(): return -# ---------------------- -# Turnaround Detector v6 -# ---------------------- - -def detect_turnaround_signal(symbol, data, interval=0, params=None): - if len(data) < 7: - return None - - # 이동평균을 기반으로 매수 신호 결정 - cur = data.iloc[-1] - prev = data.iloc[-2] - - return None - def run_schedule(): # 코인 모니터링 스케줄 (매시간 1분, 11분, 21분, 31분, 41분, 51분) @@ -501,5 +488,4 @@ def run_schedule(): if __name__ == "__main__": - #run_schedule() - monitor_coins() + run_schedule()