Upload 2 files

hub_dashboard_service.py

@@ -88,16 +88,22 @@ class TradeLogParser:
         r'(?:TRADE CLOSED|no-cid fallback|FORCE-CLOSED.*?timeout).*?(?:pnl|profit)=([+-]?[\d.]+)'
     )
     
-    # FIX v2.2: Dedicated regex for Line 2 of the two-line close event.
-    # The ranker emits TWO TRADE CLOSED lines per close:
-    #   Line 1 — pnl + return%  (no exit_price)
-    #   Line 2 — pnl + exit_price + status + contract_id
-    # The old STRICT regex used an optional group (?:.*?exit_price=...)?
-    # which Python's NFA engine would skip (zero-width match) because the
-    # overall pattern succeeds without it — so exit_price was always None.
-    # This dedicated regex has NO optional groups and matches Line 2 only.
+    # FIX v2.3: Dual-format regex for trade close lines that carry exit_price.
+    # Root cause (v2.2 bug): ranker_logging.trade_close() wrote exit_price ONLY
+    # into the trailing JSON metadata blob, e.g.:
+    #   TRADE CLOSED | ID=... | pnl=... | return=...% | {"exit_price": 4364.21}
+    # but this regex looked for it as a pipe-delimited text field:
+    #   TRADE CLOSED | ID=... | pnl=... | exit_price=...   <- never present
+    # so TRADE_CLOSE_RE_WITH_EXIT never matched and exit_price was always None.
+    #
+    # Fix has TWO parts:
+    #   1. ranker_logging.py now writes exit_price into the message text too.
+    #   2. This regex matches BOTH formats so old log files still parse correctly:
+    #      Group 3 - pipe-delimited text field  (new format, post-fix)
+    #      Group 4 - JSON metadata field        (old format, pre-fix)
     TRADE_CLOSE_RE_WITH_EXIT = re.compile(
-        r'TRADE CLOSED \| ID=(\S+) \| pnl=([+-]?[\d.]+) \| exit_price=([\d.]+)'
+        r'TRADE CLOSED \| ID=(\S+) \| pnl=([+-]?[\d.]+)'
+        r'.*?(?:\| exit_price=([\d.]+)|"exit_price":\s*([\d.]+))'
     )
 
     # Fallback for Line 1: pnl + return%, no exit_price
@@ -259,7 +265,9 @@ class TradeLogParser:
         if m2e:
             trade_id    = m2e.group(1)
             pnl         = float(m2e.group(2))
-            _exit_price = float(m2e.group(3))
+            # Group 3 = pipe-delimited "| exit_price=..." (new format, post-fix)
+            # Group 4 = JSON metadata   '"exit_price": ...' (old format, pre-fix)
+            _exit_price = float(m2e.group(3) or m2e.group(4))
             logger.debug(
                 f"[TradeLogParser] Matched CLOSE+EXIT: {trade_id} "
                 f"pnl={pnl} exit_price={_exit_price}"

ranker_logging.py

@@ -244,14 +244,19 @@ class RankerLogger:
                   asset=asset, metadata=metadata)
 
     def trade_close(self, trade_id: str, asset: str, pnl: float, return_pct: float, exit_price: Optional[float] = None):
-        """Log trade closing. ✅ FIX v2.1: Now accepts exit_price for dashboard."""
+        """Log trade closing. ✅ FIX v2.2: exit_price written into message text AND metadata."""
         metadata = {"trade_id": trade_id, "pnl": pnl, "return_pct": return_pct}
-        # ✅ FIX: Include exit_price in metadata if provided
+        # Include exit_price in metadata for JSON export
         if exit_price is not None:
             metadata["exit_price"] = exit_price
-        self._log(LogLevel.INFO, EventCategory.TRADE,
-                  f"TRADE CLOSED | ID={trade_id} | pnl={pnl:+.4f} | return={return_pct:+.2%}",
-                  asset=asset, metadata=metadata)
+        # ✅ FIX v2.2: Also embed exit_price in the pipe-delimited message so the
+        # dashboard regex (TRADE_CLOSE_RE_WITH_EXIT) can capture it directly.
+        # Previously exit_price lived only in the trailing JSON metadata, which the
+        # regex never reached — causing the EXIT column to always display "—".
+        msg = f"TRADE CLOSED | ID={trade_id} | pnl={pnl:+.4f} | return={return_pct:+.2%}"
+        if exit_price is not None:
+            msg += f" | exit_price={exit_price}"
+        self._log(LogLevel.INFO, EventCategory.TRADE, msg, asset=asset, metadata=metadata)
 
     def ranking_update(self, rankings: List[Dict], top_asset: str, top_score: float):
         """Log ranking cycle results."""