lsst-daf-butler 30.0.0rc3__tar.gz → 30.2025.5000__tar.gz

{lsst_daf_butler-30.0.0rc3/python/lsst_daf_butler.egg-info → lsst_daf_butler-30.2025.5000}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 30.0.0rc3
+Version: 30.2025.5000
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/doc/lsst.daf.butler/CHANGES.rst

@@ -1,118 +1,3 @@
-Butler v30.0.0 (2026-01-15)
-===========================
-
-New Features
-------------
-
-- Modified ``ButlerMDC`` to preserve metadata for exceptions that are raised in a context but handled outside it.
-  This lets exceptions be logged by high-level handlers the same way they would have been if the problem were logged immediately. (`DM-42272 <https://rubinobs.atlassian.net/browse/DM-42272>`_)
-- Added a new method ``Butler.query_all_datasets()``, which can be used to query for datasets of multiple types more efficiently than looping over ``query_datasets()``. (`DM-47563 <https://rubinobs.atlassian.net/browse/DM-47563>`_)
-- Added a new registry configuration option ``temporary_tables: False`` to disable the use of temporary tables by the database backend. (`DM-51125 <https://rubinobs.atlassian.net/browse/DM-51125>`_)
-- Added support to the query language to allow sky regions to be specified directly in an ADQL-like way. This includes ``CIRCLE``, ``BOX``, ``POLYGON``, and ``REGION``. (`DM-51454 <https://rubinobs.atlassian.net/browse/DM-51454>`_)
-- ``Butler.transfer_dimension_records_from`` now accepts ``DataCoordinate`` instances in addition to ``DatasetRef`` instances to specify the dimension records to be transferred. (`DM-51681 <https://rubinobs.atlassian.net/browse/DM-51681>`_)
-- ``Butler.ingest()`` now has an optional ``skip_existing`` parameter that makes it ignore datasets that already exist in the repository instead of raising an error.  This makes it easier for applications to retry ingests. (`DM-52179 <https://rubinobs.atlassian.net/browse/DM-52179>`_)
-- Added glob-style matching to column names in parquet tables, when specified via the ``columns`` parameter. (`DM-52515 <https://rubinobs.atlassian.net/browse/DM-52515>`_)
-- Added a new ``--remove-from-parents`` flag for the ``remove-collections`` CLI to allow removal of collections that are still referenced from chained collections. (`DM-52782 <https://rubinobs.atlassian.net/browse/DM-52782>`_)
-- We now build the Butler server Docker container for both arm64 and amd64. (`DM-52819 <https://rubinobs.atlassian.net/browse/DM-52819>`_)
-- Made ``ButlerLogRecords`` extensible.
-
-  This changes the ``ButlerLogRecords`` file format (the old format can still be
-  read) to allow arbitrary JSON data to be serialized with the log records.
-
-  The ``ButlerLogRecords`` class has been modified to inherit from
-  ``collections.abc.MutableSequence`` instead of `pydantic.RootModel`, which means
-  Pydantic methods can no longer be called on it directly (in particular, use
-  ``to_json_data`` to serialize instead of ``model_dump_json``). (`DM-53019 <https://rubinobs.atlassian.net/browse/DM-53019>`_)
-- The ``id`` parameter to ``Butler.get_dataset`` now accepts hexadecimal strings, in addition to UUID instances.
-  A new method ``Butler.get_many_datasets()`` allows the efficient lookup of multiple ``DatasetRef`` by dataset UUID. (`DM-53176 <https://rubinobs.atlassian.net/browse/DM-53176>`_)
-- Added ``Butler.close()``, a context manager implementation for ``Butler``, and ``QuantumBackedButler.close()``.  These can be used to ensure that database connections are closed deterministically, rather than waiting for mark-and-sweep garbage collection. (`DM-53233 <https://rubinobs.atlassian.net/browse/DM-53233>`_)
-- ``LabeledButlerFactory`` now has a ``writeable`` constructor option to allow writeable Butlers to be instantiated.
-  ``LabeledButlerFactory`` can now be used as a context manager to control the lifetime of its database connections. (`DM-53739 <https://rubinobs.atlassian.net/browse/DM-53739>`_)
-
-Bug Fixes
----------
-
-- Fixed a few server-side exceptions that should have been sent to ``RemoteButler`` clients as meaningful exceptions, but instead were triggering an HTTP 500 Internal Server Error. (`DM-51314 <https://rubinobs.atlassian.net/browse/DM-51314>`_)
-- Deferred loading storage class definitions when deserializing datastore records.
-
-  This prevents storage class lookup errors when loading quantum graphs, when the storage class definitions are defined somewhere other than the defaults in ``daf_butler`` (such as a repository root). (`DM-51381 <https://rubinobs.atlassian.net/browse/DM-51381>`_)
-- When exporting ``visit`` dimension records, ``Butler.export()`` now includes ``populated_by: visit`` records like ``visit_definition``/``visit_system_membership``, and the associated ``exposure`` records. (`DM-51681 <https://rubinobs.atlassian.net/browse/DM-51681>`_)
-- Fixed a bug introduced in July 2024 in collection query methods that specify ``flatten_chains=True`` with name patterns.
-
-  The bug resulted in not returning all children names for a chain collection that matches the pattern, only child names that also match the pattern were returned. (`DM-51819 <https://rubinobs.atlassian.net/browse/DM-51819>`_)
-- ``Butler.ingest()`` now checks for conflicting datastore records before ingesting files, reducing the likelihood of an issue where existing files are overwritten/deleted by an ingest that fails due to conflicting datasets. (`DM-52179 <https://rubinobs.atlassian.net/browse/DM-52179>`_)
-- Query generation will no longer throw ``sqlalchemy.exc.ArgumentError`` when attempting to use a dataset calibration timespan constraint for a dataset search without any calibration collections. (`DM-52398 <https://rubinobs.atlassian.net/browse/DM-52398>`_)
-- Changed the conceptual timespan associated with ``RUN`` and ``TAGGED`` collections from `None` / ``NULL`` to an unbounded timespan.
-
-  This fixes the behavior of temporal joins in quantum graph builds, where prior to this change a ``RUN`` or ``TAGGED`` collection earlier in the search path would be silently ignored in favor of a later ``CALIBRATION`` collection.
-  It also changes the value of timespan columns for these collection types via the ``Query.general`` interface.
-  The behavior of ``queryDatasetAssociations`` has *not* been changed for backwards-compatibility; it continues to return ``timespan=None`` for non-``CALIBRATION``` collections. (`DM-52895 <https://rubinobs.atlassian.net/browse/DM-52895>`_)
-- The unit tests will no longer fail due to file descriptor exhaustion.
-  All `ResourceWarning` messages in the unit test suite have been fixed.
-  Butler instances are now garbage-collected immediately when they are no longer referenced, although their database connections still might not be released until mark-and-sweep garbage collection runs. (`DM-53233 <https://rubinobs.atlassian.net/browse/DM-53233>`_)
-- Fixed compatibility of the unit test suite with pytest v9. (`DM-53266 <https://rubinobs.atlassian.net/browse/DM-53266>`_)
-- Storage classes are no longer loaded implicitly when using ``Butler.registry.queryDatasets()``.
-  A warning about the ``datasetType`` parameter being deprecated is no longer issued when calling ``Butler.registry.queryDatasetAssociations``. (`DM-53342 <https://rubinobs.atlassian.net/browse/DM-53342>`_)
-- ``FileDatastore.export_records()`` will no longer fail with ``sqlalchemy.exc.InternalError`` when given a large number of dataset IDs.
-  ``Butler.get_many_datasets()`` will no longer fail with ``sqlalchemy.exc.InternalError`` when given a large number of dataset IDs. (`DM-53610 <https://rubinobs.atlassian.net/browse/DM-53610>`_)
-
-
-Performance Enhancement
------------------------
-
-- Fewer database queries are now used when inserting/exporting datasets, in cases where the datasets do not have "expanded data ID" values known in advance. (`DM-51593 <https://rubinobs.atlassian.net/browse/DM-51593>`_)
-- ``Butler.transfer_from(transfer_dimensions = True)``, ``Butler.transfer_dimension_records_from()``, and ``butler transfer-datasets`` are now significantly faster. (`DM-51681 <https://rubinobs.atlassian.net/browse/DM-51681>`_)
-- New dataset UUIDs are now generated using UUIDv7 instead of UUIDv4, to improve Postgres insert performance. (`DM-52719 <https://rubinobs.atlassian.net/browse/DM-52719>`_)
-- Removed unnecessary directory existence checks when writing files to the datastore.
-  We no longer create zero-byte files to represent "directories" when writing files to an S3 datastore. (`DM-53580 <https://rubinobs.atlassian.net/browse/DM-53580>`_)
-
-
-Other Changes and Additions
----------------------------
-
-- Updated the storage class definitions for scarlet lite models to be Zip archives that can be accessed as single blends. (`DM-49537 <https://rubinobs.atlassian.net/browse/DM-49537>`_)
-- Made some registry test data available to downstream packages via `importlib.resources`. (`DM-51363 <https://rubinobs.atlassian.net/browse/DM-51363>`_)
-- Added support for ``obs_publisher_did`` value in ObsCore config file. (`DM-51383 <https://rubinobs.atlassian.net/browse/DM-51383>`_)
-- * Modified ``ObsCore`` records to place "exposure" in any visit fields if there is an exposure but no visit defined.
-    This required the addition of a new method to the ``RecordFactory`` which can be subclassed by other plugins.
-  * Added ability to hard code the ``s_xel1`` and ``s_xel2`` ObsCore fields per dataset type. (`DM-51495 <https://rubinobs.atlassian.net/browse/DM-51495>`_)
-- Drop incomplete support for case-insensitive handling of identifiers in query expressions.
-
-  Some code in the query generation system was trying to allow dimension names to be case-insensitive, but was actually just inadvertently requiring all dimension names to be defined as lowercase.
-  Our Python-flavored user base probably expects case-sensitive dimension and dataset type names anyway.
-
-  Constants (e.g., ``AND`` or ``OVERLAPS``) in the query system are still case insensitive. (`DM-52339 <https://rubinobs.atlassian.net/browse/DM-52339>`_)
-- ``Butler.registry.queryDatasets``, ``Butler.registry.queryDataIds``, and ``Butler.registry.queryDimensionRecords`` have been re-implemented using the same query framework backing ``Butler.query()`` and the various ``Butler.query_*()`` methods.  Though the ``Butler.registry.*`` methods are not yet deprecated, users are encouraged to begin migrating to the equivalent ``Butler.query_*`` functions.  The new implementation comes with a number of minor behavior changes:
-  - We no longer raise an exception if governor dimension values in a query constraint are not known to the registry.  Instead, we return no results.
-  - Result rows are now deduplicated.
-  - ``findFirst`` searches are now supported in calibration collections. (`DM-52397 <https://rubinobs.atlassian.net/browse/DM-52397>`_)
-- ``Butler.find_dataset()`` / ``Butler.registry.findDataset()`` have been re-implemented using the same query framework backing ``Butler.query()``. These methods now always return ``DatasetRef`` instances with ``dataId.hasFull() = True``. (`DM-52398 <https://rubinobs.atlassian.net/browse/DM-52398>`_)
-- For EUPS users we now set the ``ARROW_DEFAULT_MEMORY_POOL`` environment variable to ``jemalloc``.
-  This works around a memory leak reported in https://github.com/apache/arrow/issues/45882 for pyarrow v18 and newer. (`DM-52412 <https://rubinobs.atlassian.net/browse/DM-52412>`_)
-- Added a new ``Datastore`` API for retrieving the datastore records for datasets that might not have been written yet.
-  There is also a related API added to ``QuantumBackedButler``. (`DM-52653 <https://rubinobs.atlassian.net/browse/DM-52653>`_)
-- Rewrote the default compression write recipes to match the new interfaces for FITS compression in ``afw`` and ``obs_base``. (`DM-52879 <https://rubinobs.atlassian.net/browse/DM-52879>`_)
-- Added new options to ``DatasetProvenance`` to prevent excessive numbers of input datasets being recorded in file metadata.
-  The limit for parquet datasets was set to 2,000 inputs. (`DM-53326 <https://rubinobs.atlassian.net/browse/DM-53326>`_)
-- Added ``lossy16`` compression recipe to replace ``lossyBasic`` (`DM-53420 <https://rubinobs.atlassian.net/browse/DM-53420>`_)
-- Added a storage class and formatter declaration for the ``ProvenanceQuantumGraph`` class.
-
-  Allowed a ``ButlerLogRecords`` container to be passed to the log handler at construction. (`DM-53622 <https://rubinobs.atlassian.net/browse/DM-53622>`_)
-- Added metrics recording for ``butler.ingest``. (`DM-53679 <https://rubinobs.atlassian.net/browse/DM-53679>`_)
-- Added Butler storage class definitions for ``GuiderROI`` ``VignettingCorrection`` class (`OSW-1064 <https://rubinobs.atlassian.net/browse/OSW-1064>`_)
-
-An API Removal or Deprecation
------------------------------
-
-- ``daf_butler`` no longer depends on the ``daf_relation`` library.
-  ``daf_relation``-related internal classes are no longer exported from the top-level module.
-  Butler query expression classes have moved from ``lsst.daf.butler.registry.queries`` to ``lsst.daf.butler.queries``. (`DM-52345 <https://rubinobs.atlassian.net/browse/DM-52345>`_)
-- Removed deprecated ``DatasetQueryResults.materialize()`` method.
-  Removed deprecated ``offset`` parameter from the ``limit`` method in the ``DataCoordinateQueryResults``, ``DatasetQueryResults``, and ``DimensionRecordQueryResults`` classes.
-  Removed the deprecated feature where HTM and HEALPix spatial dimensions like ``htm11`` or ``healpix10`` could be used in data ID constraints passed to queries. The exception is ``htm7``, which will continue to work.  Users should instead use region ``OVERLAPS`` constraints in query ``where`` expressions.
-  Removed support for ``<`` and ``>`` operators in ``Butler.registry.query*()`` ``where`` strings for comparisons of ``Timespan`` vs ``Timespan``, or ``Timespan`` vs ``Time``.  Instead, use ``timespan.begin < ts`` or ``timespan.end > ts`` to explicitly indicate which timespan bound you are comparing with. (`DM-52397 <https://rubinobs.atlassian.net/browse/DM-52397>`_)
-
-
 Butler v29.1.0 (2025-06-13)
 ===========================
 

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/_butler.py

