spells-mtg 0.11.15__tar.gz → 0.11.17__tar.gz

{spells_mtg-0.11.15 → spells_mtg-0.11.17}/PKG-INFO

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

{spells_mtg-0.11.15 → spells_mtg-0.11.17}/pyproject.toml

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

{spells_mtg-0.11.15 → spells_mtg-0.11.17}/spells/card_data_files.py

@@ -25,6 +25,7 @@ START_DATE_MAP = {
     "FIN": dt.date(2025, 6, 10),
     "EOE": dt.date(2025, 7, 29),
     "OM1": dt.date(2025, 9, 23),
+    "Cube+-+Powered": dt.date(2025, 10, 28),
 }
 
 ratings_col_defs = {
@@ -176,7 +177,7 @@ def base_ratings_df(
             )
 
         concat_list.append(
-            pl.read_json(ratings_file_path, infer_schema_length=500)
+            pl.read_json(ratings_file_path, infer_schema_length=540)
             .with_columns(
                 (pl.lit(deck_color) if deck_color != "any" else pl.lit(None))
                 .alias(ColName.MAIN_COLORS)
@@ -195,4 +196,27 @@ def base_ratings_df(
             )
         )
 
-    return pl.concat(concat_list)
+    raw_df = pl.concat(concat_list)
+
+    group_cols = [
+        ColName.NAME,
+        ColName.EXPANSION,
+        ColName.MAIN_COLORS,
+    ]
+
+    attr_cols = [
+        ColName.EVENT_TYPE,
+        ColName.PLAYER_COHORT,
+        ColName.COLOR,
+        ColName.RARITY,
+        ColName.IMAGE_URL,
+    ]
+
+    sum_cols = list(set(ratings_col_defs) - set(group_cols + attr_cols))
+
+    attr_df = raw_df.select(group_cols + attr_cols).group_by(group_cols).first()
+    sum_df = raw_df.select(group_cols + sum_cols).group_by(group_cols).sum()
+
+    df = attr_df.join(sum_df, on=group_cols, join_nulls=True)
+
+    return df