core-lens 0.1.dev140__tar.gz → 0.1.dev141__tar.gz

{core_lens-0.1.dev140 → core_lens-0.1.dev141}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: core-lens
-Version: 0.1.dev140
+Version: 0.1.dev141
 Summary: Query, analyse, and visualise CoreStack's microwatershed and Earth science data through a clean, composable Python API.
 Project-URL: Homepage, https://github.com/ApoorvaKashyap/core-lens
 Project-URL: Issues, https://github.com/ApoorvaKashyap/core-lens/issues

{core_lens-0.1.dev140 → core_lens-0.1.dev141}/src/core_lens/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.dev140'
-__version_tuple__ = version_tuple = (0, 1, 'dev140')
+__version__ = version = '0.1.dev141'
+__version_tuple__ = version_tuple = (0, 1, 'dev141')
 
 __commit_id__ = commit_id = None

{core_lens-0.1.dev140 → core_lens-0.1.dev141}/src/core_lens/aoi.py

@@ -219,12 +219,23 @@ def _cached_resolve_boundary(
 
     lf = pl.scan_parquet(static_path, storage_options=storage_options or None)
     filter_expr = pl.lit(True)
+    schema_types = lf.collect_schema()
     for col, val in entity_kwargs.items():
         if col in schema.key_cols or col in schema.extra_static_cols:
+            is_list_col = isinstance(schema_types.get(col), pl.List)
             if isinstance(val, list):
-                lf = lf.filter(pl.col(col).is_in(val))
+                if is_list_col:
+                    filter_expr = (
+                        filter_expr
+                        & pl.col(col).list.eval(pl.element().is_in(val)).list.any()
+                    )
+                else:
+                    filter_expr = filter_expr & pl.col(col).is_in(val)
             else:
-                filter_expr = filter_expr & (pl.col(col) == val)
+                if is_list_col:
+                    filter_expr = filter_expr & pl.col(col).list.contains(val)
+                else:
+                    filter_expr = filter_expr & (pl.col(col) == val)
 
     df = lf.filter(filter_expr).select(candidate.key_cols + [geom_col]).collect()
 

{core_lens-0.1.dev140 → core_lens-0.1.dev141}/src/core_lens/base/view.py

@@ -99,16 +99,31 @@ class View:
         """
         static = self.entity._resolve(self.entity.static_path)
 
-        filter_expr = pl.lit(True)
-        for col, val in kwargs.items():
-            filter_expr = filter_expr & (pl.col(col) == val)
-
         lf = scan_with_key_filter(
             path=static,
             key_cols=self.entity.key_cols,
             key_values=self.keys,
             storage_options=self._storage_options or None,
         )
+        schema_types = lf.collect_schema()
+
+        filter_expr = pl.lit(True)
+        for col, val in kwargs.items():
+            is_list_col = isinstance(schema_types.get(col), pl.List)
+            if isinstance(val, list):
+                if is_list_col:
+                    filter_expr = (
+                        filter_expr
+                        & pl.col(col).list.eval(pl.element().is_in(val)).list.any()
+                    )
+                else:
+                    filter_expr = filter_expr & pl.col(col).is_in(val)
+            else:
+                if is_list_col:
+                    filter_expr = filter_expr & pl.col(col).list.contains(val)
+                else:
+                    filter_expr = filter_expr & (pl.col(col) == val)
+
         keys = lf.filter(filter_expr).select(self.entity.key_cols).collect()
 
         return View(