fix: apply live asset specs to broker valuation

Author: yunjinqi

backtrader/broker.py

@@ -132,7 +132,31 @@ def set_fund_history(self, fund):
         # Add fund history. See cerebro for details
         raise NotImplementedError
 
-    # Get commission info, if data._name is in commission info dict, get corresponding value, otherwise use default self.p.commission
+    @staticmethod
+    def _commission_lookup_keys(data):
+        """Return stable symbol/name candidates for commission lookup."""
+        keys = []
+        seen = set()
+        for attr in ("name", "_name", "_dataname", "symbol"):
+            value = getattr(data, attr, None)
+            if value in (None, ""):
+                continue
+            text = str(value)
+            for key in (value, text, text.upper(), text.lower()):
+                try:
+                    marker = ("hashable", key)
+                    if marker in seen:
+                        continue
+                    seen.add(marker)
+                except TypeError:
+                    marker = ("repr", repr(key))
+                    if marker in seen:
+                        continue
+                    seen.add(marker)
+                keys.append(key)
+        return keys
+
+    # Get commission info, if data name is in commission info dict, get corresponding value, otherwise use default self.p.commission
     def getcommissioninfo(self, data):
         """Get the commission info for a given data.
 
@@ -145,9 +169,9 @@ def getcommissioninfo(self, data):
         # PERFORMANCE OPTIMIZATION: Use getattr instead of hasattr+access
         # Called 2.1M+ times, avoid double attribute lookup
         comminfo = self.comminfo
-        name = getattr(data, "name", None)
-        if name is not None and name in comminfo:
-            return comminfo[name]
+        for name in self._commission_lookup_keys(data):
+            if name in comminfo:
+                return comminfo[name]
 
         return comminfo[None]
 
@@ -157,6 +181,10 @@ def setcommission(
         commission=0.0,
         maker_commission=None,
         taker_commission=None,
+        open_commission=None,
+        close_commission=None,
+        close_today_commission=None,
+        close_yesterday_commission=None,
         margin=None,
         mult=1.0,
         commtype=None,
@@ -180,6 +208,10 @@ def setcommission(
             commission=commission,
             maker_commission=maker_commission,
             taker_commission=taker_commission,
+            open_commission=open_commission,
+            close_commission=close_commission,
+            close_today_commission=close_today_commission,
+            close_yesterday_commission=close_yesterday_commission,
             margin=margin,
             mult=mult,
             commtype=commtype,

backtrader/brokers/bbroker.py

@@ -549,6 +549,22 @@ def _attach_position_meta(order, position_side=None, offset=None, **kwargs):
             order.addinfo(**kwargs)
         return order
 
+    @staticmethod
+    def _close_commission_role(offset):
+        offset_text = str(offset or "").strip().lower()
+        if offset_text in {"close_today", "closetoday"}:
+            return "close_today"
+        if offset_text in {"close_yesterday", "closeyesterday"}:
+            return "close_yesterday"
+        return "close"
+
+    @staticmethod
+    def _getcommission_role(comminfo, size, price, role):
+        try:
+            return comminfo.getcommission(size, price, role=role)
+        except TypeError:
+            return comminfo.getcommission(size, price)
+
     @staticmethod
     def _position_storage_key(data):
         return data
@@ -1643,7 +1659,12 @@ def _execute(self, order, ago=None, price=None, cash=None, position=None, dtcoc=
             cash += closecash + pnl * comminfo.stocklike
             # Calculate and subtract commission
             # Commission when closing position
-            closedcomm = comminfo.getcommission(closed, price)
+            closedcomm = self._getcommission_role(
+                comminfo,
+                closed,
+                price,
+                self._close_commission_role(getattr(order.info, "offset", None)),
+            )
             # Cash equals cash minus closing commission
             cash -= closedcomm
             # If ago is not None
@@ -1675,7 +1696,7 @@ def _execute(self, order, ago=None, price=None, cash=None, position=None, dtcoc=
             # Subtract cash obtained after opening
             cash -= opencash  # original behavior
             # Commission for opening
-            openedcomm = cinfocomp.getcommission(opened, price)
+            openedcomm = self._getcommission_role(cinfocomp, opened, price, "open")
             # Cash obtained after subtracting opening commission
             cash -= openedcomm
             # If cash is less than 0, opening position is not possible
@@ -1824,7 +1845,12 @@ def _execute_dual_side(self, order, ago=None, price=None, cash=None, position=No
             if closedvalue > 0:
                 closecash /= comminfo.get_leverage()
             cash += closecash + pnl * comminfo.stocklike
-            closedcomm = comminfo.getcommission(closed, price)
+            closedcomm = self._getcommission_role(
+                comminfo,
+                closed,
+                price,
+                self._close_commission_role(getattr(order.info, "offset", None)),
+            )
             cash -= closedcomm
             if ago is not None:
                 cash += comminfo.cashadjust(-closed, signed_position.adjbase, price)
@@ -1843,7 +1869,7 @@ def _execute_dual_side(self, order, ago=None, price=None, cash=None, position=No
             if openedvalue > 0:
                 opencash /= comminfo.get_leverage()
             cash -= opencash
-            openedcomm = cinfocomp.getcommission(opened, price)
+            openedcomm = self._getcommission_role(cinfocomp, opened, price, "open")
             cash -= openedcomm
             if cash < 0.0:
                 opened = 0