Merge pull request #82 from narwhals-dev/public

use fewer private imports

Author: MarcoGorelli

narwhals_daft/dataframe.py

@@ -32,8 +32,8 @@
     from pathlib import Path
     from types import ModuleType
 
-    from narwhals._compliant.typing import CompliantDataFrameAny
     from narwhals._utils import _LimitedContext
+    from narwhals.compliant import CompliantDataFrame
     from narwhals.dataframe import LazyFrame
     from narwhals.dtypes import DType
     from narwhals.typing import JoinStrategy
@@ -124,7 +124,7 @@ def columns(self) -> list[str]:
 
     def collect(
         self, backend: ModuleType | Implementation | str | None, **kwargs: Any
-    ) -> CompliantDataFrameAny:
+    ) -> CompliantDataFrame[Any, Any, Any, Any]:
         if backend is None or backend is Implementation.PYARROW:
             from narwhals._arrow.dataframe import ArrowDataFrame
 

narwhals_daft/expr.py

@@ -5,12 +5,12 @@
 
 import daft.functions as F
 from daft import Window, col, lit
-from narwhals._compliant import CompliantExpr
 from narwhals._expression_parsing import (
     combine_alias_output_names,
     combine_evaluate_output_names,
 )
 from narwhals._utils import Implementation, not_implemented
+from narwhals.compliant import CompliantExpr
 
 from narwhals_daft.expr_dt import ExprDateTimeNamesSpace
 from narwhals_daft.expr_name import ExprNameNamespace
@@ -21,7 +21,6 @@
     from collections.abc import Callable, Sequence
 
     from daft import Expression
-    from narwhals._compliant.typing import AliasNames, EvalNames, EvalSeries
     from narwhals._utils import Version, _LimitedContext
     from narwhals.dtypes import DType
     from narwhals.typing import RankMethod
@@ -33,6 +32,8 @@
     WindowFunction: TypeAlias = Callable[
         [DaftLazyFrame, "WindowInputs"], Sequence[Expression]
     ]
+    AliasNames: TypeAlias = Callable[[Sequence[str]], Sequence[str]]
+    EvalNames: TypeAlias = Callable[[DaftLazyFrame], Sequence[str]]
 
 
 class WindowInputs:
@@ -53,7 +54,7 @@ def __init__(
         call: Callable[[DaftLazyFrame], Sequence[Expression]],
         window_function: WindowFunction | None = None,
         *,
-        evaluate_output_names: EvalNames[DaftLazyFrame],
+        evaluate_output_names: EvalNames,
         alias_output_names: AliasNames | None,
         version: Version,
     ) -> None:
@@ -226,7 +227,7 @@ def fn(names: Sequence[str]) -> Sequence[str]:
     @classmethod
     def from_column_names(
         cls: type[DaftExpr],
-        evaluate_column_names: EvalNames[DaftLazyFrame],
+        evaluate_column_names: EvalNames,
         /,
         *,
         context: _LimitedContext,
@@ -280,7 +281,7 @@ def window_function(
 
     def _callable_to_eval_series(
         self, call: Callable[..., Expression], /, **expressifiable_args: DaftExpr
-    ) -> EvalSeries[DaftLazyFrame, Expression]:
+    ) -> Callable[[DaftLazyFrame], Sequence[Expression]]:
         def func(df: DaftLazyFrame) -> list[Expression]:
             native_series_list = self(df)
             other_native_series = {

narwhals_daft/expr_dt.py

@@ -3,8 +3,8 @@
 from typing import TYPE_CHECKING
 
 import daft.functions as F
-from narwhals._compliant.any_namespace import DateTimeNamespace
 from narwhals._utils import not_implemented
+from narwhals.compliant import DateTimeNamespace
 
 if TYPE_CHECKING:
     from narwhals_daft.expr import DaftExpr

narwhals_daft/expr_name.py

@@ -5,7 +5,7 @@
 from narwhals._compliant.expr import CompliantExprNameNamespace
 
 if TYPE_CHECKING:
-    from narwhals._compliant.typing import AliasName
+    from collections.abc import Callable
 
     from narwhals_daft.expr import DaftExpr
 
@@ -14,7 +14,7 @@ class ExprNameNamespace(CompliantExprNameNamespace["DaftExpr"]):
     def __init__(self, expr: DaftExpr, /) -> None:
         self._compliant_expr = expr
 
-    def _from_callable(self, func: AliasName | None) -> DaftExpr:
+    def _from_callable(self, func: Callable[[str], str] | None) -> DaftExpr:
         expr = self.compliant
         output_names = self._alias_output_names(func) if func else None
         return expr._with_alias_output_names(output_names)

narwhals_daft/expr_str.py

@@ -5,8 +5,8 @@
 import daft.functions as F
 from daft import lit
 from daft.expressions import col
-from narwhals._compliant.any_namespace import StringNamespace
 from narwhals._utils import not_implemented
+from narwhals.compliant import StringNamespace
 
 if TYPE_CHECKING:
     from daft import Expression

narwhals_daft/group_by.py

@@ -3,8 +3,8 @@
 from itertools import chain
 from typing import TYPE_CHECKING
 
-from narwhals._compliant.group_by import CompliantGroupBy
 from narwhals._utils import is_sequence_of
+from narwhals.compliant import CompliantGroupBy
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator, Sequence

narwhals_daft/namespace.py

@@ -7,8 +7,8 @@
 
 import daft
 import daft.functions as F
-from narwhals._compliant.namespace import CompliantNamespace
 from narwhals._utils import Implementation, not_implemented
+from narwhals.compliant import CompliantNamespace
 
 from narwhals_daft.dataframe import DaftLazyFrame
 from narwhals_daft.expr import DaftExpr