spells-mtg 0.11.12__py3-none-any.whl → 0.11.14__py3-none-any.whl

spells/columns.py

@@ -40,6 +40,11 @@ default_columns = [
     ColName.GIH_WR,
 ]
 
+
+def agg_col(expr: pl.Expr) -> ColSpec:
+    return ColSpec(col_type=ColType.AGG, expr=expr)
+
+
 _specs: dict[str, ColSpec] = {
     ColName.NAME: ColSpec(
         col_type=ColType.GROUP_BY,
@@ -168,7 +173,8 @@ _specs: dict[str, ColSpec] = {
     ),
     ColName.PICK_INDEX: ColSpec(
         col_type=ColType.GROUP_BY,
-        expr=lambda set_context: pl.col(ColName.PICK_NUMBER) + pl.col(ColName.PACK_NUMBER) * set_context['picks_per_pack']
+        expr=lambda set_context: pl.col(ColName.PICK_NUMBER)
+        + pl.col(ColName.PACK_NUMBER) * set_context["picks_per_pack"],
     ),
     ColName.TAKEN_AT: ColSpec(
         col_type=ColType.PICK_SUM,
@@ -441,149 +447,61 @@ _specs: dict[str, ColSpec] = {
     ColName.IMAGE_URL: ColSpec(
         col_type=ColType.CARD_ATTR,
     ),
-    ColName.PICKED_MATCH_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.EVENT_MATCH_WINS_SUM) / pl.col(ColName.EVENT_MATCHES_SUM),
-    ),
-    ColName.TROPHY_RATE: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.IS_TROPHY_SUM) / pl.col(ColName.NUM_TAKEN),
-    ),
-    ColName.GAME_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.NUM_WON) / pl.col(ColName.NUM_GAMES),
-    ),
-    ColName.ALSA: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.LAST_SEEN) / pl.col(ColName.NUM_SEEN),
-    ),
-    ColName.ATA: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.TAKEN_AT) / pl.col(ColName.NUM_TAKEN),
-    ),
-    ColName.NUM_GP: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK),
-    ),
-    ColName.PCT_GP: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK) / (pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD)),
-    ),
-    ColName.GP_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_DECK) / pl.col(ColName.DECK),
-    ),
-    ColName.NUM_OH: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.OPENING_HAND),
-    ),
-    ColName.OH_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_OPENING_HAND) / pl.col(ColName.OPENING_HAND),
-    ),
-    ColName.NUM_GIH: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.OPENING_HAND) + pl.col(ColName.DRAWN),
-    ),
-    ColName.NUM_GIH_WON: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_OPENING_HAND) + pl.col(ColName.WON_DRAWN),
-    ),
-    ColName.GIH_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.NUM_GIH_WON) / pl.col(ColName.NUM_GIH),
-    ),
-    ColName.GNS_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_NUM_GNS) / pl.col(ColName.NUM_GNS),
-    ),
-    ColName.IWD: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GIH_WR) - pl.col(ColName.GNS_WR),
-    ),
-    ColName.NUM_IN_POOL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD),
-    ),
-    ColName.NUM_IN_POOL_TOTAL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.NUM_IN_POOL).sum(),
-    ),
-    ColName.IN_POOL_WR: ColSpec(
-        col_type=ColType.AGG,
-        expr=(pl.col(ColName.WON_DECK) + pl.col(ColName.WON_SIDEBOARD))
-        / pl.col(ColName.NUM_IN_POOL),
-    ),
-    ColName.DECK_TOTAL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK).sum(),
-    ),
-    ColName.WON_DECK_TOTAL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_DECK).sum(),
-    ),
-    ColName.GP_WR_MEAN: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_DECK_TOTAL) / pl.col(ColName.DECK_TOTAL),
-    ),
-    ColName.GP_WR_EXCESS: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GP_WR) - pl.col(ColName.GP_WR_MEAN),
-    ),
-    ColName.GP_WR_VAR: ColSpec(
-        col_type=ColType.AGG,
-        expr=(pl.col(ColName.GP_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GP)).sum()
-        / pl.col(ColName.DECK_TOTAL),
-    ),
-    ColName.GP_WR_STDEV: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GP_WR_VAR).sqrt(),
-    ),
-    ColName.GP_WR_Z: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GP_WR_EXCESS) / pl.col(ColName.GP_WR_STDEV),
-    ),
-    ColName.GIH_TOTAL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.NUM_GIH).sum(),
-    ),
-    ColName.WON_GIH_TOTAL: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.NUM_GIH_WON).sum(),
-    ),
-    ColName.GIH_WR_MEAN: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.WON_GIH_TOTAL) / pl.col(ColName.GIH_TOTAL),
-    ),
-    ColName.GIH_WR_EXCESS: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GIH_WR) - pl.col(ColName.GIH_WR_MEAN),
-    ),
-    ColName.GIH_WR_VAR: ColSpec(
-        col_type=ColType.AGG,
-        expr=(pl.col(ColName.GIH_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GIH)).sum()
-        / pl.col(ColName.GIH_TOTAL),
-    ),
-    ColName.GIH_WR_STDEV: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GIH_WR_VAR).sqrt(),
-    ),
-    ColName.GIH_WR_Z: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.GIH_WR_EXCESS) / pl.col(ColName.GIH_WR_STDEV),
-    ),
-    ColName.DECK_MANA_VALUE_AVG: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK_MANA_VALUE) / pl.col(ColName.DECK_SPELLS),
-    ),
-    ColName.DECK_LANDS_AVG: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK_LANDS) / pl.col(ColName.NUM_GAMES),
-    ),
-    ColName.DECK_SPELLS_AVG: ColSpec(
-        col_type=ColType.AGG,
-        expr=pl.col(ColName.DECK_SPELLS) / pl.col(ColName.NUM_GAMES),
-    ),
+    ColName.PICKED_MATCH_WR: agg_col(
+        pl.col(ColName.EVENT_MATCH_WINS_SUM) / pl.col(ColName.EVENT_MATCHES_SUM)
+    ),
+    ColName.TROPHY_RATE: agg_col(
+        pl.col(ColName.IS_TROPHY_SUM) / pl.col(ColName.NUM_TAKEN),
+    ),
+    ColName.GAME_WR: agg_col(
+        pl.col(ColName.NUM_WON) / pl.col(ColName.NUM_GAMES),
+    ),
+    ColName.ALSA: agg_col(pl.col(ColName.LAST_SEEN) / pl.col(ColName.NUM_SEEN)),
+    ColName.ATA: agg_col(pl.col(ColName.TAKEN_AT) / pl.col(ColName.NUM_TAKEN)),
+    ColName.NUM_GP: agg_col(pl.col(ColName.DECK)),
+    ColName.PCT_GP: agg_col(
+        pl.col(ColName.DECK) / (pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD))
+    ),
+    ColName.GP_WR: agg_col(pl.col(ColName.WON_DECK) / pl.col(ColName.DECK)),
+    ColName.NUM_OH: agg_col(pl.col(ColName.OPENING_HAND)),
+    ColName.OH_WR: agg_col(
+        pl.col(ColName.WON_OPENING_HAND) / pl.col(ColName.OPENING_HAND)
+    ),
+    ColName.NUM_GIH: agg_col(pl.col(ColName.OPENING_HAND) + pl.col(ColName.DRAWN)),
+    ColName.NUM_GIH_WON: agg_col(
+        pl.col(ColName.WON_OPENING_HAND) + pl.col(ColName.WON_DRAWN)
+    ),
+    ColName.GIH_WR: agg_col(pl.col(ColName.NUM_GIH_WON) / pl.col(ColName.NUM_GIH)),
+    ColName.GNS_WR: agg_col(pl.col(ColName.WON_NUM_GNS) / pl.col(ColName.NUM_GNS)),
+    ColName.IWD: agg_col(pl.col(ColName.GIH_WR) - pl.col(ColName.GNS_WR)),
+    ColName.NUM_IN_POOL: agg_col(pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD)),
+    ColName.NUM_IN_POOL_TOTAL: agg_col(pl.col(ColName.NUM_IN_POOL).sum()),
+    ColName.IN_POOL_WR: agg_col(
+        (pl.col(ColName.WON_DECK) + pl.col(ColName.WON_SIDEBOARD))
+        / pl.col(ColName.NUM_IN_POOL)
+    ),
+    ColName.DECK_TOTAL: agg_col(pl.col(ColName.DECK).sum()),
+    ColName.WON_DECK_TOTAL: agg_col(pl.col(ColName.WON_DECK).sum()),
+    ColName.GP_WR_MEAN: agg_col(pl.col(ColName.WON_DECK_TOTAL) / pl.col(ColName.DECK_TOTAL)),
+    ColName.GP_WR_EXCESS: agg_col(pl.col(ColName.GP_WR) - pl.col(ColName.GP_WR_MEAN)),
+    ColName.GP_WR_VAR: agg_col((pl.col(ColName.GP_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GP)).sum()
+        / pl.col(ColName.DECK_TOTAL)
+    ),
+    ColName.GP_WR_STDEV: agg_col(pl.col(ColName.GP_WR_VAR).sqrt()),
+    ColName.GP_WR_Z: agg_col(pl.col(ColName.GP_WR_EXCESS) / pl.col(ColName.GP_WR_STDEV)),
+    ColName.GIH_TOTAL: agg_col(pl.col(ColName.NUM_GIH).sum()),
+    ColName.WON_GIH_TOTAL: agg_col(pl.col(ColName.NUM_GIH_WON).sum()),
+    ColName.GIH_WR_MEAN: agg_col(pl.col(ColName.WON_GIH_TOTAL) / pl.col(ColName.GIH_TOTAL)),
+    ColName.GIH_WR_EXCESS: agg_col(pl.col(ColName.GIH_WR) - pl.col(ColName.GIH_WR_MEAN)),
+    ColName.GIH_WR_VAR: agg_col(
+        (pl.col(ColName.GIH_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GIH)).sum()
+        / pl.col(ColName.GIH_TOTAL)
+    ),
+    ColName.GIH_WR_STDEV: agg_col(pl.col(ColName.GIH_WR_VAR).sqrt()),
+    ColName.GIH_WR_Z: agg_col(pl.col(ColName.GIH_WR_EXCESS) / pl.col(ColName.GIH_WR_STDEV)),
+    ColName.DECK_MANA_VALUE_AVG: agg_col(pl.col(ColName.DECK_MANA_VALUE) / pl.col(ColName.DECK_SPELLS)),
+    ColName.DECK_LANDS_AVG: agg_col(pl.col(ColName.DECK_LANDS) / pl.col(ColName.NUM_GAMES)),
+    ColName.DECK_SPELLS_AVG: agg_col(pl.col(ColName.DECK_SPELLS) / pl.col(ColName.NUM_GAMES)),
 }
 
 for item in ColName:

