Upload Quasar_axrvi_ranker.py

Quasar_axrvi_ranker.py

@@ -2864,8 +2864,7 @@ class PositionManager:
     ) -> Optional[Trade]:
         """
         Called from _on_deriv_message when proposal_open_contract reports
-        a terminal state (is_expired, is_sold, status in won/lost/sold/expired).
-        Authoritative close — profit comes directly from broker.
+        a terminal state. Authoritative close - profit comes directly from broker.
         """
         with self._lock:
             if trade_id not in self._open_trades:
@@ -2873,38 +2872,36 @@ class PositionManager:
             trade = self._open_trades.pop(trade_id)
 
         exit_price = sell_price or exit_tick or (trade.current_spot or 0.0)
-        trade.profit       = profit
-        trade.realized_pnl = profit          # authoritative broker P&L
-        trade.sell_price   = sell_price
-        trade.exit_price   = exit_price
-        trade.exit_time    = time.time()
-        trade.status       = status
-        trade.state        = PositionState.CLOSED
-        trade.fees         = 0.0             # fees already reflected in broker profit
+        
+        # ✅ Store the REAL profit from broker
+        trade.profit = profit
+        trade.realized_pnl = profit  # authoritative broker P&L
+        trade.sell_price = sell_price
+        trade.exit_price = exit_price
+        trade.exit_time = time.time()
+        trade.status = status
+        trade.state = PositionState.CLOSED
+        trade.fees = 0.0
 
         with self._lock:
             self._closed_trades.append(trade)
-            self.trades_closed      += 1
+            self.trades_closed += 1
             self.total_realized_pnl += trade.realized_pnl
 
         if self.ranker_logger:
-            return_pct = (
-                (exit_price - trade.entry_price) / trade.entry_price
-                if trade.direction == TradeDirection.LONG and trade.entry_price > 0
-                else (trade.entry_price - exit_price) / trade.entry_price
-                if trade.entry_price > 0
-                else 0.0
-            )
+            # ✅ Use REAL profit for return calculation, not price difference
+            return_pct = (profit / trade.quantity) / trade.entry_price if trade.entry_price > 0 else 0.0
             self.ranker_logger.trade_close(
-                trade_id  = trade_id,
-                asset     = trade.asset,
-                pnl       = trade.realized_pnl,
-                return_pct = return_pct,
+                trade_id=trade_id,
+                asset=trade.asset,
+                pnl=profit,  # ← REAL profit!
+                return_pct=return_pct,
             )
 
+        # ✅ Log the REAL profit, not the contract value
         logger.info(
             f"🔴 [{trade.asset}] TRADE CLOSED | trade_id={trade_id} | "
-            f"status={status} | profit={profit:+.4f} | "
+            f"status={status} | profit={profit:+.4f} | "  # ← This is the REAL P&L now
             f"contract_id={trade.contract_id}"
         )
         return trade