Fix Array typing

Author: ratheron

.gitignore

@@ -3,6 +3,7 @@
 **/*.egg-info
 .vscode/
 /build
+/dist
 # pixi environments
 .pixi
 *.egg-info

drone_models/_typing.py

@@ -0,0 +1,6 @@
+from typing import Any, TypeAlias
+
+import numpy.typing as npt
+
+Array: TypeAlias = Any  # To be changed to a Protocol later (see array-api#589)
+ArrayLike: TypeAlias = Array | npt.ArrayLike

drone_models/core.py

@@ -14,7 +14,7 @@
 if TYPE_CHECKING:
     from types import ModuleType
 
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 F = TypeVar("F", bound=Callable[..., Any])

drone_models/first_principles/model.py

@@ -13,7 +13,7 @@
 from drone_models.utils import rotation, to_xp
 
 if TYPE_CHECKING:
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 @supports(rotor_dynamics=True)

drone_models/so_rpy/model.py

@@ -14,7 +14,7 @@
 from drone_models.utils import rotation, to_xp
 
 if TYPE_CHECKING:
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 @supports(rotor_dynamics=False)

drone_models/so_rpy_rotor/model.py

@@ -14,7 +14,7 @@
 from drone_models.utils import rotation, to_xp
 
 if TYPE_CHECKING:
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 @supports(rotor_dynamics=True)

drone_models/so_rpy_rotor_drag/model.py

@@ -14,7 +14,7 @@
 from drone_models.utils import rotation, to_xp
 
 if TYPE_CHECKING:
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 # Additional symbols specific to this model
 roll, pitch, yaw = cs.MX.sym("roll"), cs.MX.sym("pitch"), cs.MX.sym("yaw")

drone_models/transform.py

@@ -12,7 +12,7 @@
 from array_api_compat import array_namespace
 
 if TYPE_CHECKING:
-    from array_api_typing import Array
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 def motor_force2rotor_vel(motor_forces: Array, rpm2thrust: Array) -> Array:

drone_models/utils/__init__.py

@@ -1,9 +1,13 @@
 """Utility functions for the drone models."""
 
-from types import ModuleType
-from typing import Any
+from __future__ import annotations
 
-from array_api_typing import Array
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from types import ModuleType
+
+    from drone_models._typing import Array  # To be changed to a Protocol later (see array-api#589)
 
 
 def to_xp(*args: Any, xp: ModuleType, device: Any) -> tuple[Array, ...] | Array: