PyPI - rslearn - Versions diffs - 0.0.5__tar.gz → 0.0.6__tar.gz - Mend

@@ -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

@@ -1,6 +1,6 @@
 [project]
 name = "rslearn"
-version = "0.0.5"
+version = "0.0.6"
 description = "A library for developing remote sensing datasets and models"
 authors = [
     { name = "OlmoEarth Team" },

@@ -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):

@@ -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

@@ -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)

@@ -7,6 +7,7 @@ rslearn/const.py
 rslearn/log_utils.py
 rslearn/main.py
 rslearn/py.typed
+rslearn/template_params.py
 rslearn.egg-info/PKG-INFO
 rslearn.egg-info/SOURCES.txt
 rslearn.egg-info/dependency_links.txt

rslearn 0.0.5__tar.gz → 0.0.6__tar.gz