Update app.py

app.py

@@ -51,9 +51,9 @@ VIETNAM_TZ = ZoneInfo("Asia/Ho_Chi_Minh")
 CONFIG = {
     "RUNNING": False,
     "AMOUNT": 10.0,
-    "LEV_MAIN": 25,    # Đòn bẩy riêng cho BTC/ETH
-    "LEV_ALTS": 15,    # Đòn bẩy riêng cho Alt Top
-    "LEV_HIGHVOL": 10, # Đòn bẩy riêng cho Coin Rác/High Vol
+    "LEV_MAIN": 25,
+    "LEV_ALTS": 15,
+    "LEV_HIGHVOL": 10,
     "WICK_MAIN": 0.13,
     "WICK_ALTS": 0.25,
     "WICK_NEW": 0.4,
@@ -72,10 +72,8 @@ MARKET_DATA_CACHE = {}
 
 def send_slack(msg):
     if SLACK_WEBHOOK_URL:
-        try:
-            requests.post(SLACK_WEBHOOK_URL, json={"text": msg}, timeout=5)
-        except:
-            pass
+        try: requests.post(SLACK_WEBHOOK_URL, json={"text": msg}, timeout=5)
+        except: pass
 
 def okx_request(method, endpoint, body=None):
     try:
@@ -106,15 +104,15 @@ def get_market_rules(symbol):
         res = requests.get(url, timeout=10).json()
         if res.get('code') == '0' and res['data']:
             inst = res['data'][0]
+            prec = len(inst['tickSz'].split('.')[-1]) if '.' in inst['tickSz'] else 0
             data = {"lotSz": float(inst['lotSz']), "tickSz": float(inst['tickSz']), 
-                    "prec": len(inst['tickSz'].split('.')[-1]) if '.' in inst['tickSz'] else 0,
-                    "ctVal": float(inst.get('ctVal', 1)), "minSz": float(inst['minSz'])}
+                    "prec": prec, "ctVal": float(inst.get('ctVal', 1)), "minSz": float(inst['minSz'])}
             MARKET_DATA_CACHE[symbol] = data
             return data
     except: return None
 
 # ==============================================================================
-# ========== CORE LOGIC ==========
+# ========== CORE LOGIC (VẬN HÀNH THEO APP.PY) ==========
 # ==============================================================================
 
 def calculate_wick_pct(row):
@@ -126,67 +124,60 @@ def calculate_wick_pct(row):
 def execute_trade(symbol, side, n0_data, n_curr_data):
     try:
         rules = get_market_rules(symbol)
-        if not rules:
-            send_slack(f"❌ LỖI: Không lấy được thông số thị trường cho {symbol}")
-            return
+        if not rules: return
         
-        # Lấy đòn bẩy tương ứng theo nhóm coin
-        if symbol in BTC_ETH_GOLD:
-            target_lev = int(CONFIG["LEV_MAIN"])
-        elif symbol in ALTS_STANDARD:
-            target_lev = int(CONFIG["LEV_ALTS"])
-        else:
-            target_lev = int(CONFIG["LEV_HIGHVOL"])
+        # 1. Chọn đòn bẩy theo nhóm
+        if symbol in BTC_ETH_GOLD: target_lev = int(CONFIG["LEV_MAIN"])
+        elif symbol in ALTS_STANDARD: target_lev = int(CONFIG["LEV_ALTS"])
+        else: target_lev = int(CONFIG["LEV_HIGHVOL"])
         
-        # Set Leverage cho OKX
         okx_request("POST", "/api/v5/account/set-leverage", {
             "instId": symbol, "lever": str(target_lev), "mgnMode": "isolated", "posSide": side
         })
         
-        # Logic Entry (Limit)
+        # 2. Logic Entry khớp 100% app.py gốc
         curr_close, curr_high, curr_low = n_curr_data['c'], n_curr_data['h'], n_curr_data['l']
         if side == "long":
             entry = curr_close if curr_close >= curr_high else min(n0_data['o'], n0_data['c'])
         else:
             entry = curr_close if curr_close <= curr_low else max(n0_data['o'], n0_data['c'])
         
-        entry = round(entry, rules['prec'])
+        # 3. Tính toán SL/TP với độ chính xác chuẩn sàn
         buffer = CONFIG["SL_BUFFER_PCT"] / 100
         sl_price = n0_data['l'] * (1 - buffer) if side == "long" else n0_data['h'] * (1 + buffer)
         risk = abs(entry - sl_price)
