spells-mtg 0.7.4__tar.gz → 0.8.1__tar.gz

{spells_mtg-0.7.4 → spells_mtg-0.8.1}/PKG-INFO

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

{spells_mtg-0.7.4 → spells_mtg-0.8.1}/pyproject.toml

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

spells_mtg-0.8.1/spells/__init__.py

@@ -0,0 +1,5 @@
+from spells.columns import ColSpec
+from spells.enums import ColType, ColName
+from spells.draft_data import summon, view_select, get_names
+
+__all__ = ["summon", "view_select", "get_names", "ColSpec", "ColType", "ColName"]

{spells_mtg-0.7.4 → spells_mtg-0.8.1}/spells/columns.py

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

{spells_mtg-0.7.4 → spells_mtg-0.8.1}/spells/draft_data.py

@@ -35,7 +35,7 @@ def _cache_key(args) -> str:
 
 
 @functools.lru_cache(maxsize=None)
-def _get_names(set_code: str) -> list[str]:
+def get_names(set_code: str) -> list[str]:
     card_fp = data_file_path(set_code, View.CARD)
     card_view = pl.read_parquet(card_fp)
     card_names_set = frozenset(card_view.get_column("name").to_list())
@@ -86,7 +86,7 @@ def _get_card_context(
 
         loaded_context = {row[ColName.NAME]: row for row in select_rows}
     else:
-        names = _get_names(set_code)
+        names = get_names(set_code)
         loaded_context = {name: {} for name in names}
 
     if card_context is not None:
@@ -265,7 +265,7 @@ def _hydrate_col_defs(
     set_context: pl.DataFrame | dict[str, Any] | None = None,
     card_only: bool = False,
 ):
-    names = _get_names(set_code)
+    names = get_names(set_code)
 
     set_context = _get_set_context(set_code, set_context)
 
@@ -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()
 
@@ -550,3 +557,46 @@ def summon(
     )
 
     return ret_df
+
+
+def view_select(
+    set_code: str,
+    view: View,
+    columns: list[str],
+    filter_spec: dict | None = None,
+    extensions: dict[str, ColSpec] | list[dict[str, ColSpec]] | None = None,
+    card_context: dict | pl.DataFrame | None = None,
+    set_context: dict | pl.DataFrame | None = None,
+) -> pl.LazyFrame:
+    specs = get_specs()
+
+    if extensions is not None:
+        if not isinstance(extensions, list):
+            extensions = [extensions]
+        for ext in extensions:
+            specs.update(ext)
+
+    col_def_map = _hydrate_col_defs(set_code, specs, card_context, set_context)
+
+    df_path = data_file_path(set_code, view)
+    base_view_df = pl.scan_parquet(df_path)
+
+    select_cols = frozenset(columns)
+
+    filter_ = spells.filter.from_spec(filter_spec)
+    if filter_ is not None:
+        select_cols = select_cols.union(filter_.lhs)
+
+    base_df_prefilter = _view_select(
+        base_view_df,
+        select_cols,
+        col_def_map,
+        is_agg_view=False,
+    )
+
+    if filter_ is not None:
+        base_df = base_df_prefilter.filter(filter_.expr)
+    else:
+        base_df = base_df_prefilter
+
+    return base_df.select(columns)

{spells_mtg-0.7.4 → spells_mtg-0.8.1}/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.4/spells/__init__.py

@@ -1,5 +0,0 @@
-from spells.columns import ColSpec
-from spells.enums import ColType, ColName
-from spells.draft_data import summon
-
-__all__ = ["summon", "ColSpec", "ColType", "ColName"]