spells-mtg 0.10.3__py3-none-any.whl → 0.10.5__py3-none-any.whl

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)

{spells_mtg-0.10.3.dist-info → spells_mtg-0.10.5.dist-info}/METADATA

@@ -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.dist-info → spells_mtg-0.10.5.dist-info}/RECORD

@@ -5,15 +5,15 @@ spells/columns.py,sha256=tQPhFpG4vOMIjV111p8DK4V-d_8634xoE-csBzou_sw,18008
 spells/config.py,sha256=_t98dc_uY3Wp3d5tsU3CJgVcWOD3wVlwMo98-tN2KRY,213
 spells/draft_data.py,sha256=xoL82NTgTJWxZK1p-6LjxnYzkeYOr-Dc9-_T0m-WZ1Y,19946
 spells/enums.py,sha256=MwJ9694AVoaKE22WlFjzHPcRfrU0DKI2_mrWC6_YjhE,4931
-spells/extension.py,sha256=sqlMSzJgNLj_B1QY97TAnPPLmCTFI8ixqae_929upJ0,7509
+spells/extension.py,sha256=LBqGbJbe7iSRQkxJK7npkADCfzhdnIwwVvlmTn8xvjQ,8454
 spells/external.py,sha256=XZpZ0mn8_BmiF76xEiu2KblZ-dwOxmbs6vrDftl2XbI,11846
 spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
 spells/log.py,sha256=3avmg65hru8K9npKLvPp1wWWxq-hoEYDUCbxqhPkKUw,2175
 spells/manifest.py,sha256=iOmhxIVMHu_Av3nd23zGjmUwLvZ2hAM0oc1ErPzZ_oE,8341
 spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
 spells/utils.py,sha256=IO3brrXVvZla0LRTEB5v6NgGqZb_rYA46XtKBURGMNk,1944
-spells_mtg-0.10.3.dist-info/METADATA,sha256=m6PPLlYg905iivI0pXkrmeg7TTPUkOSEvFE7Dx8cMEU,47227
-spells_mtg-0.10.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.10.3.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.10.3.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.10.3.dist-info/RECORD,,
+spells_mtg-0.10.5.dist-info/METADATA,sha256=RVb22q0WHU2DVO6AMF2lM_d-Lo3pEQW4kVJytUtArGQ,47227
+spells_mtg-0.10.5.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.10.5.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.10.5.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.10.5.dist-info/RECORD,,