tsam-xarray 0.6.2__tar.gz → 0.6.3__tar.gz

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
         with:
           enable-cache: true
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 
@@ -56,7 +56,7 @@ jobs:
         with:
           enable-cache: true
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -83,7 +83,7 @@ jobs:
         with:
           enable-cache: true
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/.github/workflows/publish.yaml

@@ -31,7 +31,7 @@ jobs:
         with:
           enable-cache: true
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 

tsam_xarray-0.6.3/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.6.3"
+}

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.3](https://github.com/FBumann/tsam_xarray/compare/v0.6.2...v0.6.3) (2026-07-22)
+
+
+### Bug Fixes
+
+* drop stored weights on apply() when columns are absent ([#100](https://github.com/FBumann/tsam_xarray/issues/100)) ([5616d1c](https://github.com/FBumann/tsam_xarray/commit/5616d1c14923c00e0bd795e7ea75193d457d6860))
+
 ## [0.6.2](https://github.com/FBumann/tsam_xarray/compare/v0.6.1...v0.6.2) (2026-07-21)
 
 

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tsam_xarray
-Version: 0.6.2
+Version: 0.6.3
 Summary: Lightweight xarray wrapper for tsam time series aggregation
 License-Expression: MIT
 License-File: LICENSE

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/src/tsam_xarray/_clustering.py

@@ -560,6 +560,43 @@ def _validate_apply(
         raise ValueError(msg)
 
 
+def _drop_missing_weights(
+    cr: tsam.ClusteringResult, df: pd.DataFrame
+) -> tsam.ClusteringResult:
+    """Strip stored clustering weights when they reference absent columns.
+
+    tsam's ``ClusteringResult.apply()`` hard-fails when a stored weight column
+    is missing from the new data, which blocks transferring a clustering to a
+    differently-composed dataset. At apply time the cluster assignments and
+    centers are already fixed, so weights cannot change which periods are
+    selected — their only remaining effect is on the weighted accuracy
+    metrics. When a weighted column is absent we drop all weights and warn.
+
+    Tracking upstream fix: https://github.com/FZJ-IEK3-VSA/tsam/issues/396.
+    Once that lands, ``test_upstream_still_rejects_missing_weight_columns``
+    fails and this workaround can be removed.
+    """
+    import dataclasses
+    import warnings
+
+    weights = getattr(cr, "weights", None)
+    if not weights:
+        return cr
+    missing = set(weights) - set(df.columns)
+    if not missing:
+        return cr
+
+    warnings.warn(
+        f"Stored clustering weights reference columns absent from the new "
+        f"data ({sorted(map(str, missing))}); dropping all weights. "
+        f"Representatives and reconstruction are unaffected — only the "
+        f"weighted accuracy metrics change.",
+        UserWarning,
+        stacklevel=3,
+    )
+    return dataclasses.replace(cr, weights=None)
+
+
 def _apply_single(
     da: xr.DataArray,
     cr: tsam.ClusteringResult,
@@ -580,6 +617,7 @@ def _apply_single(
     from tsam_xarray._result import AccuracyMetrics, AggregationResult
 
     df = _to_dataframe(da, time_dim, col_dims)
+    cr = _drop_missing_weights(cr, df)
     tsam_result = cr.apply(df, **tsam_kwargs)
 
     typical = _representatives_to_da(tsam_result.cluster_representatives, col_dims)

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/src/tsam_xarray/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.6.2'
-__version_tuple__ = version_tuple = (0, 6, 2)
+__version__ = version = '0.6.3'
+__version_tuple__ = version_tuple = (0, 6, 3)
 
 __commit_id__ = commit_id = None

{tsam_xarray-0.6.2 → tsam_xarray-0.6.3}/test/test_aggregate.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import warnings
+
 import numpy as np
 import pandas as pd
 import pytest
@@ -1373,6 +1375,63 @@ class TestClusteringIO:
         xr.testing.assert_allclose(dis, new_result.reconstructed)
 
 
+class TestApplyWeightTransfer:
+    """Transferring a weighted clustering to differently-composed data.
+
+    Works around tsam#396: ``ClusteringResult.apply()`` hard-fails when a
+    stored weight column is missing from the new data. We drop the weights
+    and warn instead, since at apply time weights cannot change selection.
+    """
+
+    def _weighted_clustering(self):
+        da = _make_da()
+        da_flat = da.isel(region=0).drop_vars("region")
+        result = tsam_xarray.aggregate(
+            da_flat,
+            time_dim="time",
+            cluster_dim="variable",
+            n_clusters=4,
+            weights={"solar": 5.0, "wind": 1.0},
+        )
+        return result.clustering, da_flat
+
+    def test_apply_warns_and_drops_missing_weight_columns(self):
+        """Applying to data without a weighted column warns, not raises."""
+        clustering, da_flat = self._weighted_clustering()
+        new_da = da_flat.sel(variable=["wind"])  # 'solar' (weighted) absent
+        with pytest.warns(UserWarning, match="absent from the new data"):
+            new_result = clustering.apply(new_da)
+        assert "solar" not in new_result.cluster_representatives["variable"].values
+        assert new_result.reconstructed.notnull().all()
+
+    def test_apply_no_warning_when_all_weight_columns_present(self):
+        """Same composition keeps weights and emits no warning."""
+        clustering, da_flat = self._weighted_clustering()
+        with warnings.catch_warnings():
+            warnings.simplefilter("error")
+            new_result = clustering.apply(da_flat)
+        assert new_result.n_clusters == 4
+
+    def test_upstream_still_rejects_missing_weight_columns(self):
+        """Canary: when raw tsam stops raising, tsam#396 is fixed.
+
+        Remove ``_drop_missing_weights`` and this test once that lands.
+        """
+        import tsam
+
+        idx = pd.date_range("2020-01-01", periods=24 * 20, freq="h")
+        rng = np.random.default_rng(0)
+        df = pd.DataFrame(
+            {"a": rng.random(len(idx)), "b": rng.random(len(idx))},
+            index=idx,
+        )
+        cr = tsam.aggregate(
+            df, 4, period_duration=24, weights={"a": 5.0, "b": 0.1}
+        ).clustering
+        with pytest.raises(ValueError, match="Weight columns not found"):
+            cr.apply(df.drop(columns=["b"]))
+
+
 class TestClusteringDisaggregate:
     """Tests for ClusteringInfo.disaggregate()."""
 

tsam_xarray-0.6.2/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.6.2"
-}