-        if risk == 0: 
-            send_slack(f"⚠️ {symbol}: Bỏ qua lệnh do Risk = 0")
-            return
+        if risk == 0: return
         
-        sl = round(sl_price, rules['prec'])
-        tp = round((entry + risk * CONFIG["RR_RATIO"]) if side == "long" else (entry - risk * CONFIG["RR_RATIO"]), rules['prec'])
+        tp_price = (entry + risk * CONFIG["RR_RATIO"]) if side == "long" else (entry - risk * CONFIG["RR_RATIO"])
         
-        # Tính Size = Amount * Leverage của từng nhóm
+        # Format string tránh lỗi Code 1
+        fmt_entry = "{:.{}f}".format(entry, rules['prec'])
+        fmt_sl = "{:.{}f}".format(sl_price, rules['prec'])
+        fmt_tp = "{:.{}f}".format(tp_price, rules['prec'])
+
+        # 4. Tính Size
         size = math.floor((CONFIG["AMOUNT"] * target_lev / (entry * rules['ctVal'])) / rules['lotSz']) * rules['lotSz']
-        if size < rules['minSz']:
-            send_slack(f"⚠️ {symbol}: Size {size} nhỏ hơn min {rules['minSz']}")
-            return
+        if size < rules['minSz']: return
 
         body = {
             "instId": symbol, "tdMode": "isolated", "side": "buy" if side == "long" else "sell", 
-            "posSide": side, "ordType": "limit", "px": str(entry), "sz": str(size),
+            "posSide": side, "ordType": "limit", "px": fmt_entry, "sz": str(size),
             "attachAlgoOrds": [
-                {"attachAlgoOrdType": "sl", "slTriggerPx": str(sl), "slOrdPx": "-1"},
-                {"attachAlgoOrdType": "tp", "tpTriggerPx": str(tp), "tpOrdPx": "-1"}
+                {"attachAlgoOrdType": "sl", "slTriggerPx": fmt_sl, "slOrdPx": "-1"},
+                {"attachAlgoOrdType": "tp", "tpTriggerPx": fmt_tp, "tpOrdPx": "-1"}
             ]
         }
         res = okx_request("POST", "/api/v5/trade/order", body)
         
         if res and res.get('code') == '0':
-            msg = f"🚀 ✅ {side.upper()} {symbol} (x{target_lev}) | Entry: {entry} | SL: {sl} | TP: {tp}"
-            print(f"   └─ ✅ {msg}", flush=True)
+            msg = f"🚀 ✅ {side.upper()} {symbol} (x{target_lev}) | Entry: {fmt_entry} | SL: {fmt_sl}"
             send_slack(msg)
+            print(f"   └─ ✅ {msg}", flush=True)
         else:
             err_msg = res.get('msg', 'Unknown Error')
-            err_code = res.get('code', 'N/A')
-            msg = f"❌ ⛔ ĐẶT LỆNH LỖI: {symbol} | {side.upper()}\nLý do: {err_msg} (Code: {err_code})"
-            print(f"   └─ {msg}", flush=True)
+            msg = f"❌ ĐẶT LỆNH LỖI: {symbol} | {side.upper()} | {err_msg} (Code: {res.get('code')})"
             send_slack(msg)
+            print(f"   └─ {msg}", flush=True)
 
     except Exception as e:
         send_slack(f"🚨 CRITICAL ERROR: {symbol} | {str(e)}")
@@ -218,8 +209,7 @@ def scan_symbol(symbol, X, Y, open_symbols, current_count):
             if symbol not in open_symbols:
                 return current_count + 1
         return current_count
-    except:
-        return current_count
+    except: return current_count
 
 def run_market_scan():
     open_symbols = get_all_open_positions()
@@ -230,10 +220,8 @@ def run_market_scan():
 
     for s in BTC_ETH_GOLD:
         current_count = scan_symbol(s, CONFIG["WICK_MAIN"], Y, open_symbols, current_count)
-    
     for s in ALTS_STANDARD:
         current_count = scan_symbol(s, CONFIG["WICK_ALTS"], Y, open_symbols, current_count)
-    
     for s in ALTS_HIGH_VOL:
         current_count = scan_symbol(s, CONFIG["WICK_NEW"], Y, open_symbols, current_count)
 
