spells-mtg 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

spells/columns.py

@@ -24,7 +24,7 @@ class ColumnDefinition:
     name: str
     col_type: ColType
     expr: pl.Expr | tuple[pl.Expr, ...]
-    views: tuple[View, ...]
+    views: set[View]
     dependencies: tuple[str, ...]
     signature: str
 

spells/draft_data.py

@@ -53,22 +53,23 @@ def _get_names(set_code: str) -> tuple[str, ...]:
 
 
 def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColumnSpec]):
-    def get_views(spec: ColumnSpec) -> list[View]:
+    def get_views(spec: ColumnSpec) -> set[View]:
         if spec.name == ColName.NAME or spec.col_type == ColType.AGG:
-            return []
+            return set()
         if spec.col_type == ColType.CARD_ATTR:
-            return [View.CARD]
+            return {View.CARD}
         if spec.views is not None:
-            return spec.views
+            return set(spec.views)
         assert (
             spec.dependencies is not None
         ), f"Col {spec.name} should have dependencies"
 
-        views = []
-        for dep in spec.dependencies:
-            views.extend(get_views(col_spec_map[dep]))
+        views = functools.reduce(
+            lambda prev, curr: prev.intersection(curr),
+            [get_views(col_spec_map[dep]) for dep in spec.dependencies],
+        )
 
-        return list(set(views))
+        return views
 
     names = _get_names(set_code)
     assert len(names) > 0, "there should be names"
@@ -118,7 +119,7 @@ def _hydrate_col_defs(set_code: str, col_spec_map: dict[str, ColumnSpec]):
         cdef = ColumnDefinition(
             name=spec.name,
             col_type=spec.col_type,
-            views=tuple(views),
+            views=views,
             expr=expr,
             dependencies=dependencies,
             signature=signature,

spells/manifest.py

@@ -99,8 +99,6 @@ def _resolve_view_cols(
     For each view ('game', 'draft', and 'card'), return the columns
     that must be present at the aggregation step. 'name' need not be
     included, and 'pick' will be added if needed.
-
-    Dependencies within base views will be resolved by `col_df`.
     """
     unresolved_cols = col_set
     view_resolution = {}
@@ -169,7 +167,7 @@ def create(
     needed_views = frozenset()
     for view, cols_for_view in view_cols.items():
         for col in cols_for_view:
-            if col_def_map[col].views == (view,):  # only found in this view
+            if col_def_map[col].views == {view}:  # only found in this view
                 needed_views = needed_views.union({view})
 
     view_cols = {v: view_cols[v] for v in needed_views}

{spells_mtg-0.2.2.dist-info → spells_mtg-0.2.3.dist-info}/METADATA

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

{spells_mtg-0.2.2.dist-info → spells_mtg-0.2.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 spells/__init__.py,sha256=QCPWQySUK2SZtCU-mSZLsn7vrNLJMDsRwil8gmAzmdk,151
 spells/cache.py,sha256=4v7h8D3TtaT0R_EdiRNhdcQrXzdH_CukezO6oAXvNEY,2956
 spells/cards.py,sha256=6seKpgI4TlJxI20bvcgt5VpxzsbCnnjWneDWpneJJ6Y,3497
-spells/columns.py,sha256=Zw7IIR-HX2HCdeYBGn0RmPGzPA1juGfMl050ndtWhlc,22052
-spells/draft_data.py,sha256=xIr0Jpzv3ktp5AptVFuXlSqTqwGcHE-j1sXNtf064c0,10497
+spells/columns.py,sha256=uPL9BqCGlxAfP75Ggo4-Ryqml9KG_62WFPyJ2ztNDMM,22045
+spells/draft_data.py,sha256=pHVMvMy4aVPRnpt3IasxH7CKRHH7UE-GldmAa_b4XWw,10547
 spells/enums.py,sha256=BQIZvCSAopiscnKY-Qm_j2BgmPy9R5oj1yeIrjMQM1o,4507
 spells/external.py,sha256=qe6wOBDhPN4CZNQvYRq6G-OpIZcWTZzJjySgnf2Gu1o,10258
 spells/filter.py,sha256=J-YTOOAzOQpvIX29tviYL04RVoOUlfsbjBXoQBDCEdQ,3380
-spells/manifest.py,sha256=XEJwwYJzOEWrQQwka39F9SgZo38hH_Kj4MPY7GOuLvY,6903
+spells/manifest.py,sha256=qj4XdYqQOlc6oPKMIWezrRLNwLI9OD5zRDYnMUgl624,6836
 spells/schema.py,sha256=z8Qn2SiHG4T6YfPsz8xHLGMjU_Ofm76-Vrquh3b9B64,6422
-spells_mtg-0.2.2.dist-info/METADATA,sha256=zUFcfmHmEp_TD34EYBnFt48qAFOqLNVJv2iKxgFnZIo,41597
-spells_mtg-0.2.2.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-spells_mtg-0.2.2.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
-spells_mtg-0.2.2.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
-spells_mtg-0.2.2.dist-info/RECORD,,
+spells_mtg-0.2.3.dist-info/METADATA,sha256=fU18GU_AKHmWHXIq_OkxR6hTdr0heLTMn58XnKkbFNg,41597
+spells_mtg-0.2.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+spells_mtg-0.2.3.dist-info/entry_points.txt,sha256=a9Y1omdl9MdnKuIj3aOodgrp-zZII6OCdvqwgP6BFvI,63
+spells_mtg-0.2.3.dist-info/licenses/LICENSE,sha256=tS54XYbJSgmq5zuHhbsQGbNQLJPVgXqhF5nu2CSRMig,1068
+spells_mtg-0.2.3.dist-info/RECORD,,