Update variable names and function calls

python/lsst/pipe/base/quantum_provenance_graph.py

@@ -42,7 +42,7 @@
 import itertools
 import logging
 import uuid
-from collections.abc import Iterator, Iterable, Sequence
+from collections.abc import Iterable, Iterator, Sequence
 from enum import Enum
 from typing import TYPE_CHECKING, ClassVar, Literal, NamedTuple, TypedDict, cast
 
@@ -484,10 +484,10 @@ def add_quantum_info(self, info: QuantumInfo, butler: Butler, do_store_logs: boo
                 self.n_unknown += 1
             case unrecognized_state:
                 raise AssertionError(f"Unrecognized quantum status {unrecognized_state!r}")
-    
+
     def add_data_id_group(self, other: TaskSummary) -> None:
         """Add information from a `TaskSummary` over one dataquery-identified
-        group to another, as part of aggregating `Summary` reports. 
+        group to another, as part of aggregating `Summary` reports.
 
         Parameters
         ----------
@@ -496,13 +496,13 @@ def add_data_id_group(self, other: TaskSummary) -> None:
         """
         self.n_successful += other.n_successful
         self.n_blocked += other.n_blocked
-        self.n_not_attempted += other.n_not_attempted
+        self.n_unknown += other.n_unknown
         self.n_expected += other.n_expected
 
         self.wonky_quanta.extend(other.wonky_quanta)
         self.recovered_quanta.extend(other.recovered_quanta)
         self.failed_quanta.extend(other.failed_quanta)
-        
+
 
 class CursedDatasetSummary(pydantic.BaseModel):
     """A summary of all the relevant information on a cursed dataset."""
@@ -643,27 +643,32 @@ def add_dataset_info(self, info: DatasetInfo, producer_info: QuantumInfo) -> Non
                 self.n_predicted_only += 1
             case unrecognized_state:
                 raise AssertionError(f"Unrecognized dataset status {unrecognized_state!r}")
-            
+
     def add_data_id_group(self, other: DatasetTypeSummary) -> None:
         """Add information from a `DatasetTypeSummary` over one
         dataquery-identified group to another, as part of aggregating `Summary`
-        reports. 
+        reports.
 
         Parameters
         ----------
         other : `DatasetTypeSummary`
             `DatasetTypeSummary` to aggregate.
         """
-        if self.producer:
+        if self.producer and other.producer:
             # Guard against empty string
             if self.producer != other.producer:
-                _LOG.warning("Producer for dataset type is not consistent: %r != %r.", self.producer, other.producer)
+                _LOG.warning(
+                    "Producer for dataset type is not consistent: %r != %r.", self.producer, other.producer
+                )
                 _LOG.warning("Ignoring %r.", other.producer)
         else:
-            self.producer = other.producer
+            if other.producer and not self.producer:
+                self.producer = other.producer
+            if self.producer and not other.producer:
+                pass
 
-        self.n_published += other.n_published
-        self.n_unpublished += other.n_unpublished
+        self.n_visible += other.n_visible
+        self.n_shadowed += other.n_shadowed
         self.n_predicted_only += other.n_predicted_only
         self.n_expected += other.n_expected