spells-mtg 0.11.11__tar.gz → 0.11.13__tar.gz

{spells_mtg-0.11.11 → spells_mtg-0.11.13}/PKG-INFO

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

{spells_mtg-0.11.11 → spells_mtg-0.11.13}/pyproject.toml

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

{spells_mtg-0.11.11 → spells_mtg-0.11.13}/spells/card_data_files.py

@@ -19,10 +19,12 @@ DECK_COLOR_DATA_TEMPLATE = (
 )
 
 START_DATE_MAP = {
+    "PIO": dt.date(2024, 12, 10),
     "DFT": dt.date(2025, 2, 11),
     "TDM": dt.date(2025, 4, 8),
     "FIN": dt.date(2025, 6, 10),
     "EOE": dt.date(2025, 7, 29),
+    "OM1": dt.date(2025, 9, 23),
 }
 
 ratings_col_defs = {

{spells_mtg-0.11.11 → spells_mtg-0.11.13}/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,