lsst-daf-butler 29.2025.2500__py3-none-any.whl → 29.2025.2600__py3-none-any.whl

lsst/daf/butler/registry/obscore/_config.py

@@ -101,6 +101,11 @@ class DatasetTypeConfig(pydantic.BaseModel):
     """Value for the ``obs_collection`` column, if specified it overrides
     global value in `ObsCoreConfig`."""
 
+    s_xel: tuple[int, int] | None = None
+    """The number of pixels in the first and second dimension of the dataset
+    type.
+    """
+
     extra_columns: (
         None | (dict[str, StrictFloat | StrictInt | StrictBool | StrictStr | ExtraColumnConfig])
     ) = None

lsst/daf/butler/registry/obscore/_records.py

@@ -179,6 +179,10 @@ class RecordFactory:
             record["obs_collection"] = self.config.obs_collection
         record["access_format"] = dataset_config.access_format
 
+        if dataset_config.s_xel is not None:
+            record["s_xel1"] = dataset_config.s_xel[0]
+            record["s_xel2"] = dataset_config.s_xel[1]
+
         dataId = ref.dataId
         dataset_type_name = ref.datasetType.name
 
@@ -190,6 +194,11 @@ class RecordFactory:
         fmt_kws.update(run=ref.run)
         fmt_kws.update(dataset_type=dataset_type_name)
         fmt_kws.update(record)
+
+        # In some cases we would like some keys to be duplicated
+        # with different names. For example making an exposure be a visit.
+        self.finalize_format_keywords(fmt_kws)
+
         if dataset_config.obs_id_fmt:
             record["obs_id"] = dataset_config.obs_id_fmt.format(**fmt_kws)
             fmt_kws["obs_id"] = record["obs_id"]
@@ -330,6 +339,17 @@ class RecordFactory:
                 raise
         return record
 
+    def finalize_format_keywords(self, format_kws: dict[str, Any]) -> None:
+        """Modify the formatting dict as required after it has been populated
+        with generic content.
+
+        Parameters
+        ----------
+        format_kws : `dict`
+            Dictionary that might be modified in place.
+        """
+        pass
+
     @classmethod
     def get_record_type_from_universe(cls, universe: DimensionUniverse) -> type[RecordFactory]:
         namespace = universe.namespace
@@ -410,10 +430,10 @@ class DafButlerRecordFactory(RecordFactory):
         if timespan is not None:
             if timespan.begin is not None:
                 t_min = cast(astropy.time.Time, timespan.begin)
-                record["t_min"] = float(t_min.mjd)
+                record["t_min"] = float(t_min.utc.mjd)
             if timespan.end is not None:
                 t_max = cast(astropy.time.Time, timespan.end)
-                record["t_max"] = float(t_max.mjd)
+                record["t_max"] = float(t_max.utc.mjd)
 
         region = dataId.region
         if self.exposure.name in dataId:
@@ -469,3 +489,9 @@ class DafButlerRecordFactory(RecordFactory):
             else:
                 return None, None
         return region_dim, "region"
+
+    def finalize_format_keywords(self, format_kws: dict[str, Any]) -> None:
+        # If we have an exposure but do not have a visit, copy the exposure
+        # into the visit field.
+        if "exposure" in format_kws and "visit" not in format_kws:
+            format_kws["visit"] = format_kws["exposure"]

lsst/daf/butler/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.2500"
+__version__ = "29.2025.2600"

{lsst_daf_butler-29.2025.2500.dist-info → lsst_daf_butler-29.2025.2600.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.2500
+Version: 29.2025.2600
 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.2500.dist-info → lsst_daf_butler-29.2025.2600.dist-info}/RECORD

@@ -52,7 +52,7 @@ lsst/daf/butler/repo_relocation.py,sha256=Ivhx2xU4slc53Z6RExhNnquMr2Hx-S8h62emml
 lsst/daf/butler/time_utils.py,sha256=MVTfOFI2xt3IeA46pa-fWY2kJRwSzaQyq1uzeUABcTM,11805
 lsst/daf/butler/timespan_database_representation.py,sha256=MWDusjIQIL2RH1CDpWSW5sYvdHCJKzAfpg1rm1DfgEU,24302
 lsst/daf/butler/utils.py,sha256=5u50COK5z4u31grOhmQF7mFz55biNLOvSMRdQjEdsjo,5140
