lsst-daf-butler 30.0.1rc1__py3-none-any.whl → 30.2025.5100__py3-none-any.whl

lsst/daf/butler/_butler.py

@@ -138,10 +138,7 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
     without_datastore : `bool`, optional
         If `True` do not attach a datastore to this butler. Any attempts
         to use a datastore will fail.
-    metrics : `ButlerMetrics` or `None`
-        External metrics object to be used for tracking butler usage. If `None`
-        a new metrics object is created.
-    **kwargs : `typing.Any`
+    **kwargs : `Any`
         Additional keyword arguments passed to a constructor of actual butler
         class.
 
@@ -243,7 +240,7 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
             to use a datastore will fail.
         metrics : `ButlerMetrics` or `None`, optional
             Metrics object to record butler usage statistics.
-        **kwargs : `typing.Any`
+        **kwargs : `Any`
             Default data ID key-value pairs.  These may only identify
             "governor" dimensions like ``instrument`` and ``skymap``.
 
@@ -1393,10 +1390,6 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
             raised if any datasets with the same dataset ID already exist
             in the datastore.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         TypeError
@@ -1436,7 +1429,6 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
         *,
         transfer_dimensions: bool = False,
         dry_run: bool = False,
-        skip_existing: bool = False,
     ) -> None:
         """Ingest a Zip file into this butler.
 
@@ -1455,14 +1447,6 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
             If `True` the ingest will be processed without any modifications
             made to the target butler and as if the target butler did not
             have any of the datasets.
-        skip_existing : `bool`, optional
-            If `True`, a zip will not be ingested if the dataset entries listed
-            in the index with the same dataset ID already exists in the butler.
-            If `False` (the default), a `ConflictingDefinitionError` will be
-            raised if any datasets with the same dataset ID already exist
-            in the repository. If, somehow, some datasets are known to the
-            butler and some are not, this is currently treated as an error
-            rather than attempting to do a partial ingest.
 
         Notes
         -----
@@ -1582,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.
 
@@ -1594,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()
 
@@ -2040,7 +2025,7 @@ class Butler(LimitedButler):  # numpydoc ignore=PR02
 
         Returns
         -------
-        records : `list` [`DimensionRecord`]
+        records : `list`[`DimensionRecord`]
             Dimension records matching the given query parameters.
 
         Raises
@@ -2242,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/_butler_collections.py

@@ -360,10 +360,10 @@ class ButlerCollections(ABC, Sequence):
         name : `str`
             The name of the collection of interest.
         include_parents : `bool`, optional
-            If `True` any parents of this collection will be included.
+           If `True` any parents of this collection will be included.
         include_summary : `bool`, optional
-            If `True` dataset type names and governor dimensions of datasets
-            stored in this collection will be included in the result.
+           If `True` dataset type names and governor dimensions of datasets
+           stored in this collection will be included in the result.
 
         Returns
         -------
@@ -464,7 +464,7 @@ class ButlerCollections(ABC, Sequence):
 
         Returns
         -------
-        filtered : `~collections.abc.Mapping` [`str`, `list` [`str`]]
+        filtered : `~collections.abc.Mapping` [`str`, `list`[`str`]]
             Mapping of the dataset type name to its corresponding list of
             collection names.
         """

lsst/daf/butler/_butler_metrics.py

@@ -27,19 +27,14 @@
 
 from __future__ import annotations
 
-__all__ = ["ButlerMetrics"]
-
 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."""
@@ -50,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().
@@ -93,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]:
@@ -146,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/_dataset_provenance.py

@@ -267,7 +267,7 @@ class DatasetProvenance(pydantic.BaseModel):
         use_upper : `bool` or `None`
             If `True` use upper case for provenance keys, if `False` use lower
             case, if `None` match the case of the prefix.
-        *keys : `tuple` of `str` | `int`
+        keys : `tuple` of `str` | `int`
             Components of key to combine with prefix and separator.
 
         Returns

lsst/daf/butler/_dataset_ref.py

@@ -479,7 +479,7 @@ class DatasetRef:
 
         Parameters
         ----------
-        simple : `dict` of [`str`, `typing.Any`]
+        simple : `dict` of [`str`, `Any`]
             The value returned by `to_simple()`.
         universe : `DimensionUniverse`
             The special graph of all known dimensions.

lsst/daf/butler/_exceptions.py

@@ -196,8 +196,8 @@ class ValidationError(RuntimeError):
 
 
 class EmptyQueryResultError(Exception):
-    """Exception raised when query methods return an empty result and
-    ``explain`` flag is set.
+    """Exception raised when query methods return an empty result and `explain`
+    flag is set.
 
     Parameters
     ----------

lsst/daf/butler/_file_dataset.py

@@ -129,8 +129,7 @@ class FileDataset:
         ----------
         dataset : `SerializedFileDataset`
             Object to deserialize.
-        dataset_type_loader : `~collections.abc.Callable` \
-              [[ `str` ], `DatasetType` ]
+        dataset_type_loader : `Callable` [[ `str` ], `DatasetType` ]
             Function that takes a string dataset type name as its
             only parameter, and returns an instance of `DatasetType`.
             Used to deserialize the `DatasetRef` instances contained

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
 
@@ -910,10 +909,6 @@ class FormatterV2:
         provenance : `DatasetProvenance` | `None`, optional
             Provenance to attach to the file being written.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         FormatterNotImplementedError
@@ -1036,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)
@@ -1141,10 +1144,6 @@ class FormatterV2:
         location : `Location`
             Location from which to extract a file extension.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         ValueError
@@ -1591,10 +1590,6 @@ class Formatter(metaclass=ABCMeta):
         location : `Location`
             Location from which to extract a file extension.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         NotImplementedError

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/_query_all_datasets.py

@@ -151,8 +151,6 @@ def _filter_collections_and_dataset_types(
 
     Parameters
     ----------
-    butler
-        Butler repository to use.
     collections
         List of collection names or collection search globs.
     dataset_type_query

lsst/daf/butler/cli/cmd/_remove_runs.py

@@ -114,7 +114,18 @@ def remove_runs(context: click.Context, confirm: bool, force: bool, **kwargs: An
 
     This command can be used to remove RUN collections and the datasets within
     them.
-    """  # numpydoc ignore=PR01
+
+    Parameters
+    ----------
+    context : `click.Context`
+        Context provided by Click.
+    confirm : `bool`
+        Confirmation for removal of the run.
+    force : `bool`
+        Force removal.
+    **kwargs : `dict` [`str`, `str`]
+        The parameters to pass to `~lsst.daf.butler.script.removeRuns`.
+    """
     result = script.removeRuns(**kwargs)
     canRemoveRuns = len(result.runs)
     if not canRemoveRuns:

lsst/daf/butler/column_spec.py

@@ -109,12 +109,12 @@ class ColumnValueSerializer(ABC):
 
         Parameters
         ----------
-        value : `typing.Any`
+        value : `Any`
             Column value to be serialized.
 
         Returns
         -------
-        value : `typing.Any`
+        value : `Any`
             Column value in serializable format.
         """
         raise NotImplementedError
@@ -125,12 +125,12 @@ class ColumnValueSerializer(ABC):
 
         Parameters
         ----------
-        value : `typing.Any`
+        value : `Any`
             Serialized column value.
 
         Returns
         -------
-        value : `typing.Any`
+        value : `Any`
             Deserialized column value.
         """
         raise NotImplementedError

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/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/datastore/_datastore.py

@@ -284,14 +284,6 @@ class DatasetRefURIs(abc.Sequence):
     def __repr__(self) -> str:
         return f"DatasetRefURIs({repr(self.primaryURI)}, {repr(self.componentURIs)})"
 
-    def iter_all(self) -> Iterator[ResourcePath]:
-        """Iterate over all URIs without regard to whether they are primary
-        or component.
-        """
-        if self.primaryURI is not None:
-            yield self.primaryURI
-        yield from self.componentURIs.values()
-
 
 class Datastore(FileTransferSource, metaclass=ABCMeta):
     """Datastore interface.
@@ -544,7 +536,7 @@ class Datastore(FileTransferSource, metaclass=ABCMeta):
 
         Returns
         -------
