rsplot 0.2.4__tar.gz → 0.2.5__tar.gz

{rsplot-0.2.4 → rsplot-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rsplot
-Version: 0.2.4
+Version: 0.2.5
 Summary: CLI tool for plotting Remote Sensing data, designed for Agent.
 Project-URL: Repository, https://git.lug.ustc.edu.cn/yaoyhu/rsplot
 Project-URL: GitHub, https://github.com/yaoyhu/rsplot
@@ -258,16 +258,61 @@ uv run rsplot --help
 
 ## Configuration
 
-For satellite basemaps, set a TianDiTu API key:
+`rsplot` does not ship site-specific data paths. Configure local satellite,
+station, boundary, and font paths with a TOML file:
+
+```bash
+mkdir -p ~/.config/rsplot
+cp config.example.toml ~/.config/rsplot/config.toml
+```
+
+Then edit `~/.config/rsplot/config.toml`:
+
+```toml
+[paths]
+geojson_dir = "/path/to/geojson"
+font_dir = "/path/to/fonts"
+# hcho_cmap_file = "/path/to/256x3_rgb_table.txt"
+
+[paths.data_dirs]
+no2 = "/path/to/NO2"
+o3 = "/path/to/O3"
+o3pr = "/path/to/O3PR"
+hcho = "/path/to/HCHO"
+guokong = "/path/to/guokong_combine"
+
+# Optional satellite basemap key. Leave commented unless you have a real key.
+# [tianditu]
+# api_key = "your-real-key"
+```
+
+You can also point to a different config file:
+
+```bash
+export RSPLOT_CONFIG="/path/to/rsplot.toml"
+```
+
+Environment variables override TOML values:
 
 ```bash
 export TIANDITU_API_KEY="your-key"
+export RSPLOT_GEOJSON_DIR="/path/to/geojson"
+export RSPLOT_FONT_DIR="/path/to/fonts"
+export RSPLOT_DATA_DIR_NO2="/path/to/NO2"
+export RSPLOT_DATA_DIR_O3="/path/to/O3"
+export RSPLOT_DATA_DIR_O3PR="/path/to/O3PR"
+export RSPLOT_DATA_DIR_HCHO="/path/to/HCHO"
+export RSPLOT_DATA_DIR_GUOKONG="/path/to/guokong_combine"
+export RSPLOT_HCHO_CMAP_FILE="/path/to/256x3_rgb_table.txt"
 ```
 
+Command-line directory options, such as `--data-dir`, take precedence for the
+command being run. If no TianDiTu API key is configured, use `--basemap none`
+to avoid requesting satellite tiles.
+
 ## Usage
 
-The examples below assume the command is running on a USTC server or in an
-environment with equivalent data paths configured.
+The examples below assume data paths are configured and readable.
 
 ```bash
 # Show available commands and options.

{rsplot-0.2.4 → rsplot-0.2.5}/README.md

@@ -31,16 +31,61 @@ uv run rsplot --help
 
 ## Configuration
 
-For satellite basemaps, set a TianDiTu API key:
+`rsplot` does not ship site-specific data paths. Configure local satellite,
+station, boundary, and font paths with a TOML file:
+
+```bash
+mkdir -p ~/.config/rsplot
+cp config.example.toml ~/.config/rsplot/config.toml
+```
+
+Then edit `~/.config/rsplot/config.toml`:
+
+```toml
+[paths]
+geojson_dir = "/path/to/geojson"
+font_dir = "/path/to/fonts"
+# hcho_cmap_file = "/path/to/256x3_rgb_table.txt"
+
+[paths.data_dirs]
+no2 = "/path/to/NO2"
+o3 = "/path/to/O3"
+o3pr = "/path/to/O3PR"
+hcho = "/path/to/HCHO"
+guokong = "/path/to/guokong_combine"
+
+# Optional satellite basemap key. Leave commented unless you have a real key.
+# [tianditu]
+# api_key = "your-real-key"
+```
+
+You can also point to a different config file:
+
+```bash
+export RSPLOT_CONFIG="/path/to/rsplot.toml"
+```
+
+Environment variables override TOML values:
 
 ```bash
 export TIANDITU_API_KEY="your-key"
+export RSPLOT_GEOJSON_DIR="/path/to/geojson"
+export RSPLOT_FONT_DIR="/path/to/fonts"
+export RSPLOT_DATA_DIR_NO2="/path/to/NO2"
+export RSPLOT_DATA_DIR_O3="/path/to/O3"
+export RSPLOT_DATA_DIR_O3PR="/path/to/O3PR"
+export RSPLOT_DATA_DIR_HCHO="/path/to/HCHO"
+export RSPLOT_DATA_DIR_GUOKONG="/path/to/guokong_combine"
+export RSPLOT_HCHO_CMAP_FILE="/path/to/256x3_rgb_table.txt"
 ```
 
+Command-line directory options, such as `--data-dir`, take precedence for the
+command being run. If no TianDiTu API key is configured, use `--basemap none`
+to avoid requesting satellite tiles.
+
 ## Usage
 
-The examples below assume the command is running on a USTC server or in an
-environment with equivalent data paths configured.
+The examples below assume data paths are configured and readable.
 
 ```bash
 # Show available commands and options.

{rsplot-0.2.4 → rsplot-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rsplot"
-version = "0.2.4"
+version = "0.2.5"
 description = "CLI tool for plotting Remote Sensing data, designed for Agent."
 authors = [
     { name = "Yaoyao Hu", email = "yaoyhu@mail.ustc.edu.cn" },

{rsplot-0.2.4 → rsplot-0.2.5}/src/rsplot/cli.py

@@ -413,6 +413,7 @@ def raster(
         vmax=use_vmax,
         basemap=use_basemap,
         tianditu_key=cfg.tianditu_key,
+        hcho_cmap_file=cfg.hcho_cmap_file,
         title=title,
         output=output,
         colorbar_label=colorbar_label,
@@ -589,7 +590,7 @@ def station(
         datetime_str=resolved_dt,
         threshold=threshold,
         unit=unit,
-        cities_gdf=_load_city(cfg.geojson_dir),
+        cities_gdf=_load_city(cfg.require_geojson_dir()),
         output=output,
     )
     emit_result(result, output)
@@ -867,6 +868,7 @@ def overlay(
         dpi=use_dpi,
         basemap=use_basemap,
         tianditu_key=cfg.tianditu_key,
+        hcho_cmap_file=cfg.hcho_cmap_file,
         title=title,
         output=output,
     )
@@ -895,7 +897,7 @@ def overlay(
         datetime_str=resolved_dt,
         threshold=threshold,
         unit=unit,
-        cities_gdf=_load_city(cfg.geojson_dir),
+        cities_gdf=_load_city(cfg.require_geojson_dir()),
         output=output,
     )
     emit_result(result, output)
@@ -1255,7 +1257,7 @@ def fnr(
         if raster_dir_hcho is not None
         else cfg.get_data_dir("hcho")
     )
-    console.print(f"\n[bold]读取数据:[/bold]")
+    console.print("\n[bold]读取数据:[/bold]")
     console.print(f"  NO2 : {use_no2_dir}")
     console.print(f"  HCHO: {use_hcho_dir}")
 

{rsplot-0.2.4 → rsplot-0.2.5}/src/rsplot/config.py

@@ -1,7 +1,8 @@
 """Configuration management for rsplot.
 
-# TODO: Loads defaults from ~/.config/rsplot/config.toml if present,
-CLI arguments override everything.
+Runtime paths are intentionally configured outside the package. The loader
+merges safe built-in defaults, TOML config files, environment variables, and
+finally CLI overrides handled by command functions.
 """
 
 from __future__ import annotations
@@ -19,21 +20,20 @@ else:
 
 
 # ---------------------------------------------------------------------------
-# Default paths
+# Safe built-in path defaults
 # ---------------------------------------------------------------------------
-DEFAULT_DATA_DIRS: dict[str, str] = {
-    "no2": "/satellite/exports2/yaoyhu/NO2",
-    "o3": "/satellite/exports2/yaoyhu/O3",
-    "o3pr": "/satellite/exports2/yaoyhu/O3PR",
-    "hcho": "/satellite/exports2/yaoyhu/HCHO",
-    "guokong": "/home/zzgsg/data/guokong_combine",
-}
-DEFAULT_GEOJSON_DIR = "/satellite/d4/yaoyhu/tiandi"
-DEFAULT_FONT_DIR = "/satellite/d4/yaoyhu/fonts"
+KNOWN_DATA_PRODUCTS = ("no2", "o3", "o3pr", "hcho", "guokong")
+
+DEFAULT_DATA_DIRS: dict[str, str] = {}
+DEFAULT_GEOJSON_DIR = None
+DEFAULT_FONT_DIR = None
+DEFAULT_HCHO_CMAP_FILE = None
 DEFAULT_TIANDITU_KEY = None
 
 
 CONFIG_PATH = Path.home() / ".config" / "rsplot" / "config.toml"
+CONFIG_ENV_VAR = "RSPLOT_CONFIG"
+HCHO_CMAP_FILE_ENV = "RSPLOT_HCHO_CMAP_FILE"
 
 
 # ---------------------------------------------------------------------------
@@ -146,15 +146,17 @@ DEFAULT_KEY_REGIONS: dict[str, list[str]] = {
 # ---------------------------------------------------------------------------
 @dataclass
 class AppConfig:
-    """Merged configuration (file defaults + CLI overrides)."""
+    """Merged configuration from files and environment variables."""
 
     # paths (per-product data directories)
     data_dirs: dict[str, str] = field(
         default_factory=lambda: dict(DEFAULT_DATA_DIRS)
     )
-    geojson_dir: str = DEFAULT_GEOJSON_DIR
-    font_dir: str = DEFAULT_FONT_DIR
+    geojson_dir: str | None = DEFAULT_GEOJSON_DIR
+    font_dir: str | None = DEFAULT_FONT_DIR
+    hcho_cmap_file: str | None = DEFAULT_HCHO_CMAP_FILE
     tianditu_key: str | None = DEFAULT_TIANDITU_KEY
+    config_files: list[str] = field(default_factory=list)
 
     # plotting defaults
     dpi: int = 300
@@ -167,43 +169,82 @@ class AppConfig:
 
     @classmethod
     def load(cls) -> AppConfig:
-        """Load config from TOML file, falling back to defaults."""
+        """Load config from TOML files and environment variables.
+
+        Merge order:
+        1. safe built-in defaults
+        2. ~/.config/rsplot/config.toml, if present
+        3. RSPLOT_CONFIG, if set
+        4. environment variable path/API-key overrides
+        """
         cfg = cls()
-        if CONFIG_PATH.exists():
-            with open(CONFIG_PATH, "rb") as f:
+        for path in _config_paths():
+            with open(path, "rb") as f:
                 data = tomllib.load(f)
             cfg._apply_toml(data)
-        # Environment variable overrides (per-product: RSPLOT_DATA_DIR_NO2, etc.)
-        for product in list(cfg.data_dirs):
+            cfg.config_files.append(str(path))
+
+        cfg._apply_env()
+        return cfg
+
+    def _apply_env(self) -> None:
+        """Apply environment variable overrides."""
+        products = set(KNOWN_DATA_PRODUCTS) | set(self.data_dirs)
+        for product in sorted(products):
             env_key = f"RSPLOT_DATA_DIR_{product.upper()}"
             if v := os.environ.get(env_key):
-                cfg.data_dirs[product] = v
+                self.data_dirs[product] = _normalize_path(v)
         if v := os.environ.get("RSPLOT_GEOJSON_DIR"):
-            cfg.geojson_dir = v
+            self.geojson_dir = _normalize_path(v)
+        if v := os.environ.get("RSPLOT_FONT_DIR"):
+            self.font_dir = _normalize_path(v)
+        if v := os.environ.get(HCHO_CMAP_FILE_ENV):
+            self.hcho_cmap_file = _normalize_path(v)
         if v := os.environ.get("TIANDITU_API_KEY"):
-            cfg.tianditu_key = v
-        return cfg
+            self.tianditu_key = v
 
     def get_data_dir(self, product: str) -> str:
         """Return data directory for a product, or raise if not configured."""
         key = product.lower()
-        if key in self.data_dirs:
-            return self.data_dirs[key]
-        available = ", ".join(self.data_dirs)
+        dir_path = self.data_dirs.get(key)
+        if dir_path:
+            return dir_path
+
+        configured = (
+            ", ".join(sorted(k for k, v in self.data_dirs.items() if v))
+            or "none"
+        )
         raise ValueError(
             f"No data directory configured for product '{product}'. "
-            f"Available: {available}"
+            f"Set [paths.data_dirs].{key} in {CONFIG_PATH}, set "
+            f"RSPLOT_DATA_DIR_{key.upper()}, point {CONFIG_ENV_VAR} to a "
+            "TOML config file, or pass the command-specific data directory "
+            f"option. Known products: {', '.join(KNOWN_DATA_PRODUCTS)}. "
+            f"Configured products: {configured}."
+        )
+
+    def require_geojson_dir(self) -> str:
+        """Return the boundary GeoJSON directory, or raise with guidance."""
+        if self.geojson_dir:
+            return self.geojson_dir
+        raise ValueError(
+            "GeoJSON boundary directory is not configured. Set "
+            f"[paths].geojson_dir in {CONFIG_PATH}, set RSPLOT_GEOJSON_DIR, "
+            f"or point {CONFIG_ENV_VAR} to a TOML config file."
         )
 
     def _apply_toml(self, data: dict[str, Any]) -> None:
         paths = data.get("paths", {})
         data_dirs = paths.get("data_dirs", {})
         for product, dir_path in data_dirs.items():
-            self.data_dirs[product.lower()] = dir_path
+            if dir_path:
+                self.data_dirs[product.lower()] = _normalize_path(dir_path)
         if v := paths.get("geojson_dir"):
-            self.geojson_dir = v
+            self.geojson_dir = _normalize_path(v)
         if v := paths.get("font_dir"):
-            self.font_dir = v
+            self.font_dir = _normalize_path(v)
+        if v := paths.get("hcho_cmap_file"):
+            self.hcho_cmap_file = _normalize_path(v)
 
         td = data.get("tianditu", {})
         if v := td.get("api_key"):
@@ -220,6 +261,33 @@ class AppConfig:
             self.key_regions[name] = provinces
 
 
+def _config_paths() -> list[Path]:
+    """Return config files to load in priority order."""
+    paths: list[Path] = []
+    if CONFIG_PATH.exists():
+        paths.append(CONFIG_PATH)
+
+    if raw := os.environ.get(CONFIG_ENV_VAR):
+        path = Path(_normalize_path(raw))
+        if not path.exists():
+            raise FileNotFoundError(
+                f"{CONFIG_ENV_VAR} points to a missing config file: {path}"
+            )
+        try:
+            already_loaded = path.resolve() in {p.resolve() for p in paths}
+        except OSError:
+            already_loaded = path in paths
+        if not already_loaded:
+            paths.append(path)
+
+    return paths
+
+
+def _normalize_path(value: Any) -> str:
+    """Expand ~ and environment variables in configured path values."""
+    return os.path.expanduser(os.path.expandvars(str(value)))
+
+
 # ---------------------------------------------------------------------------
 # GB 3095-2026 Air Quality Limits (transitional phase, grade II)
 # ---------------------------------------------------------------------------
@@ -241,7 +309,7 @@ AQ_LIMITS_2026: dict[str, dict[str, float]] = {
 # ---------------------------------------------------------------------------
 AQI_COLORS: list[tuple[int, str]] = [
     # (upper bound, hex color)
-    (50, "#00e400"),   # 优 / green
+    (50, "#00e400"),  # 优 / green
     (100, "#ffff00"),  # 良 / yellow
     (150, "#ff7e00"),  # 轻度污染 / orange
     (200, "#ff0000"),  # 中度污染 / red

{rsplot-0.2.4 → rsplot-0.2.5}/src/rsplot/geo/boundaries.py

@@ -47,7 +47,9 @@ class RegionInfo:
     # sub-boundary GeoDataFrames for overlay
     main_boundary_gdf: gpd.GeoDataFrame | None = None  # red border
     sub_boundary_gdf: gpd.GeoDataFrame | None = None  # grey sub-divisions
-    detail_boundary_gdf: gpd.GeoDataFrame | None = None  # finer sub-divisions (counties in province view)
+    detail_boundary_gdf: gpd.GeoDataFrame | None = (
+        None  # finer sub-divisions (counties in province view)
+    )
     sub_name_field: str = NAME_FIELD
 
 
@@ -108,7 +110,7 @@ def resolve_region(
     Cascade order: key_region → province → city → county.
     If level_override is given, skip cascade and match only that level.
     """
-    gj = cfg.geojson_dir
+    gj = cfg.require_geojson_dir()
     gdf_prov = _load_province(gj)
     gdf_city = _load_city(gj)
     gdf_county = _load_county(gj)
@@ -209,9 +211,7 @@ def resolve_region(
                 )
             else:
                 # Regular province: cities + counties within each city
-                sub_cities = gdf_city[
-                    gdf_city.geometry.intersects(union_geom)
-                ]
+                sub_cities = gdf_city[gdf_city.geometry.intersects(union_geom)]
                 detail_counties = gdf_county[
                     gdf_county.geometry.intersects(union_geom)
                 ]
@@ -244,7 +244,7 @@ def resolve_region(
     if level_override == "county":
         # "/" case already handled above; bare name with --level county is ambiguous
         raise ValueError(
-            f"县/区级别需要指定所属城市，格式: 城市/县区，如 合肥/蜀山、成都/高新"
+            "县/区级别需要指定所属城市，格式: 城市/县区，如 合肥/蜀山、成都/高新"
         )
 
     raise ValueError(

{rsplot-0.2.4 → rsplot-0.2.5}/src/rsplot/plotting/colormaps.py

@@ -12,15 +12,10 @@ import numpy as np
 HCHO_CMAP = "rsplot_hcho"
 STATION_CONCENTRATION_CMAP = "rsplot_station_concentration"
 
-DEFAULT_HCHO_CMAP_FILE = (
-    "/exports/XCZ/python/tmp/pycharm_project_24/colormap_22.txt"
-)
-HCHO_CMAP_FILE_ENV = "RSPLOT_HCHO_CMAP_FILE"
 
-
-def register_rsplot_colormaps() -> None:
+def register_rsplot_colormaps(hcho_cmap_file: str | None = None) -> None:
     """Register custom colormaps used by rsplot plots."""
-    _register(_build_hcho_cmap())
+    _register(_build_hcho_cmap(hcho_cmap_file))
     _register(
         mcolors.LinearSegmentedColormap.from_list(
             STATION_CONCENTRATION_CMAP,
@@ -36,9 +31,13 @@ def register_rsplot_colormaps() -> None:
     )
 
 
-def _build_hcho_cmap() -> mcolors.Colormap:
-    cmap_file = Path(os.environ.get(HCHO_CMAP_FILE_ENV, DEFAULT_HCHO_CMAP_FILE))
-    if cmap_file.exists():
+def _build_hcho_cmap(hcho_cmap_file: str | None) -> mcolors.Colormap:
+    if hcho_cmap_file:
+        cmap_file = Path(os.path.expandvars(hcho_cmap_file)).expanduser()
+        if not cmap_file.exists():
+            raise FileNotFoundError(
+                f"Configured HCHO colormap file does not exist: {cmap_file}"
+            )
         data = np.loadtxt(cmap_file)
         if data.shape != (256, 3):
             raise ValueError(