rslearn 0.0.5__py3-none-any.whl → 0.0.6__py3-none-any.whl

rslearn/arg_parser.py

@@ -1,33 +1,12 @@
 """Custom Lightning ArgumentParser with environment variable substitution support."""
 
 import os
-import re
 from typing import Any
 
 from jsonargparse import Namespace
 from lightning.pytorch.cli import LightningArgumentParser
 
-
-def substitute_env_vars_in_string(content: str) -> str:
-    """Substitute environment variables in a string.
-
-    Replaces ${VAR_NAME} patterns with os.getenv(VAR_NAME, "") values.
-    This works on raw string content before YAML parsing.
-
-    Args:
-        content: The string content containing template variables
-
-    Returns:
-        The string with environment variables substituted
-    """
-    pattern = r"\$\{([^}]+)\}"
-
-    def replace_variable(match_obj: re.Match[str]) -> str:
-        var_name = match_obj.group(1)
-        env_value = os.getenv(var_name, "")
-        return env_value if env_value is not None else ""
-
-    return re.sub(pattern, replace_variable, content)
+from rslearn.template_params import substitute_env_vars_in_string
 
 
 class RslearnArgumentParser(LightningArgumentParser):

rslearn/dataset/dataset.py

@@ -8,6 +8,7 @@ from upath import UPath
 
 from rslearn.config import load_layer_config
 from rslearn.log_utils import get_logger
+from rslearn.template_params import substitute_env_vars_in_string
 from rslearn.tile_stores import TileStore, load_tile_store
 
 from .index import DatasetIndex
@@ -52,7 +53,9 @@ class Dataset:
 
         # Load dataset configuration.
         with (self.path / "config.json").open("r") as f:
-            config = json.load(f)
+            config_content = f.read()
+            config_content = substitute_env_vars_in_string(config_content)
+            config = json.loads(config_content)
             self.layers = {}
             for layer_name, d in config["layers"].items():
                 # Layer names must not contain period, since we use period to

rslearn/template_params.py

@@ -0,0 +1,26 @@
+"""Template parameter substitution utilities for rslearn configuration files."""
+
+import os
+import re
+
+
+def substitute_env_vars_in_string(content: str) -> str:
+    """Substitute environment variables in a string.
+
+    Replaces ${VAR_NAME} patterns with os.getenv(VAR_NAME, "") values.
+    This works on raw string content before YAML/JSON parsing.
+
+    Args:
+        content: The string content containing template variables
+
+    Returns:
+        The string with environment variables substituted
+    """
+    pattern = r"\$\{([^}]+)\}"
+
+    def replace_variable(match_obj: re.Match[str]) -> str:
+        var_name = match_obj.group(1)
+        env_value = os.getenv(var_name, "")
+        return env_value if env_value is not None else ""
+
+    return re.sub(pattern, replace_variable, content)

{rslearn-0.0.5.dist-info → rslearn-0.0.6.dist-info}/METADATA

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

{rslearn-0.0.5.dist-info → rslearn-0.0.6.dist-info}/RECORD

@@ -1,9 +1,10 @@
 rslearn/__init__.py,sha256=fFmAen3vxZyosEfPbG0W46IttujYGVxzrGkJ0YutmmY,73
-rslearn/arg_parser.py,sha256=mkiZCiomUI5GNjG1jfPuTJebGHFzXbyUqe0pPwS4lTA,2055
+rslearn/arg_parser.py,sha256=GNlJncO6Ck_dCNrcg7z_SSG61I-2gKn3Ix2tAxIk9CI,1428
 rslearn/const.py,sha256=FUCfsvFAs-QarEDJ0grdy0C1HjUjLpNFYGo5I2Vpc5Y,449
 rslearn/log_utils.py,sha256=unD9gShiuO7cx5Nnq8qqVQ4qrbOOwFVgcHxN5bXuiAo,941
 rslearn/main.py,sha256=lAMcE4e3wCO2tVUq3bJl2oOHyztsTagtSNc0kJU7OZk,29266
 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=cR6Jd9ppzHgKHCteUsNapCcsJk4k5X90E71EHfbW7m0,21046
 rslearn/data_sources/__init__.py,sha256=8_7Pi3agKsatNoxXw74-U5G-QAP-rbdfcH8EkZfJbH4,1449
