address review

Author: lucascolley

src/array_api_extra/_funcs.py

@@ -6,7 +6,7 @@
 
 # https://github.com/pylint-dev/pylint/issues/10112
 from collections.abc import Callable  # pylint: disable=import-error
-from typing import ClassVar
+from typing import Literal
 
 from ._lib import _utils
 from ._lib._compat import (
@@ -657,13 +657,13 @@ class at:  # pylint: disable=invalid-name
 
     x: Array
     idx: Index
-    __slots__: ClassVar[tuple[str, str]] = ("idx", "x")
+    __slots__ = ("idx", "x")
 
-    def __init__(self, x: Array, idx: Index = _undef, /):
+    def __init__(self, x: Array, idx: Index = _undef, /) -> None:
         self.x = x
         self.idx = idx
 
-    def __getitem__(self, idx: Index) -> at:
+    def __getitem__(self, idx: Index, /) -> at:
         """Allow for the alternate syntax ``at(x)[start:stop:step]``,
         which looks prettier than ``at(x, slice(start, stop, step))``
         and feels more intuitive coming from the JAX documentation.
@@ -704,19 +704,16 @@ def _common(
 
         x = self.x
 
-        if copy is True:
+        if copy is None:
+            writeable = is_writeable_array(x)
+            copy = _is_update and not writeable
+        elif copy:
             writeable = None
-        elif copy is False:
+        else:
             writeable = is_writeable_array(x)
             if not writeable:
                 msg = "Cannot modify parameter in place"
                 raise ValueError(msg)
-        elif copy is None:  # type: ignore[redundant-expr]
-            writeable = is_writeable_array(x)
-            copy = _is_update and not writeable
-        else:
-            msg = f"Invalid value for copy: {copy!r}"  # type: ignore[unreachable]  # pyright: ignore[reportUnreachable]
-            raise ValueError(msg)
 
         if copy:
             try:
@@ -782,7 +779,9 @@ def set(self, y: Array, /, **kwargs: Untyped) -> Array:
 
     def _iop(
         self,
-        at_op: str,
+        at_op: Literal[
+            "set", "add", "subtract", "multiply", "divide", "power", "min", "max"
+        ],
         elwise_op: Callable[[Array, Array], Array],
         y: Array,
         /,

src/array_api_extra/_lib/_typing.py

@@ -1,24 +1,32 @@
 from __future__ import annotations  # https://github.com/pylint-dev/pylint/pull/9990
 
 import typing
+from collections.abc import Mapping
 from types import ModuleType
-from typing import Any
+from typing import Any, Protocol
 
 if typing.TYPE_CHECKING:
     from typing_extensions import override
 
     # To be changed to a Protocol later (see data-apis/array-api#589)
-    Array = Any  # type: ignore[no-any-explicit]
-    Device = Any  # type: ignore[no-any-explicit]
-    Index = Any  # type: ignore[no-any-explicit]
     Untyped = Any  # type: ignore[no-any-explicit]
+    Array = Untyped
+    Device = Untyped
+    Index = Untyped
+
+    class CanAt(Protocol):
+        @property
+        def at(self) -> Mapping[Index, Untyped]: ...
+
 else:
 
     def no_op_decorator(f):  # pyright: ignore[reportUnreachable]
         return f
 
     override = no_op_decorator
 
+    CanAt = object
+
 __all__ = ["ModuleType", "override"]
 if typing.TYPE_CHECKING:
     __all__ += ["Array", "Device", "Index", "Untyped"]

tests/test_at.py

@@ -2,7 +2,7 @@
 
 from contextlib import contextmanager, suppress
 from importlib import import_module
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Final
 
 import numpy as np
 import pytest
@@ -18,7 +18,7 @@
 if TYPE_CHECKING:
     from array_api_extra._lib._typing import Array, Untyped
 
-all_libraries = (
+all_libraries: Final = (
     "array_api_strict",
     "numpy",
     "numpy_readonly",