spells-mtg 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

spells/__init__.py

@@ -1,3 +1,5 @@
+import logging
+
 from spells.columns import ColSpec
 from spells.enums import ColType, ColName
 from spells.draft_data import summon, view_select, get_names
@@ -5,4 +7,4 @@ from spells.log import setup_logging
 
 setup_logging()
 
-__all__ = ["summon", "view_select", "get_names", "ColSpec", "ColType", "ColName"]
+__all__ = ["summon", "view_select", "get_names", "ColSpec", "ColType", "ColName", "logging"]

spells/draft_data.py

@@ -356,10 +356,11 @@ def _fetch_or_cache(
 
     if read_cache:
         if cache.cache_exists(set_code, key):
-            logging.debug(f"Cache {key} found")
+            logging.info(f"Cache {key} found")
             return cache.read_cache(set_code, key)
 
-    logging.debug(f"Cache not found, calculating with signature {cache_args}")
+    logging.info("Cache not found, calculating")
+    logging.debug(f"Signature:\n{cache_args}")
     df = calc_fn()
 
     if write_cache:
@@ -490,7 +491,7 @@ def summon(
 
     concat_dfs = []
     for code in codes:
-        logging.debug(f"Calculating agg df for {code}")
+        logging.info(f"Calculating agg df for {code}")
         if isinstance(card_context, pl.DataFrame):
             set_card_context = card_context.filter(pl.col("expansion") == code)
         elif isinstance(card_context, dict):

spells/external.py

@@ -100,7 +100,7 @@ def cli() -> int:
 def _add(set_code: str, force_download=False):
     download_data_set(set_code, View.DRAFT, force_download=force_download)
     write_card_file(set_code, force_download=force_download)
-    get_set_context(set_code)
+    get_set_context(set_code, force_download=force_download)
     download_data_set(set_code, View.GAME, force_download=force_download)
     return 0
 

spells/log.py

@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+from functools import wraps
 import logging
 import logging.handlers
 from pathlib import Path
@@ -16,7 +17,7 @@ def setup_logging(
     log_format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
 ):
     log_dir = Path(data_home()) / ".logs"
-    log_dir.mkdir(exist_ok=True)
+    log_dir.mkdir(parents=True, exist_ok=True)
     log_file_path = log_dir / log_file_name
 
     handler = logging.handlers.RotatingFileHandler(
@@ -42,8 +43,9 @@ def rotate_logs():
 
 
 @contextmanager
-def add_console_logging():
+def console_logging(log_level):
     console_handler = logging.StreamHandler(sys.stdout)
+    console_handler.setLevel(log_level)
     formatter = logging.Formatter(
         "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
     )
@@ -57,12 +59,10 @@ def add_console_logging():
         logger.removeHandler(console_handler)
 
 
-def make_verbose(callable: Callable) -> Callable:
-    def wrapped(*args, verbose=False, **kwargs):
-        if verbose:
-            with add_console_logging():
-                return callable(*args, **kwargs)
-        else:
-            return callable(*args, **kwargs)
-
+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
+

{spells_mtg-0.9.1.dist-info → spells_mtg-0.9.3.dist-info}/METADATA

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

{spells_mtg-0.9.1.dist-info → spells_mtg-0.9.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
-spells/__init__.py,sha256=bpxhRijyI-wxLPRVNathM9N9Cpq3E8uBSqWyYpDGFAI,275
+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=HDelOKrEbgMIAJfSGqzJbZdf-sInMZXRD-BI2j0QnZI,180
-spells/draft_data.py,sha256=_gzxlpnKa5WlxTfwdnxJhvFvGsTY69bCl0cOe4VRlaI,19271
+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=T34oqhyM5cIFvMAMJwlltdFS4CDeouVMbU-6My60OLg,11305
+spells/external.py,sha256=yt2cwAGIiYp9mjzn1sUOtJFxT61JORPbSUQL1M8j9ko,11336
 spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
-spells/log.py,sha256=-GnocAZ7K-032QohHCY5vC2myRhumuUQCTuq1erTmL4,1819
+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.1.dist-info/METADATA,sha256=VcOjIXJ0q-qvg5aVOW-cwO3PfmV4b3DBhKuC5vY_xLc,46731
-spells_mtg-0.9.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.9.1.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.9.1.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.9.1.dist-info/RECORD,,
+spells_mtg-0.9.3.dist-info/METADATA,sha256=ZhiDCy0kBePqAa6cueYd7ki_RY7y_WpvHZWitjL0trs,46731
+spells_mtg-0.9.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.9.3.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.9.3.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.9.3.dist-info/RECORD,,