Revert "Support subclass inits for Url and MultiHostUrl (#1508)"

sydney-runkle · sydney-runkle · commit 4100130869e0 · 2024-10-31T11:16:48.000-04:00
This reverts commit fe73652.
diff --git a/python/pydantic_core/__init__.py b/python/pydantic_core/__init__.py
@@ -124,7 +124,7 @@ class ErrorTypeInfo(_TypedDict):
     """Example of context values."""
 
 
-class MultiHostHost(_TypedDict, total=False):
+class MultiHostHost(_TypedDict):
     """
     A host part of a multi-host URL.
     """
diff --git a/python/pydantic_core/_pydantic_core.pyi b/python/pydantic_core/_pydantic_core.pyi
@@ -583,7 +583,7 @@ class Url(SupportsAllComparisons):
         scheme: str,
         username: str | None = None,
         password: str | None = None,
-        host: str | None = None,
+        host: str,
         port: int | None = None,
         path: str | None = None,
         query: str | None = None,
@@ -596,7 +596,7 @@ class Url(SupportsAllComparisons):
             scheme: The scheme part of the URL.
             username: The username part of the URL, or omit for no username.
             password: The password part of the URL, or omit for no password.
-            host: The host part of the URL, or omit for no host.
+            host: The host part of the URL.
             port: The port part of the URL, or omit for no port.
             path: The path part of the URL, or omit for no path.
             query: The query part of the URL, or omit for no query.
diff --git a/python/pydantic_core/core_schema.py b/python/pydantic_core/core_schema.py
@@ -3655,7 +3655,6 @@ class MyModel:
 
 class UrlSchema(TypedDict, total=False):
     type: Required[Literal['url']]
-    cls: Type[Any]
     max_length: int
     allowed_schemes: List[str]
     host_required: bool  # default False
