spforge 0.8.31__tar.gz → 0.8.33__tar.gz

{spforge-0.8.31/spforge.egg-info → spforge-0.8.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spforge
-Version: 0.8.31
+Version: 0.8.33
 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.31 → spforge-0.8.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spforge"
-version = "0.8.31"
+version = "0.8.33"
 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.31 → spforge-0.8.33}/spforge/ratings/_player_rating.py

@@ -595,7 +595,7 @@ class PlayerRatingGenerator(RatingGenerator):
                         * float(pre_player.match_performance.participation_weight)
                     )
 
-                if team1_def_perf is None:
+                if team1_def_perf is None or (not self.use_off_def_split and perf_value 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 team2_def_perf is None:
+                if team2_def_perf is None or (not self.use_off_def_split and perf_value is None):
                     def_change = 0.0
                 else:
                     def_perf = float(team2_def_perf)

{spforge-0.8.31 → spforge-0.8.33}/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.31 → spforge-0.8.33/spforge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spforge
-Version: 0.8.31
+Version: 0.8.33
 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.31 → spforge-0.8.33}/tests/ratings/test_player_rating_generator.py

@@ -2874,3 +2874,38 @@ def test_defense_participation_weight_backwards_compatibility(base_cn, library):
     assert result is not None
     assert len(gen._player_off_ratings) > 0
     assert len(gen._player_def_ratings) > 0
+
+
+def test_fit_transform_null_perf_with_use_off_def_split_false__no_crash(base_cn):
+    """
+    Regression test: null performance with use_off_def_split=False should not crash.
+
+    Bug: When use_off_def_split=False and a player has null performance:
+    - Line 598 checks `if team1_def_perf is None` (team-level avg, not None if any played)
+    - Line 605 does `def_perf = float(perf_value)` where perf_value is None
+    - Crash: TypeError: float() argument must be a string or a number, not 'NoneType'
+
+    Fix: Check `if team1_def_perf is None or perf_value is None` to skip def update
+    for players who didn't play (null performance means no rating update).
+    """
+    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.6, 0.4, 0.5, 0.5, None, 0.6, 0.5, 0.5],  # P1 null in M2
+            "pw": [1.0] * 8,
+        }
+    )
+
+    gen = PlayerRatingGenerator(
+        performance_column="perf",
+        column_names=base_cn,
+        use_off_def_split=False,  # This triggers the buggy code path
+    )
+
+    # Should not crash - before fix this raises:
+    # TypeError: float() argument must be a string or a number, not 'NoneType'
+    result = gen.fit_transform(df)
+    assert result is not None

{spforge-0.8.31 → spforge-0.8.33}/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",