Update hub_dashboard_service.py

hub_dashboard_service.py

@@ -188,13 +188,18 @@ class DashboardState:
 # ══════════════════════════════════════════════════════════════════════════════════════
 # SECTION 1b — TRADE LOG PARSER
 # ══════════════════════════════════════════════════════════════════════════════════════
-
 class TradeLogParser:
     """
     Tails ranker log files and maintains open/closed trade state.
     Runs in a background thread, refreshing every 2 seconds.
     """
 
+    # Updated regex to match ranker's actual log format
+    TRADE_OPEN_RE  = re.compile(r'\[([^\]]+)\] TRADE OPENED \| ID=(\S+) \| Dir=(\w+) \| Entry=([\d.]+)')
+    TRADE_CLOSE_RE = re.compile(r'\[([^\]]+)\] TRADE CLOSED \| reward=[+-]?[\d.]+ \| pnl=([+-]?[\d.]+)')
+    TRADE_ID_RE    = re.compile(r'\[([^\]]+)\] TRADE CLOSED')
+    REWARD_RE      = re.compile(r'Closed (\w+) \| reward=([+-]?[\d.]+) \| pnl=([+-]?[\d.]+) \| portfolio_dd=([\d.]+)%')
+
     def __init__(self, log_dir: str = "./ranker_logs"):
         self._lock      = threading.RLock()
         self._open:   dict  = {}   # trade_id → trade dict
@@ -208,11 +213,9 @@ class TradeLogParser:
             "win_count":    0,
             "loss_count":   0,
         }
-
-    # ── public ────────────────────────────────────────────────────────────────────────
+        self._debug_counter = 0  # for debugging
 
     def start_background(self, interval: float = 2.0) -> None:
-        """Launch a daemon thread that calls refresh() every `interval` seconds."""
         def _loop():
             while True:
                 try:
@@ -226,21 +229,19 @@ class TradeLogParser:
         logger.info(f"[TradeLogParser] Started — watching {self._log_dir}")
 
     def refresh(self) -> None:
-        """Find all log files, read new lines since last position."""
         pattern = os.path.join(self._log_dir, "*.log")
-        files   = sorted(glob.glob(pattern))
+        files = sorted(glob.glob(pattern))
         if not files:
-            # Also try plain text files
             pattern = os.path.join(self._log_dir, "*.txt")
-            files   = sorted(glob.glob(pattern))
+            files = sorted(glob.glob(pattern))
 
         for fpath in files:
             self._tail_file(fpath)
 
     def get_state(self) -> dict:
         with self._lock:
-            open_trades   = list(self._open.values())
-            closed_trades = list(reversed(self._closed[-100:]))  # last 100, newest first
+            open_trades = list(self._open.values())
+            closed_trades = list(reversed(self._closed[-100:]))
             stats = dict(self._stats)
             stats["win_rate"] = (
                 round(stats["win_count"] / stats["total_closed"] * 100, 1)
@@ -253,10 +254,7 @@ class TradeLogParser:
                 "timestamp": datetime.utcnow().isoformat() + "Z",
             }
 
-    # ── private ───────────────────────────────────────────────────────────────────────
-
     def _tail_file(self, fpath: str) -> None:
-        """Read only new bytes from fpath since last call."""
         try:
             size = os.path.getsize(fpath)
         except OSError:
@@ -264,7 +262,7 @@ class TradeLogParser:
 
         last = self._last_pos.get(fpath, 0)
         if size <= last:
-            return  # no new data
+            return
 
         try:
             with open(fpath, "r", encoding="utf-8", errors="replace") as f:
@@ -278,14 +276,16 @@ class TradeLogParser:
             self._parse_line(line)
 
     def _parse_line(self, line: str) -> None:
-        """Extract trade events from a single log line."""
+        # Debug first few lines
+        if self._debug_counter < 10:
+            logger.debug(f"[TradeLogParser] Line: {line.strip()}")
+            self._debug_counter += 1
+
         # ── TRADE OPENED ─────────────────────────────────────────────────────────
-        m = TRADE_OPEN_RE.search(line)
+        m = self.TRADE_OPEN_RE.search(line)
         if m:
-            trade_id, direction, entry = m.group(1), m.group(2), float(m.group(3))
-            # Extract asset from trade_id prefix (e.g. "V75_1774...")
-            asset = "_".join(trade_id.split("_")[:-1]) if "_" in trade_id else trade_id
-            ts    = self._parse_ts(line)
+            asset, trade_id, direction, entry = m.group(1), m.group(2), m.group(3), float(m.group(4))
+            ts = self._parse_ts(line)
             with self._lock:
                 self._open[trade_id] = {
                     "trade_id":   trade_id,
@@ -296,52 +296,54 @@ class TradeLogParser:
                     "status":     "OPEN",
                 }
                 self._stats["total_opened"] += 1
+                logger.info(f"[TradeLogParser] Opened: {trade_id} {asset} {direction}")
             return
 
         # ── TRADE CLOSED ─────────────────────────────────────────────────────────
-        m_pnl = TRADE_CLOSE_RE.search(line)
-        m_id  = TRADE_ID_RE.search(line)
-        if m_pnl and m_id:
+        m_close = self.TRADE_CLOSE_RE.search(line)
+        m_id = self.TRADE_ID_RE.search(line)
+        if m_close and m_id:
             asset = m_id.group(1)
-            pnl   = float(m_pnl.group(1))
-            ts    = self._parse_ts(line)
-            # find matching open trade by asset prefix
+            pnl = float(m_close.group(2))
+            ts = self._parse_ts(line)
+
             with self._lock:
                 matched_id = None
-                for tid in list(self._open):
-                    if tid.startswith(asset + "_"):
+                for tid, trade in self._open.items():
+                    if trade["asset"] == asset:
                         matched_id = tid
                         break
+
                 trade = self._open.pop(matched_id, None) if matched_id else None
                 closed = {
                     "trade_id":   matched_id or asset,
                     "asset":      asset,
                     "direction":  trade["direction"] if trade else "?",
-                    "entry":      trade["entry"]     if trade else 0.0,
+                    "entry":      trade["entry"] if trade else 0.0,
                     "pnl":        pnl,
                     "closed_at":  ts,
                     "status":     "CLOSED",
                 }
                 self._closed.append(closed)
                 self._stats["total_closed"] += 1
-                self._stats["total_pnl"]    += pnl
+                self._stats["total_pnl"] += pnl
                 if pnl >= 0:
                     self._stats["win_count"] += 1
                 else:
                     self._stats["loss_count"] += 1
+                logger.info(f"[TradeLogParser] Closed: {asset} pnl={pnl}")
             return
 
         # ── REWARD / portfolio_dd line ────────────────────────────────────────────
-        m = REWARD_RE.search(line)
+        m = self.REWARD_RE.search(line)
         if m and self._closed:
             reward = float(m.group(2))
             with self._lock:
-                self._closed[-1]["reward"]       = reward
-                self._closed[-1]["portfolio_dd"]  = float(m.group(4))
+                self._closed[-1]["reward"] = reward
+                self._closed[-1]["portfolio_dd"] = float(m.group(4))
 
     @staticmethod
     def _parse_ts(line: str) -> str:
-        """Extract ISO timestamp from log line prefix, fallback to now."""
         parts = line.split("|")
         if parts:
             ts = parts[0].strip()