spells-mtg 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

spells/columns.py

@@ -25,6 +25,8 @@ class ColDef:
 
 
 default_columns = [
+    ColName.COLOR,
+    ColName.RARITY,
     ColName.NUM_SEEN,
     ColName.ALSA,
     ColName.NUM_TAKEN,

spells/draft_data.py

@@ -538,7 +538,14 @@ def summon(
     ), "What happened? We mean to use one of the sets manifest, it shouldn't matter which."
 
     if m.group_by:
-        full_agg_df = full_agg_df.group_by(m.group_by).sum()
+        gb = m.group_by
+        # an agg may depend on some card column that hasn't been explicitly requested, but can be safely
+        # depended on if we are grouping by name
+        if ColName.NAME in m.group_by and View.CARD in m.view_cols:
+            for col in m.view_cols[View.CARD]:
+                if col not in m.group_by:
+                    gb = tuple([*gb, col])
+        full_agg_df = full_agg_df.group_by(gb).sum()
     else:
         full_agg_df = full_agg_df.sum()
 

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/manifest.py

@@ -163,14 +163,14 @@ def create(
     group_by: list[str] | None = None,
     filter_spec: dict | None = None,
 ):
-    gbs = (
-        (ColName.NAME, ColName.COLOR, ColName.RARITY)
-        if group_by is None
-        else tuple(group_by)
-    )
+    gbs = (ColName.NAME,) if group_by is None else tuple(group_by)
 
     if columns is None:
         cols = tuple(spells.columns.default_columns)
+        if ColName.NAME not in gbs:
+            cols = tuple(
+                col for col in cols if col not in (ColName.COLOR, ColName.RARITY)
+            )
     else:
         cols = tuple(columns)
 

{spells_mtg-0.7.3.dist-info → spells_mtg-0.7.5.dist-info}/METADATA

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

spells_mtg-0.7.5.dist-info/RECORD

@@ -0,0 +1,16 @@
+spells/__init__.py,sha256=iyX74sLFJIQ_5ShZ7KDOeBlbYLm21ibWxwyzCGnKdg8,169
+spells/cache.py,sha256=YpTmlW-U2EosvGCH9gRQdQc8gRjjcGbgQovn5gfA_WE,3165
+spells/cards.py,sha256=EOXAB_F2yedjf6KquCERCIHl0TSIJIoOe1jv8g4JzOc,3601
+spells/columns.py,sha256=SdNw51lA1ox5rD2M7F8M2yqo-m0Dal5sKzS4Rp4q9MQ,18092
+spells/draft_data.py,sha256=2wi5u6iSAyvWZy658AVeqQLLmZ7X21VG-QnNeO02of8,17641
+spells/enums.py,sha256=DL7e1xDEvrsTMbA7vJB_Et1DaYkyO4rIEzvIQDz3MZk,4871
+spells/extension.py,sha256=RFLnNdT_4fIibgw_lAsAjQsFzWmNjJp8KRXJvagdz3Y,6580
+spells/external.py,sha256=PN0PkwdKnvx-4HkApFhI1_ZwRvBUDMUd3Vfbky0xSJA,11786
+spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
+spells/manifest.py,sha256=dOUmj2uZZ17vCWpFwv7B5F6wOIWnoQdZkEB9SDKdx9M,8310
+spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
+spells_mtg-0.7.5.dist-info/METADATA,sha256=aOdLLR4bAzd7jPcStcuooaRU3l2jDUK0CvsZqZ-bSco,46731
+spells_mtg-0.7.5.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.7.5.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.7.5.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.7.5.dist-info/RECORD,,

spells_mtg-0.7.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-spells/__init__.py,sha256=iyX74sLFJIQ_5ShZ7KDOeBlbYLm21ibWxwyzCGnKdg8,169
-spells/cache.py,sha256=YpTmlW-U2EosvGCH9gRQdQc8gRjjcGbgQovn5gfA_WE,3165
-spells/cards.py,sha256=EOXAB_F2yedjf6KquCERCIHl0TSIJIoOe1jv8g4JzOc,3601
-spells/columns.py,sha256=kWeDofGL0bYcxq4OOfUwkU4Ty3fm0xux6R9774v9HVQ,18053
-spells/draft_data.py,sha256=YeixEMn9OZu9fAFH-VMC6urkbybySqlHITBhfZLFigc,17271
-spells/enums.py,sha256=DL7e1xDEvrsTMbA7vJB_Et1DaYkyO4rIEzvIQDz3MZk,4871
-spells/extension.py,sha256=CcKRdDfFrt2L-53-m2tQrurX-LbIkaRokOD8CuupzW0,6538
-spells/external.py,sha256=PN0PkwdKnvx-4HkApFhI1_ZwRvBUDMUd3Vfbky0xSJA,11786
-spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
-spells/manifest.py,sha256=83VCuS5AuVjvOltdNscOOwekAfeIEHSg9a2O_aKAyA0,8214
-spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
-spells_mtg-0.7.3.dist-info/METADATA,sha256=gYlwPDbztvSCDiKBb5H31sclXBhlSnyLLizp0Rs2ip0,46731
-spells_mtg-0.7.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.7.3.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.7.3.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.7.3.dist-info/RECORD,,