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

spells/config.py

@@ -11,6 +11,7 @@ all_sets = [
     "WOE",
     "LTR",
     "MOM",
+    "SIR",
     "ONE",
     "BRO",
     "DMU",

spells/log.py

@@ -63,10 +63,12 @@ def console_logging(log_level):
         logger.removeHandler(console_handler)
 
 
-def make_verbose(level: int = logging.ERROR) -> Callable:
+def make_verbose(level: int | None = None) -> Callable:
     def decorator(func: Callable) -> Callable:
         @wraps(func)
-        def wrapped(*args, log_to_console: int = level, **kwargs):
+        def wrapped(*args, log_to_console: int | None = level, **kwargs):
+            if log_to_console is None:
+                return func(*args, **kwargs)
             with console_logging(log_to_console):
                 return func(*args, **kwargs)
 

spells/utils.py

@@ -0,0 +1,55 @@
+import polars as pl
+
+def convert_to_expr_list(
+    input: str | pl.Expr | list[str | pl.Expr] | None
+):
+    if input is None:
+        return []
+
+    input_list = [input] if isinstance(input, str | pl.Expr) else input
+    return [pl.col(i) if isinstance(i, str) else i for i in input_list]
+
+
+def wavg(
+    df: pl.DataFrame, 
+    cols: str | pl.Expr | list[str | pl.Expr],
+    weights: str | pl.Expr | list[str | pl.Expr],
+    group_by: str | pl.Expr | list[str | pl.Expr] | None = None,
+    new_names: str | list[str] | None = None,
+) -> pl.DataFrame:
+    col_list = convert_to_expr_list(cols)
+    weight_list = convert_to_expr_list(weights)
+    gbs = convert_to_expr_list(group_by)
+
+    name_list: list[str]
+    if isinstance(new_names, str):
+        name_list = [new_names]
+    elif new_names is None:
+        name_list = [c.meta.output_name() for c in col_list]
+    else:
+        name_list = list(new_names)
+
+    assert len(name_list) == len(col_list), f"{len(name_list)} names provided for {len(col_list)} columns"
+    assert len(name_list) == len(set(name_list)), "Output names must be unique"
+    assert len(weight_list) == len(col_list) or len(weight_list) == 1, f"{len(weight_list)} weights provided for {len(col_list)} columns" 
+
+    enum_wl = weight_list * int(len(col_list) / len(weight_list))
+    wl_names = [w.meta.output_name() for w in weight_list]
+    assert len(wl_names) == len(set(wl_names)), "Weights must have unique names. Send one weight column or n uniquely named ones"
+    
+    to_group = df.select(gbs + weight_list + [ 
+        (c * enum_wl[i]).alias(name_list[i]) for i, c in enumerate(col_list)
+    ]) 
+
+    grouped = to_group if not gbs else to_group.group_by(gbs)
+
+    ret_df = grouped.sum().select(
+        gbs + 
+        wl_names + 
+        [(pl.col(name) / pl.col(enum_wl[i].meta.output_name())) for i, name in enumerate(name_list)]
+    )
+   
+    if gbs:
+        ret_df = ret_df.sort(by=gbs)
+
+    return ret_df

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

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

{spells_mtg-0.9.7.dist-info → spells_mtg-0.10.0.dist-info}/RECORD

@@ -2,17 +2,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/config.py,sha256=_t98dc_uY3Wp3d5tsU3CJgVcWOD3wVlwMo98-tN2KRY,213
 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/log.py,sha256=3avmg65hru8K9npKLvPp1wWWxq-hoEYDUCbxqhPkKUw,2175
 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/utils.py,sha256=IO3brrXVvZla0LRTEB5v6NgGqZb_rYA46XtKBURGMNk,1944
+spells_mtg-0.10.0.dist-info/METADATA,sha256=Uj4GOhiHcGnWlI31o52ZGZ8PnnZGJggw81N558btGPE,47008
+spells_mtg-0.10.0.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.10.0.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.10.0.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.10.0.dist-info/RECORD,,