spells-mtg 0.11.5__tar.gz → 0.11.7__tar.gz

{spells_mtg-0.11.5 → spells_mtg-0.11.7}/PKG-INFO

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

{spells_mtg-0.11.5 → spells_mtg-0.11.7}/pyproject.toml

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

{spells_mtg-0.11.5 → spells_mtg-0.11.7}/spells/card_data_files.py

@@ -18,12 +18,6 @@ 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),
-}
-
 ratings_col_defs = {
     ColName.NAME: pl.col("name").cast(pl.String),
     ColName.COLOR: pl.col("color").cast(pl.String),
@@ -40,7 +34,8 @@ ratings_col_defs = {
     ColName.WON_OPENING_HAND: pl.col("opening_hand_game_count")
     * pl.col("opening_hand_win_rate").cast(pl.Float64),
     ColName.DRAWN: pl.col("drawn_game_count").cast(pl.Int64),
-    ColName.WON_DRAWN: pl.col("drawn_win_rate") * pl.col("drawn_game_count").cast(pl.Float64),
+    ColName.WON_DRAWN: pl.col("drawn_win_rate")
+    * pl.col("drawn_game_count").cast(pl.Float64),
     ColName.NUM_GIH: pl.col("ever_drawn_game_count").cast(pl.Int64),
     ColName.NUM_GIH_WON: pl.col("ever_drawn_game_count")
     * pl.col("ever_drawn_win_rate").cast(pl.Float64),
@@ -58,16 +53,11 @@ 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,
@@ -106,9 +96,9 @@ def deck_color_df(
             [
                 pl.lit(set_code).alias(ColName.EXPANSION),
                 pl.lit(format).alias(ColName.EVENT_TYPE),
-                (pl.lit("Top") if player_cohort == "top" else pl.lit(None)).alias(
-                    ColName.PLAYER_COHORT
-                ).cast(pl.String),
+                (pl.lit("Top") if player_cohort == "top" else pl.lit(None))
+                .alias(ColName.PLAYER_COHORT)
+                .cast(pl.String),
                 *[val.alias(key) for key, val in deck_color_col_defs.items()],
             ]
         )
@@ -119,17 +109,12 @@ 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]
 
@@ -171,20 +156,24 @@ def base_ratings_df(
                 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
-            ).cast(pl.String)
-        ).select(
-            [
-                pl.lit(set_code).alias(ColName.EXPANSION),
-                pl.lit(format).alias(ColName.EVENT_TYPE),
-                (pl.lit("Top") if player_cohort == "top" else pl.lit(None)).alias(
-                    ColName.PLAYER_COHORT
-                ).cast(pl.String),
-                ColName.MAIN_COLORS,
-                *[val.alias(key) for key, val in ratings_col_defs.items()],
-            ]
-       ))
+        concat_list.append(
+            pl.read_json(ratings_file_path, infer_schema_length=500)
+            .with_columns(
+                (pl.lit(deck_color) if deck_color != "any" else pl.lit(None))
+                .alias(ColName.MAIN_COLORS)
+                .cast(pl.String)
+            )
+            .select(
+                [
+                    pl.lit(set_code).alias(ColName.EXPANSION),
+                    pl.lit(format).alias(ColName.EVENT_TYPE),
+                    (pl.lit("Top") if player_cohort == "top" else pl.lit(None))
+                    .alias(ColName.PLAYER_COHORT)
+                    .cast(pl.String),
+                    ColName.MAIN_COLORS,
+                    *[val.alias(key) for key, val in ratings_col_defs.items()],
+                ]
+            )
+        )
 
     return pl.concat(concat_list)

{spells_mtg-0.11.5 → spells_mtg-0.11.7}/spells/config.py

@@ -1,4 +1,5 @@
 all_sets = [
+    "FIN",
     "TDM",
     "DFT",
     "PIO",