Introspection: Set INPUT_TYPE and OUTPUT_TYPE on Vec<_> and &[]

Properly specialize for u8

Author: Tpt

src/conversion.rs

@@ -7,7 +7,11 @@ use crate::inspect::types::TypeInfo;
 use crate::inspect::TypeHint;
 use crate::pyclass::boolean_struct::False;
 use crate::pyclass::{PyClassGuardError, PyClassGuardMutError};
+#[cfg(feature = "experimental-inspect")]
+use crate::type_object::PyTypeInfo;
 use crate::types::PyTuple;
+#[cfg(feature = "experimental-inspect")]
+use crate::types::{PyList, PySequence};
 use crate::{
     Borrowed, Bound, BoundObject, Py, PyAny, PyClass, PyClassGuard, PyErr, PyRef, PyRefMut, Python,
 };
@@ -109,6 +113,12 @@ pub trait IntoPyObject<'py>: Sized {
         let list = crate::types::list::try_new_from_iter(py, &mut iter);
         list.map(Bound::into_any)
     }
+
+    /// The output type of [`owned_sequence_into_pyobject`] and [`borrowed_sequence_into_pyobject`]
+    #[cfg(feature = "experimental-inspect")]
+    #[doc(hidden)]
+    const SEQUENCE_OUTPUT_TYPE: TypeHint =
+        TypeHint::subscript(&PyList::TYPE_HINT, &[Self::OUTPUT_TYPE]);
 }
 
 pub(crate) mod private {
@@ -436,6 +446,12 @@ pub trait FromPyObject<'a, 'py>: Sized {
         Option::<NeverASequence<Self>>::None
     }
 
+    /// The union of Sequence[Self::INPUT_TYPE] and the input sequence extraction function [`sequence_extractor`] if it's defined
+    #[cfg(feature = "experimental-inspect")]
+    #[doc(hidden)]
+    const SEQUENCE_INPUT_TYPE: TypeHint =
+        TypeHint::subscript(&PySequence::TYPE_HINT, &[Self::INPUT_TYPE]);
+
     /// Helper used to make a specialized path in extracting `DateTime<Tz>` where `Tz` is
     /// `chrono::Local`, which will accept "naive" datetime objects as being in the local timezone.
     #[cfg(feature = "chrono-local")]

src/conversions/smallvec.rs

@@ -19,6 +19,8 @@ use crate::conversion::{FromPyObjectOwned, IntoPyObject};
 use crate::exceptions::PyTypeError;
 #[cfg(feature = "experimental-inspect")]
 use crate::inspect::types::TypeInfo;
+#[cfg(feature = "experimental-inspect")]
+use crate::inspect::TypeHint;
 use crate::types::any::PyAnyMethods;
 use crate::types::{PySequence, PyString};
 use crate::{
@@ -35,6 +37,9 @@ where
     type Output = Bound<'py, Self::Target>;
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const OUTPUT_TYPE: TypeHint = A::SEQUENCE_OUTPUT_TYPE;
+
     /// Turns [`SmallVec<u8>`] into [`PyBytes`], all other `T`s will be turned into a [`PyList`]
     ///
     /// [`PyBytes`]: crate::types::PyBytes

src/conversions/std/array.rs

@@ -14,6 +14,9 @@ where
     type Output = Bound<'py, Self::Target>;
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const OUTPUT_TYPE: TypeHint = T::SEQUENCE_OUTPUT_TYPE;
+
     /// Turns [`[u8; N]`](std::array) into [`PyBytes`], all other `T`s will be turned into a [`PyList`]
     ///
     /// [`PyBytes`]: crate::types::PyBytes
@@ -47,6 +50,9 @@ where
 {
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const INPUT_TYPE: TypeHint = T::SEQUENCE_INPUT_TYPE;
+
     fn extract(obj: Borrowed<'_, 'py, PyAny>) -> PyResult<Self> {
         if let Some(extractor) = T::sequence_extractor(obj, crate::conversion::private::Token) {
             return extractor.to_array();

src/conversions/std/num.rs

@@ -8,6 +8,8 @@ use crate::inspect::TypeHint;
 use crate::py_result_ext::PyResultExt;
 #[cfg(feature = "experimental-inspect")]
 use crate::type_object::PyTypeInfo;
+#[cfg(feature = "experimental-inspect")]
+use crate::types::PySequence;
 use crate::types::{PyByteArray, PyByteArrayMethods, PyBytes, PyInt};
 use crate::{exceptions, ffi, Borrowed, Bound, FromPyObject, PyAny, PyErr, PyResult, Python};
 use std::convert::Infallible;
@@ -283,6 +285,9 @@ impl<'py> IntoPyObject<'py> for &'_ u8 {
     {
         Ok(PyBytes::new(py, iter.as_ref()).into_any())
     }
+
+    #[cfg(feature = "experimental-inspect")]
+    const SEQUENCE_OUTPUT_TYPE: TypeHint = PyBytes::TYPE_HINT;
 }
 
 impl<'py> FromPyObject<'_, 'py> for u8 {
@@ -314,6 +319,13 @@ impl<'py> FromPyObject<'_, 'py> for u8 {
             None
         }
     }
+
+    #[cfg(feature = "experimental-inspect")]
+    const SEQUENCE_INPUT_TYPE: TypeHint = TypeHint::union(&[
+        TypeHint::subscript(&PySequence::TYPE_HINT, &[Self::INPUT_TYPE]),
+        PyBytes::TYPE_HINT,
+        PyByteArray::TYPE_HINT,
+    ]);
 }
 
 pub(crate) enum BytesSequenceExtractor<'a, 'py> {

src/conversions/std/slice.rs

@@ -20,6 +20,9 @@ where
     type Output = Bound<'py, Self::Target>;
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const OUTPUT_TYPE: TypeHint = <&T>::SEQUENCE_OUTPUT_TYPE;
+
     /// Turns [`&[u8]`](std::slice) into [`PyBytes`], all other `T`s will be turned into a [`PyList`]
     ///
     /// [`PyBytes`]: crate::types::PyBytes
@@ -90,7 +93,7 @@ where
     type Error = PyErr;
 
     #[cfg(feature = "experimental-inspect")]
-    const OUTPUT_TYPE: TypeHint = <&[T]>::OUTPUT_TYPE;
+    const OUTPUT_TYPE: TypeHint = <&T>::SEQUENCE_OUTPUT_TYPE;
 
     /// Turns `Cow<[u8]>` into [`PyBytes`], all other `T`s will be turned into a [`PyList`]
     ///

src/conversions/std/vec.rs

@@ -19,6 +19,9 @@ where
     type Output = Bound<'py, Self::Target>;
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const OUTPUT_TYPE: TypeHint = T::SEQUENCE_OUTPUT_TYPE;
+
     /// Turns [`Vec<u8>`] into [`PyBytes`], all other `T`s will be turned into a [`PyList`]
     ///
     /// [`PyBytes`]: crate::types::PyBytes
@@ -65,6 +68,9 @@ where
 {
     type Error = PyErr;
 
+    #[cfg(feature = "experimental-inspect")]
+    const INPUT_TYPE: TypeHint = T::SEQUENCE_INPUT_TYPE;
+
     fn extract(obj: Borrowed<'_, 'py, PyAny>) -> PyResult<Self> {
         if let Some(extractor) = T::sequence_extractor(obj, crate::conversion::private::Token) {
             return Ok(extractor.to_vec());