fix(data): daily增量marker按日折叠——首日全量done后次日整段跳过增量的day-2致命坑 [nas]
CI/CD / test (push) Failing after 12m23s
CI/CD / nas-deploy (push) Has been skipped
CI/CD / nas-verify (push) Has been skipped

09-07 首跑夜复查发现: daily ann/news marker 无日期维度,首跑日已写满
6168+6168 → 次日 06:00 首班会整段跳过增量采集,且 backfill 仍在跑会掩盖
症状。修=unit 名前挂 dt=YYYY-MM-DD/ 子目录(_dunit)+日初清旧日目录与
历史平铺 marker(_prune_daily_increment_markers);fulltext/pdf 段键=内容
id(不可变一次永逸)保持平铺不走折叠。契约测试: 次日重新拉窗承接新公告/
当日断点续传不变/旧日目录日初清。
This commit is contained in:
2026-09-07 18:53:41 +08:00
parent b833ecd122
commit 52756e35ab
2 changed files with 80 additions and 12 deletions
+50 -8
View File
@@ -418,19 +418,58 @@ def test_daily_happy_path_writes_all_domains(root, monkeypatch):
ft = pd.read_parquet(root / "news_fulltext" / f"dt={today}" / "part-0.parquet")
assert len(ft) == 1 and "正文内容" in ft.iloc[0]["content_text"]
# markers: ann/news 每股 done;fulltext 每 art done
assert cd.is_done("daily", "ann", "000001") and cd.is_done("daily", "ann", "600519")
assert cd.is_done("daily", "news", "600519")
assert cd.is_done("daily", "ann", f"dt={today}/000001") \
and cd.is_done("daily", "ann", f"dt={today}/600519")
assert cd.is_done("daily", "news", f"dt={today}/600519")
assert cd.is_done("daily", "fulltext", "art1")
def test_daily_increment_next_day_refetches(root, monkeypatch):
"""daily ann/news 增量 marker 按日折叠(09-07 首跑夜抓到的 day-2 致命坑):
marker 无日期维度→首日全量 done 后次日整段跳过增量采集(backfill 仍在跑会掩盖)。
契约: 次日必须重新拉窗承接新公告/新闻;当日断点续传语义不变;旧日 dt= 目录日初清。"""
import pandas as pd
_wire_daily(monkeypatch, root)
day1 = dt.date.today()
assert cd.run_lane("daily") == 0
assert cd.is_done("daily", "ann", f"dt={day1.isoformat()}/000001")
class _NextDay(dt.date):
@classmethod
def today(cls):
return day1 + dt.timedelta(days=1)
monkeypatch.setattr(cd.dt, "date", _NextDay)
_wire_daily(monkeypatch, root,
ann_pages=[_cninfo_page([_ann_raw(aid="a2", code="000001")])],
news_rows=[{"code": "art2", "date": "2026-09-07 10:00:00",
"title": "次日新闻", "content": "摘要",
"mediaName": "", "image": ""}])
assert cd.run_lane("daily") == 0
day2 = (day1 + dt.timedelta(days=1)).isoformat()
ann = pd.read_parquet(root / "ann_meta" / f"dt={day2}" / "part-0.parquet")
assert list(ann["announcement_id"]) == ["a2"] # 次日新公告承接
news = pd.read_parquet(root / "news_meta" / f"dt={day2}" / "part-0.parquet")
assert "art2" in set(news["art_code"])
ft = pd.read_parquet(root / "news_fulltext" / f"dt={day2}" / "part-0.parquet")
assert list(ft["art_code"]) == ["art2"]
# 旧日 dt= 目录日初被清(无限增长防线);当日再跑零 fetch(同日断点续传不变)
assert not (root / "state" / "markers" / "daily" / "ann" / f"dt={day1.isoformat()}").exists()
m = cd.fetch_cninfo_announcements
inc = lambda: sum(1 for c in m.call_args_list if not c.kwargs.get("category"))
n_before = inc() # 增量段调用(无 category);fivecat 全池扫描(mark=False)不计
assert cd.run_lane("daily") == 0
assert inc() == n_before
def test_daily_rerun_idempotent_no_dup(root, monkeypatch):
import pandas as pd
_wire_daily(monkeypatch, root)
assert cd.run_lane("daily") == 0
# markers 全 done → 第二趟零 fetch;强制清 marker 重跑同数据 → 零重复行
today = dt.date.today().isoformat()
for code, _ in POOL:
(root / "state" / "markers" / "daily" / "ann" / f"{code}.done").unlink()
(root / "state" / "markers" / "daily" / "news" / f"{code}.done").unlink()
(root / "state" / "markers" / "daily" / "ann" / f"dt={today}" / f"{code}.done").unlink()
(root / "state" / "markers" / "daily" / "news" / f"dt={today}" / f"{code}.done").unlink()
assert cd.run_lane("daily") == 0
today = dt.date.today().isoformat()
ann = pd.read_parquet(root / "ann_meta" / f"dt={today}" / "part-0.parquet")
@@ -453,8 +492,9 @@ def test_daily_two_day_window_after_missed_day(root, monkeypatch):
_wire_daily(monkeypatch, root)
cd.run_lane("daily")
# 清 marker 模拟「另一天再来」;同 id 仍是昨天发的 → 已在账,不重
today = dt.date.today().isoformat()
for code, _ in POOL:
(root / "state" / "markers" / "daily" / "ann" / f"{code}.done").unlink()
(root / "state" / "markers" / "daily" / "ann" / f"dt={today}" / f"{code}.done").unlink()
cd.run_lane("daily")
today = dt.date.today().isoformat()
ann = pd.read_parquet(root / "ann_meta" / f"dt={today}" / "part-0.parquet")
@@ -476,8 +516,9 @@ def test_daily_unit_fail_not_marked_and_rc1(root, monkeypatch):
monkeypatch.setattr(cd, "fetch_cninfo_announcements", flaky)
rc = cd.run_lane("daily")
assert rc == 1
assert not cd.is_done("daily", "ann", "000001")
assert cd.is_done("daily", "ann", "600519")
today = dt.date.today().isoformat()
assert not cd.is_done("daily", "ann", f"dt={today}/000001")
assert cd.is_done("daily", "ann", f"dt={today}/600519")
today = dt.date.today().isoformat()
ann = pd.read_parquet(root / "ann_meta" / f"dt={today}" / "part-0.parquet")
assert len(ann) == 1 # 只有好股的
@@ -592,7 +633,8 @@ def test_wallclock_stops_after_current_unit(root, monkeypatch):
past = (dt.datetime.now() - dt.timedelta(minutes=1)).strftime("%H:%M")
rc = cd.run_lane("daily", until=past)
assert rc == 3
assert cd.is_done("daily", "ann", "000001") # 首 unit 完成后停
today = dt.date.today().isoformat()
assert cd.is_done("daily", "ann", f"dt={today}/000001") # 首 unit 完成后停
def test_wallclock_future_runs_to_completion(root, monkeypatch):