Merge pull request #67 from lsst-dm/tickets/DM-50402

DM-50402: Batch filenames for webhook.

Author: ktlim

Dockerfile.ingest

@@ -24,7 +24,7 @@
 ARG RUBINENV_VERSION=10.0.0
 FROM ghcr.io/lsst-dm/docker-newinstall:9-latest-${RUBINENV_VERSION}
 ARG OBS_LSST_VERSION
-ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-d_2025_04_22}
+ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-w_2025_25}
 USER lsst
 RUN source loadLSST.bash && mamba install redis-py
 RUN source loadLSST.bash && eups distrib install -t "${OBS_LSST_VERSION}" lsst_obs

src/ingest.py

@@ -76,6 +76,7 @@ def on_success(datasets):
     datasets: `list` [`lsst.daf.butler.FileDataset`]
         The successfully-ingested datasets.
     """
+    webhook_filenames = dict()
     for dataset in datasets:
         logger.info("Ingested %s", dataset)
         info = Info.from_path(dataset.path.geturl())
@@ -85,9 +86,13 @@ def on_success(datasets):
             pipe.hset(f"FILE:{info.path}", "ingest_time", str(time.time()))
             pipe.hincrby(f"INGEST:{info.bucket}:{info.instrument}", f"{info.obs_day}", 1)
             pipe.execute()
-        if webhook_uri:
-            resp = requests.post(webhook_uri, json=info.__dict__, timeout=0.5)
-            logger.info("Webhook response: %s", resp)
+        if info.is_raw():
+            webhook_filenames.setdefault(info.exp_id, []).append(info.filename)
+    if webhook_uri:
+        for exp_id in webhook_filenames:
+            info_dict = {"exp_id": exp_id, "filenames": webhook_filenames[exp_id]}
+            resp = requests.post(webhook_uri, json=info_dict, timeout=0.5)
+            logger.info("Webhook response %s: %s", info_dict, resp)
 
 
 def on_ingest_failure(dataset, exc):