wip try fixing build

Author: MarcoGorelli

spec/API_specification/dataframe_api/__init__.py

@@ -8,8 +8,6 @@
 from .eagercolumn_object import EagerColumn
 from .expression_object import Expression
 from .dataframe_object import DataFrame
-from .groupby_object import GroupBy
-from ._types import DType
 
 __all__ = [
     "__dataframe_api_version__",

spec/API_specification/dataframe_api/dataframe_object.py

@@ -6,12 +6,15 @@
 if TYPE_CHECKING:
     from .expression_object import Expression
     from .eagerframe_object import EagerFrame
+    from .eagercolumn_object import EagerColumn
     from .groupby_object import GroupBy
     from ._types import NullType, Scalar
 
 
 __all__ = ["DataFrame"]
 
+IntoExpression = EagerColumn[Any] | Expression
+
 
 class DataFrame:
     """
@@ -167,7 +170,7 @@ def filter(self, mask: Expression) -> DataFrame:
         """
         ...
 
-    def insert_column(self, column: Expression) -> DataFrame:
+    def insert_columns(self, columns: IntoExpression | Sequence[IntoExpression]) -> DataFrame:
         """
         Insert column into DataFrame at rightmost location.
 
@@ -198,11 +201,12 @@ def insert_column(self, column: Expression) -> DataFrame:
 
         Parameters
         ----------
-        expression : Expression
+        columns
+            A single column, an expression, or a sequence of either.
         """
         ...
 
-    def update_columns(self, columns: Expression | Sequence[Expression], /) -> DataFrame:
+    def update_columns(self, columns: Expression | EagerColumn | Sequence[Expression | EagerColumn], /) -> DataFrame:
         """
         Update values in existing column(s) from Dataframe.
 

spec/API_specification/dataframe_api/eagerframe_object.py

@@ -23,7 +23,7 @@ class EagerFrame:
 
     Convert back to `:class:`DataFrame` using `:meth:`EagerFrame.relax()`.
     """
-    def __eagerframe_namespace__(self) -> Any:
+    def __dataframe_namespace__(self) -> Any:
         """
         Returns an object that has all the top-level dataframe API functions on it.
 
@@ -90,7 +90,7 @@ def get_column_by_name(self, name: str, /) -> EagerColumn[Any]:
         """
         ...
 
-    def select(self, names: Sequence[str | Expression], /) -> EagerFrame:
+    def select(self, names: str | Expression | Sequence[str | Expression], /) -> EagerFrame:
         """
         Select multiple columns by name.
 
@@ -158,7 +158,7 @@ def filter(self, mask: Expression) -> EagerFrame:
         """
         ...
 
-    def insert_column(self, column: Expression) -> EagerFrame:
+    def insert_columns(self, columns: Expression | EagerColumn | Sequence[Expression | EagerColumn]) -> EagerFrame:
         """
         Insert column into DataFrame at rightmost location.
 
@@ -169,7 +169,7 @@ def insert_column(self, column: Expression) -> EagerFrame:
         .. code-block:: python
 
             new_column = df.get_column_by_name('a') + 1
-            df = df.insert_column(new_column.rename('a_plus_1').to_expression())
+            df = df.insert_column(new_column.rename('a_plus_1'))
         
         If you need to insert the column at a different location, combine with
         :meth:`get_columns_by_name`, e.g.:
@@ -178,12 +178,13 @@ def insert_column(self, column: Expression) -> EagerFrame:
 
             new_column = df.get_column_by_name('a') + 1
             new_columns_names = ['a_plus_1'] + df.get_column_names()
-            df = df.insert_column(new_column.rename('a_plus_1').to_expression())
+            df = df.insert_column(new_column.rename('a_plus_1'))
             df = df.select(new_column_names)
 
         Parameters
         ----------
-        column : Expression
+        columns
+            A single column, an expression, or a sequence of either.
         """
         ...
 

spec/conf.py

@@ -74,6 +74,9 @@
 nitpick_ignore = [
     ('py:class', 'array'),
     ('py:class', 'DataFrame'),
+    ('py:class', 'EagerFrame'),
+    ('py:class', 'EagerColumn'),
+    ('py:class', 'Expression'),
     ('py:class', 'device'),
     ('py:class', 'DType'),
     ('py:class', 'NestedSequence'),