rslearn 0.0.15__py3-none-any.whl → 0.0.16__py3-none-any.whl

rslearn/train/prediction_writer.py

@@ -12,10 +12,8 @@ from lightning.pytorch.callbacks import BasePredictionWriter
 from upath import UPath
 
 from rslearn.config import (
+    LayerConfig,
     LayerType,
-    RasterFormatConfig,
-    RasterLayerConfig,
-    VectorLayerConfig,
 )
 from rslearn.dataset import Dataset, Window
 from rslearn.log_utils import get_logger
@@ -25,9 +23,8 @@ from rslearn.utils.geometry import PixelBounds
 from rslearn.utils.raster_format import (
     RasterFormat,
     adjust_projection_and_bounds_for_array,
-    load_raster_format,
 )
-from rslearn.utils.vector_format import VectorFormat, load_vector_format
+from rslearn.utils.vector_format import VectorFormat
 
 from .lightning_module import RslearnLightningModule
 from .tasks.task import Task
@@ -150,7 +147,7 @@ class RslearnWriter(BasePredictionWriter):
         selector: list[str] | None = None,
         merger: PatchPredictionMerger | None = None,
         output_path: str | Path | None = None,
-        layer_config: RasterLayerConfig | VectorLayerConfig | None = None,
+        layer_config: LayerConfig | None = None,
     ):
         """Create a new RslearnWriter.
 
@@ -178,43 +175,31 @@ class RslearnWriter(BasePredictionWriter):
         )
 
         # Handle dataset and layer config
-        self.layer_config: RasterLayerConfig | VectorLayerConfig
+        self.layer_config: LayerConfig
         if layer_config:
             self.layer_config = layer_config
-            self.dataset = None if self.output_path else Dataset(self.path)
         else:
-            self.dataset = Dataset(self.path)
-            if self.output_layer not in self.dataset.layers:
+            dataset = Dataset(self.path)
+            if self.output_layer not in dataset.layers:
                 raise KeyError(
                     f"Output layer '{self.output_layer}' not found in dataset layers."
                 )
-            raw_layer_config = self.dataset.layers[self.output_layer]
-            # Type narrowing to ensure compatibility
-            if isinstance(raw_layer_config, (RasterLayerConfig | VectorLayerConfig)):
-                self.layer_config = raw_layer_config
-            else:
-                raise ValueError(
-                    f"Layer config must be RasterLayerConfig or VectorLayerConfig, got {type(raw_layer_config)}"
-                )
+            self.layer_config = dataset.layers[self.output_layer]
 
         self.format: RasterFormat | VectorFormat
-        if self.layer_config.layer_type == LayerType.RASTER:
-            assert isinstance(self.layer_config, RasterLayerConfig)
+        if self.layer_config.type == LayerType.RASTER:
             band_cfg = self.layer_config.band_sets[0]
-            self.format = load_raster_format(
-                RasterFormatConfig(band_cfg.format["name"], band_cfg.format)
-            )
-        elif self.layer_config.layer_type == LayerType.VECTOR:
-            assert isinstance(self.layer_config, VectorLayerConfig)
-            self.format = load_vector_format(self.layer_config.format)
+            self.format = band_cfg.instantiate_raster_format()
+        elif self.layer_config.type == LayerType.VECTOR:
+            self.format = self.layer_config.instantiate_vector_format()
         else:
-            raise ValueError(f"invalid layer type {self.layer_config.layer_type}")
+            raise ValueError(f"invalid layer type {self.layer_config.type}")
 
         if merger is not None:
             self.merger = merger
-        elif self.layer_config.layer_type == LayerType.RASTER:
+        elif self.layer_config.type == LayerType.RASTER:
             self.merger = RasterMerger()
-        elif self.layer_config.layer_type == LayerType.VECTOR:
+        elif self.layer_config.type == LayerType.VECTOR:
             self.merger = VectorMerger()
 
         # Map from window name to pending data to write.
@@ -337,8 +322,7 @@ class RslearnWriter(BasePredictionWriter):
         logger.debug(f"Merging and writing for window {window.name}")
         merged_output = self.merger.merge(window, pending_output)
 
-        if self.layer_config.layer_type == LayerType.RASTER:
-            assert isinstance(self.layer_config, RasterLayerConfig)
+        if self.layer_config.type == LayerType.RASTER:
             raster_dir = window.get_raster_dir(
                 self.output_layer, self.layer_config.band_sets[0].bands
             )
@@ -351,7 +335,7 @@ class RslearnWriter(BasePredictionWriter):
             )
             self.format.encode_raster(raster_dir, projection, bounds, merged_output)
 
-        elif self.layer_config.layer_type == LayerType.VECTOR:
+        elif self.layer_config.type == LayerType.VECTOR:
             layer_dir = window.get_layer_dir(self.output_layer)
             assert isinstance(self.format, VectorFormat)
             self.format.encode_vector(layer_dir, merged_output)

rslearn/train/tasks/classification.py

@@ -26,7 +26,7 @@ class ClassificationTask(BasicTask):
     def __init__(
         self,
         property_name: str,
-        classes: list,  # TODO: Should this be a list of str or int or can it be both?
+        classes: list[str],
         filters: list[tuple[str, str]] = [],
         read_class_id: bool = False,
         allow_invalid: bool = False,
@@ -176,6 +176,7 @@ class ClassificationTask(BasicTask):
             # For multiclass classification or when using the default threshold
             class_idx = probs.argmax().item()
 
+        value: str | int
         if not self.read_class_id:
             value = self.classes[class_idx]  # type: ignore
         else:

rslearn/utils/fsspec.py

@@ -156,3 +156,23 @@ def open_rasterio_upath_writer(
         with path.open("wb") as f:
             with rasterio.open(f, "w", **kwargs) as raster:
                 yield raster
+
+
+def get_relative_suffix(base_dir: UPath, fname: UPath) -> str:
+    """Get the suffix of fname relative to base_dir.
+
+    Args:
+        base_dir: the base directory.
+        fname: a filename within the base directory.
+
+    Returns:
+        the suffix on base_dir that would yield the given filename.
+    """
+    if not fname.path.startswith(base_dir.path):
+        raise ValueError(
+            f"filename {fname.path} must start with base directory {base_dir.path}"
+        )
+    suffix = fname.path[len(base_dir.path) :]
+    if suffix.startswith("/"):
+        suffix = suffix[1:]
+    return suffix

rslearn/utils/jsonargparse.py

@@ -1,7 +1,18 @@
 """Custom serialization for jsonargparse."""
 
+from datetime import datetime
+from typing import TYPE_CHECKING, Any
+
 import jsonargparse
 from rasterio.crs import CRS
+from upath import UPath
+
+from rslearn.config.dataset import LayerConfig
+
+if TYPE_CHECKING:
+    from rslearn.data_sources.data_source import DataSourceContext
+
+INITIALIZED = False
 
 
 def crs_serializer(v: CRS) -> str:
@@ -28,6 +39,74 @@ def crs_deserializer(v: str) -> CRS:
     return CRS.from_string(v)
 
 
+def datetime_serializer(v: datetime) -> str:
+    """Serialize datetime for jsonargparse.
+
+    Args:
+        v: the datetime object.
+
+    Returns:
+        the datetime encoded to string
+    """
+    return v.isoformat()
+
+
+def datetime_deserializer(v: str) -> datetime:
+    """Deserialize datetime for jsonargparse.
+
+    Args:
+        v: the encoded datetime.
+
+    Returns:
+        the decoded datetime object
+    """
+    return datetime.fromisoformat(v)
+
+
+def data_source_context_serializer(v: "DataSourceContext") -> dict[str, Any]:
+    """Serialize DataSourceContext for jsonargparse."""
+    x = {
+        "ds_path": (str(v.ds_path) if v.ds_path is not None else None),
+        "layer_config": (
+            v.layer_config.model_dump(mode="json")
+            if v.layer_config is not None
+            else None
+        ),
+    }
+    return x
+
+
+def data_source_context_deserializer(v: dict[str, Any]) -> "DataSourceContext":
+    """Deserialize DataSourceContext for jsonargparse."""
+    # We lazily import these to avoid cyclic dependency.
+    from rslearn.data_sources.data_source import DataSourceContext
+
+    return DataSourceContext(
+        ds_path=(UPath(v["ds_path"]) if v["ds_path"] is not None else None),
+        layer_config=(
+            LayerConfig.model_validate(v["layer_config"])
+            if v["layer_config"] is not None
+            else None
+        ),
+    )
+
+
 def init_jsonargparse() -> None:
     """Initialize custom jsonargparse serializers."""
+    global INITIALIZED
+    if INITIALIZED:
+        return
     jsonargparse.typing.register_type(CRS, crs_serializer, crs_deserializer)
+    jsonargparse.typing.register_type(
+        datetime, datetime_serializer, datetime_deserializer
+    )
+
+    from rslearn.data_sources.data_source import DataSourceContext
+
+    jsonargparse.typing.register_type(
+        DataSourceContext,
+        data_source_context_serializer,
+        data_source_context_deserializer,
+    )
+
+    INITIALIZED = True

rslearn/utils/raster_format.py

@@ -2,8 +2,7 @@
 
 import hashlib
 import json
-from collections.abc import Callable
-from typing import Any, BinaryIO, TypeVar
+from typing import Any, BinaryIO
 
 import affine
 import numpy as np
@@ -14,34 +13,12 @@ from rasterio.crs import CRS
 from rasterio.enums import Resampling
 from upath import UPath
 
-from rslearn.config import RasterFormatConfig
 from rslearn.const import TILE_SIZE
 from rslearn.log_utils import get_logger
 from rslearn.utils.fsspec import open_rasterio_upath_reader, open_rasterio_upath_writer
 
 from .geometry import PixelBounds, Projection
 
-_RasterFormatT = TypeVar("_RasterFormatT", bound="RasterFormat")
-
-
-class _RasterFormatRegistry(dict[str, type["RasterFormat"]]):
-    """Registry for RasterFormat classes."""
-
-    def register(
-        self, name: str
-    ) -> Callable[[type[_RasterFormatT]], type[_RasterFormatT]]:
-        """Decorator to register a raster format class."""
-
-        def decorator(cls: type[_RasterFormatT]) -> type[_RasterFormatT]:
-            self[name] = cls
-            return cls
-
-        return decorator
-
-
-RasterFormats = _RasterFormatRegistry()
-
-
 logger = get_logger(__name__)
 
 
@@ -219,7 +196,6 @@ class RasterFormat:
         raise NotImplementedError
 
 
-@RasterFormats.register("image_tile")
 class ImageTileRasterFormat(RasterFormat):
     """A RasterFormat that stores data in image tiles corresponding to grid cells.
 
