spells-mtg 0.7.2__tar.gz → 0.7.4__tar.gz

{spells_mtg-0.7.2 → spells_mtg-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.7.2
+Version: 0.7.4
 Summary: analaysis of 17Lands.com public datasets
 Author-Email: Joel Barnes <oelarnes@gmail.com>
 License: MIT

{spells_mtg-0.7.2 → spells_mtg-0.7.4}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "0.7.2"
+version = "0.7.4"
 
 [project.license]
 text = "MIT"

{spells_mtg-0.7.2 → spells_mtg-0.7.4}/spells/draft_data.py

@@ -173,6 +173,9 @@ def _determine_expression(
         else:
             expr = spec.expr
         expr = expr.alias(col)
+
+        if spec.col_type == ColType.AGG:
+            expr = expr.fill_nan(None)
     else:
         expr = pl.col(col)
 

{spells_mtg-0.7.2 → spells_mtg-0.7.4}/spells/extension.py

@@ -130,11 +130,11 @@ def stat_cols(attr: str, silent: bool = False) -> dict[str, ColSpec]:
         ),
         f"{attr}_dw_excess": ColSpec(
             col_type=ColType.AGG,
-            expr=pl.col(f"{attr}_dw_mean") - pl.col(f"{attr}"),
+            expr=pl.col(f"{attr}") - pl.col(f"{attr}_dw_mean"),
         ),
         f"{attr}_dw_var": ColSpec(
             col_type=ColType.AGG,
-            expr=(pl.col(f"{attr}_dw_excess").pow(2) * pl.col(ColName.DECK))
+            expr=(pl.col(f"{attr}_dw_excess").pow(2) * pl.col(ColName.DECK)).sum()
             / pl.col(ColName.DECK_TOTAL),
         ),
         f"{attr}_dw_stdev": ColSpec(
@@ -158,11 +158,13 @@ def stat_cols(attr: str, silent: bool = False) -> dict[str, ColSpec]:
         ),
         f"{attr}_pw_excess": ColSpec(
             col_type=ColType.AGG,
-            expr=pl.col(f"{attr}_pw_mean") - pl.col(f"{attr}"),
+            expr=pl.col(f"{attr}") - pl.col(f"{attr}_pw_mean"),
         ),
         f"{attr}_pw_var": ColSpec(
             col_type=ColType.AGG,
-            expr=(pl.col(f"{attr}_pw_excess").pow(2) * pl.col(ColName.NUM_IN_POOL))
+            expr=(
+                pl.col(f"{attr}_pw_excess").pow(2) * pl.col(ColName.NUM_IN_POOL)
+            ).sum()
             / pl.col(ColName.NUM_IN_POOL_TOTAL),
         ),
         f"{attr}_pw_stdev": ColSpec(

{spells_mtg-0.7.2 → spells_mtg-0.7.4}/spells/manifest.py

@@ -106,6 +106,7 @@ def _resolve_view_cols(
                 view_resolution[View.DRAFT] = view_resolution.get(
                     View.DRAFT, frozenset()
                 ).union({ColName.PICK})
+            # now determine views and deps
             if cdef.col_type == ColType.CARD_ATTR:
                 view_resolution[View.CARD] = view_resolution.get(
                     View.CARD, frozenset()