lsst-daf-butler 29.2025.3800__tar.gz → 29.2025.3900__tar.gz

{lsst_daf_butler-29.2025.3800/python/lsst_daf_butler.egg-info → lsst_daf_butler-29.2025.3900}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.3800
+Version: 29.2025.3900
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_daf_butler-29.2025.3800 → lsst_daf_butler-29.2025.3900}/python/lsst/daf/butler/cli/utils.py

@@ -74,6 +74,7 @@ from typing import TYPE_CHECKING, Any, cast
 from unittest.mock import patch
 
 import click
+import click.core
 import click.exceptions
 import click.testing
 import yaml
@@ -95,6 +96,11 @@ if _click_version >= Version("8.2.0"):
 else:
     _click_make_metavar_has_context = False
 
+# Starting from Click 8.3.0, a special `UNSET` sentinel value is used to
+# indicate the absence of a default value for a parameter.  Prior to 8.3.0,
+# they just used `None`.
+_CLICK_UNSET_SENTINEL = getattr(click.core, "UNSET", None)
+
 log = logging.getLogger(__name__)
 
 # This is used as the metavar argument to Options that accept multiple string
@@ -554,7 +560,7 @@ def split_kv(
 
     if add_to_default:
         default = param.get_default(context)
-        if default:
+        if default and default != _CLICK_UNSET_SENTINEL:
             vals = tuple(v for v in itertools.chain(default, vals))  # Convert to tuple for mypy
 
     ret: RetDict | RetTuple
@@ -1013,7 +1019,8 @@ class MWCommand(click.Command):
                     captured_args.append(val)
             elif isinstance(param, click.Argument):
                 param_name = cast(str, param.name)
-                if (opt := opts[param_name]) is not None:
+                opt = opts[param_name]
+                if opt is not None and opt != _CLICK_UNSET_SENTINEL:
                     captured_args.append(opt)
             else:
                 raise AssertionError("All parameters should be an Option or an Argument")

{lsst_daf_butler-29.2025.3800 → lsst_daf_butler-29.2025.3900}/python/lsst/daf/butler/remote_butler/server/_dependencies.py

@@ -29,6 +29,8 @@ from typing import Annotated
 
 from fastapi import Depends, Header, HTTPException
 from safir.dependencies.gafaelfawr import auth_delegated_token_dependency
+from safir.dependencies.logger import logger_dependency as safir_logger_dependency
+from structlog.stdlib import BoundLogger
 
 from lsst.daf.butler import LabeledButlerFactory
 
@@ -117,6 +119,31 @@ async def repository_authorization_dependency(
         )
 
 
+async def logger_dependency(
+    logger: Annotated[BoundLogger, Depends(safir_logger_dependency)],
+    repository: str,
+    user_name: Annotated[str | None, Depends(user_name_dependency)],
+    x_auth_request_service: Annotated[str | None, Header()] = None,
+) -> BoundLogger:
+    """Return a logger with additional bound context information.
+
+    Parameters
+    ----------
+    logger : `structlog.stdlib.BoundLogger`
+        Logger provided by Safir.
+    repository : `str`
+        Butler repository that is being accessed.
+    user_name : `str` or `None`
+        Name of the user accessing the repository, from Gafaelfawr headers.
+    x_auth_request_service : `str` or `None`
+        Name of the service being used to access the repository, from
+        Gafaelfawr headers.
+    """
+    return logger.bind(
+        butler_repo=repository, requester={"username": user_name, "service": x_auth_request_service}
+    )
+
+
 async def factory_dependency(
     repository: str,
     butler_factory: Annotated[LabeledButlerFactory, Depends(butler_factory_dependency)],

{lsst_daf_butler-29.2025.3800 → lsst_daf_butler-29.2025.3900}/python/lsst/daf/butler/remote_butler/server/handlers/_external.py

@@ -30,10 +30,11 @@ from __future__ import annotations
 __all__ = ()
 
 import uuid
-from typing import Any
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import RedirectResponse
+from structlog.stdlib import BoundLogger
 
 from ...._butler import Butler
 from ...._collection_type import CollectionType
@@ -64,7 +65,7 @@ from ...server_models import (
     QueryDatasetTypesResponseModel,
 )
 from .._config import load_config
-from .._dependencies import factory_dependency
+from .._dependencies import factory_dependency, logger_dependency
 from .._factory import Factory
 from ._file_info import get_file_info_payload
 from ._utils import generate_file_download_uri, set_default_data_id
@@ -184,12 +185,14 @@ def expand_data_id(
 )
 def get_file(
     dataset_id: uuid.UUID,
+    logger: Annotated[BoundLogger, Depends(logger_dependency)],
     factory: Factory = Depends(factory_dependency),
 ) -> GetFileResponseModel:
     butler = factory.create_butler()
     ref = butler.get_dataset(dataset_id, datastore_records=True)
     if ref is None:
         raise DatasetNotFoundError(f"Dataset ID {dataset_id} not found")
+    _log_file_access(logger, ref, "uuid")
     return _get_file_info_response(butler, ref)
 
 
@@ -200,6 +203,7 @@ def get_file(
 )
 def get_file_by_data_id(
     request: GetFileByDataIdRequestModel,
+    logger: Annotated[BoundLogger, Depends(logger_dependency)],
     factory: Factory = Depends(factory_dependency),
 ) -> GetFileResponseModel:
     butler = factory.create_butler()
@@ -211,6 +215,7 @@ def get_file_by_data_id(
         datastore_records=True,
         timespan=request.timespan,
     )
+    _log_file_access(logger, ref, "data-id")
     return _get_file_info_response(butler, ref)
 
 
@@ -220,12 +225,21 @@ def _get_file_info_response(butler: Butler, ref: DatasetRef) -> GetFileResponseM
     )
 
 
+def _log_file_access(logger: BoundLogger, ref: DatasetRef, access_method: str) -> None:
+    logger.info(
+        "file-access",
+        dataset={"uuid": str(ref.id), "type": ref.datasetType.name, "data_id": dict(ref.dataId.required)},
+        file_access_endpoint=access_method,
+    )
+
+
 @external_router.get(
     "/v1/dataset/{dataset_id}/download",
     summary="Return an HTTP redirect to a location where you can download the artifact file for the dataset.",
 )
 def redirect_to_dataset_download(
     dataset_id: uuid.UUID,
+    logger: Annotated[BoundLogger, Depends(logger_dependency)],
     component: str | None = None,
     factory: Factory = Depends(factory_dependency),
 ) -> RedirectResponse:
@@ -245,6 +259,7 @@ def redirect_to_dataset_download(
         # files, and you must specify the component to pick which one you want
         # to download.
         if info.datastoreRecords.component == component:
+            _log_file_access(logger, ref, "uuid-redirect")
             return RedirectResponse(status_code=307, url=str(info.url))
 
     found_components = [info.datastoreRecords.component for info in payload.file_info]

lsst_daf_butler-29.2025.3900/python/lsst/daf/butler/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "29.2025.3900"

{lsst_daf_butler-29.2025.3800 → lsst_daf_butler-29.2025.3900/python/lsst_daf_butler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.3800
+Version: 29.2025.3900
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

lsst_daf_butler-29.2025.3800/python/lsst/daf/butler/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.3800"