@@ -1566,7 +1566,7 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
 
     @abstractmethod
     def transfer_dimension_records_from(
-        self, source_butler: LimitedButler | Butler, source_refs: Iterable[DatasetRef | DataCoordinate]
+        self, source_butler: LimitedButler | Butler, source_refs: Iterable[DatasetRef]
     ) -> None:
         """Transfer dimension records to this Butler from another Butler.
 
@@ -1578,9 +1578,10 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
             `Butler` whose registry will be used to expand data IDs. If the
             source refs contain coordinates that are used to populate other
             records then this will also need to be a full `Butler`.
-        source_refs : iterable of `DatasetRef` or `DataCoordinate`
-            Datasets or data IDs defined in the source butler whose dimension
-            records should be transferred to this butler.
+        source_refs : iterable of `DatasetRef`
+            Datasets defined in the source butler whose dimension records
+            should be transferred to this butler. In most circumstances.
+            transfer is faster if the dataset refs are expanded.
         """
         raise NotImplementedError()
 
@@ -2226,7 +2227,3 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
     @abstractmethod
     def close(self) -> None:
         raise NotImplementedError()
-
-    @abstractmethod
-    def _expand_data_ids(self, data_ids: Iterable[DataCoordinate]) -> list[DataCoordinate]:
-        raise NotImplementedError()

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/_butler_metrics.py

