合并

etl_billiards/orchestration/run_tracker.py

@@ -39,9 +39,18 @@ class RunTracker:
         self.db.commit()
         return run_id
     
-    def update_run(self, run_id: int, counts: dict, status: str,
-                   ended_at: datetime = None, manifest: dict = None,
-                   error_message: str = None):
+    def update_run(
+        self,
+        run_id: int,
+        counts: dict,
+        status: str,
+        ended_at: datetime = None,
+        manifest: dict = None,
+        error_message: str = None,
+        window: dict | None = None,
+        request_params: dict | None = None,
+        overlap_seconds: int | None = None,
+    ):
         """更新运行记录"""
         sql = """
         UPDATE etl_admin.etl_run
@@ -54,17 +63,65 @@ class RunTracker:
             status = %s,
             ended_at = %s,
             manifest = %s,
-            error_message = %s
+            error_message = %s,
+            window_start = COALESCE(%s, window_start),
+            window_end = COALESCE(%s, window_end),
+            window_minutes = COALESCE(%s, window_minutes),
+            overlap_seconds = COALESCE(%s, overlap_seconds),
+            request_params = CASE WHEN %s IS NULL THEN request_params ELSE %s::jsonb END
         WHERE run_id = %s
         """
         
+        def _count(v, default: int = 0) -> int:
+            if v is None:
+                return default
+            if isinstance(v, bool):
+                return int(v)
+            if isinstance(v, int):
+                return int(v)
+            if isinstance(v, str):
+                try:
+                    return int(v)
+                except Exception:
+                    return default
+            if isinstance(v, (list, tuple, set, dict)):
+                try:
+                    return len(v)
+                except Exception:
+                    return default
+            return default
+
+        safe_counts = counts or {}
+
+        window_start = None
+        window_end = None
+        window_minutes = None
+        if isinstance(window, dict):
+            window_start = window.get("start") or window.get("window_start")
+            window_end = window.get("end") or window.get("window_end")
+            window_minutes = window.get("minutes") or window.get("window_minutes")
+
+        request_json = None if request_params is None else json.dumps(request_params or {}, ensure_ascii=False)
         self.db.execute(
             sql,
-            (counts.get("fetched", 0), counts.get("inserted", 0),
-             counts.get("updated", 0), counts.get("skipped", 0),
-             counts.get("errors", 0), counts.get("unknown_fields", 0),
-             status, ended_at,
-             json.dumps(manifest or {}, ensure_ascii=False),
-             error_message, run_id)
+            (
+                _count(safe_counts.get("fetched", 0)),
+                _count(safe_counts.get("inserted", 0)),
+                _count(safe_counts.get("updated", 0)),
+                _count(safe_counts.get("skipped", 0)),
+                _count(safe_counts.get("errors", 0)),
+                _count(safe_counts.get("unknown_fields", 0)),
+                status,
+                ended_at,
+                json.dumps(manifest or {}, ensure_ascii=False),
+                error_message,
+                window_start,
+                window_end,
+                window_minutes,
+                overlap_seconds,
+                request_json,
+                request_json,
+                run_id,
+            ),
         )
         self.db.commit()