spells-mtg 0.9.4__py3-none-any.whl → 0.9.7__py3-none-any.whl

spells/__init__.py

@@ -7,4 +7,12 @@ from spells.log import setup_logging
 
 setup_logging()
 
-__all__ = ["summon", "view_select", "get_names", "ColSpec", "ColType", "ColName", "logging"]
+__all__ = [
+    "summon",
+    "view_select",
+    "get_names",
+    "ColSpec",
+    "ColType",
+    "ColName",
+    "logging",
+]

spells/cache.py

@@ -25,7 +25,7 @@ class DataDir(StrEnum):
 
 
 def spells_print(mode, content):
-    print(f"🪄 {mode} ✨ {content}")
+    print(f"  🪄 {mode} ✨ {content}")
 
 
 def data_home() -> str:

spells/cards.py

@@ -78,7 +78,13 @@ def card_df(draft_set_code: str, names: list[str]) -> pl.DataFrame:
     draft_set_json = _fetch_mtg_json(draft_set_code)
     booster_info = draft_set_json["data"]["booster"]
 
-    booster_type = "play" if "play" in booster_info else "draft"
+    booster_type = (
+        "play"
+        if "play" in booster_info
+        else "draft"
+        if "draft" in booster_info
+        else list(booster_info.keys())[0]
+    )
     set_codes = booster_info[booster_type]["sourceSetCodes"]
     set_codes.reverse()
 

spells/draft_data.py

@@ -148,6 +148,10 @@ def _determine_expression(
                     )
                 )
             except KeyError:
+                logging.warning(
+                    f"KeyError raised in calculation of {col}, probably caused by "
+                    + "missing context. Column will have value `None`"
+                )
                 expr = tuple(pl.lit(None).alias(f"{col}_{name}") for name in names)
         else:
             expr = tuple(map(lambda name: pl.col(f"{col}_{name}"), names))
@@ -233,7 +237,11 @@ def _infer_dependencies(
             ):
                 dependencies.add(split[0])
                 found = True
-        # fail silently here, so that columns can be passed in harmlessly
+        if not found:
+            logging.warning(
+                f"No column definition found matching dependency {item}! "
+                + "`summon` will fail if called with this column"
+            )
 
     return dependencies
 