@@ -468,7 +444,6 @@ class ImageTileRasterFormat(RasterFormat):
         )
 
 
-@RasterFormats.register("geotiff")
 class GeotiffRasterFormat(RasterFormat):
     """A raster format that uses one big, tiled GeoTIFF with small block size."""
 
@@ -623,7 +598,6 @@ class GeotiffRasterFormat(RasterFormat):
         return GeotiffRasterFormat(**kwargs)
 
 
-@RasterFormats.register("single_image")
 class SingleImageRasterFormat(RasterFormat):
     """A raster format that produces a single image called image.png/jpg.
 
@@ -775,17 +749,3 @@ class SingleImageRasterFormat(RasterFormat):
         if "format" in config:
             kwargs["format"] = config["format"]
         return SingleImageRasterFormat(**kwargs)
-
-
-def load_raster_format(config: RasterFormatConfig) -> RasterFormat:
-    """Loads a RasterFormat from a RasterFormatConfig.
-
-    Args:
-        config: the RasterFormatConfig configuration object specifying the
-            RasterFormat.
-
-    Returns:
-        the loaded RasterFormat implementation
-    """
-    cls = RasterFormats[config.name]
-    return cls.from_config(config.name, config.config_dict)

rslearn/utils/vector_format.py

@@ -1,15 +1,13 @@
 """Classes for writing vector data to a UPath."""
 
 import json
-from collections.abc import Callable
 from enum import Enum
-from typing import Any, TypeVar
+from typing import Any
 
 import shapely
 from rasterio.crs import CRS
 from upath import UPath
 
-from rslearn.config import VectorFormatConfig
 from rslearn.const import WGS84_PROJECTION
 from rslearn.log_utils import get_logger
 from rslearn.utils.fsspec import open_atomic
@@ -18,25 +16,6 @@ from .feature import Feature
 from .geometry import PixelBounds, Projection, STGeometry, safely_reproject_and_clip
 
 logger = get_logger(__name__)
-_VectorFormatT = TypeVar("_VectorFormatT", bound="VectorFormat")
-
-
-class _VectorFormatRegistry(dict[str, type["VectorFormat"]]):
-    """Registry for VectorFormat classes."""
-
-    def register(
-        self, name: str
-    ) -> Callable[[type[_VectorFormatT]], type[_VectorFormatT]]:
-        """Decorator to register a vector format class."""
-
-        def decorator(cls: type[_VectorFormatT]) -> type[_VectorFormatT]:
-            self[name] = cls
-            return cls
-
-        return decorator
-
-
-VectorFormats = _VectorFormatRegistry()
 
 
 class VectorFormat:
@@ -85,7 +64,6 @@ class VectorFormat:
         raise NotImplementedError
 
 
-@VectorFormats.register("tile")
 class TileVectorFormat(VectorFormat):
     """TileVectorFormat stores data in GeoJSON files corresponding to grid cells.
 