-        exists : `dict` [`DatasetRef`, `bool`]
+        exists : `dict`[`DatasetRef`, `bool`]
             Mapping of dataset to boolean indicating whether the dataset
             is known to the datastore.
         """
@@ -833,10 +825,6 @@ class Datastore(FileTransferSource, metaclass=ABCMeta):
             in an external system or if the file is to be compressed in place.
             It is up to the datastore whether this parameter is relevant.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         NotImplementedError
@@ -1155,10 +1143,6 @@ class Datastore(FileTransferSource, metaclass=ABCMeta):
             Determine whether errors should be ignored. When multiple
             refs are being trashed there will be no per-ref check.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         FileNotFoundError
@@ -1294,10 +1278,6 @@ class Datastore(FileTransferSource, metaclass=ABCMeta):
             Entity to compare with configuration retrieved using the
             specified lookup key.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         DatastoreValidationError

lsst/daf/butler/datastore/stored_file_info.py

@@ -423,8 +423,8 @@ def make_datastore_path_relative(path: str) -> str:
     path : `str`
         The file path from a `StoredFileInfo`.
 
-    Returns
-    -------
+    Return
+    ------
     normalized_path : `str`
         The original path, if it was relative. Otherwise, a version of it that
         was converted to a relative path, stripping URI scheme and netloc from

lsst/daf/butler/datastores/chainedDatastore.py

@@ -1077,10 +1077,6 @@ class ChainedDatastore(Datastore):
             If `True`, output a log message for every validation error
             detected.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         DatastoreValidationError

lsst/daf/butler/datastores/fileDatastore.py

@@ -2152,13 +2152,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
 
         return artifact_map
 
-    def ingest_zip(
-        self,
-        zip_path: ResourcePath,
-        transfer: str | None,
-        *,
-        dry_run: bool = False,
-    ) -> None:
+    def ingest_zip(self, zip_path: ResourcePath, transfer: str | None, *, dry_run: bool = False) -> None:
         """Ingest an indexed Zip file and contents.
 
         The Zip file must have an index file as created by `retrieveArtifacts`.
@@ -2982,10 +2976,6 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
             If `True`, output a log message for every validation error
             detected.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         DatastoreValidationError

lsst/daf/butler/datastores/file_datastore/get.py

@@ -97,12 +97,12 @@ def generate_datastore_get_information(
 
     Parameters
     ----------
-    fileLocations : `list` [`DatasetLocationInformation`]
+    fileLocations : `list`[`DatasetLocationInformation`]
         List of file locations for this artifact and their associated datastore
         records.
     ref : `DatasetRef`
         The registry information associated with this artifact.
-    parameters : `~collections.abc.Mapping` [`str`, `typing.Any`]
+    parameters : `Mapping`[`str`, `Any`]
         `StorageClass` and `Formatter` parameters.
     readStorageClass : `StorageClass` | `None`, optional
         The StorageClass to use when ultimately returning the resulting object
@@ -255,12 +255,12 @@ def get_dataset_as_python_object_from_get_info(
 
     Parameters
     ----------
-    allGetInfo : `list` [`DatastoreFileGetInformation`]
+    allGetInfo : `list`[`DatastoreFileGetInformation`]
         Pre-processed information about each file associated with this
         artifact.
     ref : `DatasetRef`
         The registry information associated with this artifact.
-    parameters : `~collections.abc.Mapping` [`str`, `typing.Any`]
+    parameters : `Mapping`[`str`, `Any`]
         `StorageClass` and `Formatter` parameters.
     cache_manager : `AbstractDatastoreCacheManager`
         The cache manager to use for caching retrieved files.

lsst/daf/butler/datastores/file_datastore/retrieve_artifacts.py

@@ -274,11 +274,7 @@ class ZipIndex(BaseModel):
             Path to the Zip file.
         """
         with zip_path.open("rb") as fd, zipfile.ZipFile(fd) as zf:
-            return cls.from_open_zip(zf)
-
-    @classmethod
-    def from_open_zip(cls, zf: zipfile.ZipFile) -> Self:
-        json_data = zf.read(cls.index_name)
+            json_data = zf.read(cls.index_name)
         return cls.model_validate_json(json_data)