@@ -29,15 +29,12 @@ from __future__ import annotations
 
 from collections.abc import Callable, Iterator
 from contextlib import contextmanager
-from typing import Concatenate, ParamSpec
 
 from pydantic import BaseModel
 
 from lsst.utils.logging import LsstLoggers
 from lsst.utils.timer import time_this
 
-P = ParamSpec("P")
-
 
 class ButlerMetrics(BaseModel):
     """Metrics collected during Butler operations."""
@@ -48,26 +45,18 @@ class ButlerMetrics(BaseModel):
     time_in_get: float = 0.0
     """Wall-clock time, in seconds, spent in get()."""
 
-    time_in_ingest: float = 0.0
-    """Wall-clock time, in seconds, spent in ingest()."""
-
     n_get: int = 0
     """Number of datasets retrieved with get()."""
 
     n_put: int = 0
     """Number of datasets stored with put()."""
 
-    n_ingest: int = 0
-    """Number of datasets ingested."""
-
     def reset(self) -> None:
         """Reset all metrics."""
         self.time_in_put = 0.0
         self.time_in_get = 0.0
-        self.time_in_ingest = 0.0
         self.n_get = 0
         self.n_put = 0
-        self.n_ingest = 0
 
     def increment_get(self, duration: float) -> None:
         """Increment time for get().
@@ -91,31 +80,13 @@ class ButlerMetrics(BaseModel):
         self.time_in_put += duration
         self.n_put += 1
 
-    def increment_ingest(self, duration: float, n_datasets: int) -> None:
-        """Increment time and datasets for ingest().
-
-        Parameters
-        ----------
-        duration : `float`
-            Duration to add to the ingest() statistics.
-        n_datasets : `int`
-            Number of datasets to be ingested for this call.
-        """
-        self.time_in_ingest += duration
-        self.n_ingest += n_datasets
-
     @contextmanager
     def _timer(
-        self,
-        handler: Callable[Concatenate[float, P], None],
-        log: LsstLoggers | None = None,
-        msg: str | None = None,
-        *args: P.args,
-        **kwargs: P.kwargs,
+        self, handler: Callable[[float], None], log: LsstLoggers | None = None, msg: str | None = None
     ) -> Iterator[None]:
         with time_this(log=log, msg=msg) as timer:
             yield
-        handler(timer.duration, *args, **kwargs)
+        handler(timer.duration)
 
     @contextmanager
     def instrument_get(self, log: LsstLoggers | None = None, msg: str | None = None) -> Iterator[None]:
@@ -144,21 +115,3 @@ class ButlerMetrics(BaseModel):
         """
         with self._timer(self.increment_put, log=log, msg=msg):
             yield
