spforge 0.8.30__tar.gz → 0.8.32__tar.gz

{spforge-0.8.30/spforge.egg-info → spforge-0.8.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spforge
-Version: 0.8.30
+Version: 0.8.32
 Summary: A flexible framework for generating features, ratings, and building machine learning or other models for training and inference on sports data.
 Author-email: Mathias Holmstrøm <mathiasholmstom@gmail.com>
 License: See LICENSE file

{spforge-0.8.30 → spforge-0.8.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spforge"
-version = "0.8.30"
+version = "0.8.32"
 description = "A flexible framework for generating features, ratings, and building machine learning or other models for training and inference on sports data."
 readme = "README.md"
 requires-python = ">=3.11"

{spforge-0.8.30 → spforge-0.8.32}/spforge/ratings/_player_rating.py

@@ -595,7 +595,7 @@ class PlayerRatingGenerator(RatingGenerator):
                         * float(pre_player.match_performance.participation_weight)
                     )
 
-                if perf_value is None or team1_def_perf is None:
+                if team1_def_perf is None:
                     def_change = 0.0
                 else:
                     def_perf = float(team1_def_perf)
@@ -689,7 +689,7 @@ class PlayerRatingGenerator(RatingGenerator):
                         * float(pre_player.match_performance.participation_weight)
                     )
 
-                if perf_value is None or team2_def_perf is None:
+                if team2_def_perf is None:
                     def_change = 0.0
                 else:
                     def_perf = float(team2_def_perf)

{spforge-0.8.30 → spforge-0.8.32}/spforge/scorer/_score.py

@@ -388,16 +388,14 @@ class BaseScorer(ABC):
         return re.sub(r'[^a-zA-Z0-9_]', '_', name)
 
     def _count_user_filters(self) -> int:
-        """Count filters excluding auto-added validation filter."""
+        """Count filters excluding any filter on validation column."""
         if not self.filters:
             return 0
         if self.validation_column is None:
             return len(self.filters)
         count = 0
         for f in self.filters:
-            if not (f.column_name == self.validation_column and
-                    f.operator == Operator.EQUALS and
-                    f.value == 1):
+            if f.column_name != self.validation_column:
                 count += 1
         return count
 

{spforge-0.8.30 → spforge-0.8.32/spforge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spforge
-Version: 0.8.30
+Version: 0.8.32
 Summary: A flexible framework for generating features, ratings, and building machine learning or other models for training and inference on sports data.
 Author-email: Mathias Holmstrøm <mathiasholmstom@gmail.com>
 License: See LICENSE file

{spforge-0.8.30 → spforge-0.8.32}/tests/ratings/test_player_rating_generator.py

@@ -2133,6 +2133,59 @@ def test_fit_transform_when_all_players_have_null_performance_then_no_rating_cha
     )
 
 
+def test_null_individual_perf_still_updates_def_rating(base_cn):
+    """
+    Regression test: Players with null individual performance should still get DEF updates.
+
+    Bug: Line 598 had `if perf_value is None or team1_def_perf is None: def_change = 0.0`
+         This incorrectly skipped DEF updates when player had null individual performance.
+
+    Fix: Changed to `if team1_def_perf is None: def_change = 0.0`
+         Defense is team-level, so null individual perf should NOT block DEF updates.
+
+    Test creates scenario where P1 has null perf but team defense is known (poor).
+    Verifies P1's DEF rating decreases (proving defensive update logic ran).
+    """
+    # Match 1: Balanced to establish baseline ratings
+    # Match 2: P1 null perf, but T2 dominates offense (0.9) so T1 defense is poor (0.1)
+    df = pl.DataFrame(
+        {
+            "pid": ["P1", "P2", "P3", "P4", "P1", "P2", "P3", "P4"],
+            "tid": ["T1", "T1", "T2", "T2", "T1", "T1", "T2", "T2"],
+            "mid": ["M1", "M1", "M1", "M1", "M2", "M2", "M2", "M2"],
+            "dt": ["2024-01-01"] * 4 + ["2024-01-02"] * 4,
+            "perf": [0.5, 0.5, 0.5, 0.5, None, 0.1, 0.9, 0.9],
+            "pw": [1.0] * 8,
+        }
+    )
+
+    gen = PlayerRatingGenerator(
+        performance_column="perf",
+        column_names=base_cn,
+        use_off_def_split=True,
+        rating_change_multiplier_offense=50.0,  # High multipliers to ensure visible changes
+        rating_change_multiplier_defense=50.0,
+        start_rating_value=1000.0,
+    )
+    gen.fit_transform(df)
+
+    # P1 had null perf in M2, so OFF rating should be unchanged from baseline
+    p1_off = gen._player_off_ratings["P1"].rating_value
+    assert p1_off == 1000.0, f"P1 OFF should be 1000 (null perf), got {p1_off}"
+
+    # P1's DEF rating MUST decrease because T1's defense was poor (0.1) in M2
+    # Team defense = 1.0 - opponent offense = 1.0 - 0.9 = 0.1 (much worse than expected 0.5)
+    p1_def = gen._player_def_ratings["P1"].rating_value
+    assert p1_def < 1000.0, (
+        f"P1 DEF should decrease (team defended poorly), but got {p1_def}. "
+        f"Bug: defensive update was incorrectly skipped for null individual performance."
+    )
+
+    # Sanity check: P2 had valid perf (0.1) so OFF should change too
+    p2_off = gen._player_off_ratings["P2"].rating_value
+    assert p2_off != 1000.0, f"P2 OFF should change (valid perf 0.1), got {p2_off}"
+
+
 # --- team_players_playing_time Tests ---
 
 

{spforge-0.8.30 → spforge-0.8.32}/tests/scorer/test_scorer_name.py

@@ -123,6 +123,19 @@ class TestScorerNameProperty:
         # Validation filter auto-added but not counted
         assert scorer.name == "mean_bias_scorer_yards"
 
+    def test_any_filter_on_validation_column_excluded_from_name(self):
+        scorer = MeanBiasScorer(
+            target="yards",
+            pred_column="pred",
+            validation_column="is_valid",
+            filters=[
+                Filter("is_valid", 0, Operator.EQUALS),
+                Filter("minutes", 10, Operator.GREATER_THAN),
+            ]
+        )
+        # Any filter on validation column should be excluded, not just value=1
+        assert scorer.name == "mean_bias_scorer_yards_filters:1"
+
     def test_complex_configuration_all_components(self):
         scorer = MeanBiasScorer(
             target="yards",