spells-mtg 0.2.2__tar.gz → 0.2.3__tar.gz

{spells_mtg-0.2.2 → spells_mtg-0.2.3}/PKG-INFO

@@ -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 → spells_mtg-0.2.3}/pyproject.toml

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

{spells_mtg-0.2.2 → spells_mtg-0.2.3}/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_mtg-0.2.2 → spells_mtg-0.2.3}/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_mtg-0.2.2 → spells_mtg-0.2.3}/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}