spells-mtg 0.3.0__tar.gz → 0.3.1__tar.gz

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.3.0
+Version: 0.3.1
 Summary: analaysis of 17Lands.com public datasets
 Author-Email: Joel Barnes <oelarnes@gmail.com>
 License: MIT
@@ -424,6 +424,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `CARD_TYPE` | `"card_type"` | `CARD` | `CARD_ATTR` | | String |
 | `SUBTYPE` | `"subtype"` | `CARD` | `CARD_ATTR` | | String |
 | `MANA_VALUE` | `"mana_value"` | `CARD` | `CARD_ATTR` | | Float |
+| `DECK_MANA_VALUE` | `"deck_mana_value"` | | `CARD_SUM` | `DECK` * `MANA_VALUE` | Float |
 | `MANA_COST` | `"mana_cost"` | `CARD` | `CARD_ATTR` | | String |
 | `POWER` | `"power"` | `CARD` | `CARD_ATTR` | | Float |
 | `TOUGHNESS` | `"toughness"` | `CARD` | `CARD_ATTR` | | Float |
@@ -462,6 +463,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `GIH_WR_VAR` | `"gih_wr_var"` | | `AGG` | Game-weighted Variance | Float |
 | `GIH_WR_STDEV` | `"gh_wr_stdev"` | | `AGG` | Sqrt of `GIH_WR_VAR` | Float |
 | `GIH_WR_Z` | `"gih_wr_z"` | | `AGG` |`GIH_WR_EXCESS` / `GIH_WR_STDEV` | Float |
+| `DECK_MANA_VALUE_AVG` | `"deck_mana_value_avg"` | | `AGG` | `DECK_MANA_VALUE ` / `DECK` | Float |
 
 # Roadmap to 1.0
 

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/README.md

@@ -413,6 +413,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `CARD_TYPE` | `"card_type"` | `CARD` | `CARD_ATTR` | | String |
 | `SUBTYPE` | `"subtype"` | `CARD` | `CARD_ATTR` | | String |
 | `MANA_VALUE` | `"mana_value"` | `CARD` | `CARD_ATTR` | | Float |
+| `DECK_MANA_VALUE` | `"deck_mana_value"` | | `CARD_SUM` | `DECK` * `MANA_VALUE` | Float |
 | `MANA_COST` | `"mana_cost"` | `CARD` | `CARD_ATTR` | | String |
 | `POWER` | `"power"` | `CARD` | `CARD_ATTR` | | Float |
 | `TOUGHNESS` | `"toughness"` | `CARD` | `CARD_ATTR` | | Float |
@@ -451,6 +452,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `GIH_WR_VAR` | `"gih_wr_var"` | | `AGG` | Game-weighted Variance | Float |
 | `GIH_WR_STDEV` | `"gh_wr_stdev"` | | `AGG` | Sqrt of `GIH_WR_VAR` | Float |
 | `GIH_WR_Z` | `"gih_wr_z"` | | `AGG` |`GIH_WR_EXCESS` / `GIH_WR_STDEV` | Float |
+| `DECK_MANA_VALUE_AVG` | `"deck_mana_value_avg"` | | `AGG` | `DECK_MANA_VALUE ` / `DECK` | Float |
 
 # Roadmap to 1.0
 

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/pyproject.toml

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

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/spells/cards.py

@@ -76,7 +76,10 @@ def _extract_value(set_code: str, name: str, card_dict: dict, field: CardAttr):
 
 def card_df(draft_set_code: str, names: list[str]) -> pl.DataFrame:
     draft_set_json = _fetch_mtg_json(draft_set_code)
-    set_codes = draft_set_json["data"]["booster"]["play"]["sourceSetCodes"]
+    booster_info = draft_set_json["data"]["booster"]
+
+    booster_type = "play" if "play" in booster_info else "draft"
+    set_codes = booster_info[booster_type]["sourceSetCodes"]
     set_codes.reverse()
 
     card_data_map = {}

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/spells/columns.py

@@ -510,6 +510,20 @@ _column_specs = [
         expr=pl.col(ColName.MANA_VALUE) * pl.col(ColName.DECK),
         dependencies=[ColName.MANA_VALUE, ColName.DECK],
     ),
+    ColumnSpec(
+        name=ColName.DECK_LANDS,
+        col_type=ColType.CARD_SUM,
+        expr=pl.when(pl.col(ColName.CARD_TYPE).str.contains("Land"))
+        .then(pl.col(ColName.DECK))
+        .otherwise(0),
+        dependencies=[ColName.CARD_TYPE, ColName.DECK],
+    ),
+    ColumnSpec(
+        name=ColName.DECK_SPELLS,
+        col_type=ColType.CARD_SUM,
+        expr=pl.col(ColName.DECK) - pl.col(ColName.DECK_SPELLS),
+        dependencies=[ColName.DECK, ColName.DECK_SPELLS],
+    ),
     ColumnSpec(
         name=ColName.MANA_COST,
         col_type=ColType.CARD_ATTR,
@@ -733,6 +747,18 @@ _column_specs = [
         expr=pl.col(ColName.DECK_MANA_VALUE) / pl.col(ColName.DECK),
         dependencies=[ColName.DECK_MANA_VALUE, ColName.DECK],
     ),
+    ColumnSpec(
+        name=ColName.DECK_LANDS_AVG,
+        col_type=ColType.AGG,
+        expr=pl.col(ColName.DECK_LANDS) / pl.col(ColName.NUM_GAMES),
+        dependencies=[ColName.DECK_LANDS, ColName.NUM_GAMES],
+    ),
+    ColumnSpec(
+        name=ColName.DECK_SPELLS_AVG,
+        col_type=ColType.AGG,
+        expr=pl.col(ColName.DECK_SPELLS) / pl.col(ColName.NUM_GAMES),
+        dependencies=[ColName.DECK_SPELLS, ColName.NUM_GAMES],
+    ),
 ]
 
 col_spec_map = {col.name: col for col in _column_specs}

{spells_mtg-0.3.0 → spells_mtg-0.3.1}/spells/enums.py

@@ -117,6 +117,8 @@ class ColName(StrEnum):
     SUBTYPE = "subtype"
     MANA_VALUE = "mana_value"
     DECK_MANA_VALUE = "deck_mana_value"
+    DECK_LANDS = "deck_lands"
+    DECK_SPELLS = "deck_spells"
     MANA_COST = "mana_cost"
     POWER = "power"
     TOUGHNESS = "toughness"
@@ -157,3 +159,5 @@ class ColName(StrEnum):
     GIH_WR_STDEV = "gh_wr_stdev"
     GIH_WR_Z = "gih_wr_z"
     DECK_MANA_VALUE_AVG = "deck_mana_value_avg"
+    DECK_LANDS_AVG = "deck_lands_avg"
+    DECK_SPELLS_AVG = "deck_spells_avg"