@@ -275,7 +253,6 @@ class GeojsonCoordinateMode(Enum):
     WGS84 = "wgs84"
 
 
-@VectorFormats.register("geojson")
 class GeojsonVectorFormat(VectorFormat):
     """A vector format that uses one big GeoJSON."""
 
@@ -429,17 +406,3 @@ class GeojsonVectorFormat(VectorFormat):
         if "coordinate_mode" in config:
             kwargs["coordinate_mode"] = GeojsonCoordinateMode(config["coordinate_mode"])
         return GeojsonVectorFormat(**kwargs)
-
-
-def load_vector_format(config: VectorFormatConfig) -> VectorFormat:
-    """Loads a VectorFormat from a VectorFormatConfig.
-
-    Args:
-        config: the VectorFormatConfig configuration object specifying the
-            VectorFormat.
-
-    Returns:
-        the loaded VectorFormat implementation
-    """
-    cls = VectorFormats[config.name]
-    return cls.from_config(config.name, config.config_dict)

{rslearn-0.0.15.dist-info → rslearn-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rslearn
-Version: 0.0.15
+Version: 0.0.16
 Summary: A library for developing remote sensing datasets and models
 Author: OlmoEarth Team
 License:                                  Apache License

{rslearn-0.0.15.dist-info → rslearn-0.0.16.dist-info}/RECORD

@@ -1,52 +1,51 @@
 rslearn/__init__.py,sha256=fFmAen3vxZyosEfPbG0W46IttujYGVxzrGkJ0YutmmY,73
 rslearn/arg_parser.py,sha256=GNlJncO6Ck_dCNrcg7z_SSG61I-2gKn3Ix2tAxIk9CI,1428
 rslearn/const.py,sha256=FUCfsvFAs-QarEDJ0grdy0C1HjUjLpNFYGo5I2Vpc5Y,449
-rslearn/lightning_cli.py,sha256=io1Agb2fr-fUu9yOODNJhP8-vJp_v9UbJJA2hkLubKA,2435
+rslearn/lightning_cli.py,sha256=x8i2QJvEBaYdqh2_f0-ety7_sNEH9UCKRZUPkqWYZdU,17169
 rslearn/log_utils.py,sha256=unD9gShiuO7cx5Nnq8qqVQ4qrbOOwFVgcHxN5bXuiAo,941
-rslearn/main.py,sha256=JMNMhAHqpb9bDUoKzj6kN659Ft_-gZv_rKUieJcJNwI,29087
+rslearn/main.py,sha256=0g1SRO975eC9DTzKqJnwlWHgVo2Pvotyr72KoJBgjew,29060
 rslearn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rslearn/template_params.py,sha256=Vop0Ha-S44ctCa9lvSZRjrMETznJZlR5y_gJrVIwrPg,791
-rslearn/config/__init__.py,sha256=Bhf2VVncdMYRC8Wfb4GsJJ13OAJYNCO_ODLSNTmBOHM,638
-rslearn/config/dataset.py,sha256=lIuFgJG0Hz7nxacFIpbwOyNJqjlkOlaMfWt91Chjb_M,21338
-rslearn/data_sources/__init__.py,sha256=8_7Pi3agKsatNoxXw74-U5G-QAP-rbdfcH8EkZfJbH4,1449
-rslearn/data_sources/aws_landsat.py,sha256=GA9H04KagBDm-N37jFdh_aHCX2ZneVdnqT1SNOyAwTs,20829
-rslearn/data_sources/aws_open_data.py,sha256=nU_D5cqc-wibxq4uyUNb0z-XD0Puf1gZ8v5FMiMAN5w,30258
-rslearn/data_sources/aws_sentinel1.py,sha256=cmf_ZcB7GCyFAdbwExeAwJIHqLL0JVoXtq5WcQ8UuiU,5197
-rslearn/data_sources/climate_data_store.py,sha256=Hct-0Ui-_CCQISOlzsqkK1dKz8684HRqfVUI-zXW2wA,11571
-rslearn/data_sources/copernicus.py,sha256=NBiZO3tLRqdi8lrFSrBtnv6gfobbDWGk_0eQoydizYE,36657
-rslearn/data_sources/data_source.py,sha256=69ptYhqa6pnKM04ux9hWvTPExN_lFNuU_0t_seYFnHE,3916
-rslearn/data_sources/earthdaily.py,sha256=dxOWm7Yiuh4fWVptRws_Ljh-HuNs1frf86ao91yS_80,19059
-rslearn/data_sources/earthdata_srtm.py,sha256=ysyVbVDLjhhLKdh7WKhQcwZezqvmTYaiPetTborW6zQ,11166
-rslearn/data_sources/eurocrops.py,sha256=bH_ul45RvNLLvVKU9JjZH1XMenAmgn7Lakq0pXjPXos,8861
-rslearn/data_sources/gcp_public_data.py,sha256=kr9stYo7ZCvz8s4E3wmoY-yAGZoLa_9RCwjS-Q5k9dM,36128
-rslearn/data_sources/geotiff.py,sha256=sFUp919chaX4j6lQytNp__xnMLlDI3Ac3rfB6F8sgZ0,45
-rslearn/data_sources/google_earth_engine.py,sha256=hpkt74ly2lEwjRrDp8FBmGvB3MEw_mQ38Av4rQOR3_w,24246
-rslearn/data_sources/local_files.py,sha256=d08m6IzrUN_80VfvgpHahMJrv-n6_CI6EIocp6kyDRs,19490
-rslearn/data_sources/openstreetmap.py,sha256=qUSMFiIA_laJkO3meBXf9TmSI7OBD-o3i4JxqllUv3Q,19232
-rslearn/data_sources/planet.py,sha256=F2JoLaQ5Cb3k1cTm0hwSWTL2TPfbaAUMXZ8q4Dy7UlA,10109
-rslearn/data_sources/planet_basemap.py,sha256=wuWM9dHSJMdINfyWb78Zk9i-KvJHTrf9J0Q2gyEyiiA,10450
-rslearn/data_sources/planetary_computer.py,sha256=Vi-aBHQe-BA8NjRyPMgurMAdo3sK6PJteCK5MwXygJo,31869
-rslearn/data_sources/raster_source.py,sha256=b8wo55GhVLxXwx1WYLzeRAlzD_ZkE_P9tnvUOdnsfQE,689
-rslearn/data_sources/usda_cdl.py,sha256=2_V11AhPRgLEGd4U5Pmx3UvE2HWBPbsFXhUIQVRVFeE,7138
-rslearn/data_sources/usgs_landsat.py,sha256=31GmOUfmxwTE6MTiVI4psb-ciVmunuA8cfvqDuvTHPE,19312
-rslearn/data_sources/utils.py,sha256=oi2ybE423TLgpXlNjZ5qDQxDiwbSs7b-qD71UueQZHE,11327
+rslearn/config/__init__.py,sha256=a8xTvYSnpfIzniHgcnSeob5jo5PVBfacpakA_150MME,434
+rslearn/config/dataset.py,sha256=iUFuwzlM9z6n1pGCd40SmAVj3fG6zTXWrlH6eenfon8,21143
+rslearn/data_sources/__init__.py,sha256=zzuZUxrlEIw84YpD2I0HJvCoLDB29LbmnKTXiJykzGU,660
+rslearn/data_sources/aws_landsat.py,sha256=0ZQtmd2NCnvLy4vFSB1AlmoguJbiQB_e_T4eS1tnW9Q,20443
+rslearn/data_sources/aws_open_data.py,sha256=lrHnMJTH3NAaRdNjxwCIxSq8rq90IvV4ho-qAG6Hdgc,29348
+rslearn/data_sources/aws_sentinel1.py,sha256=knBg2ZdwzGRIibUPAqnhYR-DbHqFL4tLsuRVrucTWU4,4745
+rslearn/data_sources/climate_data_store.py,sha256=4ZPVtwFCc35IhPVM24tqrmXTB61zABCDKYa4U4IKQhQ,11191
+rslearn/data_sources/copernicus.py,sha256=DLyXwnkFo2LzbxfLKHkOvHyZcNYFg5w-yXQPeBL67_w,35049
+rslearn/data_sources/data_source.py,sha256=lxdcxefETX5ui5uUdZn-ACSBhy6YVo4XDfk368EMD40,4862
+rslearn/data_sources/earthdaily.py,sha256=BNP7BK_vb9yQw6LaIaJ80vjCfBZ9TeALGkjHYIet_W0,18205
+rslearn/data_sources/earthdata_srtm.py,sha256=bwo8e_y9fFPliZ411tTWOiAUlEcb3AWBkeZxnkFY5SI,10633
+rslearn/data_sources/eurocrops.py,sha256=FQqdBcNl43fArq6rd_-iffVJyliIDbB0lIHvNdmtQBU,8663
+rslearn/data_sources/gcp_public_data.py,sha256=E3BhJqOgHMqwcfaxg7D47KNmfAwJDiDjH8-OdqNdjuI,36524
+rslearn/data_sources/google_earth_engine.py,sha256=xdoSDjSVp6lPVPMv4UJZ6BRUozUA2hFbSTl1707TBoM,23523
+rslearn/data_sources/local_files.py,sha256=mo5W_BxBl89EPTIHNDEpXM6qBjrP225KK0PcmNgvJZQ,19090
+rslearn/data_sources/openstreetmap.py,sha256=TzZfouc2Z4_xjx2v_uv7aPn4tVW3flRVQN4qBfl507E,18161
+rslearn/data_sources/planet.py,sha256=6FWQ0bl1k3jwvwp4EVGi2qs3OD1QhnKOKP36mN4HELI,9446
+rslearn/data_sources/planet_basemap.py,sha256=e9R6FlagJjg8Z6Rc1dC6zK3xMkCohz8eohXqXmd29xg,9670
+rslearn/data_sources/planetary_computer.py,sha256=qgvGe_hQDxAIrRVB9szvJZL5IvE2jTo8UWuKCMzx7jM,29773
+rslearn/data_sources/usda_cdl.py,sha256=_WvxZkm0fbXfniRs6NT8iVCbTTmVPflDhsFT2ci6_Dk,6879
+rslearn/data_sources/usgs_landsat.py,sha256=kPOb3hsZe5-guUcFZZkwzcRpYZ3Zo7Bk4E829q_xiyU,18516
+rslearn/data_sources/utils.py,sha256=v_90ALOuts7RHNcx-j8o-aQ_aFjh8ZhXrmsaa9uEGDA,11651
 rslearn/data_sources/vector_source.py,sha256=NCa7CxIrGKe9yRT0NyyFKFQboDGDZ1h7663PV9OfMOM,44
-rslearn/data_sources/worldcereal.py,sha256=Psdf3EF3REj1WDltHWyMaICY3--KAJO_nEqpF0Gl_G8,21808
-rslearn/data_sources/worldcover.py,sha256=rimHJpQN9a56GaYxyHTOGXKzE3bkWKgd1UbH5A4aaGs,6097
-rslearn/data_sources/worldpop.py,sha256=HZrDJjz_5gXlHG6IOGIzVaL0Y4rO6FKF4FELMEX-lk4,5856
-rslearn/data_sources/xyz_tiles.py,sha256=SJV8TB6WUP6DTPr2d3LXRKVjFxda7bdR9IM84VvaRto,14618
+rslearn/data_sources/worldcereal.py,sha256=rGGxwJAC3pAASVBQoUhwS3qL-qcmF6W__Tb53qWCEmE,21501
+rslearn/data_sources/worldcover.py,sha256=n7gi-JRytxkvkUhKT--dVziMcWSSyMbZA7ZCzLT2MJY,6037
+rslearn/data_sources/worldpop.py,sha256=S3RSc5kTwSs2bcREjNarBsqf3MBX5CN0eHj7Qkx4K74,5625
+rslearn/data_sources/xyz_tiles.py,sha256=P601CvUmoVDC_ZRVhPKaIoPYYCq5UhZ-v7DaGlN5y_0,13797
 rslearn/dataset/__init__.py,sha256=bHtBlEEBCekO-gaJqiww0-VjvZTE5ahx0llleo8bfP8,289
 rslearn/dataset/add_windows.py,sha256=pwCEvwLE1jQCoqQxw6CJ-sP46ayWppFa2hGYIB6VVkc,8494
-rslearn/dataset/dataset.py,sha256=bjf9nI55j-MF0bIQWSNPjNbpfqnLK4jy-96TAcwO0MM,5214
+rslearn/dataset/dataset.py,sha256=qmZmFfQOHoKVx6_sBYtBR5H4GTNMgETvq0S4XrqafQU,5165
 rslearn/dataset/handler_summaries.py,sha256=wI99RDk5erCWkzl1A7Uc4chatQ9KWIr4F_0Hxr9Co6s,2607
 rslearn/dataset/index.py,sha256=Wni5m6h4gisRB54fPLnCfUrRTEsJ5EvwS0fs9sYc2wg,6025
-rslearn/dataset/manage.py,sha256=IURlbCtm9a5f4d52AXfte1yyodlf6MgjfYn3__GdIL4,19062
-rslearn/dataset/materialize.py,sha256=-z47svc_JqGhzkp8kq5Hd9fykWNqFEUCQezo887TWBw,22056
+rslearn/dataset/manage.py,sha256=-lGSIgk6Z7-verF_POwe4n5w9eSpgyt4nEOcOj382rc,18971
+rslearn/dataset/materialize.py,sha256=x7FewmdqFUviLtPZGZIfAcw1rd0wfKZhk_N-uN-tQms,20922
 rslearn/dataset/remap.py,sha256=6MaImsY02GNACpvRM81RvWmjZWRfAHxo_R3Ox6XLF6A,2723
 rslearn/dataset/window.py,sha256=I5RqZ12jlIXhohw4qews1x_I4tSDpml709DZRtLiN24,12546
 rslearn/models/__init__.py,sha256=_vWoF9d2Slah8-6XhYhdU4SRsy_CNxXjCGQTD2yvu3Q,22
 rslearn/models/anysat.py,sha256=3Oh2gWxicVdUzOjevBEZf0PuolmCy0KC5Ad7JY-0Plc,7949
 rslearn/models/clip.py,sha256=u5aqYnVB4Jag7o1h8EzPDAc1t2BAHeALA9FcUwP5tfo,2238
+rslearn/models/concatenate_features.py,sha256=qQPwKF-wz18hC1EA1OS81C6RPjYggPrZ5grCuHIM4aY,3434
 rslearn/models/conv.py,sha256=fWyByeswIOKKzyPmP3erYUlZaKEV0huWHA4CyKTBbfY,1703
 rslearn/models/croma.py,sha256=n7yunpT7lo8vWWaOpx4yt8jZSXjgWqfgZcZKFW5zuEQ,10591
 rslearn/models/dinov3.py,sha256=9k9kNlXCorQQwKjLGptooANd48TUBsITQ1e4fUomlM4,6337
@@ -104,16 +103,16 @@ rslearn/models/panopticon_data/sensors/wv23.yaml,sha256=SWYSlkka6UViKAz6YI8aqwQ-
 rslearn/models/presto/__init__.py,sha256=eZrB-XKi_vYqZhpyAOwppJi4dRuMtYVAdbq7KRygze0,64
 rslearn/models/presto/presto.py,sha256=8mZnc0jk_r_JikybHQNyyHg6t7JNPmoPmgoivyNf-U8,9177
 rslearn/models/presto/single_file_presto.py,sha256=Kbwp8V7pO8HHM2vlCPpjekQiFiDryW8zQkWmt1g05BY,30381
-rslearn/tile_stores/__init__.py,sha256=o_tWVKu6UwFzZbO9jn_3cmIDqc_Q3qDd6tA9If0T_Qk,2050
+rslearn/tile_stores/__init__.py,sha256=-cW1J7So60SEP5ZLHCPdaFBV5CxvV3QlOhaFnUkhTJ0,1675
 rslearn/tile_stores/default.py,sha256=PYaDNvBxhJTDKJGw0EjDTSE1OKajR7_iJpMbOjj-mE8,15054
 rslearn/tile_stores/tile_store.py,sha256=9AeYduDYPp_Ia2NMlq6osptpz_AFGIOQcLJrqZ_m-z0,10469
 rslearn/train/__init__.py,sha256=fnJyY4aHs5zQqbDKSfXsJZXY_M9fbTsf7dRYaPwZr2M,30
 rslearn/train/all_patches_dataset.py,sha256=xFJ96HU3CodrUBzXTsgrmEShosKH79T2SxI0xDVSH3Q,18217
 rslearn/train/data_module.py,sha256=pgut8rEWHIieZ7RR8dUvhtlNqk0egEdznYF3tCvqdHg,23552
-rslearn/train/dataset.py,sha256=8F3bpus25g_NG0-CwMCuznwKxOvBDClNBCOEvDbMyN8,34312
+rslearn/train/dataset.py,sha256=OLPBtVf7tmHodoMnB_gI-jLQq2xQ9aXz38Hq8kBgbp0,33944
 rslearn/train/lightning_module.py,sha256=ZLBiId3secUlVs2yzkN-mwVv4rMdh5TkdZYl4vv_Cw0,14466
 rslearn/train/optimizer.py,sha256=EKSqkmERalDA0bF32Gey7n6z69KLyaUWKlRsGJfKBmE,927
-rslearn/train/prediction_writer.py,sha256=mDvREwEB5k5_tNuBnYIvAGnxS3sYFWQYvV07V3UEe2k,14106
+rslearn/train/prediction_writer.py,sha256=D2CCLlwlElMoMxnPiI6B9Q9HafGspuwoqYD8TKq98pk,13173
 rslearn/train/scheduler.py,sha256=wFbmycMHgL6nRYeYalDjb0G8YVo8VD3T3sABS61jJ7c,2318
 rslearn/train/callbacks/__init__.py,sha256=VNV0ArZyYMvl3dGK2wl6F046khYJ1dEBlJS6G_SYNm0,47
 rslearn/train/callbacks/adapters.py,sha256=yfv8nyCj3jmo2_dNkFrjukKxh0MHsf2xKqWwMF0QUtY,1869
@@ -121,7 +120,7 @@ rslearn/train/callbacks/freeze_unfreeze.py,sha256=8fIzBMhCKKjpTffIeAdhdSjsBd8NjT
 rslearn/train/callbacks/gradients.py,sha256=4YqCf0tBb6E5FnyFYbveXfQFlgNPyxIXb2FCWX4-6qs,5075
 rslearn/train/callbacks/peft.py,sha256=wEOKsS3RhsRaZTXn_Kz2wdsZdIiIaZPdCJWtdJBurT8,4156
 rslearn/train/tasks/__init__.py,sha256=dag1u72x1-me6y0YcOubUo5MYZ0Tjf6-dOir9UeFNMs,75
-rslearn/train/tasks/classification.py,sha256=kahVdXPU6fDwDCdqlrjZGb9uA-PYG74DbQQ0kJUt-Eg,13186
+rslearn/train/tasks/classification.py,sha256=8nSv0caf2PzV3Pmme_iN4WQIac4ry3hdW6FRHbh4L1M,13152
 rslearn/train/tasks/detection.py,sha256=9j9webusrjGexvUmZ7gl3NTBS63Qq511VFlB2WbLi5Y,22302
 rslearn/train/tasks/embedding.py,sha256=DK3l1aQ3d5gQUT1h3cD6vcUaNKvSsH26RHx2Bbzutbg,3667
 rslearn/train/tasks/multi_task.py,sha256=dBWsnbvQ0CReNsbDHmZ_-sXjUE0H4S2OPcbJwMquG9g,6016
@@ -142,22 +141,22 @@ rslearn/train/transforms/transform.py,sha256=n1Qzqix2dVvej-Q7iPzHeOQbqH79IBlvqPo
 rslearn/utils/__init__.py,sha256=GNvdTUmXakiEMnLdje7k1fe5aC7SFVqP757kbpN6Fzw,558
 rslearn/utils/array.py,sha256=RC7ygtPnQwU6Lb9kwORvNxatJcaJ76JPsykQvndAfes,2444
 rslearn/utils/feature.py,sha256=lsg0WThZDJzo1mrbaL04dXYI5G3x-n5FG9aEjj7uUaI,1649
-rslearn/utils/fsspec.py,sha256=9QwN46heBhjUnth3qFeRNE3W6Wlr6dM3twYVswPnS9o,5300
+rslearn/utils/fsspec.py,sha256=h3fER_bkewzR9liEAULXguTIvXLUXA17pC_yZoWN5Tk,5902
 rslearn/utils/geometry.py,sha256=oZllq1aBFcDewTTDYAMnTeP1xR0EdB5Xz3ILmfASo-8,18455
 rslearn/utils/get_utm_ups_crs.py,sha256=kUrcyjCK7KWvuP1XR-nURPeRqYeRO-3L8QUJ1QTF9Ps,3599
 rslearn/utils/grid_index.py,sha256=hRmrtgpqN1pLa-djnZtgSXqKJlbgGyttGnCEmPLD0zo,2347
-rslearn/utils/jsonargparse.py,sha256=JcTKQoZ6jgwag-kSeTIEVBO9AsRj0X1oEJBsoaCazH4,658
+rslearn/utils/jsonargparse.py,sha256=gpGbo5KOrF1_1_sgHFEzAA1c_-SZCATOg6hLju8jxUs,2697
 rslearn/utils/mp.py,sha256=XYmVckI5TOQuCKc49NJyirDJyFgvb4AI-gGypG2j680,1399
-rslearn/utils/raster_format.py,sha256=RDzDPnWUJunqcj-F4oXKBl-rKFBUpRjvq7mMYhid3iU,27413
+rslearn/utils/raster_format.py,sha256=qZpbODF4I7BsOxf43O6vTmH2TSNw6N8PP0wsFUVvdIw,26267
 rslearn/utils/rtree_index.py,sha256=j0Zwrq3pXuAJ-hKpiRFQ7VNtvO3fZYk-Em2uBPAqfx4,6460
 rslearn/utils/spatial_index.py,sha256=eomJAUgzmjir8j9HZnSgQoJHwN9H0wGTjmJkMkLLfsU,762
 rslearn/utils/sqlite_index.py,sha256=YGOJi66544e6JNtfSft6YIlHklFdSJO2duxQ4TJ2iu4,2920
 rslearn/utils/time.py,sha256=2ilSLG94_sxLP3y5RSV5L5CG8CoND_dbdzYEHVtN-I8,387
-rslearn/utils/vector_format.py,sha256=EIChYCL6GLOILS2TO2JBkca1TuaWsSubWv6iRS3P2ds,16139
-rslearn-0.0.15.dist-info/licenses/LICENSE,sha256=_99ZWPoLdlUbqZoSC5DF4ihiNwl5rTEmBaq2fACecdg,11352
-rslearn-0.0.15.dist-info/licenses/NOTICE,sha256=wLPr6rwV_jCg-xEknNGwhnkfRfuoOE9MZ-lru2yZyLI,5070
-rslearn-0.0.15.dist-info/METADATA,sha256=HRkJjQfvxCEosmCBvLcLd9nZnXjbmfAgPIknMy_ORBo,36319
-rslearn-0.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rslearn-0.0.15.dist-info/entry_points.txt,sha256=doTBQ57NT7nq-dgYGgTTw6mafcGWb_4PWYtYR4rGm50,46
-rslearn-0.0.15.dist-info/top_level.txt,sha256=XDKo90WBH8P9RQumHxo0giLJsoufT4r9odv-WE6Ahk4,8
-rslearn-0.0.15.dist-info/RECORD,,
+rslearn/utils/vector_format.py,sha256=4ZDYpfBLLxguJkiIaavTagiQK2Sv4Rz9NumbHlq-3Lw,15041
+rslearn-0.0.16.dist-info/licenses/LICENSE,sha256=_99ZWPoLdlUbqZoSC5DF4ihiNwl5rTEmBaq2fACecdg,11352
+rslearn-0.0.16.dist-info/licenses/NOTICE,sha256=wLPr6rwV_jCg-xEknNGwhnkfRfuoOE9MZ-lru2yZyLI,5070
+rslearn-0.0.16.dist-info/METADATA,sha256=h0p9V4jlSLDsrC2_owCn0xEKL7Kka74mEsE_pj-tJf0,36319
+rslearn-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rslearn-0.0.16.dist-info/entry_points.txt,sha256=doTBQ57NT7nq-dgYGgTTw6mafcGWb_4PWYtYR4rGm50,46
+rslearn-0.0.16.dist-info/top_level.txt,sha256=XDKo90WBH8P9RQumHxo0giLJsoufT4r9odv-WE6Ahk4,8
+rslearn-0.0.16.dist-info/RECORD,,

rslearn/data_sources/geotiff.py

@@ -1 +0,0 @@
-"""Placeholder for a GeoTIFF data source."""

rslearn/data_sources/raster_source.py

@@ -1,23 +0,0 @@
-"""Helper functions for raster data sources."""
-
-from rslearn.config import BandSetConfig
-from rslearn.log_utils import get_logger
-
-logger = get_logger(__name__)
-
-
-def is_raster_needed(raster_bands: list[str], band_sets: list[BandSetConfig]) -> bool:
-    """Check if the raster by comparing its bands to the configured bands.
-
-    Args:
-        raster_bands: the list of bands in the raster in question.
-        band_sets: the band sets configured in the dataset.
-
-    Returns:
-        whether the raster is needed for the dataset.
-    """
-    for band_set in band_sets:
-        for band in band_set.bands:
-            if band in raster_bands:
-                return True
-    return False