♻️ refactor annotation for logical related class

Co-Authored-By: Joren Hammudoglu <[email protected]>

Author: guan404ming

src/numpy-stubs/__init__.pyi

@@ -309,8 +309,8 @@ from ._typing._char_codes import (
 )
 from ._typing._ufunc import (
     _Call11Bool,
-    _Call11Isnat
-    _Call11LogicalNot,
+    _Call11Isnat,
+    _Call11Logical,
     _Call21Bool,
     _Call21Logical,
     _gufunc_2_1,
@@ -7113,7 +7113,7 @@ log: Final[_ufunc_1_1] = ...
 log2: Final[_ufunc_1_1] = ...
 log10: Final[_ufunc_1_1] = ...
 log1p: Final[_ufunc_1_1] = ...
-logical_not: Final[_ufunc_1_1[_Call11LogicalNot]] = ...
+logical_not: Final[_ufunc_1_1[_Call11Logical]] = ...
 negative: Final[_ufunc_1_1] = ...
 positive: Final[_ufunc_1_1] = ...
 rad2deg: Final[_ufunc_1_1] = ...

src/numpy-stubs/_typing/_ufunc.pyi

@@ -16,7 +16,7 @@ import numpy as np
 from numpy import _CastingKind, _OrderKACF  # noqa: ICN003
 from numpy._typing import _DTypeLikeBool, _NestedSequence
 
-from ._array_like import ArrayLike, NDArray, _ArrayLike, _ArrayLikeBool_co, _ArrayLikeInt_co, _ArrayLikeNumber_co
+from ._array_like import ArrayLike, NDArray, _ArrayLike, _ArrayLikeBool_co, _ArrayLikeInt_co, _ArrayLikeNumber_co, _ArrayLikeObject_co
 from ._dtype_like import DTypeLike, _DTypeLike, _DTypeLikeObject
 from ._scalars import _NumberLike_co, _ScalarLike_co
 from ._shape import _ShapeLike
@@ -223,16 +223,16 @@ class _Call11Bool(Protocol):
     ) -> NDArray[np.bool] | np.bool: ...
 
 @type_check_only
-class _Call11LogicalNot(Protocol):
+class _Call11Logical(Protocol):
     @overload
-    def __call__(  # (scalar, dtype: np.object_) -> np.object_
+    def __call__(  # (scalar, dtype: np.object_) -> np.bool
         self,
         x: _NumberLike_co,
         /,
-        dtype: _DTypeLikeObject,
+        dtype: _DTypeLike[np.object_],
         out: None = None,
         **kwargs: Unpack[_Kwargs2],
-    ) -> np.object_: ...
+    ) -> np.bool: ...
     @overload
     def __call__(  # (scalar) -> bool
         self,
@@ -247,10 +247,10 @@ class _Call11LogicalNot(Protocol):
         self,
         x: _ArrayLikeNumber_co,
         /,
-        dtype: _DTypeLikeObject,
+        dtype: _DTypeLike[np.object_],
         out: None = None,
         **kwargs: Unpack[_Kwargs2],
-    ) -> np.object_: ...
+    ) -> NDArray[np.object_] | np.bool: ...
     @overload
     def __call__(  # (array-like, out: T) -> T
         self,
@@ -287,7 +287,7 @@ class _Call11LogicalNot(Protocol):
         out: _Out1[_AnyArray] | None = None,
         dtype: DTypeLike | None = None,
         **kwargs: Unpack[_Kwargs2],
-    ) -> NDArray[np.bool] | np.bool: ...
+    ) -> Any: ...
 
 class _Call12(Protocol):
     @overload
@@ -459,10 +459,10 @@ class _Call21Logical(Protocol):
         x1: _NumberLike_co,
         x2: _NumberLike_co,
         /,
-        dtype: _DTypeLikeObject,
+        dtype: _DTypeLike[np.object_],
         out: None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> np.object_: ...
+    ) -> np.bool: ...
     @overload  # (scalar, scalar) -> bool
     def __call__(
         self,
@@ -473,46 +473,57 @@ class _Call21Logical(Protocol):
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
     ) -> np.bool: ...
-    @overload  # (array-like, array, dtype: np.object_) -> np.object_
+    @overload  # (array-like, array, dtype: object_) -> Array[object_]
     def __call__(
         self,
-        x1: _ArrayLikeNumber_co,
+        x1: _ArrayLikeNumber_co | _ArrayLikeObject_co,
         x2: _AnyArray,
         /,
-        dtype: _DTypeLikeObject,
+        dtype: _DTypeLike[np.object_],
         out: None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> np.object_: ...
+    ) -> NDArray[np.object_]: ...
     @overload  # (array-like, array, dtype: dtype[T]) -> Array[T]
     def __call__(
         self,
         x1: _ArrayLikeNumber_co,
-        x2: _AnyArray,
+        x2: NDArray[np.bool | np.number],
         /,
         out: None = None,
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> NDArray[np.bool]: ...
-    @overload  # (array, array-like, dtype: np.object_) -> np.object_
+    ) -> NDArray[np.bool | np.object_]: ...
+    @overload  # (array, array-like, dtype: object_) -> Array[object_]
     def __call__(
         self,
         x1: _AnyArray,
-        x2: _ArrayLikeNumber_co,
+        x2: _ArrayLikeNumber_co | _ArrayLikeObject_co,
         /,
-        dtype: _DTypeLikeObject,
+        dtype: _DTypeLike[np.object_],
         out: None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> np.object_: ...
+    ) -> NDArray[np.object_]: ...
     @overload  # (array, array-like, dtype: dtype[T]) -> Array[T]
     def __call__(
         self,
-        x1: _AnyArray,
+        x1: NDArray[np.bool | np.number],
         x2: _ArrayLikeNumber_co,
         /,
         out: None = None,
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
     ) -> NDArray[np.bool]: ...
+    @overload  # (array-like, array-like, out: T) -> T
+    def __call__(
+        self,
+        x1: _ArrayLikeNumber_co,
+        x2: _ArrayLikeNumber_co,
+        /,
+        out: _Out1[_ArrayT],
+        *,
+        dtype: None = None,
+        **kwds: Unpack[_Kwargs3],
+    ) -> _ArrayT: ...
     @overload  # (array-like, array) -> Array[?]
     def __call__(
         self,
@@ -523,7 +534,7 @@ class _Call21Logical(Protocol):
         *,
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> NDArray[np.bool]: ...
+    ) -> NDArray[np.bool | np.object_]: ...
     @overload  # (array, array-like) -> Array[?]
     def __call__(
         self,
@@ -535,17 +546,6 @@ class _Call21Logical(Protocol):
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
     ) -> NDArray[np.bool]: ...
-    @overload  # (array-like, array-like, out: T) -> T
-    def __call__(
-        self,
-        x1: _ArrayLikeNumber_co,
-        x2: ArrayLike,
-        /,
-        out: _ArrayT | tuple[_ArrayT],
-        *,
-        dtype: None = None,
-        **kwds: Unpack[_Kwargs3],
-    ) -> _ArrayT: ...
     @overload  # (array-like, array-like) -> Array[?] | ?
     def __call__(
         self,
@@ -556,7 +556,7 @@ class _Call21Logical(Protocol):
         *,
         dtype: DTypeLike | None = None,
         **kwds: Unpack[_Kwargs3],
-    ) -> NDArray[np.bool] | np.bool: ...
+    ) -> Any: ...
 
 @type_check_only
 class _Call21(Protocol):