spells-mtg 0.11.0__py3-none-any.whl → 0.11.1__py3-none-any.whl

spells/card_data_files.py

@@ -1,6 +1,7 @@
 import datetime as dt
 import os
 import wget
+from time import sleep
 
 import polars as pl
 
@@ -19,6 +20,7 @@ DECK_COLOR_DATA_TEMPLATE = (
 
 START_DATE_MAP = {
     "DFT": dt.date(2025, 2, 11),
+    "TDM": dt.date(2025, 4, 8),
     "FIN": dt.date(2025, 6, 10),
 }
 
@@ -120,7 +122,7 @@ def base_ratings_df(
     set_code: str,
     format: str = "PremierDraft",
     player_cohort: str = "all",
-    deck_color: str = "any",
+    deck_colors: str | list[str] = "any",
     start_date: dt.date | None = None,
     end_date: dt.date | None = None,
 ) -> pl.DataFrame:
@@ -129,41 +131,53 @@ def base_ratings_df(
     if end_date is None:
         end_date = dt.date.today() - dt.timedelta(days=1)
 
-    ratings_dir, filename = cache.card_ratings_file_path(
-        set_code,
-        format,
-        player_cohort,
-        deck_color,
-        start_date,
-        end_date,
-    )
-
-    if not os.path.isdir(ratings_dir):
-        os.makedirs(ratings_dir)
-
-    ratings_file_path = os.path.join(ratings_dir, filename)
-
-    if not os.path.isfile(ratings_file_path):
-        user_group_param = (
-            "" if player_cohort == "all" else f"&user_group={player_cohort}"
+    if isinstance(deck_colors, str):
+        deck_colors = [deck_colors]
+
+    concat_list = []
+    for i, deck_color in enumerate(deck_colors):
+        ratings_dir, filename = cache.card_ratings_file_path(
+            set_code,
+            format,
+            player_cohort,
+            deck_color,
+            start_date,
+            end_date,
         )
-        deck_color_param = "" if deck_color == "any" else f"&deck_colors={deck_color}"
 
-        url = RATINGS_TEMPLATE.format(
-            set_code=set_code,
-            format=format,
-            user_group_param=user_group_param,
-            deck_color_param=deck_color_param,
-            start_date_str=start_date.strftime("%Y-%m-%d"),
-            end_date_str=end_date.strftime("%Y-%m-%d"),
-        )
-
-        wget.download(
-            url,
-            out=ratings_file_path,
-        )
-
-    df = pl.read_json(ratings_file_path)
+        if not os.path.isdir(ratings_dir):
+            os.makedirs(ratings_dir)
+
+        ratings_file_path = os.path.join(ratings_dir, filename)
+
+        if not os.path.isfile(ratings_file_path):
+            if i > 0:
+                sleep(5)
+            user_group_param = (
+                "" if player_cohort == "all" else f"&user_group={player_cohort}"
+            )
+            deck_color_param = "" if deck_color == "any" else f"&deck_colors={deck_color}"
+
+            url = RATINGS_TEMPLATE.format(
+                set_code=set_code,
+                format=format,
+                user_group_param=user_group_param,
+                deck_color_param=deck_color_param,
+                start_date_str=start_date.strftime("%Y-%m-%d"),
+                end_date_str=end_date.strftime("%Y-%m-%d"),
+            )
+
+            wget.download(
+                url,
+                out=ratings_file_path,
+            )
+
+        concat_list.append(pl.read_json(ratings_file_path).with_columns(
+            (pl.lit(deck_color) if deck_color != "any" else pl.lit(None)).alias(
+                ColName.MAIN_COLORS
+            )
+        ))
+    df = pl.concat(concat_list)
 
     return df.select(
         [
@@ -172,9 +186,7 @@ def base_ratings_df(
             (pl.lit("Top") if player_cohort == "top" else pl.lit(None)).alias(
                 ColName.PLAYER_COHORT
             ),
-            (pl.lit(deck_color) if deck_color != "any" else pl.lit(None)).alias(
-                ColName.MAIN_COLORS
-            ),
+            ColName.MAIN_COLORS,
             *[val.alias(key) for key, val in ratings_col_defs.items()],
         ]
     )

spells/draft_data.py

@@ -34,9 +34,9 @@ class CardDataFileSpec():
     set_code: str
     format: str = "PremierDraft"
     player_cohort: str = "all"
-    deck_color: str = "any"
-    start_date: datetime.datetime | None = None
-    end_date: datetime.datetime | None = None
+    deck_colors: str = "any"
+    start_date: datetime.date | None = None
+    end_date: datetime.date | None = None
 
 
 def _cache_key(args) -> str:
@@ -563,7 +563,7 @@ def summon(
                 set_code=cdfs.set_code,
                 format=cdfs.format,
                 player_cohort=cdfs.player_cohort,
-                deck_color=cdfs.deck_color,
+                deck_colors=cdfs.deck_colors,
                 start_date=cdfs.start_date,
                 end_date=cdfs.end_date,
             )

{spells_mtg-0.11.0.dist-info → spells_mtg-0.11.1.dist-info}/METADATA

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

{spells_mtg-0.11.0.dist-info → spells_mtg-0.11.1.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=1tUgeFYRBRzxAUCtCMyp5cvwrfuU7XWEmOgGCOZZ3RI,5545
+spells/card_data_files.py,sha256=dMLbzNCO82xk9Z6qumYBypy9MmpaEYusa5r9uCchSJM,6023
 spells/cards.py,sha256=6stFPhJOzHqvQnkSv9cDeylRa_7L9Y8sOaowiZhzz6I,4174
 spells/columns.py,sha256=s_PYyg2QaRL6kLWFNKCBEfbMF0x7O7-Yd9SeG1ttYL4,18206
 spells/config.py,sha256=zpRUZ-6JKALE149L0yfeD1AgqKPaVBGHfD_TdHi-jqE,235
-spells/draft_data.py,sha256=hpv1hiUbFfcUjV2cACdLIZn9u3dlg5nnrXoItBFflcc,21005
+spells/draft_data.py,sha256=H-Betq204FcN43491Ya2A3KOO5zzSQY1tp7wQqPvGSs,21000
 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.0.dist-info/METADATA,sha256=M1bbgYWMEKhNVhn_MwnvSEWo6QQ4Zold_DsECzQicdw,47369
-spells_mtg-0.11.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-spells_mtg-0.11.0.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.11.0.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.11.0.dist-info/RECORD,,
+spells_mtg-0.11.1.dist-info/METADATA,sha256=rzLlasItKx3lGRpl5m0j2gLj_EY5kViwfXArOnatKvk,47369
+spells_mtg-0.11.1.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+spells_mtg-0.11.1.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.11.1.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.11.1.dist-info/RECORD,,