chore(parser): refactor legacy parameter extraction

python/rnet/__init__.pyi

@@ -1018,7 +1018,10 @@ class WebSocketRequest(TypedDict):
     The basic authentication to use for the request.
     """
 
-    query: NotRequired[Sequence[Tuple[str, str]]]
+    query: NotRequired[
+        Sequence[Tuple[str, str | int | float | bool]]
+        | Dict[str, str | int | float | bool]
+    ]
     """
     The query parameters to use for the request.
     """

src/client.rs

@@ -148,7 +148,7 @@ struct Builder {
     /// The proxy to use for the client.
     proxies: Option<Extractor<Vec<Proxy>>>,
     /// Bind to a local IP Address.
-    local_address: Option<Extractor<IpAddr>>,
+    local_address: Option<IpAddr>,
     /// Bind to an interface by `SO_BINDTODEVICE`.
     interface: Option<String>,
 
@@ -432,12 +432,7 @@ impl Client {
                 }
             }
             apply_option!(set_if_true, builder, params.no_proxy, no_proxy, false);
-            apply_option!(
-                set_if_some_inner,
-                builder,
-                params.local_address,
-                local_address
-            );
+            apply_option!(set_if_some, builder, params.local_address, local_address);
             #[cfg(any(
                 target_os = "android",
                 target_os = "fuchsia",

src/client/req.rs

@@ -30,7 +30,7 @@ pub struct Request {
     proxy: Option<Extractor<Proxy>>,
 
     /// Bind to a local IP Address.
-    local_address: Option<Extractor<IpAddr>>,
+    local_address: Option<IpAddr>,
 
     /// Bind to an interface by `SO_BINDTODEVICE`.
     interface: Option<String>,
@@ -108,6 +108,7 @@ impl FromPyObject<'_, '_> for Request {
         extract_option!(ob, params, proxy);
         extract_option!(ob, params, local_address);
         extract_option!(ob, params, interface);
+
         extract_option!(ob, params, timeout);
         extract_option!(ob, params, read_timeout);
 
@@ -147,7 +148,7 @@ pub struct WebSocketRequest {
     proxy: Option<Extractor<Proxy>>,
 
     /// Bind to a local IP Address.
-    local_address: Option<Extractor<IpAddr>>,
+    local_address: Option<IpAddr>,
 
     /// Bind to an interface by `SO_BINDTODEVICE`.
     interface: Option<String>,
@@ -180,7 +181,7 @@ pub struct WebSocketRequest {
     basic_auth: Option<(PyBackedStr, Option<PyBackedStr>)>,
 
     /// The query parameters to use for the request.
-    query: Option<Extractor<Vec<(PyBackedStr, PyBackedStr)>>>,
+    query: Option<Query>,
 
     /// Read buffer capacity. This buffer is eagerly allocated and used for receiving
     /// messages.
@@ -302,12 +303,7 @@ where
 
     // Network options.
     apply_option!(set_if_some_inner, builder, params.proxy, proxy);
-    apply_option!(
-        set_if_some_inner,
-        builder,
-        params.local_address,
-        local_address
-    );
+    apply_option!(set_if_some, builder, params.local_address, local_address);
     #[cfg(any(
         target_os = "android",
         target_os = "fuchsia",
@@ -458,12 +454,7 @@ where
 
     // Network options.
     apply_option!(set_if_some_inner, builder, params.proxy, proxy);
-    apply_option!(
-        set_if_some_inner,
-        builder,
-        params.local_address,
-        local_address
-    );
+    apply_option!(set_if_some, builder, params.local_address, local_address);
     #[cfg(any(
         target_os = "android",
         target_os = "fuchsia",

src/extractor.rs

@@ -5,7 +5,6 @@ use pyo3::{
     pybacked::PyBackedStr,
     types::{PyDict, PyList},
 };
-use serde::ser::{Serialize, SerializeSeq, Serializer};
 use wreq::header::{self, HeaderName, HeaderValue};
 
 use crate::{
@@ -20,29 +19,6 @@ use crate::{
 /// A generic extractor for various types.
 pub struct Extractor<T>(pub T);
 
-/// Serialize implementation for [`Vec<(PyBackedStr, PyBackedStr)>`].
-impl Serialize for Extractor<Vec<(PyBackedStr, PyBackedStr)>> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut seq = serializer.serialize_seq(Some(self.0.len()))?;
-        for (key, value) in &self.0 {
-            seq.serialize_element::<(&str, &str)>(&(key.as_ref(), value.as_ref()))?;
-        }
-        seq.end()
-    }
-}
-
-/// Extractor for URL-encoded values as [`Vec<(PyBackedStr, PyBackedStr)>`].
-impl FromPyObject<'_, '_> for Extractor<Vec<(PyBackedStr, PyBackedStr)>> {
-    type Error = PyErr;
-
-    fn extract(ob: Borrowed<PyAny>) -> PyResult<Self> {
-        ob.extract().map(Self)
-    }
-}
-
 /// Extractor for HTTP Version as [`wreq::Version`].
 impl FromPyObject<'_, '_> for Extractor<wreq::Version> {
     type Error = PyErr;
@@ -198,12 +174,3 @@ impl FromPyObject<'_, '_> for Extractor<wreq::multipart::Form> {
             .map_err(Into::into)
     }
 }
-
-/// Extractor for a single IP address as [`std::net::IpAddr`].
-impl FromPyObject<'_, '_> for Extractor<std::net::IpAddr> {
-    type Error = PyErr;
-
-    fn extract(ob: Borrowed<PyAny>) -> PyResult<Self> {
-        ob.extract().map(Self)
-    }
-}