reduce AggFuncType

Author: cmp0xff

pandas-stubs/_typing.pyi

@@ -595,24 +595,22 @@ IndexKeyFunc: TypeAlias = Callable[[Index], Index | AnyArrayLike] | None
 
 # types of `func` kwarg for DataFrame.aggregate and Series.aggregate
 # More specific than what is in pandas
-AggFuncTypeBase: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    Callable | str | np.ufunc
-)
+AggFuncTypeBase: TypeAlias = Callable[..., Any] | str | np.ufunc
 AggFuncTypeDictSeries: TypeAlias = Mapping[HashableT, AggFuncTypeBase]
 AggFuncTypeDictFrame: TypeAlias = Mapping[
     HashableT, AggFuncTypeBase | list[AggFuncTypeBase]
 ]
-AggFuncTypeSeriesToFrame: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    list[AggFuncTypeBase] | AggFuncTypeDictSeries
+AggFuncTypeSeriesToFrame: TypeAlias = (
+    list[AggFuncTypeBase] | AggFuncTypeDictSeries[HashableT]
 )
-AggFuncTypeFrame: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    AggFuncTypeBase | list[AggFuncTypeBase] | AggFuncTypeDictFrame
+AggFuncTypeFrame: TypeAlias = (
+    AggFuncTypeBase | list[AggFuncTypeBase] | AggFuncTypeDictFrame[HashableT]
 )
-AggFuncTypeDict: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    AggFuncTypeDictSeries | AggFuncTypeDictFrame
+AggFuncTypeDict: TypeAlias = (
+    AggFuncTypeDictSeries[HashableT] | AggFuncTypeDictFrame[HashableT]
 )
-AggFuncType: TypeAlias = (  # pyright: ignore[reportUnknownVariableType]
-    AggFuncTypeBase | list[AggFuncTypeBase] | AggFuncTypeDict
+AggFuncType: TypeAlias = (
+    AggFuncTypeBase | list[AggFuncTypeBase] | AggFuncTypeDict[HashableT]
 )
 
 # Not used in stubs

pandas-stubs/core/frame.pyi

@@ -83,13 +83,12 @@ from pandas._libs.lib import _NoDefaultDoNotUse
 from pandas._libs.missing import NAType
 from pandas._libs.tslibs import BaseOffset
 from pandas._libs.tslibs.nattype import NaTType
-from pandas._typing import (
-    AggFuncTypeFrame,  # pyright: ignore[reportUnknownVariableType]
-)
 from pandas._typing import (
     S2,
+    AggFuncTypeBase,
     AggFuncTypeDictFrame,
     AggFuncTypeDictSeries,
+    AggFuncTypeFrame,
     AlignJoin,
     AnyAll,
     AnyArrayLike,
@@ -174,7 +173,6 @@ from pandas._typing import (
     np_ndarray_float,
     np_ndarray_num,
 )
-from pandas._typing import AggFuncTypeBase  # pyright: ignore[reportUnknownVariableType]
 
 from pandas.io.formats.style import Styler
 from pandas.plotting import PlotAccessor

pandas-stubs/core/groupby/generic.pyi

@@ -29,12 +29,11 @@ from pandas.core.series import Series
 from typing_extensions import Self
 
 from pandas._libs.tslibs.timestamps import Timestamp
-from pandas._typing import (
-    AggFuncTypeFrame,  # pyright: ignore[reportUnknownVariableType]
-)
 from pandas._typing import (
     S2,
     S3,
+    AggFuncTypeBase,
+    AggFuncTypeFrame,
     ByT,
     CorrelationMethod,
     Dtype,
@@ -49,7 +48,6 @@ from pandas._typing import (
     WindowingEngineKwargs,
     np_ndarray,
 )
-from pandas._typing import AggFuncTypeBase  # pyright: ignore[reportUnknownVariableType]
 
 AggScalar: TypeAlias = str | Callable[..., Any]
 
@@ -97,7 +95,7 @@ class SeriesGroupBy(GroupBy[Series[S2]], Generic[S2, ByT]):
         engine_kwargs: WindowingEngineKwargs = ...,
         **kwargs: Any,
     ) -> Series: ...
-    agg = aggregate  # pyright: ignore[reportUnknownVariableType]
+    agg = aggregate
     @overload
     def transform(
         self,

pandas-stubs/core/series.pyi

@@ -135,15 +135,14 @@ from pandas._libs.lib import _NoDefaultDoNotUse
 from pandas._libs.missing import NAType
 from pandas._libs.tslibs import BaseOffset
 from pandas._libs.tslibs.nattype import NaTType
-from pandas._typing import (
-    AggFuncTypeSeriesToFrame,  # pyright: ignore[reportUnknownVariableType]
-)
 from pandas._typing import (
     S1,
     S2,
     S2_NSDT,
     T_COMPLEX,
+    AggFuncTypeBase,
     AggFuncTypeDictFrame,
+    AggFuncTypeSeriesToFrame,
     AnyAll,
     AnyArrayLike,
     ArrayLike,
@@ -246,7 +245,6 @@ from pandas._typing import (
     np_ndarray_str,
     np_ndarray_td,
 )
-from pandas._typing import AggFuncTypeBase  # pyright: ignore[reportUnknownVariableType]
 
 from pandas.core.dtypes.base import ExtensionDtype
 from pandas.core.dtypes.dtypes import CategoricalDtype

pandas-stubs/core/window/rolling.pyi

@@ -19,12 +19,9 @@ from typing_extensions import Self
 
 from pandas._libs.tslibs import BaseOffset
 from pandas._typing import (
-    AggFuncTypeFrame,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas._typing import (
-    AggFuncTypeSeriesToFrame,  # pyright: ignore[reportUnknownVariableType]
-)
-from pandas._typing import (
+    AggFuncTypeBase,
+    AggFuncTypeFrame,
+    AggFuncTypeSeriesToFrame,
     AxisInt,
     CalculationMethod,
     IntervalClosedType,
@@ -34,7 +31,6 @@ from pandas._typing import (
     WindowingEngineKwargs,
     WindowingRankType,
 )
-from pandas._typing import AggFuncTypeBase  # pyright: ignore[reportUnknownVariableType]
 
 class BaseWindow(SelectionMixin[NDFrameT]):
     on: str | Index | None