-
-    @contextmanager
-    def instrument_ingest(
-        self, n_datasets: int, log: LsstLoggers | None = None, msg: str | None = None
-    ) -> Iterator[None]:
-        """Run code and increment ingest statistics.
-
-        Parameters
-        ----------
-        n_datasets : `int`
-            Number of datasets being ingested.
-        log : `logging.Logger` or `None`
-            Logger to use for any timing information.
-        msg : `str` or `None`
-            Any message to be included in log output.
-        """
-        with self._timer(self.increment_ingest, n_datasets=n_datasets, log=log, msg=msg):
-            yield

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/_formatter.py

@@ -54,7 +54,6 @@ from ._config import Config
 from ._config_support import LookupKey, processLookupConfigs
 from ._file_descriptor import FileDescriptor
 from ._location import Location
-from ._rubin.temporary_for_ingest import TemporaryForIngest
 from .dimensions import DataCoordinate, DimensionUniverse
 from .mapping_factory import MappingFactory
 
@@ -1032,7 +1031,15 @@ class FormatterV2:
         """
         cache_manager = self._ensure_cache(cache_manager)
 
-        with TemporaryForIngest.make_path(uri) as temporary_uri:
+        # Always write to a temporary even if
+        # using a local file system -- that gives us atomic writes.
+        # If a process is killed as the file is being written we do not
+        # want it to remain in the correct place but in corrupt state.
+        # For local files write to the output directory not temporary dir.
+        prefix = uri.dirname() if uri.isLocal else None
+        if prefix is not None:
+            prefix.mkdir()
+        with ResourcePath.temporary_uri(suffix=uri.getExtension(), prefix=prefix) as temporary_uri:
             # Need to configure the formatter to write to a different
             # location and that needs us to overwrite internals
             log.debug("Writing dataset to temporary location at %s", temporary_uri)

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/_labeled_butler_factory.py

@@ -30,9 +30,7 @@ from __future__ import annotations
 __all__ = ("LabeledButlerFactory", "LabeledButlerFactoryProtocol")
 
 from collections.abc import Mapping
-from contextlib import AbstractContextManager
-from logging import getLogger
-from typing import Any, Literal, Protocol, Self
+from typing import Protocol
 
 from lsst.resources import ResourcePathExpression
 
@@ -42,8 +40,6 @@ from ._butler_repo_index import ButlerRepoIndex
 from ._utilities.named_locks import NamedLocks
 from ._utilities.thread_safe_cache import ThreadSafeCache
 
-_LOG = getLogger(__name__)
-
 
 class LabeledButlerFactoryProtocol(Protocol):
     """Callable to retrieve a butler from a label."""
@@ -51,7 +47,7 @@ class LabeledButlerFactoryProtocol(Protocol):
     def __call__(self, label: str) -> Butler: ...
 
 
-class LabeledButlerFactory(AbstractContextManager):
+class LabeledButlerFactory:
     """Factory for efficiently instantiating Butler instances from the
     repository index file.  This is intended for use from long-lived services
     that want to instantiate a separate Butler instance for each end user
