fix(data): bs_eod 15min datetime 格式 bug 根治 + --no-daily 选项

bug 根因(2026-07-25): baostock 15min 实测 date='2026-07-21'(带 -), time='20260721094500000'(17 位 YYYYMMDDHHMMSSmmm)。原代码假设 date 纯数字 + time[:6] 取年月, 产乱 datetime 致 dbbardata 15min 全市场停 2026-07-17(8 天没正确累积), 日线正常(7-24)。修复: - 提纯函数 _build_15m_dt(date_series, time_series): date 直连 + 从 17 位 time 第 8-12 位提取 HHMM, 产出 'YYYY-MM-DD HH:MM:00' (符合 GLOB 清理模式) - upsert_15m 调用 _build_15m_dt 替代内联拼接 - 新增 --no-daily 选项(只跑 15min, 用于重灌快), 与 --no-15m 对称 - TDD: 8 case 覆盖(09:45/14:30/15:00/13:00/跨日/多行混合/GLOB 格式) - conftest.py 修补 sibling import 在 pytest 下可用
2026-07-25 21:14:12 +08:00
parent e807bed09c
commit b06af336c3
3 changed files with 120 additions and 4 deletions
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+"""pytest 路径修补: 让 scripts/data_platform/* 的 sibling import 在测试下可用。
+
+VPS 上 bs_eod.py 作为脚本跑(scripts/data_platform 在 sys.path[0]),
+`from dbbardata_utils import ...` 可用。pytest 以包导入 `scripts.data_platform.bs_eod`
+时 sibling import 失败 — 此处把 script dir 加到 sys.path 兼容两种运行模式。
+"""
+import sys
+from pathlib import Path
+
+_SCRIPT_DIR = Path(__file__).resolve().parents[2] / "scripts" / "data_platform"
+if str(_SCRIPT_DIR) not in sys.path:
+    sys.path.insert(0, str(_SCRIPT_DIR))
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+"""TDD for bs_eod._build_15m_dt (15min datetime 格式 bug 根治).
+
+背景:
+    baostock 15min 实测返回 date="2026-07-21"(带 -), time="20260721094500000"
+    (17 位 YYYYMMDDHHMMSSmmm)。原代码假设 date 纯数字 + time[:6] 取年月,
+    产出乱 datetime 致 dbbardata 15min 全市场停 2026-07-17 (8 天没正确累积)。
+
+修复策略: 提纯函数 _build_15m_dt(date_series, time_series) 单测。
+"""
+import pandas as pd
+import pytest
+
+from scripts.data_platform.bs_eod import _build_15m_dt
+
+
+def _series(date_str: str, time_str: str) -> tuple[pd.Series, pd.Series]:
+    return pd.Series([date_str]), pd.Series([time_str])
+
+
+@pytest.mark.parametrize("date_str,time_str,expected", [
+    # 早盘 09:45
+    ("2026-07-21", "20260721094500000", "2026-07-21 09:45:00"),
+    # 午盘 14:30
+    ("2026-07-21", "20260721143000000", "2026-07-21 14:30:00"),
+    # 收盘 15:00
+    ("2026-07-21", "20260721150000000", "2026-07-21 15:00:00"),
+    # 午盘 13:00
+    ("2026-07-21", "20260721130000000", "2026-07-21 13:00:00"),
+    # 跨日 2025-12-31 14:45
+    ("2025-12-31", "20251231144500000", "2025-12-31 14:45:00"),
+])
+def test_build_15m_dt_single_row(date_str, time_str, expected):
+    """单行: 从 17 位 time 第 8-12 位提取 HHMM, date 直连(带 -)."""
+    d, t = _series(date_str, time_str)
+    out = _build_15m_dt(d, t)
+    assert list(out) == [expected]
+
+
+def test_build_15m_dt_multi_row_mixed_times():
+    """多行混合: 同日不同时分, 产出对应 HH:MM:00."""
+    dates = pd.Series(["2026-07-21"] * 4)
+    times = pd.Series([
+        "20260721094500000",
+        "20260721100000000",
+        "20260721143000000",
+        "20260721150000000",
+    ])
+    out = list(_build_15m_dt(dates, times))
+    assert out == [
+        "2026-07-21 09:45:00",
+        "2026-07-21 10:00:00",
+        "2026-07-21 14:30:00",
+        "2026-07-21 15:00:00",
+    ]
+
+
+def test_build_15m_dt_multi_row_different_dates():
+    """多行不同日期: 跨日场景."""
+    dates = pd.Series(["2026-07-21", "2026-07-22", "2026-07-23"])
+    times = pd.Series([
+        "20260721150000000",
+        "20260722150000000",
+        "20260723150000000",
+    ])
+    out = list(_build_15m_dt(dates, times))
+    assert out == [
+        "2026-07-21 15:00:00",
+        "2026-07-22 15:00:00",
+        "2026-07-23 15:00:00",
+    ]
+
+
+def test_build_15m_dt_format_glob_safe():
+    """产出格式必须符合 'YYYY-MM-DD HH:MM:SS' GLOB 模式
+    (用于 VPS 清理乱 datetime 时不会误删正常行)."""
+    d, t = _series("2026-07-21", "20260721094500000")
+    out = _build_15m_dt(d, t)
+    val = out.iloc[0]
+    # GLOB '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]'
+    assert len(val) == 19
+    assert val[4] == "-" and val[7] == "-" and val[10] == " "
+    assert val[13] == ":" and val[16] == ":"
+    # 每位均数字
+    digits = val.replace("-", "").replace(":", "").replace(" ", "")
+    assert digits.isdigit() and len(digits) == 14