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

spells/draft_data.py

@@ -407,7 +407,11 @@ def _base_agg_df(
             for c in cols_for_view
             if m.col_def_map[c].col_type in (ColType.PICK_SUM, ColType.GAME_SUM)
         )
-        if sum_cols:
+        name_sum_cols = tuple(
+            c for c in cols_for_view if m.col_def_map[c].col_type == ColType.NAME_SUM
+        )
+
+        if sum_cols or not name_sum_cols:
             # manifest will verify that GAME_SUM manifests do not use NAME grouping
             name_col_tuple = (
                 (pl.col(ColName.PICK).alias(ColName.NAME),) if is_name_gb else ()
@@ -418,9 +422,6 @@ def _base_agg_df(
             grouped = sum_col_df.group_by(group_by) if group_by else sum_col_df
             join_dfs.append(grouped.sum().collect(streaming=use_streaming))
 
-        name_sum_cols = tuple(
-            c for c in cols_for_view if m.col_def_map[c].col_type == ColType.NAME_SUM
-        )
         for col in name_sum_cols:
             names = get_names(set_code)
             expr = tuple(pl.col(f"{col}_{name}").alias(name) for name in names)
@@ -611,4 +612,12 @@ def view_select(
     else:
         base_df = base_df_prefilter
 
-    return base_df.select(columns)
+    select_defs = [col_def_map[c] for c in columns]
+    select_names = []
+    for d in select_defs:
+        if d.col_type == ColType.NAME_SUM:
+            select_names.extend([expr.meta.output_name() for expr in d.expr])
+        else:
+            select_names.append(d.expr.meta.output_name())
+
+    return base_df.select(select_names)

spells/extension.py

@@ -1,3 +1,5 @@
+from typing import Callable
+
 import math
 
 import polars as pl
@@ -13,6 +15,19 @@ def print_ext(ext: dict[str, ColSpec]) -> None:
         print("\t" + key)
 
 
+def seen_greatest_name_fn(attr: str) -> Callable:
+    def inner(names: list[str]) -> pl.Expr:
+        expr = pl.lit(None)
+        for name in names:
+            expr = (
+                pl.when(pl.col(f"seen_{attr}_is_greatest_{name}"))
+                .then(pl.lit(name))
+                .otherwise(expr)
+            )
+        return expr
+    return inner
+
+
 def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
     ext = {
         f"seen_{attr}": ColSpec(
@@ -41,6 +56,9 @@ def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
             expr=lambda name: pl.col(f"seen_{attr}_{name}")
             == pl.col(f"greatest_{attr}_seen"),
         ),
+        f"seen_greatest_{attr}_name": ColSpec(
+            col_type=ColType.GROUP_BY, expr=seen_greatest_name_fn(attr)
+        ),
         f"seen_{attr}_greater": ColSpec(
             col_type=ColType.NAME_SUM,
             expr=lambda name: pl.col(f"seen_{attr}_{name}")

spells/manifest.py

@@ -208,7 +208,7 @@ def create(
     else:
         needed_views = needed_views.union({View.GAME, View.DRAFT})
 
-    view_cols = {v: view_cols[v] for v in needed_views}
+    view_cols = {v: view_cols.get(v, frozenset({ColName.PICK})) for v in needed_views}
 
     return Manifest(
         columns=cols,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.10.1
+Version: 0.10.3
 Summary: analaysis of 17Lands.com public datasets
 Author-Email: Joel Barnes <oelarnes@gmail.com>
 License: MIT
@@ -304,7 +304,7 @@ summon(
     set_context: pl.DataFrame | dict[str, Any] | None = None,
     read_cache: bool = True,
     write_cache: bool = True,
-    use_streaming: bool = False,
+    use_streaming: bool = True,
     log_to_console: int = logging.ERROR,
 ) -> polars.DataFrame
 ```
@@ -365,7 +365,7 @@ Used to define extensions in `summon`
 and `AGG` must be derivable at the individual row level on one or both base views. `CARD_ATTR` must be derivable at the individual row level from the card file. `AGG` can depend on any column present after 
 summing over groups, and can include polars Expression aggregations. Arbitrarily long chains of aggregate dependencies are supported.
 
-- `expr`: A polars expression or function returning a polars expression giving the derivation of the column value at the first level where it is defined. 
+- `expr`: A polars expression or function returning a polars expression giving the derivation of the column value at the first level where it is defined. The name is inferred from the dictionary key in the extensions argument, you do not need to specify an alias.
     - For `NAME_SUM` columns, `expr` must be a function of `name` which will result in a list of expressions mapped over all card names.
     - `PICK_SUM` columns can also be functions on `name`, in which case the value will be a function of the value of the `PICK` field. 
     - `AGG` columns that depend on `NAME_SUM` columns reference the prefix (`cdef.name`) only, since the unpivot has occured prior to selection. 

{spells_mtg-0.10.1.dist-info → spells_mtg-0.10.3.dist-info}/RECORD

@@ -3,17 +3,17 @@ spells/cache.py,sha256=7XDcltmlpagK2nkhuCCcAQVyrFMYkw9Acr7iVsLs3JU,3799
 spells/cards.py,sha256=6stFPhJOzHqvQnkSv9cDeylRa_7L9Y8sOaowiZhzz6I,4174
 spells/columns.py,sha256=tQPhFpG4vOMIjV111p8DK4V-d_8634xoE-csBzou_sw,18008
 spells/config.py,sha256=_t98dc_uY3Wp3d5tsU3CJgVcWOD3wVlwMo98-tN2KRY,213
-spells/draft_data.py,sha256=FsgY2SvaWVZABLD6SeWDHBSZZ0F8lIgye_wFe897Dow,19624
+spells/draft_data.py,sha256=xoL82NTgTJWxZK1p-6LjxnYzkeYOr-Dc9-_T0m-WZ1Y,19946
 spells/enums.py,sha256=MwJ9694AVoaKE22WlFjzHPcRfrU0DKI2_mrWC6_YjhE,4931
-spells/extension.py,sha256=DVzIedggeGfkD6BD5g-dko9l9BoPgmXWvcQ3NWdEG0U,6991
+spells/extension.py,sha256=sqlMSzJgNLj_B1QY97TAnPPLmCTFI8ixqae_929upJ0,7509
 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=dOUmj2uZZ17vCWpFwv7B5F6wOIWnoQdZkEB9SDKdx9M,8310
+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.1.dist-info/METADATA,sha256=u6o0Lzlz_6O-KrTLTP_ToSzo75nF4EulX5HHsz0DAAQ,47119
-spells_mtg-0.10.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.10.1.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.10.1.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.10.1.dist-info/RECORD,,
+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,,