@@ -64,9 +60,6 @@ class LabeledButlerFactory(AbstractContextManager):
         files.  If not provided, defaults to the global repository index
         configured by the ``DAF_BUTLER_REPOSITORY_INDEX`` environment variable
         --  see `ButlerRepoIndex`.
-    writeable : `bool`, optional
-        If `True`, Butler instances created by this factory will be writeable.
-        If `False` (the default), instances will be read-only.
 
     Notes
     -----
@@ -83,12 +76,11 @@ class LabeledButlerFactory(AbstractContextManager):
     safely be used by separate threads.
     """
 
-    def __init__(self, repositories: Mapping[str, str] | None = None, writeable: bool = False) -> None:
+    def __init__(self, repositories: Mapping[str, str] | None = None) -> None:
         if repositories is None:
             self._repositories = None
         else:
             self._repositories = dict(repositories)
-        self._writeable = writeable
 
         self._factories = ThreadSafeCache[str, _ButlerFactory]()
         self._initialization_locks = NamedLocks()
@@ -96,16 +88,6 @@ class LabeledButlerFactory(AbstractContextManager):
         # This may be overridden by unit tests.
         self._preload_unsafe_direct_butler_caches = True
 
-    def __enter__(self) -> Self:
-        return self
-
-    def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> Literal[False]:
-        try:
-            self.close()
-        except Exception:
-            _LOG.exception("An exception occurred during LabeledButlerFactory.close()")
-        return False
-
     def bind(self, access_token: str | None) -> LabeledButlerFactoryProtocol:
         """Create a callable factory function for generating Butler instances
         with out needing to specify access tokans again.
