From 71a6ee895ef9021bb8e7bc8737eba11da7568a20 Mon Sep 17 00:00:00 2001
From: whning0513 <3267069960@qq.com>
Date: Mon, 29 Jun 2026 18:52:15 +0800
Subject: [PATCH] Handle missing future bar in TradeCalendarManager

---
 qlib/backtest/utils.py                        |  10 +-
 tests/backtest/test_trade_calendar_manager.py | 118 ++++++++++++++++++
 2 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 tests/backtest/test_trade_calendar_manager.py

diff --git a/qlib/backtest/utils.py b/qlib/backtest/utils.py
index 4210c9548a8..cc1c70379db 100644
--- a/qlib/backtest/utils.py
+++ b/qlib/backtest/utils.py
@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from qlib.utils.time import epsilon_change
+from qlib.utils.time import Freq, epsilon_change
 
 if TYPE_CHECKING:
     from qlib.backtest.decision import BaseTradeDecision
@@ -128,7 +128,13 @@ def get_step_time(self, trade_step: int | None = None, shift: int = 0) -> Tuple[
         if trade_step is None:
             trade_step = self.get_trade_step()
         calendar_index = self.start_index + trade_step - shift
-        return self._calendar[calendar_index], epsilon_change(self._calendar[calendar_index + 1])
+        start_time = self._calendar[calendar_index]
+        if calendar_index + 1 < len(self._calendar):
+            end_time = epsilon_change(self._calendar[calendar_index + 1])
+        else:
+            count, base = Freq.parse(self.freq)
+            end_time = epsilon_change(start_time + Freq.get_timedelta(count, base))
+        return start_time, end_time
 
     def get_data_cal_range(self, rtype: str = "full") -> Tuple[int, int]:
         """
diff --git a/tests/backtest/test_trade_calendar_manager.py b/tests/backtest/test_trade_calendar_manager.py
new file mode 100644
index 00000000000..993bc4a78ca
--- /dev/null
+++ b/tests/backtest/test_trade_calendar_manager.py
@@ -0,0 +1,118 @@
+import unittest
+from importlib.util import module_from_spec, spec_from_file_location
+from pathlib import Path
+from types import ModuleType
+from unittest.mock import patch
+
+import numpy as np
+import pandas as pd
+
+
+class TradeCalendarManagerTest(unittest.TestCase):
+    @staticmethod
+    def _load_trade_calendar_manager():
+        utils_path = Path(__file__).resolve().parents[2] / "qlib" / "backtest" / "utils.py"
+
+        qlib_pkg = ModuleType("qlib")
+        qlib_pkg.__path__ = []
+        backtest_pkg = ModuleType("qlib.backtest")
+        backtest_pkg.__path__ = []
+        data_pkg = ModuleType("qlib.data")
+        data_pkg.__path__ = []
+        utils_pkg = ModuleType("qlib.utils")
+        utils_pkg.__path__ = []
+
+        time_module = ModuleType("qlib.utils.time")
+        time_module.epsilon_change = lambda dt, direction="backward": dt - pd.Timedelta(seconds=1)
+        class FakeFreq:
+            @staticmethod
+            def parse(freq: str):
+                if freq == "day":
+                    return 1, "day"
+                raise ValueError(freq)
+
+            @staticmethod
+            def get_timedelta(n: int, freq: str):
+                return pd.Timedelta(f"{n}{freq}")
+
+        time_module.Freq = FakeFreq
+
+        data_module = ModuleType("qlib.data.data")
+
+        class FakeCal:
+            @staticmethod
+            def calendar(*args, **kwargs):
+                raise NotImplementedError
+
+            @staticmethod
+            def locate_index(*args, **kwargs):
+                raise NotImplementedError
+
+        data_module.Cal = FakeCal
+
+        with patch.dict(
+            "sys.modules",
+            {
+                "qlib": qlib_pkg,
+                "qlib.backtest": backtest_pkg,
+                "qlib.data": data_pkg,
+                "qlib.data.data": data_module,
+                "qlib.utils": utils_pkg,
+                "qlib.utils.time": time_module,
+            },
+        ):
+            spec = spec_from_file_location("qlib.backtest.utils", utils_path)
+            module = module_from_spec(spec)
+            assert spec.loader is not None
+            spec.loader.exec_module(module)
+            return module.TradeCalendarManager, module.Cal
+
+    def test_get_step_time_uses_freq_boundary_when_future_calendar_is_missing(self):
+        TradeCalendarManager, Cal = self._load_trade_calendar_manager()
+        calendar = np.array(
+            [
+                pd.Timestamp("2024-01-02"),
+                pd.Timestamp("2024-01-03"),
+                pd.Timestamp("2024-01-04"),
+            ],
+            dtype=object,
+        )
+
+        with patch.object(Cal, "calendar", return_value=calendar), patch.object(
+            Cal,
+            "locate_index",
+            return_value=(calendar[0], calendar[-1], 0, 2),
+        ):
+            trade_calendar = TradeCalendarManager(freq="day", start_time="2024-01-02", end_time="2024-01-04")
+
+        step_start, step_end = trade_calendar.get_step_time(trade_step=2)
+
+        self.assertEqual(pd.Timestamp("2024-01-04"), step_start)
+        self.assertEqual(pd.Timestamp("2024-01-04 23:59:59"), step_end)
+
+    def test_get_step_time_keeps_next_calendar_boundary_when_available(self):
+        TradeCalendarManager, Cal = self._load_trade_calendar_manager()
+        calendar = np.array(
+            [
+                pd.Timestamp("2024-01-05"),
+                pd.Timestamp("2024-01-08"),
+                pd.Timestamp("2024-01-09"),
+            ],
+            dtype=object,
+        )
+
+        with patch.object(Cal, "calendar", return_value=calendar), patch.object(
+            Cal,
+            "locate_index",
+            return_value=(calendar[0], calendar[-1], 0, 2),
+        ):
+            trade_calendar = TradeCalendarManager(freq="day", start_time="2024-01-05", end_time="2024-01-09")
+
+        step_start, step_end = trade_calendar.get_step_time(trade_step=0)
+
+        self.assertEqual(pd.Timestamp("2024-01-05"), step_start)
+        self.assertEqual(pd.Timestamp("2024-01-07 23:59:59"), step_end)
+
+
+if __name__ == "__main__":
+    unittest.main()