-
Notifications
You must be signed in to change notification settings - Fork 36
Expand file tree
/
Copy pathtelegram_commands.py
More file actions
833 lines (680 loc) Β· 47.2 KB
/
Copy pathtelegram_commands.py
File metadata and controls
833 lines (680 loc) Β· 47.2 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
# ==========================================================
# FILE: telegram_commands.py
# ==========================================================
# π¨ VERIFIED: [μ΅μ’
무결μ νμ ] 5λ νλ² λ° 48λ μ£μ§ μΌμ΄μ€ μλ²½ κ²°μ κ΅μ°¨ κ²μ¦ μλ£.
# π¨ MODIFIED: [μ 1νλ² μ² μ μ€μ] λ¬λ ₯ API(mcal) μ€μΊ μ ννΈνλ νΈμΆλ§μ μκ°νκ³ , GlobalThrottle.wait_api_sync()λ₯Ό κ°μ μ£Όμ
νμ¬ μ¬λλ§ νλ μλ²½ μ°¨λ¨.
# π¨ MODIFIED: [μμΈ μΆμ μμ€ν
λ½μ¨] /record λͺ
λ Ήμ΄ μ€ν μ KIS μλ² ν΅μ μ₯μ μ μ νν μμΈ(Endpoint λ° Timeout λ±)μ ν
λ κ·Έλ¨ UIλ‘ μ§μ νμΆνλλ‘ μλ¬ νμ± λ‘μ§ μ λ©΄ ν©νΈ κ΅μ μλ£.
# π¨ MODIFIED: [2μ°¨ μ€μΈ ν¨λ¬λ
μ€(False Alarm) λΆκ΄΄ μ°¨λ¨] `/add_q` λ° `/clear_q` μλ μ‘°μ μ, μ§ν μ€μΈ μ¬λΌμ΄μ± μ§μμ(`vrev_slice_state`, `vrev_aftermarket_state`)λ₯Ό os.remove()λ‘ λ¬Όλ¦¬μ μμ νλ λ§Ήλ
μ± λ‘μ§μ μꡬ μκ°. λμ `hijacked=True`μΈ λΉ μ§μμλ₯Ό μμμ μΌλ‘ λ°μ νμ¬ VWAP μ€μΌμ€λ¬μ μ€μΈ μλ¬ νμ μ 100% μμ² λ΄μ μλ£.
# π¨ NEW: [μ€λ λ ν κ³ κ°(Thread Leak) κΆκ·Ή μμ ] νμ KIS ν΅μ μ§μ°(μ΅λ 35μ΄) μ μμ `wait_for`κ° 10~15μ΄ λ§μ μ½λ£¨ν΄μ μ·¨μμμΌ λ°μνλ 'μ’λΉ μ€λ λ λμ λ° κ΅μ°©(Deadlock)' λμ°Έμ¬λ₯Ό μμ² λ΄μνκΈ° μν΄, λͺ¨λ λΉλκΈ° I/O λνΌμ νμμμμ 45.0μ΄λ‘ μν₯ ν©νΈ νλ μΊ‘ν μλ£.
# ==========================================================
import logging
import datetime
import math
import os
import json
import asyncio
import time
import html
import functools
import glob
import tempfile # π¨ NEW: μμμ μ°κΈ°μ© λͺ¨λ κ²°μ
import yfinance as yf
import pandas_market_calendars as mcal
from zoneinfo import ZoneInfo
from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
from telegram.ext import ContextTypes
import telegram.error
from scheduler_core import get_budget_allocation
from telegram_avwap_console import AvwapConsolePlugin
from plugin_updater import SystemUpdater
from global_throttle import GlobalThrottle # π¨ NEW: μ€μ ν΅μ μ κ²°μ
class TelegramCommands:
def __init__(self, config, broker, strategy, queue_ledger, sync_engine, view, tx_lock):
self.cfg = config
self.broker = broker
self.strategy = strategy
self.queue_ledger = queue_ledger
self.sync_engine = sync_engine
self.view = view
self.tx_lock = tx_lock
def _safe_float(self, val):
try:
f_val = float(str(val or 0.0).replace(',', ''))
if math.isnan(f_val) or math.isinf(f_val):
return 0.0
return f_val
except Exception:
return 0.0
# π¨ MODIFIED: [μ€λ λ ν κ³ κ° λΆκ΄΄ μμ ] 15.0 -> 45.0 κ°μ νλμΊ‘
async def _retry_api(self, func, *args, timeout=45.0, default=None, **kwargs):
for attempt in range(3):
try:
if asyncio.iscoroutinefunction(func):
return await asyncio.wait_for(func(*args, **kwargs), timeout=timeout)
else:
p_func = functools.partial(func, *args, **kwargs)
return await asyncio.wait_for(asyncio.to_thread(p_func), timeout=timeout)
except Exception as e:
if attempt == 2:
func_name = getattr(func, '__name__', 'unknown_func')
logging.debug(f"π¨ API λνΌ μ΅μ’
μ€ν¨ ({func_name}): {e}")
return default
await asyncio.sleep(1.0 * (2 ** attempt))
return default
# π¨ MODIFIED: [μ€λ λ ν κ³ κ° λΆκ΄΄ μμ ] 15.0 -> 45.0 κ°μ νλμΊ‘
async def _safe_reply(self, message_obj, text, timeout=45.0, **kwargs):
if not message_obj: return None
try:
return await asyncio.wait_for(message_obj.reply_text(text, **kwargs), timeout=timeout)
except Exception as e:
logging.error(f"π¨ ν
λ κ·Έλ¨ λ°μ‘ μ€ν¨: {e}")
return None
# π¨ MODIFIED: [μ€λ λ ν κ³ κ° λΆκ΄΄ μμ ] 15.0 -> 45.0 κ°μ νλμΊ‘
async def _safe_edit(self, message_obj, text, timeout=45.0, **kwargs):
if not message_obj: return None
try:
return await asyncio.wait_for(message_obj.edit_text(text, **kwargs), timeout=timeout)
except telegram.error.BadRequest as e:
if "not modified" not in str(e).lower():
logging.warning(f"β οΈ UI κ°±μ μμΈ: {e}")
except Exception as e:
logging.error(f"π¨ ν
λ κ·Έλ¨ μμ μ€ν¨: {e}")
return None
# π¨ MODIFIED: [μ€λ λ ν κ³ κ° λΆκ΄΄ μμ ] 15.0 -> 45.0 κ°μ νλμΊ‘
async def _safe_send(self, context, chat_id, text, timeout=45.0, **kwargs):
if not chat_id: return None
try:
return await asyncio.wait_for(context.bot.send_message(chat_id=chat_id, text=text, **kwargs), timeout=timeout)
except Exception as e:
logging.error(f"π¨ ν
λ κ·Έλ¨ μ μ‘ μ€ν¨: {e}")
return None
def _get_dst_info(self):
est = ZoneInfo('America/New_York')
now_est = datetime.datetime.now(est)
is_dst = now_est.dst() != datetime.timedelta(0)
if is_dst: return (17, "π <b>μλ¨Ένμ μ μ© (Summer)</b>")
else: return (18, "βοΈ <b>μλ¨Ένμ ν΄μ (Winter)</b>")
async def _get_market_status(self):
est = ZoneInfo('America/New_York')
now = datetime.datetime.now(est)
def _fetch_schedule(target_now):
GlobalThrottle.wait_api_sync()
nyse = mcal.get_calendar('NYSE')
return nyse.schedule(start_date=target_now.date(), end_date=target_now.date())
# π¨ MODIFIED: 10.0 -> 45.0
schedule = await self._retry_api(_fetch_schedule, now, timeout=45.0)
if schedule is None or schedule.empty:
if now.weekday() < 5: return "REG", "π₯ μ κ·μ₯ (Fail-Open)"
return "CLOSE", "β μ₯λ§κ°"
market_open = schedule.iloc[0]['market_open'].astimezone(est)
market_close = schedule.iloc[0]['market_close'].astimezone(est)
pre_start = market_open.replace(hour=4, minute=0)
after_end = market_close.replace(hour=20, minute=0)
if pre_start <= now < market_open: return "PRE", "π
ν리λ§μΌ"
elif market_open <= now < market_close: return "REG", "π₯ μ κ·μ₯"
elif market_close <= now < after_end: return "AFTER", "π μ νν°λ§μΌ"
else: return "CLOSE", "β μ₯λ§κ°"
async def cmd_start(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
target_hour, season_icon = self._get_dst_info()
latest_version = await self._retry_api(self.cfg.get_latest_version) or "V14.x"
msg = self.view.get_start_message(target_hour, season_icon, latest_version)
await self._safe_reply(update.effective_message, msg, parse_mode='HTML')
async def cmd_sync(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
chat_id = update.effective_chat.id
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_send(context, chat_id, "π‘οΈ <b>μ₯λΆ λ¬΄κ²°μ± κ²μ¦ λ° λκΈ°ν μ€...</b>", parse_mode='HTML')
async with self.tx_lock:
cash, holdings = 0.0, {}
# π¨ MODIFIED: 15.0 -> 45.0
res = await self._retry_api(self.broker.get_account_balance, timeout=45.0)
if res and (isinstance(res, (list, tuple)) and len(res) > 1 and res[1] is not None):
cash = self._safe_float(res[0]) if len(res) > 0 else 0.0
holdings = res[1] if len(res) > 1 and isinstance(res[1], dict) else {}
else:
await self._safe_edit(status_msg, "β KIS API ν΅μ μ€λ₯λ‘ κ³μ’ μ 보λ₯Ό λΆλ¬μ¬ μ μμ΅λλ€. (get_account_balance ν΅μ μ€ν¨) μ μ ν λ€μ μλν΄μ£ΌμΈμ.")
return
target_hour, _ = self._get_dst_info()
dst_txt = "π μλ¨Ένμ (17:30)" if target_hour == 17 else "βοΈ κ²¨μΈ (18:30)"
status_code, status_text = await self._get_market_status()
tickers = await self._retry_api(self.cfg.get_active_tickers) or []
render_tickers = list(tickers) if isinstance(tickers, list) else []
alloc_res = await self._retry_api(get_budget_allocation, cash, render_tickers, self.cfg)
if alloc_res:
sorted_tickers = alloc_res[0] if isinstance(alloc_res, (list, tuple)) and len(alloc_res) > 0 else render_tickers
allocated_cash = alloc_res[1] if isinstance(alloc_res, (list, tuple)) and len(alloc_res) > 1 else {}
else:
sorted_tickers, allocated_cash = render_tickers, {}
ticker_data_list = []
total_buy_needed = 0.0
app_data = context.bot_data.get('app_data', {})
if not app_data or not isinstance(app_data, dict): app_data = {}
tracking_cache = app_data.get('sniper_tracking', {})
if not isinstance(tracking_cache, dict): tracking_cache = {}
est = ZoneInfo('America/New_York')
now_est = datetime.datetime.now(est)
def _check_schedule(target_now):
GlobalThrottle.wait_api_sync()
nyse = mcal.get_calendar('NYSE')
return nyse.schedule(start_date=target_now.date(), end_date=target_now.date())
schedule = await self._retry_api(_check_schedule, now_est)
is_sniper_active_time = False
if schedule is not None and not schedule.empty:
market_open = schedule.iloc[0]['market_open'].astimezone(est)
if now_est >= market_open + datetime.timedelta(minutes=30):
is_sniper_active_time = True
elif now_est.weekday() < 5 and now_est.time() >= datetime.time(10, 0):
is_sniper_active_time = True
for t in sorted_tickers:
is_avwap_active = False
avwap_status_txt = "OFF"
h = holdings.get(t) if isinstance(holdings.get(t), dict) else {'qty':0, 'avg':0}
curr = self._safe_float(await self._retry_api(self.broker.get_current_price, t, is_market_closed=(status_code == "CLOSE")))
prev_close = self._safe_float(await self._retry_api(self.broker.get_previous_close, t))
ma_5day = self._safe_float(await self._retry_api(self.broker.get_5day_ma, t))
d_hl = await self._retry_api(self.broker.get_day_high_low, t)
day_high, day_low = (self._safe_float(d_hl[0]), self._safe_float(d_hl[1])) if d_hl else (0.0, 0.0)
actual_avg = self._safe_float(h.get('avg', 0.0))
actual_qty = int(self._safe_float(h.get('qty', 0)))
safe_prev_close = prev_close
if status_code in ["AFTER", "CLOSE", "PRE"]:
def get_exact_prev_close(ticker_name):
df = yf.Ticker(ticker_name).history(period="5d", interval="1m", prepost=True, timeout=5)
if not df.empty and 'Close' in df.columns:
tz_est = ZoneInfo('America/New_York')
tz_now = datetime.datetime.now(tz_est)
cutoff_date = tz_now.date()
if tz_now.time() <= datetime.time(16, 0, 30):
cutoff_date -= datetime.timedelta(days=1)
if df.index.tzinfo is None:
df.index = df.index.tz_localize('UTC').tz_convert(tz_est)
else:
df.index = df.index.tz_convert(tz_est)
past_df = df[df.index.date <= cutoff_date].copy()
if not past_df.empty:
past_df['Close'] = past_df['Close'].ffill().bfill()
regular_past = past_df.between_time('09:30', '15:59')
if not regular_past.empty:
val = float(regular_past['Close'].iloc[-1])
else:
val = float(past_df['Close'].iloc[-1])
return val if not math.isnan(val) else None
return None
yf_close = None
for attempt in range(3):
try:
# π¨ MODIFIED: 10.0 -> 45.0
yf_close = await asyncio.wait_for(asyncio.to_thread(get_exact_prev_close, t), timeout=45.0)
break
except Exception:
if attempt == 2: pass
else: await asyncio.sleep(1.0 * (2 ** attempt))
if yf_close and yf_close > 0:
safe_prev_close = yf_close
prev_close = safe_prev_close
if status_code == "CLOSE":
curr = safe_prev_close
idx_ticker = "SOXX" if t == "SOXL" else "QQQ"
dynamic_pct_obj = await self._retry_api(self.broker.get_dynamic_sniper_target, idx_ticker)
dynamic_pct = self._safe_float(getattr(dynamic_pct_obj, 'base_amp', 0.0)) if hasattr(dynamic_pct_obj, 'base_amp') else (8.79 if t == "SOXL" else 4.95)
if dynamic_pct == 0.0: dynamic_pct = (8.79 if t == "SOXL" else 4.95)
tracking_status = tracking_cache.get(t, {}) if isinstance(tracking_cache.get(t), dict) else {}
current_day_high = self._safe_float(tracking_status.get('day_high', day_high))
hybrid_target_price = current_day_high * (1 - (abs(dynamic_pct) / 100.0))
trigger_reason = f"-{abs(dynamic_pct)}%"
is_locked_reg = await self._retry_api(self.cfg.check_lock, t, "REG", default=False)
is_locked_sniper = await self._retry_api(self.cfg.check_lock, t, "SNIPER", default=False)
is_already_ordered = is_locked_reg or is_locked_sniper
ver = await self._retry_api(self.cfg.get_version, t) or "V14"
is_manual_vwap = await self._retry_api(getattr(self.cfg, 'get_manual_vwap_mode', lambda x: False), t, default=False)
cached_snap = None
if ver == "V_REV":
cached_snap = await self._retry_api(self.strategy.v_rev_plugin.load_daily_snapshot, t)
elif ver == "V14":
if is_manual_vwap: cached_snap = await self._retry_api(self.strategy.v14_vwap_plugin.load_daily_snapshot, t)
elif hasattr(self.strategy, 'v14_plugin') and hasattr(self.strategy.v14_plugin, 'load_daily_snapshot'):
cached_snap = await self._retry_api(self.strategy.v14_plugin.load_daily_snapshot, t)
if not isinstance(cached_snap, dict): cached_snap = None
real_val = self._safe_float(getattr(dynamic_pct_obj, 'metric_val', 0.0))
vol_status = "ON" if real_val >= 20.0 else "OFF"
logic_qty = actual_qty
is_zero_start_fact = (actual_qty == 0)
if ver == "V_REV" and getattr(self, 'queue_ledger', None):
q_data_check = await self._retry_api(self.queue_ledger.get_queue, t, default=[])
if isinstance(q_data_check, list):
vrev_ledger_qty_check = sum(int(self._safe_float(item.get("qty"))) for item in q_data_check if isinstance(item, dict))
vrev_ledger_inv = sum(int(self._safe_float(item.get("qty"))) * self._safe_float(item.get("price")) for item in q_data_check if isinstance(item, dict))
actual_qty = vrev_ledger_qty_check
logic_qty = vrev_ledger_qty_check
actual_avg = round(vrev_ledger_inv / vrev_ledger_qty_check, 4) if vrev_ledger_qty_check > 0 else 0.0
if vrev_ledger_qty_check > 0: is_zero_start_fact = False
else: is_zero_start_fact = True
if cached_snap:
if not is_zero_start_fact: pass
else: is_zero_start_fact = bool(cached_snap.get("is_zero_start", True))
jobs = context.job_queue.jobs() if context.job_queue else []
job_data = jobs[0].data if jobs and len(jobs) > 0 and jobs[0].data is not None else {}
regime_data = job_data.get('regime_data') if isinstance(job_data, dict) else None
plan = await self._retry_api(
self.strategy.get_plan, t, curr, actual_avg, logic_qty, safe_prev_close, ma_5day=ma_5day,
market_type="REG", available_cash=allocated_cash.get(t, 0.0),
is_simulation=True, regime_data=regime_data, is_snapshot_mode=False
) or {}
split = await self._retry_api(self.cfg.get_split_count, t, default=40.0)
safe_seed = await self._retry_api(self.cfg.get_seed, t, default=0.0)
t_val = self._safe_float(plan.get('t_val', 0.0))
is_rev = plan.get('is_reverse', False)
v_rev_q_qty, v_rev_q_lots = 0, 0
if ver == "V_REV":
q_list = await self._retry_api(self.queue_ledger.get_queue, t, default=[]) if getattr(self, 'queue_ledger', None) else []
q_list = q_list if isinstance(q_list, list) else []
v_rev_q_lots = len(q_list)
v_rev_q_qty = sum(int(self._safe_float(item.get('qty', 0))) for item in q_list if isinstance(item, dict))
one_portion_cash = safe_seed * 0.15
plan['one_portion'] = one_portion_cash
is_avwap_hybrid_on = await self._retry_api(getattr(self.cfg, 'get_avwap_hybrid_mode', lambda x: False), t, default=False)
if is_avwap_hybrid_on:
is_avwap_active = True
avwap_status_txt = "π κ΄μΈ‘ μ€"
avwap_base_ticker = 'SOXX' if t == 'SOXL' else ('QQQ' if t == 'TQQQ' else t)
avwap_ctx = await self._retry_api(self.strategy.v_avwap_plugin.fetch_macro_context, avwap_base_ticker)
if status_code in ["PRE", "REG"]:
df_1min_base = await self._retry_api(self.broker.get_1min_candles_df, avwap_base_ticker)
base_curr_p = self._safe_float(await self._retry_api(self.broker.get_current_price, avwap_base_ticker))
if hasattr(self.strategy, 'v_avwap_plugin'):
decision = await self._retry_api(
self.strategy.v_avwap_plugin.get_decision,
base_ticker=avwap_base_ticker, exec_ticker=t,
base_curr_p=base_curr_p, exec_curr_p=curr,
df_1min_base=df_1min_base, avwap_qty=0, avwap_alloc_cash=0.0,
now_est=now_est, avwap_state={"strikes": 0, "cooldown_active": False},
context_data=avwap_ctx, is_simulation=True,
amp5=self._safe_float(getattr(dynamic_pct_obj, 'base_amp', 0.0)) if hasattr(dynamic_pct_obj, 'base_amp') else 0.0,
prev_close=safe_prev_close, ma_5day=ma_5day, sortie_mode="SINGLE"
) or {}
if decision:
avwap_status_txt = f"ποΈ κ΄μΈ‘ μ€: {decision.get('reason', 'νμ κ³μ°μ€')}"
upward_sniper_mode_on = await self._retry_api(self.cfg.get_upward_sniper_mode, t, default=False)
target_val = await self._retry_api(self.cfg.get_target_profit, t, default=10.0)
ticker_data_list.append({
'ticker': t, 'version': ver, 't_val': t_val, 'split': split, 'curr': curr, 'avg': actual_avg, 'qty': actual_qty,
'profit_amt': (curr - actual_avg) * actual_qty if actual_qty > 0 else 0,
'profit_pct': (curr - actual_avg) / actual_avg * 100 if actual_avg > 0 else 0,
'upward_sniper': "ON" if upward_sniper_mode_on else "OFF",
'target': target_val, 'star_pct': round(self._safe_float(plan.get('star_ratio', 0.0)) * 100, 2),
'seed': safe_seed, 'one_portion': self._safe_float(plan.get('one_portion', 0.0)), 'plan': plan,
'is_locked': is_already_ordered, 'mode': "REG",
'is_reverse': is_rev, 'star_price': self._safe_float(plan.get('star_price', 0.0)),
'hybrid_target': hybrid_target_price,
'trigger_reason': trigger_reason,
'sniper_trigger': abs(self._safe_float(dynamic_pct)),
'day_high': day_high, 'day_low': day_low,
'prev_close': safe_prev_close,
'tracking_info': tracking_status,
'dynamic_obj': dynamic_pct_obj,
'is_sniper_active_time': is_sniper_active_time,
'vol_weight': round(real_val, 2),
'vol_status': vol_status,
'v_rev_q_lots': v_rev_q_lots,
'v_rev_q_qty': v_rev_q_qty,
'is_manual_vwap': is_manual_vwap,
'is_zero_start': is_zero_start_fact,
'has_snapshot': bool(cached_snap)
})
plan_orders_raw = plan.get('orders', []) if isinstance(plan.get('orders'), list) else []
total_buy_needed += sum(
self._safe_float(o.get('price')) * self._safe_float(o.get('qty'))
for o in plan_orders_raw if isinstance(o, dict) and o.get('side') == 'BUY'
)
surplus = cash - total_buy_needed
rp_amount = surplus * 0.95 if surplus > 0 else 0
def get_exchange_rate():
df = yf.Ticker("KRW=X").history(period="1d", timeout=5.0)
if not df.empty and 'Close' in df.columns and len(df['Close']) > 0:
val = self._safe_float(df['Close'].iloc[-1])
return val if val > 0 else 0.0
return 0.0
exchange_rate = self._safe_float(await self._retry_api(get_exchange_rate, default=0.0))
final_msg, markup = self.view.create_sync_report(
status_text, dst_txt, cash, rp_amount, ticker_data_list,
status_code in ["PRE", "REG"], p_trade_data={}, exchange_rate=exchange_rate
)
await self._safe_edit(status_msg, final_msg, reply_markup=markup, parse_mode='HTML')
async def cmd_record(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
chat_id = update.effective_chat.id
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_send(context, chat_id, "π‘οΈ <b>μ₯λΆ λ¬΄κ²°μ± κ²μ¦ λ° λκΈ°ν μ€...</b>", parse_mode='HTML')
success_tickers = []
locked_tickers = []
error_tickers = []
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
for t in active_tickers:
try:
if status_msg:
await self._safe_edit(status_msg, f"π‘οΈ <b>[{t}] μ₯λΆ λ¬΄κ²°μ± κ²μ¦ μ§ν μ€... (μ΅λ 1~2λΆ μμλ μ μμ΅λλ€)</b>", parse_mode='HTML')
res = await self.sync_engine.process_auto_sync(t, chat_id, context, silent_ledger=True)
if res == "SUCCESS": success_tickers.append(t)
elif res == "LOCKED": locked_tickers.append(t)
else: error_tickers.append(f"{t} ({res})")
except Exception as e:
logging.error(f"π¨ [{t}] κ°λ³ μ’
λͺ© μ₯λΆ λκΈ°ν μ€ μλ¬ (격리): {e}")
error_tickers.append(f"{t} (λ°νμ μμΈ: {str(e)})")
if success_tickers:
async with self.tx_lock:
# π¨ MODIFIED: 15.0 -> 45.0
res = await self._retry_api(self.broker.get_account_balance, timeout=45.0)
holdings = res[1] if res and len(res) > 1 and isinstance(res[1], dict) else {}
for idx, t in enumerate(success_tickers):
try:
if idx == 0:
await self.sync_engine._display_ledger(t, chat_id, context, message_obj=status_msg, pre_fetched_holdings=holdings)
else:
await self.sync_engine._display_ledger(t, chat_id, context, message_obj=None, pre_fetched_holdings=holdings)
except Exception as e:
logging.error(f"π¨ [{t}] λ λλ§ μ€ν¨: {e}")
await self._safe_send(context, chat_id, f"β <b>[{t}] λ λλ§ μ€ μ€λ₯ λ°μ:</b> {html.escape(str(e))}", parse_mode='HTML')
if locked_tickers:
await self._safe_send(context, chat_id, f"β οΈ <b>[λκΈ°ν μ§μ°]</b> {', '.join(locked_tickers)} μ’
λͺ©μ νμ¬ λ°±κ·ΈλΌμ΄λ μ€μΌμ€λ¬κ° μ₯λΆλ₯Ό μ μ μ€μ
λλ€. μ μ ν λ€μ μλν΄μ£ΌμΈμ.", parse_mode='HTML')
if error_tickers:
err_details = '\n'.join([f"β«οΈ {err}" for err in error_tickers])
await self._safe_send(context, chat_id, f"β <b>[λκΈ°ν μλ¬ μμΈ μ§λ¨]</b>\n{err_details}\n\nπ‘ KIS μλ² μΌμ μ₯μ μ΄κ±°λ ν ν° λ¬Έμ μΌ μ μμ΅λλ€. μμΈ ν΅μ λ‘κ·Έλ <code>/log</code> λͺ
λ Ήμ΄λ‘ νμΈνμΈμ.", parse_mode='HTML')
else:
err_msg = "β
<b>λκΈ°ν μλ£</b> (μ§ν μ€μΈ μ₯λΆκ° μμ΅λλ€.)"
if locked_tickers:
err_msg = f"β οΈ <b>[λκΈ°ν μ§μ°]</b> {', '.join(locked_tickers)} μ’
λͺ©μ λ°±κ·ΈλΌμ΄λ μμ
μ΄ μ₯λΆλ₯Ό μ μ μ€μ
λλ€. μ μ ν λ€μ μλν΄μ£ΌμΈμ."
elif error_tickers:
err_details = '\n'.join([f"β«οΈ {err}" for err in error_tickers])
err_msg = f"β <b>[λκΈ°ν μλ¬ μμΈ μ§λ¨]</b>\n{err_details}\n\nπ‘ KIS μλ² μΌμ μ₯μ μ΄κ±°λ ν ν° λ¬Έμ μΌ μ μμ΅λλ€. μμΈ ν΅μ λ‘κ·Έλ <code>/log</code> λͺ
λ Ήμ΄λ‘ νμΈνμΈμ."
await self._safe_edit(status_msg, err_msg, parse_mode='HTML')
async def cmd_history(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
is_callback = update.callback_query is not None
history_data = await self._retry_api(self.cfg.get_history, default=[])
if not isinstance(history_data, list): history_data = []
if not history_data:
if is_callback:
await self._safe_edit(update.effective_message, "π <b>λͺ
μμ μ λΉ (μ‘Έμ
κΈ°λ‘)μ΄ λΉμ΄μμ΅λλ€.</b>", parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, "π <b>λͺ
μμ μ λΉ (μ‘Έμ
κΈ°λ‘)μ΄ λΉμ΄μμ΅λλ€.</b>", parse_mode='HTML')
return
sorted_hist = sorted(history_data, key=lambda x: str(x.get('end_date') or '') if isinstance(x, dict) else '', reverse=True)
msg = "π <b>[ λͺ
μμ μ λΉ (κ³Όκ±° μ‘Έμ
κΈ°λ‘) ]</b>\n\nμμΈ λ΄μμ μ‘°νν κΈ°λ‘μ μ ννμΈμ.\n"
keyboard = []
for h in sorted_hist[:15]:
if not isinstance(h, dict): continue
t = h.get('ticker', 'UNK')
p = self._safe_float(h.get('profit'))
date_str = str(h.get('end_date') or '')[:10].replace("-", ".")
sign = "+" if p >= 0 else "-"
btn_text = f"π
{date_str} [{html.escape(str(t))}] {sign}${abs(p):.2f}"
keyboard.append([InlineKeyboardButton(btn_text, callback_data=f"HIST:VIEW:{h.get('id', 0)}")])
keyboard.append([InlineKeyboardButton("β λ«κΈ°", callback_data="RESET:CANCEL")])
if is_callback:
await self._safe_edit(update.effective_message, msg, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, msg, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
async def cmd_settlement(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_reply(update.effective_message, "β³ <b>μ€μκ° μμ₯ μ§ν μ°μ° μ€...</b>", parse_mode='HTML')
app_data = context.bot_data.get('app_data', {}) if isinstance(context.bot_data.get('app_data'), dict) else {}
tracking_cache = app_data.get('sniper_tracking', {}) if isinstance(app_data.get('sniper_tracking'), dict) else {}
atr_data = {t: (0.0, 0.0) for t in active_tickers}
# π¨ MODIFIED: 15.0 -> 45.0
msg, markup = await self._retry_api(self.view.get_settlement_message, active_tickers, self.cfg, atr_data, tracking_cache, timeout=45.0)
if not msg: msg, markup = "β μ€μ νλ©΄μ λΆλ¬μ€λ λμ€ μλ¬κ° λ°μνμ΅λλ€.", None
await self._safe_edit(status_msg, msg, reply_markup=markup, parse_mode='HTML')
async def cmd_seed(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
msg = "π΅ <b>[ μ’
λͺ©λ³ μλλ¨Έλ κ΄λ¦¬ ]</b>\n\n"
keyboard = []
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
for t in active_tickers:
current_seed = self._safe_float(await self._retry_api(self.cfg.get_seed, t))
msg += f"π <b>{html.escape(str(t))}</b>: ${current_seed:,.0f}\n"
keyboard.append([
InlineKeyboardButton(f"β {html.escape(str(t))} μΆκ°", callback_data=f"SEED:ADD:{html.escape(str(t))}"),
InlineKeyboardButton(f"β {html.escape(str(t))} κ°μ", callback_data=f"SEED:SUB:{html.escape(str(t))}"),
InlineKeyboardButton(f"π’ {html.escape(str(t))} κ³ μ ", callback_data=f"SEED:SET:{html.escape(str(t))}")
])
is_callback = update.callback_query is not None
if is_callback:
await self._safe_edit(update.effective_message, msg, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, msg, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
async def cmd_ticker(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
msg, markup = self.view.get_ticker_menu(active_tickers)
is_callback = update.callback_query is not None
if is_callback:
await self._safe_edit(update.effective_message, msg, reply_markup=markup, parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, msg, reply_markup=markup, parse_mode='HTML')
async def cmd_mode(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
report = "π <b>[ μμ¨μ£Όν λ³λμ± λ§μ€ν° μ§ν μμΈ λΆμ ]</b>\n\n"
report += "<b>[ π§ μ§μ λ²μ λ²λ‘ (ON/OFF κΆμ₯) ]</b>\n"
report += "π§ <code>~ 15.00</code> : κ·Ήμ λ³λμ± (OFF)\n"
report += "π© <code>15.00 ~ 20.00</code> : μ μ κΆ€λ (OFF)\n"
report += "π¨ <code>20.00 ~ 25.00</code> : λ³λμ± νλ (ON)\n"
report += "π₯ <code>25.00 μ΄μ </code> : ν¨λ μ
λ§ (ON)\n\n"
for t in active_tickers:
idx_ticker = "SOXX" if t == "SOXL" else "QQQ"
dynamic_pct_obj = await self._retry_api(self.broker.get_dynamic_sniper_target, idx_ticker)
real_val = self._safe_float(getattr(dynamic_pct_obj, 'metric_val', 0.0))
real_name = html.escape(str(getattr(dynamic_pct_obj, 'metric_name', 'μ§ν')))
if real_val <= 15.0: diag_text = "κ·Ήμ λ³λμ± (μ°μΈ‘ 꼬리 μ λ¨ λ°©μ§λ₯Ό μν΄ μ€λμ΄νΌ OFF)"; status_icon = "π§"
elif real_val <= 20.0: diag_text = "μ μ κΆ€λ μμ°© (μ€λμ΄νΌ OFF)"; status_icon = "π©"
elif real_val <= 25.0: diag_text = "λ³λμ± νλ μ₯μΈ (κ³μ’ λ°©μ΄λ₯Ό μν΄ μ€λμ΄νΌ ON)"; status_icon = "π¨"
else: diag_text = "ν¨λ μ
λ§ λ° μμ€ν
좩격 (μ€λμ΄νΌ νμ κ°λ)"; status_icon = "π₯"
report += f"π <b>[ {html.escape(str(t))} κ΅λ©΄ λΆμ ]</b>\nβ«οΈ λΉμΌ μ λ μ§μ({real_name}): {real_val:.2f}\nβ«οΈ μ§λ¨ : {status_icon} {diag_text}\n\n"
report += "π― <b>[ μλ μλ°© μ€λμ΄νΌ λ
립 μ μ΄ ]</b>\n"
keyboard = []
for t in active_tickers:
is_sniper = await self._retry_api(self.cfg.get_upward_sniper_mode, t, default=False)
status_txt = 'ON (κ°λμ€)' if is_sniper else 'OFF (λκΈ°μ€)'
report += f"β«οΈ {html.escape(str(t))} νμ¬ μν : {status_txt}\n"
keyboard.append([InlineKeyboardButton(f"{html.escape(str(t))} βͺ OFF", callback_data=f"MODE:OFF:{html.escape(str(t))}"), InlineKeyboardButton(f"{html.escape(str(t))} π― ON", callback_data=f"MODE:ON:{html.escape(str(t))}")])
is_callback = update.callback_query is not None
if is_callback:
await self._safe_edit(update.effective_message, report, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, report, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
async def cmd_version(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
history_data = await self._retry_api(self.cfg.get_full_version_history, default=[])
msg, markup = self.view.get_version_message(history_data, page_index=None)
is_callback = update.callback_query is not None
if is_callback:
await self._safe_edit(update.effective_message, msg, parse_mode='HTML', reply_markup=markup)
else:
await self._safe_reply(update.effective_message, msg, parse_mode='HTML', reply_markup=markup)
async def cmd_queue(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
args = context.args
if not args:
await self._safe_reply(update.effective_message, "β μ’
λͺ©λͺ
μ μ
λ ₯νμΈμ. μ: /queue SOXL")
return
ticker = args[0].upper()
if not getattr(self, 'queue_ledger', None):
from queue_ledger import QueueLedger
self.queue_ledger = await asyncio.to_thread(QueueLedger)
q_data = await self._retry_api(self.queue_ledger.get_queue, ticker, default=[])
msg, reply_markup = self.view.get_queue_management_menu(ticker, q_data if isinstance(q_data, list) else [])
await self._safe_reply(update.effective_message, msg, reply_markup=reply_markup, parse_mode='HTML')
async def cmd_add_q(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
args = context.args
if not args or len(args) < 4:
await self._safe_reply(update.effective_message, "β μ νν μμ: <code>/add_q SOXL 2026-04-06 20 52.16</code>", parse_mode='HTML')
return
ticker = args[0].upper()
date_str = args[1]
qty = int(self._safe_float(args[2]))
price = self._safe_float(args[3])
if qty <= 0 or price <= 0.0:
await self._safe_reply(update.effective_message, "β μλκ³Ό νλ¨κ°λ 0λ³΄λ€ ν° μ«μμ¬μΌ ν©λλ€. (νΉμ νμ μ€λ₯)", parse_mode='HTML')
return
curr_p_val = await self._retry_api(self.broker.get_current_price, ticker)
curr_p = self._safe_float(curr_p_val)
if curr_p > 0:
if price < curr_p * 0.4 or price > curr_p * 1.6:
await self._safe_reply(update.effective_message, f"π¨ <b>μ€μ
λ ₯ μ°¨λ¨:</b> μ
λ ₯νμ νλ¨κ°(<b>${price:.2f}</b>)κ° νμ¬κ° λλΉ Β±60%λ₯Ό λ²μ΄λ©λλ€. μ€νλ₯Ό νμΈνμΈμ!", parse_mode='HTML')
return
if not getattr(self, 'queue_ledger', None):
from queue_ledger import QueueLedger
self.queue_ledger = await asyncio.to_thread(QueueLedger)
q_data = await self._retry_api(self.queue_ledger.get_queue, ticker, default=[])
if not isinstance(q_data, list): q_data = []
q_data.append({"qty": qty, "price": price, "date": f"{date_str} 23:59:59", "type": "MANUAL_OVERRIDE"})
q_data.sort(key=lambda x: str(x.get('date', '')) if isinstance(x, dict) else '', reverse=True)
await self._retry_api(self.queue_ledger.overwrite_queue, ticker, q_data)
# π¨ MODIFIED: [μ΄μ€ ν격 λ°©μ΄] ν μλ μΆκ° μμλ λ‘컬 μ¬λΌμ΄μ± λ° μ νν°μ₯ μ§μμ μμμ μꡬ μκ°
def _nuke_snapshot_and_state():
for f in glob.glob(f"data/daily_snapshot_*_{ticker}.json"):
with GlobalThrottle.get_file_lock(f):
try: os.remove(f)
except OSError: pass
for f in glob.glob(f"data/vwap_state_*_{ticker}.json"):
with GlobalThrottle.get_file_lock(f):
try: os.remove(f)
except OSError: pass
# π¨ MODIFIED: 2μ°¨ μ€μΈ ν¨λ¬λ
μ€ μ°¨λ¨ (물리μ μμ λμ λΉ μ§μμ λ°μ )
est_now = datetime.datetime.now(ZoneInfo('America/New_York'))
today_str = est_now.strftime('%Y-%m-%d')
empty_state = {"date": today_str, "hijacked": True, "orders": []}
for f_path in [f"data/vrev_slice_state_{ticker}.json", f"data/vrev_aftermarket_state_{ticker}.json"]:
with GlobalThrottle.get_file_lock(f_path):
dir_name = os.path.dirname(f_path) or '.'
try: os.makedirs(dir_name, exist_ok=True)
except OSError: pass
try:
fd, tmp_path = tempfile.mkstemp(dir=dir_name, text=True)
with os.fdopen(fd, 'w', encoding='utf-8') as f_out:
json.dump(empty_state, f_out, ensure_ascii=False, indent=4)
f_out.flush()
os.fsync(f_out.fileno())
os.replace(tmp_path, f_path)
except Exception: pass
await asyncio.to_thread(_nuke_snapshot_and_state)
chat_id = update.effective_chat.id
if ticker not in self.sync_engine.sync_locks: self.sync_engine.sync_locks[ticker] = asyncio.Lock()
if not self.sync_engine.sync_locks[ticker].locked(): await self.sync_engine.process_auto_sync(ticker, chat_id, context, silent_ledger=False)
date_str_safe = html.escape(str(date_str))
ticker_safe = html.escape(str(ticker))
await self._safe_reply(update.effective_message, f"β
<b>[{ticker_safe}] μλ μ§μΈ΅ μ½μ
μλ£ λ° μ€μΌ κΈ°μ΅ μλ μμ !</b>\nβ«οΈ {date_str_safe} | {qty}μ£Ό | ${price:.2f}", parse_mode='HTML')
async def cmd_clear_q(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
args = context.args
if not args:
await self._safe_reply(update.effective_message, "β μ’
λͺ©λͺ
μ μ
λ ₯νμΈμ. μ: /clear_q SOXL")
return
ticker = args[0].upper()
ticker_safe = html.escape(str(ticker))
if not getattr(self, 'queue_ledger', None):
from queue_ledger import QueueLedger
self.queue_ledger = await asyncio.to_thread(QueueLedger)
await self._retry_api(self.queue_ledger.clear_queue, ticker)
# π¨ MODIFIED: [μ΄μ€ ν격 λ°©μ΄] ν μ 체 μμ μ λ‘컬 μ¬λΌμ΄μ± λ° μ νν°μ₯ μ§μμ μμμ μꡬ μκ°
def _nuke_snapshot_and_state():
for f in glob.glob(f"data/daily_snapshot_*_{ticker}.json"):
with GlobalThrottle.get_file_lock(f):
try: os.remove(f)
except OSError: pass
for f in glob.glob(f"data/vwap_state_*_{ticker}.json"):
with GlobalThrottle.get_file_lock(f):
try: os.remove(f)
except OSError: pass
# π¨ MODIFIED: 2μ°¨ μ€μΈ ν¨λ¬λ
μ€ μ°¨λ¨ (물리μ μμ λμ λΉ μ§μμ λ°μ )
est_now = datetime.datetime.now(ZoneInfo('America/New_York'))
today_str = est_now.strftime('%Y-%m-%d')
empty_state = {"date": today_str, "hijacked": True, "orders": []}
for f_path in [f"data/vrev_slice_state_{ticker}.json", f"data/vrev_aftermarket_state_{ticker}.json"]:
with GlobalThrottle.get_file_lock(f_path):
dir_name = os.path.dirname(f_path) or '.'
try: os.makedirs(dir_name, exist_ok=True)
except OSError: pass
try:
fd, tmp_path = tempfile.mkstemp(dir=dir_name, text=True)
with os.fdopen(fd, 'w', encoding='utf-8') as f_out:
json.dump(empty_state, f_out, ensure_ascii=False, indent=4)
f_out.flush()
os.fsync(f_out.fileno())
os.replace(tmp_path, f_path)
except Exception: pass
await asyncio.to_thread(_nuke_snapshot_and_state)
chat_id = update.effective_chat.id
if ticker not in self.sync_engine.sync_locks: self.sync_engine.sync_locks[ticker] = asyncio.Lock()
if not self.sync_engine.sync_locks[ticker].locked(): await self.sync_engine.process_auto_sync(ticker, chat_id, context, silent_ledger=True)
await self._safe_reply(update.effective_message, f"ποΈ <b>[{ticker_safe}] μ₯λΆκ° μμ ν μκ°λκ³ λΉμΌ μ€μΌ κΈ°μ΅μ΄ νκΈ°λμμ΅λλ€.</b>\nμλ‘μ΄ μ§μΈ΅μ ꡬμΆν μ€λΉκ° μλ£λμμ΅λλ€.", parse_mode='HTML')
async def cmd_update(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
updater = SystemUpdater()
allowed, fail_msg = await updater.is_update_allowed()
if not allowed:
await self._safe_reply(update.effective_message, f"π <b>[μμ μ€ μ
λ°μ΄νΈ κ±°λΆ]</b>\n\n{fail_msg}", parse_mode='HTML')
return
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_reply(update.effective_message, "β³ <b>[μμ€ν
μ
λ°μ΄νΈ]</b> κΉνλΈ μ격 μλ²μ ν΅μ μ μμν©λλ€...", parse_mode='HTML')
success, msg = await updater.pull_latest_code()
safe_msg = html.escape(str(msg))
if success:
await self._safe_edit(status_msg, f"β
<b>[λκΈ°ν μλ£]</b> {safe_msg}\n\nπ μμ€ν
λ°λͺ¬(pipiosbot)μ OS λ¨μμ μ¬κ°λν©λλ€. λ€μ΄νμ ν λ΄μ΄ λ€μ κΉ¨μ΄λ©λλ€.", parse_mode='HTML')
await updater.restart_daemon()
else:
await self._safe_edit(status_msg, f"β <b>[λκΈ°ν μ€ν¨]</b>\nβ«οΈ μ¬μ : {safe_msg}", parse_mode='HTML')
async def cmd_avwap(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_reply(update.effective_message, "β³ <b>[AVWAP λμΌ λͺ¨λ©ν
κ΄μ ν]</b>\nλ μ΄λλ§μ κ°λνμ¬ μμ₯ λ°μ΄ν°λ₯Ό μ€μΊ μ€...", parse_mode='HTML')
plugin = AvwapConsolePlugin(self.cfg, self.broker, self.strategy, self.tx_lock)
app_data = context.bot_data.get('app_data', {})
if not app_data or not isinstance(app_data, dict):
try:
jobs = context.job_queue.jobs() if context.job_queue else []
if jobs and len(jobs) > 0 and jobs[0].data is not None: app_data = jobs[0].data
except Exception: app_data = {}
if not isinstance(app_data, dict): app_data = {}
# π¨ MODIFIED: 15.0 -> 45.0
msg, markup = await self._retry_api(plugin.get_console_message, app_data, timeout=45.0)
if msg:
await self._safe_edit(status_msg, msg, reply_markup=markup, parse_mode='HTML')
else:
await self._safe_edit(status_msg, "β <b>[λ€νΈμν¬ μ§μ° λ°μ]</b>\nμΌν νμ΄λΈμ€ λλ μ¦κΆμ¬ μλ² μλ΅μ΄ μ§μ°λμ΄ μ€μΊμ κ°μ μ’
λ£νμ΅λλ€.", parse_mode='HTML')
async def cmd_log(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
is_callback = update.callback_query is not None
status_msg = update.effective_message if is_callback else None
if not is_callback:
status_msg = await self._safe_reply(update.effective_message, "π <b>[μ격 μ§λ¨]</b> μ΅κ·Ό μμ€ν
μλ¬ λ‘κ·Έλ₯Ό νμ
μΆμΆ μ€...", parse_mode='HTML')
log_path = "logs/bot_app.log"
def _grep_tail_logs(path, limit=50):
try:
with open(path, 'r', encoding='utf-8') as f:
lines = f.readlines()
tail_lines = lines[-limit:]
return [line.strip() for line in reversed(tail_lines)]
except FileNotFoundError: return None
error_logs = await self._retry_api(_grep_tail_logs, log_path, timeout=10.0)
if error_logs is None:
await self._safe_edit(status_msg, "π <b>[μ§λ¨ κ²°κ³Ό]</b> μ€λμ λ‘κ·Έ νμΌμ΄ μμ±λμ§ μμμ΅λλ€.", parse_mode='HTML')
return
if not error_logs:
await self._safe_edit(status_msg, "β
<b>[μ§λ¨ κ²°κ³Ό]</b> μ΅κ·Ό κ°μ§λ μμ€ν
κ²°ν¨μ΄ μμ΅λλ€. 무결μ μν μ€!", parse_mode='HTML')
return
report = self.view.format_log_report(error_logs)
await self._safe_edit(status_msg, report, parse_mode='HTML')
async def cmd_reset(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
active_tickers = await self._retry_api(self.cfg.get_active_tickers, default=[])
if not isinstance(active_tickers, list): active_tickers = []
msg, markup = self.view.get_reset_menu(active_tickers)
is_callback = update.callback_query is not None
if is_callback:
await self._safe_edit(update.effective_message, msg, reply_markup=markup, parse_mode='HTML')
else:
await self._safe_reply(update.effective_message, msg, reply_markup=markup, parse_mode='HTML')