@@ -127,7 +109,7 @@ class LabeledButlerFactory(AbstractContextManager):
 
         return create
 
-    def create_butler(self, label: str, *, access_token: str | None = None) -> Butler:
+    def create_butler(self, *, label: str, access_token: str | None) -> Butler:
         """Create a Butler instance.
 
         Parameters
@@ -136,7 +118,7 @@ class LabeledButlerFactory(AbstractContextManager):
             Label of the repository to instantiate, from the ``repositories``
             parameter to the `LabeledButlerFactory` constructor or the global
             repository index file.
-        access_token : `str` | `None`, optional
+        access_token : `str` | `None`
             Gafaelfawr access token used to authenticate to a Butler server.
             This is required for any repositories configured to use
             `RemoteButler`.  If you only use `DirectButler`, this may be
@@ -185,9 +167,7 @@ class LabeledButlerFactory(AbstractContextManager):
 
         match butler_type:
             case ButlerType.DIRECT:
-                return _DirectButlerFactory(
-                    config, self._preload_unsafe_direct_butler_caches, self._writeable
-                )
+                return _DirectButlerFactory(config, self._preload_unsafe_direct_butler_caches)
             case ButlerType.REMOTE:
                 return _RemoteButlerFactory(config)
             case _:
@@ -209,12 +189,12 @@ class _ButlerFactory(Protocol):
 
 
 class _DirectButlerFactory(_ButlerFactory):
-    def __init__(self, config: ButlerConfig, preload_unsafe_caches: bool, writeable: bool) -> None:
+    def __init__(self, config: ButlerConfig, preload_unsafe_caches: bool) -> None:
         import lsst.daf.butler.direct_butler
 
         # Create a 'template' Butler that will be cloned when callers request
         # an instance.
-        self._butler = Butler.from_config(config, writeable=writeable)
+        self._butler = Butler.from_config(config)
         assert isinstance(self._butler, lsst.daf.butler.direct_butler.DirectButler)
 
         # Load caches so that data is available in cloned instances without

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/configs/datastores/formatters.yaml

@@ -100,4 +100,3 @@ VisitBackgroundModel: lsst.daf.butler.formatters.json.JsonFormatter
 VignettingCorrection: lsst.ts.observatory.control.utils.extras.vignetting_storage.VignettingCorrectionFormatter
 SSPAuxiliaryFile: lsst.pipe.tasks.sspAuxiliaryFile.SSPAuxiliaryFileFormatter
 VisitGeometry: lsst.daf.butler.formatters.json.JsonFormatter
-ProvenanceQuantumGraph: lsst.pipe.base.quantum_graph.formatter.ProvenanceFormatter

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/configs/storageClasses.yaml

@@ -443,18 +443,3 @@ storageClasses:
     pytype: lsst.pipe.tasks.sspAuxiliaryFile.SSPAuxiliaryFile
   VisitGeometry:
     pytype: lsst.obs.base.visit_geometry.VisitGeometry
-  ProvenanceQuantumGraph:
-    pytype: lsst.pipe.base.quantum_graph.ProvenanceQuantumGraph
-    parameters:
-      - import_mode   # lsst.pipe.base.pipeline_graph.TaskImportMode
-      - quanta  # iterable of uuid.UUID; quanta to read
-      - datasets  # iterable of uuid.UUID; datasets to read
-      - read_init_quanta  # bool, defaults to True; whether to read pre-exec-init info
-    derivedComponents:
-      packages: Packages  # ignores node parameters
-
-      # UUID keys can be quantum or data IDs (whichever is passed in via
-      # parameters).  Nested lists are attempts to run the quantum (last is
-      # most recent).
-      logs: StructuredDataDict  # dict[uuid.UUID, list[ButlerLogRecords]]
-      metadata: StructuredDataDict  # dict[uuid.UUID, list[TaskMetadata]]

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/datastore/record_data.py

@@ -49,7 +49,7 @@ if TYPE_CHECKING:
 # Pydantic requires the possible value types to be explicitly enumerated in
 # order for `uuid.UUID` in particular to work.  `typing.Any` does not work
 # here.
-_Record: TypeAlias = dict[str, int | str | None]
+_Record: TypeAlias = dict[str, int | str | uuid.UUID | None]
 
 
 class SerializedDatastoreRecordData(pydantic.BaseModel):

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/datastores/fileDatastore.py

@@ -3166,20 +3166,6 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
 
     def export_records(self, refs: Iterable[DatasetIdRef]) -> Mapping[str, DatastoreRecordData]:
         # Docstring inherited from the base class.
-
-        # This call to 'bridge.check' filters out "partially deleted" datasets.
-        # Specifically, ones in the unusual edge state that:
-        # 1. They have an entry in the registry dataset tables
-        # 2. They were "trashed" from the datastore, so they are not
-        # present in the "dataset_location" table.)
-        # 3. But the trash has not been "emptied", so there are still entries
-        #  in the "opaque" datastore records table.
-        #
-        # As far as I can tell, this can only occur in the case of a concurrent
-        # or aborted call to `Butler.pruneDatasets(unstore=True, purge=False)`.
-        # Datasets (with or without files existing on disk) can persist in
-        # this zombie state indefinitely, until someone manually empties
-        # the trash.
         exported_refs = list(self._bridge.check(refs))
         ids = {ref.id for ref in exported_refs}
         records: dict[DatasetId, dict[str, list[StoredDatastoreItemInfo]]] = {id: {} for id in ids}

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/dimensions/_coordinate.py

@@ -755,11 +755,6 @@ class DataCoordinate:
     to_json = to_json_pydantic
     from_json: ClassVar[Callable[..., Self]] = cast(Callable[..., Self], classmethod(from_json_pydantic))
 
-    @property
-    def dataId(self) -> Self:
-        """Return this `DataCoordinate` instance, unmodified."""
-        return self
-
 
 DataId = DataCoordinate | Mapping[str, Any]
 """A type-annotation alias for signatures that accept both informal data ID

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/direct_butler/_direct_butler.py