@@ -3670,7 +3669,6 @@ class UrlSchema(TypedDict, total=False):
 
 def url_schema(
     *,
-    cls: Type[Any] | None = None,
     max_length: int | None = None,
     allowed_schemes: list[str] | None = None,
     host_required: bool | None = None,
@@ -3695,7 +3693,6 @@ def url_schema(
     ```
 
     Args:
-        cls: The class to use for the URL build (a subclass of `pydantic_core.Url`)
         max_length: The maximum length of the URL
         allowed_schemes: The allowed URL schemes
         host_required: Whether the URL must have a host
@@ -3709,7 +3706,6 @@ def url_schema(
     """
     return _dict_not_none(
         type='url',
-        cls=cls,
         max_length=max_length,
         allowed_schemes=allowed_schemes,
         host_required=host_required,
@@ -3725,7 +3721,6 @@ def url_schema(
 
 class MultiHostUrlSchema(TypedDict, total=False):
     type: Required[Literal['multi-host-url']]
-    cls: Type[Any]
     max_length: int
     allowed_schemes: List[str]
     host_required: bool  # default False
@@ -3740,7 +3735,6 @@ class MultiHostUrlSchema(TypedDict, total=False):
 
 def multi_host_url_schema(
     *,
-    cls: Type[Any] | None = None,
     max_length: int | None = None,
     allowed_schemes: list[str] | None = None,
     host_required: bool | None = None,
@@ -3765,7 +3759,6 @@ def multi_host_url_schema(
     ```
 
     Args:
-        cls: The class to use for the URL build (a subclass of `pydantic_core.MultiHostUrl`)
         max_length: The maximum length of the URL
         allowed_schemes: The allowed URL schemes
         host_required: Whether the URL must have a host
@@ -3779,7 +3772,6 @@ def multi_host_url_schema(
     """
     return _dict_not_none(
         type='multi-host-url',
-        cls=cls,
         max_length=max_length,
         allowed_schemes=allowed_schemes,
         host_required=host_required,
diff --git a/src/url.rs b/src/url.rs
@@ -156,12 +156,12 @@ impl PyUrl {
     }
 
     #[classmethod]
-    #[pyo3(signature=(*, scheme, host=None, username=None, password=None, port=None, path=None, query=None, fragment=None))]
+    #[pyo3(signature=(*, scheme, host, username=None, password=None, port=None, path=None, query=None, fragment=None))]
     #[allow(clippy::too_many_arguments)]
     pub fn build<'py>(
         cls: &Bound<'py, PyType>,
         scheme: &str,
-        host: Option<&str>,
+        host: &str,
         username: Option<&str>,
         password: Option<&str>,
         port: Option<u16>,
@@ -172,7 +172,7 @@ impl PyUrl {
         let url_host = UrlHostParts {
             username: username.map(Into::into),
             password: password.map(Into::into),
-            host: host.map(Into::into),
+            host: Some(host.into()),
             port,
         };
         let mut url = format!("{scheme}://{url_host}");
@@ -423,7 +423,6 @@ impl PyMultiHostUrl {
     }
 }
 
-#[cfg_attr(debug_assertions, derive(Debug))]
 pub struct UrlHostParts {
     username: Option<String>,
     password: Option<String>,
@@ -441,12 +440,11 @@ impl FromPyObject<'_> for UrlHostParts {
     fn extract_bound(ob: &Bound<'_, PyAny>) -> PyResult<Self> {
         let py = ob.py();
         let dict = ob.downcast::<PyDict>()?;
-
         Ok(UrlHostParts {
-            username: dict.get_as::<Option<_>>(intern!(py, "username"))?.flatten(),
-            password: dict.get_as::<Option<_>>(intern!(py, "password"))?.flatten(),
-            host: dict.get_as::<Option<_>>(intern!(py, "host"))?.flatten(),
-            port: dict.get_as::<Option<_>>(intern!(py, "port"))?.flatten(),
+            username: dict.get_as(intern!(py, "username"))?,
+            password: dict.get_as(intern!(py, "password"))?,
+            host: dict.get_as(intern!(py, "host"))?,
+            port: dict.get_as(intern!(py, "port"))?,
         })
     }
 }
diff --git a/src/validators/url.rs b/src/validators/url.rs
@@ -4,7 +4,7 @@ use std::str::Chars;
 
 use pyo3::intern;
 use pyo3::prelude::*;
-use pyo3::types::{PyDict, PyList, PyType};
+use pyo3::types::{PyDict, PyList};
 
 use ahash::AHashSet;
 use url::{ParseError, SyntaxViolation, Url};
@@ -26,7 +26,6 @@ type AllowedSchemas = Option<(AHashSet<String>, String)>;
 #[derive(Debug, Clone)]
 pub struct UrlValidator {
     strict: bool,
-    cls: Option<Py<PyType>>,
     max_length: Option<usize>,
     allowed_schemes: AllowedSchemas,
     host_required: bool,
@@ -48,7 +47,6 @@ impl BuildValidator for UrlValidator {
 
         Ok(Self {
             strict: is_strict(schema, config)?,
-            cls: schema.get_as(intern!(schema.py(), "cls"))?,
             max_length: schema.get_as(intern!(schema.py(), "max_length"))?,
             host_required: schema.get_as(intern!(schema.py(), "host_required"))?.unwrap_or(false),
             default_host: schema.get_as(intern!(schema.py(), "default_host"))?,
@@ -61,7 +59,7 @@ impl BuildValidator for UrlValidator {
     }
 }
 
-impl_py_gc_traverse!(UrlValidator { cls });
+impl_py_gc_traverse!(UrlValidator {});
 
 impl Validator for UrlValidator {
     fn validate<'py>(
@@ -95,31 +93,7 @@ impl Validator for UrlValidator {
             Ok(()) => {
                 // Lax rather than strict to preserve V2.4 semantic that str wins over url in union
                 state.floor_exactness(Exactness::Lax);
-
-                if let Some(url_subclass) = &self.cls {
-                    // TODO: we do an extra build for a subclass here, we should avoid this
-                    // in v2.11 for perf reasons, but this is a worthwhile patch for now
-                    // given that we want isinstance to work properly for subclasses of Url
-                    let py_url = match either_url {
-                        EitherUrl::Py(py_url) => py_url.get().clone(),
-                        EitherUrl::Rust(rust_url) => PyUrl::new(rust_url),
-                    };
-
-                    let py_url = PyUrl::build(
-                        url_subclass.bind(py),
-                        py_url.scheme(),
-                        py_url.host(),
-                        py_url.username(),
-                        py_url.password(),
-                        py_url.port(),
-                        py_url.path().filter(|path| *path != "/"),
-                        py_url.query(),
-                        py_url.fragment(),
-                    )?;
-                    Ok(py_url.into_py(py))
-                } else {
-                    Ok(either_url.into_py(py))
-                }
+                Ok(either_url.into_py(py))
             }
             Err(error_type) => Err(ValError::new(error_type, input)),
         }
@@ -212,7 +186,6 @@ impl CopyFromPyUrl for EitherUrl<'_> {
 #[derive(Debug, Clone)]
 pub struct MultiHostUrlValidator {
     strict: bool,
-    cls: Option<Py<PyType>>,
     max_length: Option<usize>,
     allowed_schemes: AllowedSchemas,
     host_required: bool,
@@ -240,7 +213,6 @@ impl BuildValidator for MultiHostUrlValidator {
         }
         Ok(Self {
             strict: is_strict(schema, config)?,
-            cls: schema.get_as(intern!(schema.py(), "cls"))?,
             max_length: schema.get_as(intern!(schema.py(), "max_length"))?,
             allowed_schemes,
             host_required: schema.get_as(intern!(schema.py(), "host_required"))?.unwrap_or(false),
@@ -253,7 +225,7 @@ impl BuildValidator for MultiHostUrlValidator {
     }
 }
 
-impl_py_gc_traverse!(MultiHostUrlValidator { cls });
+impl_py_gc_traverse!(MultiHostUrlValidator {});
 
 impl Validator for MultiHostUrlValidator {
     fn validate<'py>(
@@ -286,38 +258,7 @@ impl Validator for MultiHostUrlValidator {
             Ok(()) => {
                 // Lax rather than strict to preserve V2.4 semantic that str wins over url in union
                 state.floor_exactness(Exactness::Lax);
-
-                if let Some(url_subclass) = &self.cls {
-                    // TODO: we do an extra build for a subclass here, we should avoid this
-                    // in v2.11 for perf reasons, but this is a worthwhile patch for now
-                    // given that we want isinstance to work properly for subclasses of Url
-                    let py_url = match multi_url {
-                        EitherMultiHostUrl::Py(py_url) => py_url.get().clone(),
-                        EitherMultiHostUrl::Rust(rust_url) => rust_url,
-                    };
-
-                    let hosts = py_url
-                        .hosts(py)?
-                        .into_iter()
-                        .map(|host| host.extract().expect("host should be a valid UrlHostParts"))
-                        .collect();
-
-                    let py_url = PyMultiHostUrl::build(
-                        url_subclass.bind(py),
-                        py_url.scheme(),
-                        Some(hosts),
-                        py_url.path().filter(|path| *path != "/"),
-                        py_url.query(),
-                        py_url.fragment(),
-                        None,
-                        None,
-                        None,
-                        None,
-                    )?;
-                    Ok(py_url.into_py(py))
-                } else {
-                    Ok(multi_url.into_py(py))
-                }
+                Ok(multi_url.into_py(py))
             }
             Err(error_type) => Err(ValError::new(error_type, input)),
         }
diff --git a/tests/validators/test_url.py b/tests/validators/test_url.py
@@ -1305,19 +1305,3 @@ def test_url_build() -> None:
     )
     assert url == Url('postgresql://testuser:testpassword@127.0.0.1:5432/database?sslmode=require#test')
     assert str(url) == 'postgresql://testuser:testpassword@127.0.0.1:5432/database?sslmode=require#test'
-
-
-def test_url_subclass() -> None:
-    class UrlSubclass(Url):
-        pass
-
-    validator = SchemaValidator(core_schema.url_schema(cls=UrlSubclass))
-    assert isinstance(validator.validate_python('http://example.com'), UrlSubclass)
-
-
-def test_multi_host_url_subclass() -> None:
-    class MultiHostUrlSubclass(MultiHostUrl):
-        pass
-
-    validator = SchemaValidator(core_schema.multi_host_url_schema(cls=MultiHostUrlSubclass))
-    assert isinstance(validator.validate_python('http://example.com'), MultiHostUrlSubclass)
