refactor(core): use object syntax for bool_and/or

Eventual-Inc · Feb 5, 2025 · c8a6bd6 · c8a6bd6
1 parent de181ff
commit c8a6bd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/daft/expressions/expressions.py b/daft/expressions/expressions.py
@@ -3268,16 +3268,16 @@ def bool_and(self) -> Expression:
             >>> df.with_column("result", df["values"].list.bool_and()).collect()
             ╭───────────────┬─────────╮
             │ values        ┆ result  │
-            │ ---          ┆ ---     │
+            │ ---           ┆ ---     │
             │ List[Boolean] ┆ Boolean │
             ╞═══════════════╪═════════╡
             │ [true, true]  ┆ true    │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
             │ [true, false] ┆ false   │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
-            │ [null, null]  ┆ null    │
+            │ [None, None]  ┆ None    │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
-            │ []            ┆ null    │
+            │ []            ┆ None    │
             ╰───────────────┴─────────╯
         """
         return Expression._from_pyexpr(native.list_bool_and(self._expr))
@@ -3296,16 +3296,16 @@ def bool_or(self) -> Expression:
             >>> df.with_column("result", df["values"].list.bool_or()).collect()
             ╭───────────────┬─────────╮
             │ values        ┆ result  │
-            │ ---          ┆ ---     │
+            │ ---           ┆ ---     │
             │ List[Boolean] ┆ Boolean │
             ╞═══════════════╪═════════╡
             │ [true, false] ┆ true    │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
             │ [false, false]┆ false   │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
-            │ [null, null]  ┆ null    │
+            │ [None, None]  ┆ None    │
             ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
-            │ []            ┆ null    │
+            │ []            ┆ None    │
             ╰───────────────┴─────────╯
         """
         return Expression._from_pyexpr(native.list_bool_or(self._expr))

diff --git a/src/daft-core/src/series/ops/agg.rs b/src/daft-core/src/series/ops/agg.rs
@@ -283,8 +283,8 @@ impl Series {
             DataType::Boolean => {
                 let downcasted = self.bool()?;
                 Ok(match groups {
-                    Some(groups) => DaftBoolAggable::grouped_bool_and(downcasted, groups)?,
-                    None => DaftBoolAggable::bool_and(downcasted)?,
+                    Some(groups) => downcasted.grouped_bool_and(groups)?,
+                    None => downcasted.bool_and()?,
                 }
                 .into_series())
             }
@@ -309,8 +309,8 @@ impl Series {
             DataType::Boolean => {
                 let downcasted = self.bool()?;
                 Ok(match groups {
-                    Some(groups) => DaftBoolAggable::grouped_bool_or(downcasted, groups)?,
-                    None => DaftBoolAggable::bool_or(downcasted)?,
+                    Some(groups) => downcasted.grouped_bool_or(groups)?,
+                    None => downcasted.bool_or()?,
                 }
                 .into_series())
             }