@@ -455,7 +463,7 @@ def _base_agg_df(
     return joined_df
 
 
-@make_verbose
+@make_verbose()
 def summon(
     set_code: str | list[str],
     columns: list[str] | None = None,

spells/external.py

@@ -100,7 +100,7 @@ def cli() -> int:
 
 
 def _add(set_code: str, force_download=False):
-    if set_code == 'all':
+    if set_code == "all":
         for code in all_sets:
             _add(code, force_download=force_download)
 

spells/log.py

@@ -42,8 +42,7 @@ def rotate_logs():
             logging.debug("Log file manually rotated")
 
 
-@contextmanager
-def console_logging(log_level):
+def add_console_handler(log_level):
     console_handler = logging.StreamHandler(sys.stdout)
     console_handler.setLevel(log_level)
     formatter = logging.Formatter(
@@ -52,17 +51,25 @@ def console_logging(log_level):
     console_handler.setFormatter(formatter)
     logger = logging.getLogger()
     logger.addHandler(console_handler)
+    return logger, console_handler
+
 
+@contextmanager
+def console_logging(log_level):
+    logger, console_handler = add_console_handler(log_level)
     try:
         yield
     finally:
         logger.removeHandler(console_handler)
 
 
-def make_verbose(func: Callable) -> Callable:
-    @wraps(func)
-    def wrapped(*args, logging: int=logging.ERROR, **kwargs):
-        with console_logging(logging):
-            return func(*args, **kwargs)
-    return wrapped
+def make_verbose(level: int = logging.ERROR) -> Callable:
+    def decorator(func: Callable) -> Callable:
+        @wraps(func)
+        def wrapped(*args, log_to_console: int = level, **kwargs):
+            with console_logging(log_to_console):
+                return func(*args, **kwargs)
+
+        return wrapped
 
+    return decorator

{spells_mtg-0.9.4.dist-info → spells_mtg-0.9.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spells-mtg
-Version: 0.9.4
+Version: 0.9.7
 Summary: analaysis of 17Lands.com public datasets
 Author-Email: Joel Barnes <oelarnes@gmail.com>
 License: MIT
@@ -15,21 +15,23 @@ Description-Content-Type: text/markdown
 
 ```
 $ spells add DSK
-🪄 spells ✨ [data home]=/Users/joel/.local/share/spells/
+  🪄 spells ✨ [data home]=/home/joel/.local/share/spells/
 
-🪄 add ✨ Downloading draft dataset from 17Lands.com
+  🪄 add ✨ Downloading draft dataset from 17Lands.com
 100% [......................................................................] 250466473 / 250466473
-🪄 add ✨ Unzipping and transforming to parquet (this might take a few minutes)...
-🪄 add ✨ Wrote file /Users/joel/.local/share/spells/external/DSK/DSK_PremierDraft_draft.parquet
-🪄 clean ✨ No local cache found for set DSK
-🪄 add ✨ Fetching card data from mtgjson.com and writing card parquet file
-🪄 add ✨ Wrote file /Users/joel/.local/share/spells/external/DSK/DSK_card.parquet
-🪄 add ✨ Downloading game dataset from 17Lands.com
+  🪄 add ✨ Unzipping and transforming to parquet (this might take a few minutes)...
+  🪄 add ✨ Wrote file /home/joel/.local/share/spells/external/DSK/DSK_PremierDraft_draft.parquet
+  🪄 clean ✨ No local cache found for set DSK
+  🪄 add ✨ Fetching card data from mtgjson.com and writing card file
+  🪄 add ✨ Wrote file /home/joel/.local/share/spells/external/DSK/DSK_card.parquet
+  🪄 add ✨ Calculating set context
+  🪄 add ✨ Wrote file /home/joel/.local/share/spells/external/DSK/DSK_PremierDraft_context.parquet
+  🪄 add ✨ Downloading game dataset from 17Lands.com
 100% [........................................................................] 77145600 / 77145600
-🪄 add ✨ Unzipping and transforming to parquet (this might take a few minutes)...
-🪄 add ✨ Wrote file /Users/joel/.local/share/spells/external/DSK/DSK_PremierDraft_game.parquet
-🪄 clean ✨ No local cache found for set DSK
-$ ipython
+  🪄 add ✨ Unzipping and transforming to parquet (this might take a few minutes)...
+  🪄 add ✨ Wrote file /home/joel/.local/share/spells/external/DSK/DSK_PremierDraft_game.parquet
+  🪄 clean ✨ Removed 1 files from local cache for set DSK
+  🪄 clean ✨ Removed local cache dir /home/joel/.local/share/spells/cache/DSK
 ```
 
 ```python
@@ -70,6 +72,7 @@ Spells is not affiliated with 17Lands. Please review the [Usage Guidelines](http
 
 - Uses [Polars](https://docs.pola.rs/) for high-performance, multi-threaded aggregations of large datasets
 - Uses Polars to power an expressive query language for specifying custom extensions
+- Analyzes larger-than-memory datasets using Polars streaming mode
 - Converts csv datasets to parquet for 10x faster calculations and 20x smaller file sizes
 - 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
@@ -249,7 +252,7 @@ Spells caches the results of expensive aggregations in the local file system as
 
 ### Memory Usage
 
-One of my goals in creating Spells was to eliminate issues with memory pressure by exclusively using the map-reduce paradigm and a technology that supports partitioned/streaming aggregation of larget-than-memory datasets. By default, Polars loads the entire dataset in memory, but the API exposes a parameter `streaming` which I have exposed as `use_streaming`. Unfortunately, that feature does not seem to work for my queries and the memory performance can be quite poor. The one feature that may assist in memory management is the local caching, since you can restart the kernel without losing all of your progress. In particular, be careful about opening multiple Jupyter tabs unless you have at least 32 GB. In general I have not run into issues on my 16 GB MacBook Air except with running multiple kernels at once. Supporting larger-than memory computations is on my roadmap, so check back periodically to see if I've made any progress.
+One of my goals in creating Spells was to eliminate issues with memory pressure by exclusively using the map-reduce paradigm and a technology that supports partitioned/streaming aggregation of larget-than-memory datasets. By default, Polars loads the entire dataset in memory, but the API exposes a parameter `streaming` which I have exposed as `use_streaming`. Further testing is needed to determine the performance impacts, but this is the first thing you should try if you run into memory issues.
 
 When refreshing a given set's data files from 17Lands using the provided cli, the cache for that set is automatically cleared. The `spells` CLI gives additional tools for managing the local and external caches.
 
@@ -289,9 +292,10 @@ To use `spells`, make sure Spells is installed in your environment using pip or
 ### Summon
 
 ```python
-from spell import summon
+from spells import summon
 
 summon(
+    set_code: list[str] | str,
     columns: list[str] | None = None,
     group_by: list[str] | None = None,
     filter_spec: dict | None = None,
@@ -300,11 +304,16 @@ summon(
     set_context: pl.DataFrame | dict[str, Any] | None = None,
     read_cache: bool = True,
     write_cache: bool = True,
+    use_streaming: bool = False,
+    log_to_console: int = logging.ERROR,
 ) -> polars.DataFrame
 ```
 
 #### parameters
 
+- `set_code`: a set code or list of set codes among those that you have added using `spells add`.
+You can use "expansion" as a group_by to separate results from multiple sets, or you can aggregate them together.
+
 - `columns`: a list of string or `ColName` values to select as non-grouped columns. Valid `ColTypes` are `PICK_SUM`, `NAME_SUM`, `GAME_SUM`, and `AGG`. Min/Max/Unique 
 aggregations of non-numeric (or numeric) data types are not supported. If `None`, use a set of columns modeled on the commonly used values on 17Lands.com/card_data.
 
@@ -326,6 +335,8 @@ aggregations of non-numeric (or numeric) data types are not supported. If `None`
 
 - `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.
 
+- 'log_to_console': Set to `logging.INFO` to see useful messages on the progress of your aggregation, or `logging.WARNING` to see warning messages about potentially invalid column definitions.
+
 ### Enums
 
 ```python
@@ -505,13 +516,10 @@ A table of all included columns. Columns can be referenced by enum or by string
 # Roadmap to 1.0
 
 - [ ] Support Traditional and Premier datasets (currently only Premier is supported)
-- [ ] Group by all
 - [ ] Enable configuration using $XDG_CONFIG_HOME/cfg.toml
-- [ ] Support min and max aggregations over base views
 - [ ] Enhanced profiling
 - [ ] Optimized caching strategy
 - [ ] Organize and analyze daily downloads from 17Lands (not a scraper!)
 - [ ] Helper functions to generate second-order analysis by card name
 - [ ] Helper functions for common plotting paradigms
-- [ ] Example notebooks
 - [ ] Scientific workflows: regression, MLE, etc

spells_mtg-0.9.7.dist-info/RECORD

@@ -0,0 +1,18 @@
+spells/__init__.py,sha256=0pnh2NLn9FrNKncE9-tBsighp3e8YAsN--_ovUpgWGs,333
+spells/cache.py,sha256=7XDcltmlpagK2nkhuCCcAQVyrFMYkw9Acr7iVsLs3JU,3799
+spells/cards.py,sha256=uYOnFXroAuUpMB0NuuBcAZ1n5OtNTQyq1mvK3ctls6Q,3710
+spells/columns.py,sha256=PztPNLtqKIqIQdiCHYykk7bcYlx0_QRypu3WOsSZb-A,17856
+spells/config.py,sha256=4Q4F_wNsjXjWONA5uLn_Xu2xPoNm0vcPGqNHWd7khIk,202
+spells/draft_data.py,sha256=DpbKEcv-tTCJ1-R9-_lS-H8oejYl-2OEcUDSUDsRtJI,19626
+spells/enums.py,sha256=DL7e1xDEvrsTMbA7vJB_Et1DaYkyO4rIEzvIQDz3MZk,4871
+spells/extension.py,sha256=DVzIedggeGfkD6BD5g-dko9l9BoPgmXWvcQ3NWdEG0U,6991
+spells/external.py,sha256=ukcEWiu6aLJYJgQlRMAH6EmdZ2OZUFPEr54KdWnR5ug,11510
+spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
+spells/log.py,sha256=_yQjVge-krVtom7CfTmgv_oc78jnt5NDKElTBgdqdfE,2086
+spells/manifest.py,sha256=dOUmj2uZZ17vCWpFwv7B5F6wOIWnoQdZkEB9SDKdx9M,8310
+spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
+spells_mtg-0.9.7.dist-info/METADATA,sha256=jP7n_UCl7q2Ude2HClulr4ZsJhLJF1rVd5xwiL5HDIU,47007
+spells_mtg-0.9.7.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.9.7.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.9.7.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.9.7.dist-info/RECORD,,

spells_mtg-0.9.4.dist-info/RECORD

@@ -1,18 +0,0 @@
-spells/__init__.py,sha256=8RdhAbk2VN_ExGZN44JnsD6_4VG30XMBe90w5-1gc3U,302
-spells/cache.py,sha256=JTFA31quGUL8pxy04NLWjEhQd5GEp37Q4PWUMnMuUJU,3797
-spells/cards.py,sha256=EOXAB_F2yedjf6KquCERCIHl0TSIJIoOe1jv8g4JzOc,3601
-spells/columns.py,sha256=PztPNLtqKIqIQdiCHYykk7bcYlx0_QRypu3WOsSZb-A,17856
-spells/config.py,sha256=4Q4F_wNsjXjWONA5uLn_Xu2xPoNm0vcPGqNHWd7khIk,202
-spells/draft_data.py,sha256=3YHNn-od8shn9DwnLpOws1qcZXiVb96pbKPEG5JMpDk,19286
-spells/enums.py,sha256=DL7e1xDEvrsTMbA7vJB_Et1DaYkyO4rIEzvIQDz3MZk,4871
-spells/extension.py,sha256=DVzIedggeGfkD6BD5g-dko9l9BoPgmXWvcQ3NWdEG0U,6991
-spells/external.py,sha256=2qNZal_t4Dd1TU8hDGiZG6g4Vely4NALB6uwQbuMtmM,11510
-spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
-spells/log.py,sha256=73cYwVqEN5GiEMKNy_stDMApFNEeyVVJMeecVzdAEXU,1844
-spells/manifest.py,sha256=dOUmj2uZZ17vCWpFwv7B5F6wOIWnoQdZkEB9SDKdx9M,8310
-spells/schema.py,sha256=DbMvV8PIThJTp0Xzp_XIorlW6JhE1ud1kWRGf5SQ4_c,6406
-spells_mtg-0.9.4.dist-info/METADATA,sha256=QFFmNQRbq3TIPQR4bJl1qJYg1OApV49-FSCISrpWf2E,46731
-spells_mtg-0.9.4.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.9.4.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.9.4.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.9.4.dist-info/RECORD,,