spells-mtg 0.11.7__py3-none-any.whl → 0.11.9__py3-none-any.whl

spells/card_data_files.py

@@ -18,6 +18,13 @@ DECK_COLOR_DATA_TEMPLATE = (
     "{user_group_param}&start_date={start_date_str}&end_date={end_date_str}&combine_splash=true"
 )
 
+START_DATE_MAP = {
+    "DFT": dt.date(2025, 2, 11),
+    "TDM": dt.date(2025, 4, 8),
+    "FIN": dt.date(2025, 6, 10),
+    "EOE": dt.date(2025, 7, 29),
+}
+
 ratings_col_defs = {
     ColName.NAME: pl.col("name").cast(pl.String),
     ColName.COLOR: pl.col("color").cast(pl.String),
@@ -53,11 +60,16 @@ deck_color_col_defs = {
 
 def deck_color_df(
     set_code: str,
-    start_date: dt.date,
-    end_date: dt.date,
     format: str = "PremierDraft",
     player_cohort: str = "all",
+    start_date: dt.date | None = None,
+    end_date: dt.date | None = None,
 ):
+    if start_date is None:
+        start_date = START_DATE_MAP[set_code]
+    if end_date is None:
+        end_date = dt.date.today() - dt.timedelta(days=1)
+
     target_dir, filename = cache.deck_color_file_path(
         set_code,
         format,
@@ -109,12 +121,17 @@ def deck_color_df(
 
 def base_ratings_df(
     set_code: str,
-    start_date: dt.date,
-    end_date: dt.date,
     format: str = "PremierDraft",
     player_cohort: str = "all",
     deck_colors: str | list[str] = "any",
+    start_date: dt.date | None = None,
+    end_date: dt.date | None = None,
 ) -> pl.DataFrame:
+    if start_date is None:
+        start_date = START_DATE_MAP[set_code]
+    if end_date is None:
+        end_date = dt.date.today() - dt.timedelta(days=1)
+
     if isinstance(deck_colors, str):
         deck_colors = [deck_colors]
 

spells/draft_data.py

@@ -49,20 +49,25 @@ def _cache_key(args) -> str:
 @functools.lru_cache(maxsize=None)
 def get_names(set_code: str) -> list[str]:
     card_fp = cache.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())
+    try:
+        card_view = pl.read_parquet(card_fp)
+        card_names_set = frozenset(card_view.get_column("name").to_list())
 
-    draft_fp = cache.data_file_path(set_code, View.DRAFT)
-    draft_view = pl.scan_parquet(draft_fp)
-    cols = draft_view.collect_schema().names()
+        draft_fp = cache.data_file_path(set_code, View.DRAFT)
+        draft_view = pl.scan_parquet(draft_fp)
+        cols = draft_view.collect_schema().names()
 
-    prefix = "pack_card_"
-    names = [col[len(prefix) :] for col in cols if col.startswith(prefix)]
-    draft_names_set = frozenset(names)
+        prefix = "pack_card_"
+        names = [col[len(prefix) :] for col in cols if col.startswith(prefix)]
+        draft_names_set = frozenset(names)
+
+        assert (
+            draft_names_set == card_names_set
+        ), "names mismatch between card and draft file"
+    except FileNotFoundError:
+        ratings_data = base_ratings_df(set_code)
+        names = list(ratings_data['name'])
 
-    assert (
-        draft_names_set == card_names_set
-    ), "names mismatch between card and draft file"
     return names
 
 
@@ -528,7 +533,13 @@ def summon(
         else:
             this_set_context = None
 
-        col_def_map = _hydrate_col_defs(code, specs, set_card_context, this_set_context)
+        col_def_map = _hydrate_col_defs(
+            code, 
+            specs, 
+            set_card_context, 
+            this_set_context,
+            card_only=cdfs is not None,
+        )
         m = manifest.create(col_def_map, columns, group_by, filter_spec)
 
         if cdfs is None:

{spells_mtg-0.11.7.dist-info → spells_mtg-0.11.9.dist-info}/METADATA

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

{spells_mtg-0.11.7.dist-info → spells_mtg-0.11.9.dist-info}/RECORD

@@ -3,11 +3,11 @@ spells/.ruff_cache/0.8.6/17785301476771359756,sha256=gPYLG8psuOSo37IefLzTu5wgRrb
 spells/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 spells/__init__.py,sha256=0pnh2NLn9FrNKncE9-tBsighp3e8YAsN--_ovUpgWGs,333
 spells/cache.py,sha256=6cl0q62erR3LCANPSfxG5-J7JQfLwNdWjzlBpfiL4IE,7174
-spells/card_data_files.py,sha256=uEYVmyqIrMwVKTX2HAr8rEZi3WpW3uPzv_6TcZzPQDQ,6036
+spells/card_data_files.py,sha256=5W1P8Zr6vea9ztX8AKb4jQlifpm-0USDjKyGv53-UTk,6559
 spells/cards.py,sha256=6stFPhJOzHqvQnkSv9cDeylRa_7L9Y8sOaowiZhzz6I,4174
 spells/columns.py,sha256=s_PYyg2QaRL6kLWFNKCBEfbMF0x7O7-Yd9SeG1ttYL4,18206
 spells/config.py,sha256=CVE2O-ZPgthbSqAB7Pul2yeFcyLHpL52OiXH7s9yl48,246
-spells/draft_data.py,sha256=EC7TCAlrWWhDFQtGx6ie-SBTNvdsoPNef7oZ0w9TSW0,21012
+spells/draft_data.py,sha256=INNGEQP1vL9qroE_Q89_QnjkvaEYpfU6pv9O1rtpIcA,21290
 spells/enums.py,sha256=gbwfon6tQCoKDb-m4hSaHWi9slj82yqaH3qhYMVrsck,4991
 spells/extension.py,sha256=LBqGbJbe7iSRQkxJK7npkADCfzhdnIwwVvlmTn8xvjQ,8454
 spells/external.py,sha256=I-f_vMx-h2kvunUlZthsauaeDn42vcRk0wvTURfImzs,11848
@@ -16,8 +16,8 @@ spells/log.py,sha256=3avmg65hru8K9npKLvPp1wWWxq-hoEYDUCbxqhPkKUw,2175
 spells/manifest.py,sha256=ExWVk17BRw615UmvrV817xwz457yfTNdNMNE_M00aEg,8338
 spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
 spells/utils.py,sha256=IO3brrXVvZla0LRTEB5v6NgGqZb_rYA46XtKBURGMNk,1944
-spells_mtg-0.11.7.dist-info/METADATA,sha256=odFdI4bYRUnk_aiFFnl0nEE5XNTOGwq-scbQ2dCFbjU,47369
-spells_mtg-0.11.7.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-spells_mtg-0.11.7.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.11.7.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.11.7.dist-info/RECORD,,
+spells_mtg-0.11.9.dist-info/METADATA,sha256=0xmSlxnu6h52KYNYfwKpSQgYoFWI4zsbkBnGFyIxpf8,47369
+spells_mtg-0.11.9.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+spells_mtg-0.11.9.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.11.9.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.11.9.dist-info/RECORD,,