refactor(typing): Use Into1DArray alias

- Less repetition, but also helps document what the 2nd `TypeVar` is for (`from_`)
- It has to be in that position to follow the rules of https://typing.python.org/en/latest/spec/generics.html#default-ordering-and-subscription-rules

Author: dangotbanned

narwhals/_arrow/series.py

@@ -53,9 +53,9 @@
     from narwhals._arrow.typing import _AsPyType
     from narwhals._arrow.typing import _BasicDataType
     from narwhals.dtypes import DType
+    from narwhals.typing import Into1DArray
     from narwhals.typing import _1DArray
     from narwhals.typing import _2DArray
-    from narwhals.typing import _NumpyScalar
     from narwhals.utils import Version
     from narwhals.utils import _FullContext
 
@@ -159,9 +159,7 @@ def _from_scalar(self, value: Any) -> Self:
         return super()._from_scalar(value)
 
     @classmethod
-    def from_numpy(
-        cls, data: _1DArray | _NumpyScalar, /, *, context: _FullContext
-    ) -> Self:
+    def from_numpy(cls, data: Into1DArray, /, *, context: _FullContext) -> Self:
         return cls._from_iterable(
             data if is_numpy_array_1d(data) else [data], name="", context=context
         )

narwhals/_compliant/series.py

@@ -16,9 +16,9 @@
     from narwhals._compliant.namespace import CompliantNamespace  # noqa: F401
     from narwhals._compliant.namespace import EagerNamespace
     from narwhals.dtypes import DType
+    from narwhals.typing import Into1DArray
     from narwhals.typing import NativeSeries
-    from narwhals.typing import _1DArray
-    from narwhals.typing import _NumpyScalar
+    from narwhals.typing import _1DArray  # noqa: F401
     from narwhals.utils import Implementation
     from narwhals.utils import Version
     from narwhals.utils import _FullContext
@@ -28,7 +28,7 @@
 NativeSeriesT_co = TypeVar("NativeSeriesT_co", bound="NativeSeries", covariant=True)
 
 
-class CompliantSeries(NumpyConvertible["_1DArray", "_1DArray | _NumpyScalar"], Protocol):
+class CompliantSeries(NumpyConvertible["_1DArray", "Into1DArray"], Protocol):
     @property
     def dtype(self) -> DType: ...
     @property
@@ -41,9 +41,7 @@ def __narwhals_namespace__(self) -> Any: ...  # CompliantNamespace[Any, Self]: .
     def _from_native_series(self, series: Any) -> Self: ...
     def _to_expr(self) -> Any: ...  # CompliantExpr[Any, Self]: ...
     @classmethod
-    def from_numpy(
-        cls, data: _1DArray | _NumpyScalar, /, *, context: _FullContext
-    ) -> Self: ...
+    def from_numpy(cls, data: Into1DArray, /, *, context: _FullContext) -> Self: ...
 
 
 class EagerSeries(CompliantSeries, Protocol[NativeSeriesT_co]):

narwhals/_pandas_like/series.py

@@ -46,9 +46,9 @@
     from narwhals._pandas_like.dataframe import PandasLikeDataFrame
     from narwhals._pandas_like.namespace import PandasLikeNamespace
     from narwhals.dtypes import DType
+    from narwhals.typing import Into1DArray
     from narwhals.typing import _1DArray
     from narwhals.typing import _AnyDArray
-    from narwhals.typing import _NumpyScalar
     from narwhals.utils import Version
     from narwhals.utils import _FullContext
 
@@ -194,9 +194,7 @@ def _from_iterable(
         )
 
     @classmethod
-    def from_numpy(
-        cls, data: _1DArray | _NumpyScalar, /, *, context: _FullContext
-    ) -> Self:
+    def from_numpy(cls, data: Into1DArray, /, *, context: _FullContext) -> Self:
         implementation = context._implementation
         if implementation.is_pandas_like():
             arr = data if is_numpy_array_1d(data) else [data]

narwhals/_polars/series.py

@@ -27,8 +27,8 @@
     from narwhals._polars.expr import PolarsExpr
     from narwhals._polars.namespace import PolarsNamespace
     from narwhals.dtypes import DType
+    from narwhals.typing import Into1DArray
     from narwhals.typing import _1DArray
-    from narwhals.typing import _NumpyScalar
     from narwhals.utils import Version
     from narwhals.utils import _FullContext
 
@@ -75,9 +75,7 @@ def _change_version(self: Self, version: Version) -> Self:
         )
 
     @classmethod
-    def from_numpy(
-        cls, data: _1DArray | _NumpyScalar, /, *, context: _FullContext
-    ) -> Self:
+    def from_numpy(cls, data: Into1DArray, /, *, context: _FullContext) -> Self:
         return cls(
             pl.Series(data if is_numpy_array_1d(data) else [data]),
             backend_version=context._backend_version,

narwhals/typing.py

@@ -200,10 +200,12 @@ def __native_namespace__(self) -> ModuleType: ...
 
 _ShapeT = TypeVar("_ShapeT", bound="tuple[int, ...]")
 _NDArray: TypeAlias = "np.ndarray[_ShapeT, Any]"
-_1DArray: TypeAlias = "_NDArray[tuple[int]]"  # noqa: PYI042, PYI047
+_1DArray: TypeAlias = "_NDArray[tuple[int]]"  # noqa: PYI042
 _2DArray: TypeAlias = "_NDArray[tuple[int, int]]"  # noqa: PYI042, PYI047
 _AnyDArray: TypeAlias = "_NDArray[tuple[int, ...]]"  # noqa: PYI047
-_NumpyScalar: TypeAlias = "np.generic[Any]"  # noqa: PYI047
+_NumpyScalar: TypeAlias = "np.generic[Any]"
+Into1DArray: TypeAlias = "_1DArray | _NumpyScalar"
+"""A 1-dimensional `numpy.ndarray` or scalar that can be converted into one."""
 
 
 class DTypes: