spells-mtg 0.4.0__tar.gz → 0.5.0__tar.gz

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.4.0
+Version: 0.5.0
 Summary: analaysis of 17Lands.com public datasets
 Author-Email: Joel Barnes <oelarnes@gmail.com>
 License: MIT
@@ -74,8 +74,9 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
 - Supports calculating the standard aggregations and measures out of the box with no arguments (ALSA, GIH WR, etc)
 - Caches aggregate DataFrames in the local file system automatically for instantaneous reproduction of previous analysis
 - Manages grouping and filtering by built-in and custom columns at the row level
-- Provides 121 explicitly specified, enumerated, documented column definitions
+- Provides 122 explicitly specified, enumerated, documented column definitions
 - Supports "Deck Color Data" aggregations with built-in column definitions.
+- Lets you feed card metrics back in to column definitions to support scientific workflows like MLE
 - Provides a CLI tool `spells [add|refresh|clean|remove|info] [SET]` to download and manage external files
 - Downloads and manages public datasets from 17Lands
 - Retrieves and models booster configuration and card data from [MTGJSON](https://mtgjson.com/)
@@ -87,7 +88,7 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
 
 ## summon
 
-`summon` takes four optional arguments, allowing a fully declarative specification of your desired analysis. Basic functionality not provided by this api can often be managed by simple chained calls using the polars API, e.g. sorting and post-agg filtering.
+`summon` takes five optional arguments, allowing a fully declarative specification of your desired analysis. Basic functionality not provided by this api can often be managed by simple chained calls using the polars API, e.g. sorting and post-agg filtering.
   - `columns` specifies the desired output columns
     ```python
     >>> spells.summon('DSK', columns=["num_gp", "pct_gp", "gp_wr", "gp_wr_z"])
@@ -150,9 +151,9 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
   - `extensions` allows for the specification of arbitrarily complex derived columns and aggregations, including custom columns built on top of custom columns.
     ```python
     >>> import polars as pl
-    >>> from spells.columns import ColumnSpec
+    >>> from spells.columns import ColSpec
     >>> from spells.enums import ColType, View, ColName
-    >>> ext = ColumnSpec(
+    >>> ext = ColSpec(
     ...     name='deq_base',
     ...     col_type=ColType.AGG,
     ...     expr=(pl.col('gp_wr_excess') + 0.03 * (1 - pl.col('ata')/14).pow(2)) * pl.col('pct_gp'),
@@ -180,8 +181,34 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
     │ Oblivious Bookworm       ┆ 0.028605 ┆ uncommon ┆ GU    │
     └──────────────────────────┴──────────┴──────────┴───────┘
     ```
-    
-    Note the use of chained calls to the Polars DataFrame api to perform manipulations on the result of `summon`.
+  - `card_context` takes a name-indexed DataFrame or name-keyed dict and allows the construction of column definitions based on the results.
+    ```python
+    >>> deq = spells.summon('DSK', columns=['deq_base'], filter_spec={'player_cohort': 'Top'}, extensions=[ext])
+    >>> ext = [ 
+    ...     ColSpec(
+    ...         name='picked_deq_base',
+    ...         col_type=ColType.PICK_SUM,
+    ...         expr=lambda name, card_context: card_context[name]['deq_base']
+    ...     ),
+    ...     ColSpec(
+    ...         name='picked_deq_base_avg',
+    ...         col_type=ColType.AGG,
+    ...         expr=pl.col('picked_deq_base') / pl.col('num_taken')
+    ...     ),
+    ... ]
+    >>> spells.summon('DSK', columns=['picked_deq_base_avg'], group_by=['player_cohort'], extensions=ext, card_context=deq)
+    shape: (4, 2)
+    ┌───────────────┬─────────────────────┐
+    │ player_cohort ┆ picked_deq_base_avg │
+    │ ---           ┆ ---                 │
+    │ str           ┆ f64                 │
+    ╞═══════════════╪═════════════════════╡
+    │ Bottom        ┆ 0.004826            │
+    │ Middle        ┆ 0.00532             │
+    │ Other         ┆ 0.004895            │
+    │ Top           ┆ 0.005659            │
+    └───────────────┴─────────────────────┘
+    ```
     
 ## Installation
 
@@ -289,7 +316,7 @@ aggregations of non-numeric (or numeric) data types are not supported. If `None`
     - `{'lhs': 'player_cohort', 'op': 'in', 'rhs': ['Top', 'Middle']}` "player_cohort" value is either "Top" or "Middle". Supported values for `op` are `<`, `<=`, `>`, `>=`, `!=`, `=`, `in` and `nin`.
     - `{'$and': [{'lhs': 'draft_date', 'op': '>', 'rhs': datetime.date(2024, 10, 7)}, {'rank': 'Mythic'}]}` Drafts after October 7 by Mythic-ranked players. Supported values for query construction keys are `$and`, `$or`, and `$not`.
 
-- extensions: a list of `spells.columns.ColumnSpec` objects, which are appended to the definitions built-in columns described below. A name not in the enum `ColName` can be used in this way if it is the name of a provided extension. Existing names can also be redefined using extensions.
+- extensions: a list of `spells.columns.ColSpec` objects, which are appended to the definitions built-in columns described below. A name not in the enum `ColName` can be used in this way if it is the name of a provided extension. Existing names can also be redefined using extensions.
 
 - read_cache/write_cache: Use the local file system to cache and retrieve aggregations to minimize expensive reads of the large datasets. You shouldn't need to touch these arguments unless you are debugging.
 
@@ -301,12 +328,12 @@ from spells.enums import ColName, ColType
 
 Recommended to import `ColName` for any usage of `summon`, and to import `ColType` when defining custom extensions.
 
-### ColumnSpec
+### ColSpec
 
 ```python
-from spells.columns import ColumnSpec
+from spells.columns import ColSpec
 
-ColumnSpec(
+ColSpec(
     name: str,
     col_type: ColType,
     expr: pl.Expr | Callable[..., pl.Expr] | None = None,
@@ -366,6 +393,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `PICK_NUMBER`            | `"pick_number"`            | `DRAFT` | `FILTER_ONLY` | Dataset Column                               | Int      |
 | `PICK_NUM`               | `"pick_num"`               | `DRAFT` | `GROUP_BY`    | 1-indexed                                    | Int      |
 | `TAKEN_AT`               | `"taken_at`                | `DRAFT` | `PICK_SUM`    | Summable alias of `PICK_NUM`                 | Int      |
+| `NUM_DRAFTS`           | `"num_drafts"` | `DRAFT` | `PICK_SUM` | | Int |
 | `NUM_TAKEN`              | `"num_taken"`              | `DRAFT` | `PICK_SUM`    | Sum 1 over rows                              | Int      |
 | `PICK`                   | `"pick"`                   | `DRAFT` | `FILTER_ONLY` | Dataset Column, joined as "name"             | String   |
 | `PICK_MAINDECK_RATE`     | `"pick_maindeck_rate"`     | `DRAFT` | `PICK_SUM`    | Dataset Column                               | Float    |

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/README.md

@@ -63,8 +63,9 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
 - Supports calculating the standard aggregations and measures out of the box with no arguments (ALSA, GIH WR, etc)
 - Caches aggregate DataFrames in the local file system automatically for instantaneous reproduction of previous analysis
 - Manages grouping and filtering by built-in and custom columns at the row level
-- Provides 121 explicitly specified, enumerated, documented column definitions
+- Provides 122 explicitly specified, enumerated, documented column definitions
 - Supports "Deck Color Data" aggregations with built-in column definitions.
+- Lets you feed card metrics back in to column definitions to support scientific workflows like MLE
 - Provides a CLI tool `spells [add|refresh|clean|remove|info] [SET]` to download and manage external files
 - Downloads and manages public datasets from 17Lands
 - Retrieves and models booster configuration and card data from [MTGJSON](https://mtgjson.com/)
@@ -76,7 +77,7 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
 
 ## summon
 
-`summon` takes four optional arguments, allowing a fully declarative specification of your desired analysis. Basic functionality not provided by this api can often be managed by simple chained calls using the polars API, e.g. sorting and post-agg filtering.
+`summon` takes five optional arguments, allowing a fully declarative specification of your desired analysis. Basic functionality not provided by this api can often be managed by simple chained calls using the polars API, e.g. sorting and post-agg filtering.
   - `columns` specifies the desired output columns
     ```python
     >>> spells.summon('DSK', columns=["num_gp", "pct_gp", "gp_wr", "gp_wr_z"])
@@ -139,9 +140,9 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
   - `extensions` allows for the specification of arbitrarily complex derived columns and aggregations, including custom columns built on top of custom columns.
     ```python
     >>> import polars as pl
-    >>> from spells.columns import ColumnSpec
+    >>> from spells.columns import ColSpec
     >>> from spells.enums import ColType, View, ColName
-    >>> ext = ColumnSpec(
+    >>> ext = ColSpec(
     ...     name='deq_base',
     ...     col_type=ColType.AGG,
     ...     expr=(pl.col('gp_wr_excess') + 0.03 * (1 - pl.col('ata')/14).pow(2)) * pl.col('pct_gp'),
@@ -169,8 +170,34 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
     │ Oblivious Bookworm       ┆ 0.028605 ┆ uncommon ┆ GU    │
     └──────────────────────────┴──────────┴──────────┴───────┘
     ```
-    
-    Note the use of chained calls to the Polars DataFrame api to perform manipulations on the result of `summon`.
+  - `card_context` takes a name-indexed DataFrame or name-keyed dict and allows the construction of column definitions based on the results.
+    ```python
+    >>> deq = spells.summon('DSK', columns=['deq_base'], filter_spec={'player_cohort': 'Top'}, extensions=[ext])
+    >>> ext = [ 
+    ...     ColSpec(
+    ...         name='picked_deq_base',
+    ...         col_type=ColType.PICK_SUM,
+    ...         expr=lambda name, card_context: card_context[name]['deq_base']
+    ...     ),
+    ...     ColSpec(
+    ...         name='picked_deq_base_avg',
+    ...         col_type=ColType.AGG,
+    ...         expr=pl.col('picked_deq_base') / pl.col('num_taken')
+    ...     ),
+    ... ]
+    >>> spells.summon('DSK', columns=['picked_deq_base_avg'], group_by=['player_cohort'], extensions=ext, card_context=deq)
+    shape: (4, 2)
+    ┌───────────────┬─────────────────────┐
+    │ player_cohort ┆ picked_deq_base_avg │
+    │ ---           ┆ ---                 │
+    │ str           ┆ f64                 │
+    ╞═══════════════╪═════════════════════╡
+    │ Bottom        ┆ 0.004826            │
+    │ Middle        ┆ 0.00532             │
+    │ Other         ┆ 0.004895            │
+    │ Top           ┆ 0.005659            │
+    └───────────────┴─────────────────────┘
+    ```
     
 ## Installation
 
@@ -278,7 +305,7 @@ aggregations of non-numeric (or numeric) data types are not supported. If `None`
     - `{'lhs': 'player_cohort', 'op': 'in', 'rhs': ['Top', 'Middle']}` "player_cohort" value is either "Top" or "Middle". Supported values for `op` are `<`, `<=`, `>`, `>=`, `!=`, `=`, `in` and `nin`.
     - `{'$and': [{'lhs': 'draft_date', 'op': '>', 'rhs': datetime.date(2024, 10, 7)}, {'rank': 'Mythic'}]}` Drafts after October 7 by Mythic-ranked players. Supported values for query construction keys are `$and`, `$or`, and `$not`.
 
-- extensions: a list of `spells.columns.ColumnSpec` objects, which are appended to the definitions built-in columns described below. A name not in the enum `ColName` can be used in this way if it is the name of a provided extension. Existing names can also be redefined using extensions.
+- extensions: a list of `spells.columns.ColSpec` objects, which are appended to the definitions built-in columns described below. A name not in the enum `ColName` can be used in this way if it is the name of a provided extension. Existing names can also be redefined using extensions.
 
 - read_cache/write_cache: Use the local file system to cache and retrieve aggregations to minimize expensive reads of the large datasets. You shouldn't need to touch these arguments unless you are debugging.
 
@@ -290,12 +317,12 @@ from spells.enums import ColName, ColType
 
 Recommended to import `ColName` for any usage of `summon`, and to import `ColType` when defining custom extensions.
 
-### ColumnSpec
+### ColSpec
 
 ```python
-from spells.columns import ColumnSpec
+from spells.columns import ColSpec
 
-ColumnSpec(
+ColSpec(
     name: str,
     col_type: ColType,
     expr: pl.Expr | Callable[..., pl.Expr] | None = None,
@@ -355,6 +382,7 @@ A table of all included columns. Columns can be referenced by enum or by string
 | `PICK_NUMBER`            | `"pick_number"`            | `DRAFT` | `FILTER_ONLY` | Dataset Column                               | Int      |
 | `PICK_NUM`               | `"pick_num"`               | `DRAFT` | `GROUP_BY`    | 1-indexed                                    | Int      |
 | `TAKEN_AT`               | `"taken_at`                | `DRAFT` | `PICK_SUM`    | Summable alias of `PICK_NUM`                 | Int      |
+| `NUM_DRAFTS`           | `"num_drafts"` | `DRAFT` | `PICK_SUM` | | Int |
 | `NUM_TAKEN`              | `"num_taken"`              | `DRAFT` | `PICK_SUM`    | Sum 1 over rows                              | Int      |
 | `PICK`                   | `"pick"`                   | `DRAFT` | `FILTER_ONLY` | Dataset Column, joined as "name"             | String   |
 | `PICK_MAINDECK_RATE`     | `"pick_maindeck_rate"`     | `DRAFT` | `PICK_SUM`    | Dataset Column                               | Float    |

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/pyproject.toml

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

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/spells/columns.py

@@ -7,7 +7,7 @@ from spells.enums import View, ColName, ColType
 
 
 @dataclass(frozen=True)
-class ColumnSpec:
+class ColSpec:
     name: str
     col_type: ColType
     expr: pl.Expr | Callable[..., pl.Expr] | None = None
@@ -16,7 +16,7 @@ class ColumnSpec:
 
 
 @dataclass(frozen=True)
-class ColumnDefinition:
+class ColDef:
     name: str
     col_type: ColType
     expr: pl.Expr | tuple[pl.Expr, ...]
@@ -42,67 +42,67 @@ default_columns = [
 ]
 
 _column_specs = [
-    ColumnSpec(
+    ColSpec(
         name=ColName.NAME,
         col_type=ColType.GROUP_BY,
         views=[View.CARD],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EXPANSION,
         col_type=ColType.GROUP_BY,
         views=[View.GAME, View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_TYPE,
         col_type=ColType.GROUP_BY,
         views=[View.GAME, View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_ID,
         views=[View.GAME, View.DRAFT],
         col_type=ColType.FILTER_ONLY,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_TIME,
         col_type=ColType.FILTER_ONLY,
         views=[View.GAME, View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_DATE,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.DRAFT_TIME).str.to_datetime("%Y-%m-%d %H:%M:%S").dt.date(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_DAY_OF_WEEK,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.DRAFT_TIME).str.to_datetime("%Y-%m-%d %H:%M:%S").dt.weekday(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_HOUR,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.DRAFT_TIME).str.to_datetime("%Y-%m-%d %H:%M:%S").dt.hour(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAFT_WEEK,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.DRAFT_TIME).str.to_datetime("%Y-%m-%d %H:%M:%S").dt.week(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.RANK,
         col_type=ColType.GROUP_BY,
         views=[View.GAME, View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.USER_N_GAMES_BUCKET,
         col_type=ColType.GROUP_BY,
         views=[View.DRAFT, View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.USER_GAME_WIN_RATE_BUCKET,
         col_type=ColType.GROUP_BY,
         views=[View.DRAFT, View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PLAYER_COHORT,
         col_type=ColType.GROUP_BY,
         expr=pl.when(pl.col(ColName.USER_N_GAMES_BUCKET) < 100)
@@ -117,303 +117,308 @@ _column_specs = [
             )
         ),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCH_WINS,
         col_type=ColType.GROUP_BY,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCH_WINS_SUM,
         col_type=ColType.PICK_SUM,
         views=[View.DRAFT],
         expr=pl.col(ColName.EVENT_MATCH_WINS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCH_LOSSES,
         col_type=ColType.GROUP_BY,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCH_LOSSES_SUM,
         col_type=ColType.PICK_SUM,
         expr=pl.col(ColName.EVENT_MATCH_LOSSES),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCHES,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.EVENT_MATCH_WINS) + pl.col(ColName.EVENT_MATCH_LOSSES),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.EVENT_MATCHES_SUM,
         col_type=ColType.PICK_SUM,
         expr=pl.col(ColName.EVENT_MATCHES),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IS_TROPHY,
         col_type=ColType.GROUP_BY,
         expr=pl.when(pl.col(ColName.EVENT_TYPE) == "Traditional")
         .then(pl.col(ColName.EVENT_MATCH_WINS) == 3)
         .otherwise(pl.col(ColName.EVENT_MATCH_WINS) == 7),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IS_TROPHY_SUM,
         col_type=ColType.PICK_SUM,
         expr=pl.col(ColName.IS_TROPHY),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PACK_NUMBER,
         col_type=ColType.FILTER_ONLY,  # use pack_num
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PACK_NUM,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.PACK_NUMBER) + 1,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PICK_NUMBER,
         col_type=ColType.FILTER_ONLY,  # use pick_num
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PICK_NUM,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.PICK_NUMBER) + 1,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.TAKEN_AT,
         col_type=ColType.PICK_SUM,
         expr=pl.col(ColName.PICK_NUM),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_TAKEN,
         col_type=ColType.PICK_SUM,
         expr=pl.when(pl.col(ColName.PICK).is_not_null())
         .then(1)
         .otherwise(0),
     ),
-    ColumnSpec(
+    ColSpec(
+        name=ColName.NUM_DRAFTS,
+        col_type=ColType.PICK_SUM,
+        expr=pl.when((pl.col(ColName.PACK_NUMBER) == 0) & (pl.col(ColName.PICK_NUMBER) == 0)).then(1).otherwise(0),
+    ),
+    ColSpec(
         name=ColName.PICK,
         col_type=ColType.FILTER_ONLY,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PICK_MAINDECK_RATE,
         col_type=ColType.PICK_SUM,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PICK_SIDEBOARD_IN_RATE,
         col_type=ColType.PICK_SUM,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PACK_CARD,
         col_type=ColType.NAME_SUM,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.LAST_SEEN,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"pack_card_{name}")
         * pl.min_horizontal(ColName.PICK_NUM, 8),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_SEEN,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"pack_card_{name}") * (pl.col(ColName.PICK_NUM) <= 8),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.POOL,
         col_type=ColType.NAME_SUM,
         views=[View.DRAFT],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_TIME,
         col_type=ColType.FILTER_ONLY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_DATE,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.GAME_TIME).str.to_datetime("%Y-%m-%d %H-%M-%S").dt.date(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_DAY_OF_WEEK,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.GAME_TIME).str.to_datetime("%Y-%m-%d %H-%M-%S").dt.weekday(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_HOUR,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.GAME_TIME).str.to_datetime("%Y-%m-%d %H-%M-%S").dt.hour(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_WEEK,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.GAME_TIME).str.to_datetime("%Y-%m-%d %H-%M-%S").dt.week(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.BUILD_INDEX,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.MATCH_NUMBER,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_NUMBER,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_GAMES,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.GAME_NUMBER).is_not_null(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_MATCHES,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.GAME_NUMBER) == 1,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_EVENTS,
         col_type=ColType.GAME_SUM,
         expr=(pl.col(ColName.GAME_NUMBER) == 1) & (pl.col(ColName.MATCH_NUMBER) == 1),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OPP_RANK,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.MAIN_COLORS,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_COLORS,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.MAIN_COLORS).str.len_chars(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.SPLASH_COLORS,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.HAS_SPLASH,
         col_type=ColType.GROUP_BY,
         expr=pl.col(ColName.SPLASH_COLORS).str.len_chars() > 0,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.ON_PLAY,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_ON_PLAY,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.ON_PLAY),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_MULLIGANS,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_MULLIGANS_SUM,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.NUM_MULLIGANS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OPP_NUM_MULLIGANS,
         col_type=ColType.GAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OPP_NUM_MULLIGANS_SUM,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.OPP_NUM_MULLIGANS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OPP_COLORS,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_TURNS,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_TURNS_SUM,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.NUM_TURNS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON,
         col_type=ColType.GROUP_BY,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_WON,
         col_type=ColType.GAME_SUM,
         expr=pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OPENING_HAND,
         col_type=ColType.NAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_OPENING_HAND,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"opening_hand_{name}") * pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DRAWN,
         col_type=ColType.NAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_DRAWN,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"drawn_{name}") * pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.TUTORED,
         col_type=ColType.NAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_TUTORED,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"tutored_{name}") * pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK,
         col_type=ColType.NAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_DECK,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"deck_{name}") * pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.SIDEBOARD,
         col_type=ColType.NAME_SUM,
         views=[View.GAME],
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_SIDEBOARD,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"sideboard_{name}") * pl.col(ColName.WON),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_GNS,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.max_horizontal(
@@ -424,251 +429,251 @@ _column_specs = [
             - pl.col(f"opening_hand_{name}"),
         ),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_NUM_GNS,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(ColName.WON) * pl.col(f"num_gns_{name}"),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.SET_CODE,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.COLOR,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.RARITY,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.COLOR_IDENTITY,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.CARD_TYPE,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.SUBTYPE,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.MANA_VALUE,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_MANA_VALUE,
         col_type=ColType.NAME_SUM,
         expr=lambda name, card_context: card_context[name][ColName.MANA_VALUE] * pl.col(f"deck_{name}"),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_LANDS,
         col_type=ColType.NAME_SUM,
         expr=lambda name, card_context: pl.col(f"deck_{name}") * ( 1 if 'Land' in card_context[name][ColName.CARD_TYPE] else 0 )
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_SPELLS,
         col_type=ColType.NAME_SUM,
         expr=lambda name: pl.col(f"deck_{name}") - pl.col(f"deck_lands_{name}"),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.MANA_COST,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.POWER,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.TOUGHNESS,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IS_BONUS_SHEET,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IS_DFC,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.ORACLE_TEXT,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.CARD_JSON,
         col_type=ColType.CARD_ATTR,
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PICKED_MATCH_WR,
         col_type=ColType.AGG,
-        expr=pl.col(ColName.EVENT_MATCH_WINS_SUM) / pl.col(ColName.EVENT_MATCHES),
+        expr=pl.col(ColName.EVENT_MATCH_WINS_SUM) / pl.col(ColName.EVENT_MATCHES_SUM),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.TROPHY_RATE,
         col_type=ColType.AGG,
         expr=pl.col(ColName.IS_TROPHY_SUM) / pl.col(ColName.NUM_TAKEN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GAME_WR,
         col_type=ColType.AGG,
         expr=pl.col(ColName.NUM_WON) / pl.col(ColName.NUM_GAMES),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.ALSA,
         col_type=ColType.AGG,
         expr=pl.col(ColName.LAST_SEEN) / pl.col(ColName.NUM_SEEN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.ATA,
         col_type=ColType.AGG,
         expr=pl.col(ColName.TAKEN_AT) / pl.col(ColName.NUM_TAKEN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_GP,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.PCT_GP,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK) / (pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD)),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_DECK) / pl.col(ColName.DECK),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_OH,
         col_type=ColType.AGG,
         expr=pl.col(ColName.OPENING_HAND),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.OH_WR,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_OPENING_HAND) / pl.col(ColName.OPENING_HAND),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_GIH,
         col_type=ColType.AGG,
         expr=pl.col(ColName.OPENING_HAND) + pl.col(ColName.DRAWN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_GIH_WON,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_OPENING_HAND) + pl.col(ColName.WON_DRAWN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR,
         col_type=ColType.AGG,
         expr=pl.col(ColName.NUM_GIH_WON) / pl.col(ColName.NUM_GIH),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GNS_WR,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_NUM_GNS) / pl.col(ColName.NUM_GNS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IWD,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GIH_WR) - pl.col(ColName.GNS_WR),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.NUM_IN_POOL,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK) + pl.col(ColName.SIDEBOARD),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.IN_POOL_WR,
         col_type=ColType.AGG,
         expr=(pl.col(ColName.WON_DECK) + pl.col(ColName.WON_SIDEBOARD))
         / pl.col(ColName.NUM_IN_POOL),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_TOTAL,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK).sum(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_DECK_TOTAL,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_DECK).sum(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR_MEAN,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_DECK_TOTAL) / pl.col(ColName.DECK_TOTAL),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR_EXCESS,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GP_WR) - pl.col(ColName.GP_WR_MEAN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR_VAR,
         col_type=ColType.AGG,
         expr=(pl.col(ColName.GP_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GP)).sum()
         / pl.col(ColName.DECK_TOTAL),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR_STDEV,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GP_WR_VAR).sqrt(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GP_WR_Z,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GP_WR_EXCESS) / pl.col(ColName.GP_WR_STDEV),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_TOTAL,
         col_type=ColType.AGG,
         expr=pl.col(ColName.NUM_GIH).sum(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.WON_GIH_TOTAL,
         col_type=ColType.AGG,
         expr=pl.col(ColName.NUM_GIH_WON).sum(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR_MEAN,
         col_type=ColType.AGG,
         expr=pl.col(ColName.WON_GIH_TOTAL) / pl.col(ColName.GIH_TOTAL),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR_EXCESS,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GIH_WR) - pl.col(ColName.GIH_WR_MEAN),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR_VAR,
         col_type=ColType.AGG,
         expr=(pl.col(ColName.GIH_WR_EXCESS).pow(2) * pl.col(ColName.NUM_GIH)).sum()
         / pl.col(ColName.GIH_TOTAL),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR_STDEV,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GIH_WR_VAR).sqrt(),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.GIH_WR_Z,
         col_type=ColType.AGG,
         expr=pl.col(ColName.GIH_WR_EXCESS) / pl.col(ColName.GIH_WR_STDEV),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_MANA_VALUE_AVG,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK_MANA_VALUE) / pl.col(ColName.DECK_SPELLS),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_LANDS_AVG,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK_LANDS) / pl.col(ColName.NUM_GAMES),
     ),
-    ColumnSpec(
+    ColSpec(
         name=ColName.DECK_SPELLS_AVG,
         col_type=ColType.AGG,
         expr=pl.col(ColName.DECK_SPELLS) / pl.col(ColName.NUM_GAMES),

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/spells/draft_data.py

@@ -14,12 +14,13 @@ from inspect import signature
 from typing import Callable, TypeVar, Any
 
 import polars as pl
+from polars.exceptions import ColumnNotFoundError
 
 from spells.external import data_file_path
 import spells.cache
 import spells.filter
 import spells.manifest
-from spells.columns import ColumnDefinition, ColumnSpec
+from spells.columns import ColDef, ColSpec
 from spells.enums import View, ColName, ColType
 
 
@@ -53,7 +54,7 @@ def _get_names(set_code: str) -> list[str]:
     return names
 
 
-def _get_card_context(set_code: str, col_spec_map: dict[str, ColumnSpec]) -> dict[str, dict[str, Any]]:
+def _get_card_context(set_code: str, col_spec_map: dict[str, ColSpec], card_context: pl.DataFrame | dict[str, dict[str, Any]] | None) -> dict[str, dict[str, Any]]:
     card_attr_specs = {col:spec for col, spec in col_spec_map.items() if spec.col_type == ColType.CARD_ATTR or spec.name == ColName.NAME}
     col_def_map = _hydrate_col_defs(set_code, card_attr_specs, card_only=True)
 
@@ -65,12 +66,25 @@ def _get_card_context(set_code: str, col_spec_map: dict[str, ColumnSpec]) -> dic
         card_df, frozenset(columns), col_def_map, is_agg_view=False
     ).to_dicts()
 
-    card_context = {row[ColName.NAME]: row for row in select_rows}
+    loaded_context = {row[ColName.NAME]: row for row in select_rows}
 
-    return card_context
+    if card_context is not None:
+        if isinstance(card_context, pl.DataFrame):
+            try:
+                card_context = {row[ColName.NAME]: row for row in card_context.to_dicts()}
+            except ColumnNotFoundError:
+                raise ValueError("card_context DataFrame must have column 'name'")
+
+        names = list(loaded_context.keys())
+        for name in names:
+            assert name in card_context, f"card_context must include a row for each card name. {name} missing."
+            for col, value in card_context[name].items():
+                loaded_context[name][col] = value
+
+    return loaded_context
     
 
-def _determine_expression(spec: ColumnSpec, names: list[str], card_context: dict[str, dict]) -> pl.Expr | tuple[pl.Expr, ...]:
+def _determine_expression(spec: ColSpec, names: list[str], card_context: dict[str, dict]) -> pl.Expr | tuple[pl.Expr, ...]:
     def seed_params(expr):
         params = {}
 
@@ -115,7 +129,7 @@ def _determine_expression(spec: ColumnSpec, names: list[str], card_context: dict
     return expr
 
 
-def _infer_dependencies(name: str, expr: pl.Expr | tuple[pl.Expr,...], col_spec_map: dict[str, ColumnSpec], names: list[str]) -> set[str]:
+def _infer_dependencies(name: str, expr: pl.Expr | tuple[pl.Expr,...], col_spec_map: dict[str, ColSpec], names: list[str]) -> set[str]:
     dependencies = set()
     tricky_ones = set()
 
@@ -150,13 +164,13 @@ def _infer_dependencies(name: str, expr: pl.Expr | tuple[pl.Expr,...], col_spec_
     return dependencies
 
 
-def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColumnSpec], card_only=False):
+def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColSpec], card_context: pl.DataFrame | dict[str, dict] | None = None, card_only: bool =False):
     names = _get_names(set_code)
 
     if card_only:
         card_context = {}
     else:
-        card_context = _get_card_context(set_code, col_spec_map)
+        card_context = _get_card_context(set_code, col_spec_map, card_context)
 
     assert len(names) > 0, "there should be names"
     hydrated = {}
@@ -184,7 +198,7 @@ def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColumnSpec], card_o
             )
         )
 