@@ -1822,25 +1822,12 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
                     f" Example: {existing_datasets[0]}"
                 )
 
-        # Calculate some statistics based on the given list of datasets.
-        n_files = len(datasets)
-        n_datasets = 0
-        for d in datasets:
-            n_datasets += len(d.refs)
-        sfiles = "s" if n_files != 1 else ""
-        srefs = "s" if n_datasets != 1 else ""
-
         # We use `datasets` rather `new_datasets` for the Registry
         # portion of this, to let it confirm that everything matches the
         # existing datasets.
         import_info = self._prepare_ingest_file_datasets(datasets, progress)
 
-        with (
-            self._metrics.instrument_ingest(
-                n_datasets, _LOG, msg=f"Ingesting {n_files} file{sfiles} with {n_datasets} dataset{srefs}"
-            ),
-            self.transaction(),
-        ):
+        with self.transaction():
             self._ingest_file_datasets(datasets, import_info, progress)
 
             # Bulk-insert everything into Datastore.
@@ -1995,7 +1982,7 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
             doImport(filename)  # type: ignore
 
     def transfer_dimension_records_from(
-        self, source_butler: LimitedButler | Butler, source_refs: Iterable[DatasetRef | DataCoordinate]
+        self, source_butler: LimitedButler | Butler, source_refs: Iterable[DatasetRef]
     ) -> None:
         # Allowed dimensions in the target butler.
         elements = frozenset(element for element in self.dimensions.elements if element.has_own_table)
@@ -2025,13 +2012,16 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
             source_butler, data_ids, allowed_elements
         )
 
+        can_query = True if isinstance(source_butler, Butler) else False
+
         additional_records: dict[DimensionElement, dict[DataCoordinate, DimensionRecord]] = defaultdict(dict)
         for original_element, record_mapping in primary_records.items():
             # Get dimensions that depend on this dimension.
             populated_by = self.dimensions.get_elements_populated_by(
                 self.dimensions[original_element.name]  # type: ignore
             )
