改 相对路径 完成客户端

etl_billiards/scripts/reload_ods_windowed.py

@@ -20,10 +20,12 @@ if str(PROJECT_ROOT) not in sys.path:
     sys.path.insert(0, str(PROJECT_ROOT))
 
 from config.settings import AppConfig
+from utils.windowing import split_window
 from utils.logging_utils import build_log_path, configure_logging
 
 MIN_RELOAD_WINDOW_DAYS = 30
 
+
 def _parse_dt(value: str, tz: ZoneInfo, *, is_end: bool) -> datetime:
     raw = (value or "").strip()
     if not raw:
@@ -56,6 +58,8 @@ def _run_task_window(
     api_page_size: int,
     api_timeout: int,
     logger: logging.Logger,
+    window_split_unit: str | None = "none",
+    window_compensation_hours: int | None = 0,
 ) -> None:
     cmd = [
         sys.executable,
@@ -70,6 +74,10 @@ def _run_task_window(
         "--window-end",
         window_end.strftime("%Y-%m-%d %H:%M:%S"),
         "--force-window-override",
+        "--window-split-unit",
+        str(window_split_unit or "none"),
+        "--window-compensation-hours",
+        str(int(window_compensation_hours or 0)),
     ]
     if api_page_size > 0:
         cmd += ["--api-page-size", str(api_page_size)]
@@ -92,6 +100,8 @@ def main() -> int:
     ap.add_argument("--end", default="", help="end datetime (default: now)")
     ap.add_argument("--window-days", type=int, default=1, help="days per window (default: 1)")
     ap.add_argument("--window-hours", type=int, default=0, help="hours per window (default: 0)")
+    ap.add_argument("--window-split-unit", default="", help="split unit (month/none), default from config")
+    ap.add_argument("--window-compensation-hours", type=int, default=None, help="window compensation hours, default from config")
     ap.add_argument("--sleep-seconds", type=float, default=0, help="sleep seconds after each window")
     ap.add_argument("--api-page-size", type=int, default=200, help="API page size override")
     ap.add_argument("--api-timeout", type=int, default=20, help="API timeout seconds override")
@@ -119,40 +129,70 @@ def main() -> int:
         end = datetime.now(tz) if not args.end else _parse_dt(args.end, tz, is_end=True)
         window_days = int(args.window_days)
         window_hours = int(args.window_hours)
-        min_hours = MIN_RELOAD_WINDOW_DAYS * 24
-        if window_hours > 0:
-            if window_hours < min_hours:
-                logger.warning(
-                    "window_hours=%s too small; adjust to %s",
-                    window_hours,
-                    min_hours,
-                )
-                window_hours = min_hours
-        elif window_days < MIN_RELOAD_WINDOW_DAYS:
-            logger.warning(
-                "window_days=%s too small; adjust to %s",
-                window_days,
-                MIN_RELOAD_WINDOW_DAYS,
+        split_unit = (args.window_split_unit or cfg.get("run.window_split.unit", "month") or "month").strip()
+        comp_hours = args.window_compensation_hours
+        if comp_hours is None:
+            comp_hours = cfg.get("run.window_split.compensation_hours", 0)
+
+        use_split = split_unit.lower() not in ("", "none", "off", "false", "0")
+        if use_split:
+            windows = split_window(
+                start,
+                end,
+                tz=tz,
+                split_unit=split_unit,
+                compensation_hours=comp_hours,
             )
-            window_days = MIN_RELOAD_WINDOW_DAYS
-        window_size = timedelta(hours=window_hours) if window_hours > 0 else timedelta(days=window_days)
+        else:
+            min_hours = MIN_RELOAD_WINDOW_DAYS * 24
+            if window_hours > 0:
+                if window_hours < min_hours:
+                    logger.warning(
+                        "window_hours=%s too small; adjust to %s",
+                        window_hours,
+                        min_hours,
+                    )
+                    window_hours = min_hours
+            elif window_days < MIN_RELOAD_WINDOW_DAYS:
+                logger.warning(
+                    "window_days=%s too small; adjust to %s",
+                    window_days,
+                    MIN_RELOAD_WINDOW_DAYS,
+                )
+                window_days = MIN_RELOAD_WINDOW_DAYS
+            adjusted = split_window(
+                start,
+                end,
+                tz=tz,
+                split_unit="none",
+                compensation_hours=comp_hours,
+            )
+            if adjusted:
+                start, end = adjusted[0]
+            window_size = timedelta(hours=window_hours) if window_hours > 0 else timedelta(days=window_days)
+            windows = list(_iter_windows(start, end, window_size))
+
+        if windows:
+            start, end = windows[0][0], windows[-1][1]
 
         task_codes = [t.strip().upper() for t in args.tasks.split(",") if t.strip()]
         if not task_codes:
             raise SystemExit("no tasks specified")
 
         logger.info(
-            "START range=%s~%s window_days=%s window_hours=%s sleep=%.2f",
+            "START range=%s~%s window_days=%s window_hours=%s split_unit=%s comp_hours=%s sleep=%.2f",
             start.isoformat(),
             end.isoformat(),
             window_days,
             window_hours,
+            split_unit,
+            comp_hours,
             args.sleep_seconds,
         )
 
         for task_code in task_codes:
             logger.info("TASK_START task=%s", task_code)
-            for window_start, window_end in _iter_windows(start, end, window_size):
+            for window_start, window_end in windows:
                 start_ts = time_mod.monotonic()
                 _run_task_window(
                     task_code=task_code,
@@ -161,6 +201,8 @@ def main() -> int:
                     api_page_size=args.api_page_size,
                     api_timeout=args.api_timeout,
                     logger=logger,
+                    window_split_unit="none",
+                    window_compensation_hours=0,
                 )
                 elapsed = time_mod.monotonic() - start_ts
                 logger.info(