-        cdef = ColumnDefinition(
+        cdef = ColDef(
             name=spec.name,
             col_type=spec.col_type,
             views=set(spec.views or set()),
@@ -199,7 +213,7 @@ def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColumnSpec], card_o
 def _view_select(
     df: DF,
     view_cols: frozenset[str],
-    col_def_map: dict[str, ColumnDefinition],
+    col_def_map: dict[str, ColDef],
     is_agg_view: bool,
 ) -> DF:
     base_cols = frozenset()
@@ -339,17 +353,18 @@ def summon(
     columns: list[str] | None = None,
     group_by: list[str] | None = None,
     filter_spec: dict | None = None,
-    extensions: list[ColumnSpec] | None = None,
+    extensions: list[ColSpec] | None = None,
     use_streaming: bool = False,
     read_cache: bool = True,
     write_cache: bool = True,
+    card_context: pl.DataFrame | dict[str, dict] | None = None
 ) -> pl.DataFrame:
     col_spec_map = dict(spells.columns.col_spec_map)
     if extensions is not None:
         for spec in extensions:
             col_spec_map[spec.name] = spec
 
-    col_def_map = _hydrate_col_defs(set_code, col_spec_map)
+    col_def_map = _hydrate_col_defs(set_code, col_spec_map, card_context)
     m = spells.manifest.create(col_def_map, columns, group_by, filter_spec)
 
     calc_fn = functools.partial(_base_agg_df, set_code, m, use_streaming=use_streaming)

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/spells/enums.py

@@ -60,6 +60,7 @@ class ColName(StrEnum):
     PICK_NUM = "pick_num"  # pick_number plus 1
     TAKEN_AT = "taken_at"
     NUM_TAKEN = "num_taken"
+    NUM_DRAFTS = "num_drafts"
     PICK = "pick"
     PICK_MAINDECK_RATE = "pick_maindeck_rate"
     PICK_SIDEBOARD_IN_RATE = "pick_sideboard_in_rate"

{spells_mtg-0.4.0 → spells_mtg-0.5.0}/spells/manifest.py

@@ -3,13 +3,13 @@ from dataclasses import dataclass
 import spells.columns
 import spells.filter
 from spells.enums import View, ColName, ColType
-from spells.columns import ColumnDefinition
+from spells.columns import ColDef
 
 
 @dataclass(frozen=True)
 class Manifest:
     columns: tuple[str, ...]
-    col_def_map: dict[str, ColumnDefinition]
+    col_def_map: dict[str, ColDef]
     base_view_group_by: frozenset[str]
     view_cols: dict[View, frozenset[str]]
     group_by: tuple[str, ...]
@@ -85,7 +85,7 @@ class Manifest:
 
 def _resolve_view_cols(
     col_set: frozenset[str],
-    col_def_map: dict[str, ColumnDefinition],
+    col_def_map: dict[str, ColDef],
 ) -> dict[View, frozenset[str]]:
     """
     For each view ('game', 'draft', and 'card'), return the columns
@@ -153,7 +153,7 @@ def _resolve_view_cols(
 
 
 def create(
-    col_def_map: dict[str, ColumnDefinition],
+    col_def_map: dict[str, ColDef],
     columns: list[str] | None = None,
     group_by: list[str] | None = None,
     filter_spec: dict | None = None,