-            if populated_by:
+
+            for data_id in record_mapping.keys():
                 for element in populated_by:
                     if element not in allowed_elements:
                         continue
@@ -2050,32 +2040,28 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
                         # have to be scanned.
                         continue
 
-                    if record_mapping:
-                        if not isinstance(source_butler, Butler):
-                            raise RuntimeError(
-                                f"Transferring populated_by records like {element.name}"
-                                " requires a full Butler."
-                            )
+                    if not can_query:
+                        raise RuntimeError(
+                            f"Transferring populated_by records like {element.name} requires a full Butler."
+                        )
 
-                        with source_butler.query() as query:
-                            records = query.join_data_coordinates(record_mapping.keys()).dimension_records(
-                                element.name
-                            )
-                            for record in records:
-                                additional_records[record.definition].setdefault(record.dataId, record)
+                    records = source_butler.query_dimension_records(  # type: ignore
+                        element.name,
+                        explain=False,
+                        **data_id.mapping,  # type: ignore
+                    )
+                    for record in records:
+                        additional_records[record.definition].setdefault(record.dataId, record)
 
         # The next step is to walk back through the additional records to
         # pick up any missing content (such as visit_definition needing to
         # know the exposure). Want to ensure we do not request records we
         # already have.
         missing_data_ids = set()
-        for record_mapping in additional_records.values():
+        for name, record_mapping in additional_records.items():
             for data_id in record_mapping.keys():
-                for dimension in data_id.dimensions.required:
-                    element = source_butler.dimensions[dimension]
-                    dimension_key = data_id.subset(dimension)
-                    if dimension_key not in primary_records[element]:
-                        missing_data_ids.add(dimension_key)
+                if data_id not in primary_records[name]:
+                    missing_data_ids.add(data_id)
 
         # Fill out the new records. Assume that these new records do not
         # also need to carry over additional populated_by records.
@@ -2092,19 +2078,19 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
     def _extract_dimension_records_from_data_ids(
         self,
         source_butler: LimitedButler | Butler,
-        data_ids: Iterable[DataCoordinate],
+        data_ids: set[DataCoordinate],
         allowed_elements: frozenset[DimensionElement],
     ) -> dict[DimensionElement, dict[DataCoordinate, DimensionRecord]]:
         dimension_records: dict[DimensionElement, dict[DataCoordinate, DimensionRecord]] = defaultdict(dict)
 
-        data_ids = set(data_ids)
-        if not all(data_id.hasRecords() for data_id in data_ids):
-            if isinstance(source_butler, Butler):
-                data_ids = source_butler._expand_data_ids(data_ids)
-            else:
-                raise TypeError("Input butler needs to be a full butler to expand DataId.")
-
         for data_id in data_ids:
+            # Need an expanded record, if not expanded that we need a full
+            # butler with registry (allow mocks with registry too).
+            if not data_id.hasRecords():
+                if registry := getattr(source_butler, "registry", None):
+                    data_id = registry.expandDataId(data_id)
+                else:
+                    raise TypeError("Input butler needs to be a full butler to expand DataId.")
             # If this butler doesn't know about a dimension in the source
             # butler things will break later.
             for element_name in data_id.dimensions.elements:
@@ -2583,9 +2569,6 @@ class DirectButler(Butler):  # numpydoc ignore=PR02
         """Immediately load caches that are used for common operations."""
         self._registry.preload_cache(load_dimension_record_cache=load_dimension_record_cache)
 
-    def _expand_data_ids(self, data_ids: Iterable[DataCoordinate]) -> list[DataCoordinate]:
-        return self._registry.expand_data_ids(data_ids)
-
     _config: ButlerConfig
     """Configuration for this Butler instance."""
 

{lsst_daf_butler-30.0.0rc3 → lsst_daf_butler-30.2025.5000}/python/lsst/daf/butler/logging.py

@@ -764,17 +764,11 @@ class ButlerLogRecords(MutableSequence[ButlerLogRecord]):
 
 
 class ButlerLogRecordHandler(StreamHandler):
-    """Python log handler that accumulates records.
+    """Python log handler that accumulates records."""
 
-    Parameters
-    ----------
-    records : `ButlerLogRecords`, optional
-        Container to store logs in.
-    """
-
-    def __init__(self, records: ButlerLogRecords | None = None) -> None:
+    def __init__(self) -> None:
         super().__init__()
-        self.records = ButlerLogRecords([]) if records is None else records
+        self.records = ButlerLogRecords([])
 
     def emit(self, record: LogRecord) -> None:
         self.records.append(record)