@@ -243,19 +231,11 @@ def run_market_scan():
 
 def update_ui(amt, lev_m, lev_a, lev_h, m_main, m_alt, m_new, sub, rr, buf, run):
     CONFIG.update({
-        "AMOUNT": amt, 
-        "LEV_MAIN": lev_m, 
-        "LEV_ALTS": lev_a, 
-        "LEV_HIGHVOL": lev_h,
-        "WICK_MAIN": m_main, 
-        "WICK_ALTS": m_alt, 
-        "WICK_NEW": m_new, 
-        "WICK_SUB": sub, 
-        "RR_RATIO": rr, 
-        "SL_BUFFER_PCT": buf, 
-        "RUNNING": run
+        "AMOUNT": amt, "LEV_MAIN": lev_m, "LEV_ALTS": lev_a, "LEV_HIGHVOL": lev_h,
+        "WICK_MAIN": m_main, "WICK_ALTS": m_alt, "WICK_NEW": m_new, "WICK_SUB": sub, 
+        "RR_RATIO": rr, "SL_BUFFER_PCT": buf, "RUNNING": run
     })
-    return f"Bot: {'ON' if run else 'OFF'} | Đã cập nhật đòn bẩy: Main {lev_m}x, Alt {lev_a}x, HighVol {lev_h}x"
+    return f"Bot: {'ON' if run else 'OFF'} | Logic: app.py (Synced)"
 
 def main_loop():
     while True:
@@ -269,37 +249,27 @@ def main_loop():
 
 threading.Thread(target=main_loop, daemon=True).start()
 
-with gr.Blocks(title="OKX Bot V17.8 Professional") as demo:
-    gr.Markdown("# 🤖 OKX Bot V17.8 - Custom Leverage Groups")
-    
+with gr.Blocks(title="OKX Bot V18.0 Professional") as demo:
+    gr.Markdown("# 🤖 OKX Bot V18.0 - app.py Logic Synced")
     with gr.Tab("Cấu hình Giao dịch"):
         with gr.Row():
             n_amt = gr.Number(label="Vốn/Lệnh (USDT)", value=10)
             n_rr = gr.Number(label="R:R Ratio", value=1.5)
             n_buf = gr.Number(label="SL Buffer (%)", value=0.15)
-        
-        gr.Markdown("### 🎚️ Thiết lập Đòn bẩy (Leverage 1 - 100)")
         with gr.Row():
-            lev_main = gr.Slider(minimum=1, maximum=100, value=25, step=1, label="Leverage BTC/ETH Group")
-            lev_alts = gr.Slider(minimum=1, maximum=100, value=15, step=1, label="Leverage Alts Top Group")
-            lev_highvol = gr.Slider(minimum=1, maximum=100, value=10, step=1, label="Leverage High Vol Group")
-
-    with gr.Tab("Cấu hình Kỹ thuật (Râu nến)"):
+            lev_main = gr.Slider(1, 100, 25, step=1, label="Leverage BTC/ETH Group")
+            lev_alts = gr.Slider(1, 100, 15, step=1, label="Leverage Alts Top Group")
+            lev_highvol = gr.Slider(1, 100, 10, step=1, label="Leverage High Vol Group")
+    with gr.Tab("Cấu hình Râu"):
         with gr.Row():
             n_main = gr.Number(label="Râu BTC/ETH", value=0.13)
             n_alt = gr.Number(label="Râu Alt Top", value=0.25)
             n_new = gr.Number(label="Râu High Vol", value=0.4)
             n_sub = gr.Number(label="Râu Phụ Max", value=0.05)
-            
     c_run = gr.Checkbox(label="KÍCH HOẠT BOT")
-    btn = gr.Button("LƯU CẤU HÌNH & CHẠY", variant="primary")
-    out = gr.Textbox(label="Trạng thái hệ thống")
-    
-    btn.click(
-        update_ui, 
-        [n_amt, lev_main, lev_alts, lev_highvol, n_main, n_alt, n_new, n_sub, n_rr, n_buf, c_run], 
-        out
-    )
+    btn = gr.Button("LƯU & CHẠY", variant="primary")
+    out = gr.Textbox(label="Status")
+    btn.click(update_ui, [n_amt, lev_main, lev_alts, lev_highvol, n_main, n_alt, n_new, n_sub, n_rr, n_buf, c_run], out)
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860)