spells/draft_data.py

@@ -347,7 +347,10 @@ def _view_select(
     cdefs = [col_def_map[c] for c in sorted(view_cols)]
     select = []
     for cdef in cdefs:
-        if is_agg_view:
+        if isinstance(df, pl.DataFrame) and cdef.name in df.columns:
+            base_cols = base_cols.union(frozenset({cdef.name}))
+            select.append(cdef.name)
+        elif is_agg_view:
             if cdef.col_type == ColType.AGG:
                 base_cols = base_cols.union(cdef.dependencies)
                 select.append(cdef.expr)
@@ -471,7 +474,7 @@ def _base_agg_df(
 
     if group_by:
         joined_df = functools.reduce(
-            lambda prev, curr: prev.join(curr, on=group_by, how="outer", coalesce=True),
+            lambda prev, curr: prev.join(curr, on=group_by, how="full", coalesce=True),
             join_dfs,
         )
     else:
@@ -565,11 +568,10 @@ def summon(
                 select_df = _view_select(
                     card_df, card_cols, m.col_def_map, is_agg_view=False
                 )
-                agg_df = agg_df.join(select_df, on="name", how="outer", coalesce=True)
+                agg_df = agg_df.join(select_df, on="name", how="full", coalesce=True)
         else:
             assert len(codes) == 1, "Only one set supported for loading from card data file"
             assert codes[0] == cdfs.set_code, "Wrong set file specified"
-            assert cdfs.format == "PremierDraft", "Only PremierDraft supported"
             agg_df = base_ratings_df(
                 set_code=cdfs.set_code,
                 format=cdfs.format,

{spells_mtg-0.11.12.dist-info → spells_mtg-0.11.14.dist-info}/METADATA

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

{spells_mtg-0.11.12.dist-info → spells_mtg-0.11.14.dist-info}/RECORD

@@ -5,9 +5,9 @@ spells/__init__.py,sha256=0pnh2NLn9FrNKncE9-tBsighp3e8YAsN--_ovUpgWGs,333
 spells/cache.py,sha256=6cl0q62erR3LCANPSfxG5-J7JQfLwNdWjzlBpfiL4IE,7174
 spells/card_data_files.py,sha256=HSD2z_5t6UEuE8S9rcBJBLlNxlPSeI9JE5lRLYrayD4,6626
 spells/cards.py,sha256=6stFPhJOzHqvQnkSv9cDeylRa_7L9Y8sOaowiZhzz6I,4174
-spells/columns.py,sha256=s_PYyg2QaRL6kLWFNKCBEfbMF0x7O7-Yd9SeG1ttYL4,18206
+spells/columns.py,sha256=HsmOSunZHs0RMyXoSo-gAVWMNZqMYs3IrO5v5-99BqM,16678
 spells/config.py,sha256=Nym660bbYt4ijzC5scVJ6PVOh-4vBi4hfFusBIPxcZk,257
-spells/draft_data.py,sha256=INNGEQP1vL9qroE_Q89_QnjkvaEYpfU6pv9O1rtpIcA,21290
+spells/draft_data.py,sha256=iYsfmVRPy67GS3Epv8xakYVZQZIr0JbrZMFG0_wpLm4,21380
 spells/enums.py,sha256=gbwfon6tQCoKDb-m4hSaHWi9slj82yqaH3qhYMVrsck,4991
 spells/extension.py,sha256=LBqGbJbe7iSRQkxJK7npkADCfzhdnIwwVvlmTn8xvjQ,8454
 spells/external.py,sha256=I-f_vMx-h2kvunUlZthsauaeDn42vcRk0wvTURfImzs,11848
@@ -16,8 +16,8 @@ spells/log.py,sha256=3avmg65hru8K9npKLvPp1wWWxq-hoEYDUCbxqhPkKUw,2175
 spells/manifest.py,sha256=ExWVk17BRw615UmvrV817xwz457yfTNdNMNE_M00aEg,8338
 spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
 spells/utils.py,sha256=IO3brrXVvZla0LRTEB5v6NgGqZb_rYA46XtKBURGMNk,1944
-spells_mtg-0.11.12.dist-info/METADATA,sha256=lTsJt82bQhxuO1P05oFILeIO1jQk9QGO5abOzD1Mdj4,47370
-spells_mtg-0.11.12.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-spells_mtg-0.11.12.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.11.12.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.11.12.dist-info/RECORD,,
+spells_mtg-0.11.14.dist-info/METADATA,sha256=Dasl06rVqIDp4nCaJ_x_G-m1YQNf-9I-ISNaW3pXnbs,47370
+spells_mtg-0.11.14.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+spells_mtg-0.11.14.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.11.14.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.11.14.dist-info/RECORD,,