-lsst/daf/butler/version.py,sha256=uW49-HYTP9jPdj_-PD584MYKQsfoumQbft7BWRqu6H4,55
+lsst/daf/butler/version.py,sha256=eKEngRNTsqzq5yv4faNqXQ7KB1ya5wGTLTxJ1qbWG50,55
 lsst/daf/butler/_utilities/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
 lsst/daf/butler/_utilities/locked_object.py,sha256=3RQf0Ish55mfQAfBy3V4Tfnfq5Q7-cxrwTlQMUhrIno,1931
 lsst/daf/butler/_utilities/named_locks.py,sha256=Zj_u1rZELaiWec3wJfkgmGD_YiZMLVxbMQmdbbVgk5E,2286
@@ -219,9 +219,9 @@ lsst/daf/butler/registry/interfaces/_obscore.py,sha256=oYmtCEqPsIUch3MTFVHp-z_kZ
 lsst/daf/butler/registry/interfaces/_opaque.py,sha256=WFusLN04IkQ2KZLA3NduByZyD5sTFYQta9Sfw_rezZQ,10371
 lsst/daf/butler/registry/interfaces/_versioning.py,sha256=nKNsZQP0NBLiOoLBb_bZ3qu1-p9D8mnLC7F-ueluluY,11951
 lsst/daf/butler/registry/obscore/__init__.py,sha256=-pBtrRuaW0D6wQrGI9RzlkK4KgPHMtxysHESbP2NfWc,1417
-lsst/daf/butler/registry/obscore/_config.py,sha256=OlO-SXVXQVOWyByD3lyvALTsUHGN7C_EXDqmjlfdD8s,8392
+lsst/daf/butler/registry/obscore/_config.py,sha256=Md5FFh9UfoOMnALpN48R1_2HSdvvwYVAfxMry1fyHYo,8529
 lsst/daf/butler/registry/obscore/_manager.py,sha256=jzZhW3LfFHhWxc_pxklNnsUtY2psMxfYlvB2DCUb_WE,16791
-lsst/daf/butler/registry/obscore/_records.py,sha256=eSWAfCsK8Lg0J8VOLzhntyW6mEkSpWN28JD9-5u8XMI,18334
+lsst/daf/butler/registry/obscore/_records.py,sha256=7zTxT_owCCenNz-j-jc8RAH77IU2cLE3JSye8PF_0i0,19329
 lsst/daf/butler/registry/obscore/_schema.py,sha256=4jmePOr4Z9qTuwLxmoPNDRCKP4-L7iIuAnnrBMbj7pQ,10115
 lsst/daf/butler/registry/obscore/_spatial.py,sha256=ipsXvDHM8C8d3vfiO9IQit0Z-tAPWlIgBMtAwPwfhr0,6478
 lsst/daf/butler/registry/obscore/default_spatial.py,sha256=7Ut51mEFloRx4AHK-Sl1qNnAHxFYlknciZX734TQBWI,4003
@@ -343,13 +343,13 @@ lsst/daf/butler/transfers/__init__.py,sha256=M1YcFszSkNB5hB2pZwwGXqbJE2dKt4YXDin
 lsst/daf/butler/transfers/_context.py,sha256=h1XDJpdg64R7DRHo7mb9xgaLiHDs_AIJmZbyo66qSSw,17278
 lsst/daf/butler/transfers/_interfaces.py,sha256=Ia1NqcFR5E-Ik4zsXEe2fuMtNCJj5Yfe_gVHLTBtJDw,7490
 lsst/daf/butler/transfers/_yaml.py,sha256=w_0GmrueuHVLfOfAXGHFBbWAl18tX6eSElbTC-2jRoc,32632
-lsst_daf_butler-29.2025.2500.dist-info/licenses/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
-lsst_daf_butler-29.2025.2500.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_daf_butler-29.2025.2500.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_daf_butler-29.2025.2500.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_daf_butler-29.2025.2500.dist-info/METADATA,sha256=yZjCnvNEQVYLue2Ng0pR4tPeQMkDKpORZXEEEZiQ5qI,3265
-lsst_daf_butler-29.2025.2500.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_daf_butler-29.2025.2500.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
-lsst_daf_butler-29.2025.2500.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_daf_butler-29.2025.2500.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_daf_butler-29.2025.2500.dist-info/RECORD,,
+lsst_daf_butler-29.2025.2600.dist-info/licenses/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
+lsst_daf_butler-29.2025.2600.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_daf_butler-29.2025.2600.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_daf_butler-29.2025.2600.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_daf_butler-29.2025.2600.dist-info/METADATA,sha256=cmlhIrx73oYFr2nqz5rguNpe5QIZRf949UPtZpzmcJQ,3265
+lsst_daf_butler-29.2025.2600.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_daf_butler-29.2025.2600.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
+lsst_daf_butler-29.2025.2600.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_daf_butler-29.2025.2600.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_daf_butler-29.2025.2600.dist-info/RECORD,,