@@ -35,7 +36,7 @@ rslearn/data_sources/worldpop.py,sha256=HZrDJjz_5gXlHG6IOGIzVaL0Y4rO6FKF4FELMEX-
 rslearn/data_sources/xyz_tiles.py,sha256=SJV8TB6WUP6DTPr2d3LXRKVjFxda7bdR9IM84VvaRto,14618
 rslearn/dataset/__init__.py,sha256=bHtBlEEBCekO-gaJqiww0-VjvZTE5ahx0llleo8bfP8,289
 rslearn/dataset/add_windows.py,sha256=pwCEvwLE1jQCoqQxw6CJ-sP46ayWppFa2hGYIB6VVkc,8494
-rslearn/dataset/dataset.py,sha256=QclnjFVH-4L2OohagonmlzO0UedDcETleWg7hP44qt8,5021
+rslearn/dataset/dataset.py,sha256=bjf9nI55j-MF0bIQWSNPjNbpfqnLK4jy-96TAcwO0MM,5214
 rslearn/dataset/index.py,sha256=Wni5m6h4gisRB54fPLnCfUrRTEsJ5EvwS0fs9sYc2wg,6025
 rslearn/dataset/manage.py,sha256=G95KpadLvwimkl-7V552nOJgglvlF7nEQXAYXPgaKN8,13377
 rslearn/dataset/materialize.py,sha256=emsxgkBKWC-ybZDtudsYOsxx7yxgmdKy5YrysgqzNac,21556
@@ -131,9 +132,9 @@ rslearn/utils/spatial_index.py,sha256=eomJAUgzmjir8j9HZnSgQoJHwN9H0wGTjmJkMkLLfs
 rslearn/utils/sqlite_index.py,sha256=YGOJi66544e6JNtfSft6YIlHklFdSJO2duxQ4TJ2iu4,2920
 rslearn/utils/time.py,sha256=2ilSLG94_sxLP3y5RSV5L5CG8CoND_dbdzYEHVtN-I8,387
 rslearn/utils/vector_format.py,sha256=XggLCIUQBZWhOXWjvhrxBOHULpsXCbktm804DSAAink,15167
-rslearn-0.0.5.dist-info/licenses/LICENSE,sha256=_99ZWPoLdlUbqZoSC5DF4ihiNwl5rTEmBaq2fACecdg,11352
-rslearn-0.0.5.dist-info/METADATA,sha256=4NZGdKV-YUfad4g698Vl4SsarOAooRspqdrcnakKuic,31715
-rslearn-0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rslearn-0.0.5.dist-info/entry_points.txt,sha256=doTBQ57NT7nq-dgYGgTTw6mafcGWb_4PWYtYR4rGm50,46
-rslearn-0.0.5.dist-info/top_level.txt,sha256=XDKo90WBH8P9RQumHxo0giLJsoufT4r9odv-WE6Ahk4,8
-rslearn-0.0.5.dist-info/RECORD,,
+rslearn-0.0.6.dist-info/licenses/LICENSE,sha256=_99ZWPoLdlUbqZoSC5DF4ihiNwl5rTEmBaq2fACecdg,11352
+rslearn-0.0.6.dist-info/METADATA,sha256=OBD66RkVbX6KvG24H7I_2fhQf6d3vo1yFTkeRdWjrfE,31715
+rslearn-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rslearn-0.0.6.dist-info/entry_points.txt,sha256=doTBQ57NT7nq-dgYGgTTw6mafcGWb_4PWYtYR4rGm50,46
+rslearn-0.0.6.dist-info/top_level.txt,sha256=XDKo90WBH8P9RQumHxo0giLJsoufT4r9odv-WE6Ahk4,8
+rslearn-0.0.6.dist-info/RECORD,,