spells-mtg 0.10.3__tar.gz → 0.10.5__tar.gz

{spells_mtg-0.10.3 → spells_mtg-0.10.5}/PKG-INFO

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

{spells_mtg-0.10.3 → spells_mtg-0.10.5}/pyproject.toml

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

{spells_mtg-0.10.3 → spells_mtg-0.10.5}/spells/extension.py

@@ -25,10 +25,11 @@ def seen_greatest_name_fn(attr: str) -> Callable:
                 .otherwise(expr)
             )
         return expr
+
     return inner
 
 
-def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
+def context_cols(attr, silent: bool = True) -> dict[str, ColSpec]:
     ext = {
         f"seen_{attr}": ColSpec(
             col_type=ColType.NAME_SUM,
@@ -49,7 +50,26 @@ def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
             else card_context[name][attr],
         ),
         f"pick_{attr}": ColSpec(
-            col_type=ColType.AGG, expr=pl.col(f"pick_{attr}_sum") / pl.col("num_taken")
+            col_type=ColType.GROUP_BY, expr=pl.col(f"pick_{attr}_sum")
+        ),
+        f"pool_{attr}": ColSpec(
+            col_type=ColType.NAME_SUM,
+            expr=(
+                lambda name, card_context: pl.lit(None)
+                if card_context[name].get(attr) is None
+                or math.isnan(card_context[name][attr])
+                else card_context[name][attr] * pl.col(f"pool_{name}")
+            ),
+        ),
+        f"pool_{attr}_sum": ColSpec(
+            col_type=ColType.PICK_SUM,
+            expr=lambda names: pl.sum_horizontal(
+                [pl.col(f"pool_{attr}_{name}") for name in names]
+            ),
+        ),
+        f"pool_pick_{attr}_sum": ColSpec(
+            col_type=ColType.PICK_SUM,
+            expr=pl.col(f"pick_{attr}_sum") + pl.col(f"pool_{attr}_sum"),
         ),
         f"seen_{attr}_is_greatest": ColSpec(
             col_type=ColType.NAME_SUM,
@@ -75,6 +95,12 @@ def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
                 [pl.col(f"seen_{attr}_{name}") for name in names]
             ),
         ),
+        f"seen_{attr}_pack_sum": ColSpec(
+            col_type=ColType.PICK_SUM,
+            expr=lambda names: pl.sum_horizontal(
+                [pl.col(f"seen_{attr}_{name}") for name in names]
+            ),
+        ),
         f"least_{attr}_seen": ColSpec(
             col_type=ColType.PICK_SUM,
             expr=lambda names: pl.min_horizontal(
@@ -145,7 +171,7 @@ def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
     return ext
 
 
-def stat_cols(attr: str, silent: bool = False) -> dict[str, ColSpec]:
+def stat_cols(attr: str, silent: bool = True) -> dict[str, ColSpec]:
     ext = {
         f"{attr}_deck_weight_group": ColSpec(
             col_type=ColType.AGG, expr=pl.col(f"{attr}") * pl.col(ColName.DECK)