Add ability to dispatch metrics to Sasquatch

This commit adds the ability to dispatch MetricMeasurementBundles
to the Sasquatch service. This can be done either with the
SasquatchDisaptcher class, or more commonly using a butler
datastore that will automatically dispatch them when put to the
datastore. There are a few other cleanups on this commit that were
made either to support this work, or that were found in the
process of doing this ticket.

python/lsst/analysis/tools/__init__.py

@@ -36,6 +36,5 @@
 from the object itself, which allows
 """
 
-from .interfaces import *
 from .statistics import *
 from .version import *  # Generated by sconsUtils

python/lsst/analysis/tools/actions/plot/colorColorFitPlot.py

@@ -28,13 +28,12 @@
 import matplotlib.patheffects as pathEffects
 import matplotlib.pyplot as plt
 import numpy as np
-from lsst.analysis.tools import PlotAction
 from lsst.pex.config import Field, ListField
 from matplotlib.figure import Figure
 from matplotlib.patches import Rectangle
 from sklearn.neighbors import KernelDensity
 
-from ...interfaces import KeyedData, KeyedDataSchema, Scalar, Vector
+from ...interfaces import KeyedData, KeyedDataSchema, PlotAction, Scalar, Vector
 from ...statistics import sigmaMad
 from .plotUtils import addPlotInfo, mkColormap, perpDistance
 

python/lsst/analysis/tools/interfaces/_actions.py

@@ -32,6 +32,8 @@
     "PlotAction",
     "JointResults",
     "JointAction",
+    "NoMetric",
+    "NoPlot",
 )
 
 import warnings

python/lsst/analysis/tools/interfaces/_analysisTools.py

@@ -125,22 +125,6 @@ class AnalysisTool(AnalysisAction):
     metric_tags = ListField[str](
         doc="List of tags which will be associated with metric measurement(s)", default=[]
     )
-    dataset_identifier = Field[str](doc="An identifier to be associated with output Metrics", optional=True)
-    reference_package = Field[str](
-        doc="A package who's version, at the time of metric upload to a "
-        "time series database, will be converted to a timestamp of when "
-        "that version was produced",
-        default="lsst_distrib",
-    )
-    timestamp_version = Field[str](
-        doc="Which time stamp should be used as the reference timestamp for a "
-        "metric in a time series database, valid values are; "
-        "reference_package_timestamp, run_timestamp, current_timestamp, "
-        "and dataset_timestamp",
-        default="run_timestamp",
-        check=lambda x: x
-        in ("reference_package_timestamp", "run_timestamp", "current_timestamp", "dataset_timestamp"),
-    )
 
     def __init_subclass__(cls: type[AnalysisTool], **kwargs):
         super().__init_subclass__(**kwargs)

python/lsst/analysis/tools/interfaces/_metricMeasurementBundle.py

@@ -42,10 +42,10 @@ class MetricMeasurementBundle(UserDict[str, list[Measurement]]):
     """
 
     def __init__(self, *args, **kwargs):
+        self.reference_package: str | None = kwargs.pop("reference_package", None)
+        self.timestamp_version: str | None = kwargs.pop("timestamp_version", None)
+        self.dataset_identifier: str | None = kwargs.pop("dataset_identifier", None)
         super().__init__(*args, **kwargs)
-        self.reference_package: str | None = None
-        self.timestamp_version: str | None = None
-        self.dataset_identifier: str | None = None
 
     def json(self) -> str:
         result = {}

python/lsst/analysis/tools/interfaces/_task.py

@@ -208,12 +208,6 @@ def freeze(self):
             for tool in self.atools:
                 for tag in self.metric_tags:
                     tool.metric_tags.insert(-1, tag)
-                if tool.dataset_identifier is None:
-                    tool.dataset_identifier = self.dataset_identifier
-                if tool.reference_package == "lsst_distrib":
-                    tool.reference_package = self.reference_package
-                if tool.timestamp_version == "run_timestamp":
-                    tool.timestamp_version = self.timestamp_version
         super().freeze()
 
     def validate(self):
@@ -245,7 +239,11 @@ class AnalysisPipelineTask(PipelineTask):
 
     def _runTools(self, data: KeyedData, **kwargs) -> Struct:
         results = Struct()
-        results.metrics = MetricMeasurementBundle()  # type: ignore
+        results.metrics = MetricMeasurementBundle(
+            dataset_identifier=self.config.dataset_identifier,
+            reference_package=self.config.reference_package,
+            timestamp_version=self.config.timestamp_version,
+        )
         # copy plot info to be sure each action sees its own copy
         plotInfo = kwargs.get("plotInfo")
         plotKey = f"{self.config.connections.outputName}_{{name}}"

python/lsst/analysis/tools/interfaces/datastore/__init__.py

@@ -0,0 +1,2 @@
+from ._dispatcher import *
+from ._sasquatchDatastore import *