fix: avoid stale pending update after empty sync

Author: Astro-Han

quantclass_sync_internal/data_query.py

@@ -15,7 +15,7 @@
 from .constants import (
     ENCODING_CANDIDATES, KNOWN_DATASETS, TIMESTAMP_FILE_NAME,
     BUSINESS_DAY_ONLY_PRODUCTS, FINANCIAL_PRODUCTS, NOTICE_PRODUCTS,
-    INFRA_PRODUCTS,
+    INFRA_PRODUCTS, REASON_NO_VALID_OUTPUT,
 )
 from .csv_engine import write_csv_payload
 from .models import CsvPayload, log_error, RULES
@@ -173,17 +173,35 @@ def get_products_overview(
         local_date = read_local_timestamp_date(data_root, product)
         last = last_results.get(product, {})
         last_status = last.get("status", "")
+        last_reason = last.get("reason_code", "")
+        last_source = last.get("source", "")
+        last_date = _parse_date(last.get("date_time", ""))
+        freshness_anchor = _parse_date(last.get("checked_at", "")) or last_date
+        last_result_fresh = (
+            freshness_anchor is not None
+            and (today - freshness_anchor).days <= _STALE_GRACE_DAYS
+        )
 
         # 优先用传入的 API 实时日期（检查更新按钮场景）
         api_date = _parse_date((api_latest_dates or {}).get(product, ""))
         if api_date is not None:
-            ref_date = api_date
+            # 同一最新日期已在同步阶段确认无有效输出时，不再把它计为待更新。
+            if (
+                last_source == "sync"
+                and last_reason == REASON_NO_VALID_OUTPUT
+                and last_result_fresh
+                and last_date == api_date
+                and _parse_date(local_date) is not None
+            ):
+                ref_date = _parse_date(local_date)
+            else:
+                ref_date = api_date
         else:
             # 用缓存的 API 日期作为参考，避免周末/假日误报落后；
             # 缓存超过宽限期或无缓存时降级回 today，提示可能有新数据。
-            # 宽限期从"上次查询/同步时间"算起（checked_at 优先，降级到 date_time）
-            cached_api_date = _parse_date(last.get("date_time", ""))
-            freshness_anchor = _parse_date(last.get("checked_at", "")) or cached_api_date
+            # 仅排除明确来自同步结果(source="sync")的 date_time；
+            # 旧安装缺少 source 字段时保持兼容，仍沿用原缓存逻辑。
+            cached_api_date = last_date if last_source != "sync" else None
             cache_fresh = (
                 cached_api_date is not None
                 and freshness_anchor is not None

tests/test_data_query.py

@@ -126,6 +126,12 @@ def _write_report(self, filename: str, products: list):
             json.dumps(existing, ensure_ascii=False), encoding="utf-8"
         )
 
+    def _write_product_last_status(self, payload: dict) -> None:
+        """直接写入 product_last_status.json，用于覆盖 source/checked_at 等字段。"""
+        (self.log_dir / "product_last_status.json").write_text(
+            json.dumps(payload, ensure_ascii=False), encoding="utf-8"
+        )
+
     def test_basic_overview(self):
         """有 timestamp + 有报告的基本场景。"""
         self._write_timestamp("stock-trading-data", "2026-03-13")
@@ -313,6 +319,63 @@ def test_overview_api_latest_dates_equal_local(self):
         self.assertEqual(overview[0]["days_behind"], 0)
         self.assertEqual(overview[0]["status_color"], "green")
 
+    def test_overview_sync_source_date_is_not_used_as_api_cache(self):
+        """sync 写入的 date_time 不能当作 API 缓存日期使用。"""
+        self._write_timestamp("coin-cap", "2026-03-10")
+        self._write_product_last_status({
+            "coin-cap": {
+                "status": "skipped",
+                "reason_code": "no_valid_output",
+                "error": "同步未产生可用输出，已跳过状态推进。",
+                "date_time": "2026-03-11",
+                "checked_at": "2026-03-13T09:00:00",
+                "source": "sync",
+            }
+        })
+
+        import unittest.mock
+        with unittest.mock.patch(
+            "quantclass_sync_internal.data_query.report_dir_path",
+            return_value=self.log_dir,
+        ):
+            overview = get_products_overview(
+                self.data_root,
+                ["coin-cap"],
+                today=date(2026, 3, 13),
+            )
+
+        self.assertEqual(overview[0]["days_behind"], 3)
+        self.assertEqual(overview[0]["status_color"], "yellow")
+
+    def test_overview_same_api_date_after_no_valid_output_is_not_pending(self):
+        """同一 API 日期已确认 no_valid_output 时，不再标记为待更新。"""
+        self._write_timestamp("coin-cap", "2026-03-10")
+        self._write_product_last_status({
+            "coin-cap": {
+                "status": "skipped",
+                "reason_code": "no_valid_output",
+                "error": "同步未产生可用输出，已跳过状态推进。",
+                "date_time": "2026-03-11",
+                "checked_at": "2026-03-13T09:00:00",
+                "source": "sync",
+            }
+        })
+
+        import unittest.mock
+        with unittest.mock.patch(
+            "quantclass_sync_internal.data_query.report_dir_path",
+            return_value=self.log_dir,
+        ):
+            overview = get_products_overview(
+                self.data_root,
+                ["coin-cap"],
+                today=date(2026, 3, 13),
+                api_latest_dates={"coin-cap": "2026-03-11"},
+            )
+
+        self.assertEqual(overview[0]["days_behind"], 0)
+        self.assertEqual(overview[0]["status_color"], "green")
+
     def test_overview_api_latest_dates_earlier_than_local(self):
         """API 日期早于本地日期时 behind=0（max(0, diff) 截断）。"""
         self._write_timestamp("stock-trading-data", "2026-03-14")