spells-mtg 0.10.2__tar.gz → 0.10.4__tar.gz

{spells_mtg-0.10.2 → spells_mtg-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.10.2
+Version: 0.10.4
 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.2 → spells_mtg-0.10.4}/README.md

@@ -293,7 +293,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
 ```
@@ -354,7 +354,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.2 → spells_mtg-0.10.4}/pyproject.toml

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

{spells_mtg-0.10.2 → spells_mtg-0.10.4}/spells/draft_data.py

@@ -612,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_mtg-0.10.2 → spells_mtg-0.10.4}/spells/extension.py

@@ -1,3 +1,5 @@
+from typing import Callable
+
 import math
 
 import polars as pl
@@ -13,7 +15,20 @@ def print_ext(ext: dict[str, ColSpec]) -> None:
         print("\t" + key)
 
 
-def context_cols(attr, silent: bool = False) -> dict[str, ColSpec]:
+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 = True) -> dict[str, ColSpec]:
     ext = {
         f"seen_{attr}": ColSpec(
             col_type=ColType.NAME_SUM,
@@ -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}")
@@ -127,7 +145,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)