Corrected UNREADY before more statistics are provided

Author: zhaoyu

python/lsst/ctrl/bps/panda/panda_service.py

@@ -251,7 +251,7 @@ def report(
         # Sort tasks by workload_id or fallback
         try:
             tasks.sort(key=lambda x: x["transform_workload_id"])
-        except Exception:
+        except (KeyError, TypeError):
             tasks.sort(key=lambda x: x["transform_id"])
 
         exit_codes_all = {}
@@ -314,9 +314,17 @@ def report(
                         njobs = val
                     if state == WmsStates.RUNNING:
                         njobs += task.get("output_new_files", 0) - task.get("input_new_files", 0)
-                wms_report.job_state_counts[state] += njobs
+                if state != WmsStates.UNREADY:
+                    wms_report.job_state_counts[state] += njobs
                 taskstatus[state] = njobs
 
+            # Count UNREADY
+            unready = WmsStates.UNREADY
+            taskstatus[unready] = totaljobs - sum(
+                taskstatus[state] for state in WmsStates if state != unready
+            )
+            wms_report.job_state_counts[unready] += taskstatus[unready]
+
             # Store task summary
             wms_report.job_summary[tasklabel] = taskstatus
             summary_part = f"{tasklabel}:{totaljobs}"

python/lsst/ctrl/bps/panda/utils.py

@@ -111,8 +111,8 @@ def extract_taskname(s: str) -> str:
 
 
 def aggregate_by_basename(job_summary, exit_code_summary, run_summary):
-    """
-    Aggregate job exit code and run summaries by their base label (basename).
+    """Aggregate job exit code and run summaries by
+    their base label (basename).
 
     Parameters
     ----------