Add patch for pydantic-core-2.23.4

Author: msimacek

graalpython/lib-graalpython/patches/metadata.toml

@@ -442,6 +442,11 @@ version = '== 2.10.1'
 patch = 'pydantic-core-2.10.1.patch'
 license = 'MIT'
 
+[[pydantic-core.rules]]
+version = '== 2.23.4'
+patch = 'pydantic-core-2.23.4.patch'
+license = 'MIT'
+
 [[pydantic-core.rules]]
 version = '== 2.27.1'
 patch = 'pydantic-core-2.27.1.patch'

graalpython/lib-graalpython/patches/pydantic-core-2.23.4.patch

@@ -0,0 +1,194 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 0871b8a..7bf96f3 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -29,7 +29,7 @@ rust-version = "1.75"
+ [dependencies]
+ # TODO it would be very nice to remove the "py-clone" feature as it can panic,
+ # but needs a bit of work to make sure it's not used in the codebase
+-pyo3 = { version = "0.22.2", features = ["generate-import-lib", "num-bigint", "py-clone"] }
++pyo3 = { version = "0.22.2", features = ["generate-import-lib", "num-bigint", "py-clone"], path = "patched_crates/pyo3" }
+ regex = "1.10.6"
+ strum = { version = "0.26.3", features = ["derive"] }
+ strum_macros = "0.26.4"
+@@ -46,7 +46,7 @@ base64 = "0.22.1"
+ num-bigint = "0.4.6"
+ python3-dll-a = "0.2.10"
+ uuid = "1.10.0"
+-jiter = { version = "0.5", features = ["python"] }
++jiter = { version = "0.5", features = ["python"], path = "patched_crates/jiter/crates/jiter" }
+ hex = "0.4.3"
+ 
+ [lib]
+@@ -74,12 +74,12 @@ debug = true
+ strip = false
+ 
+ [dev-dependencies]
+-pyo3 = { version = "0.22.2", features = ["auto-initialize"] }
++pyo3 = { version = "0.22.2", features = ["auto-initialize"], path = "patched_crates/pyo3" }
+ 
+ [build-dependencies]
+ version_check = "0.9.5"
+ # used where logic has to be version/distribution specific, e.g. pypy
+-pyo3-build-config = { version = "0.22.0" }
++pyo3-build-config = { version = "0.22.0", path = "patched_crates/pyo3/pyo3-build-config" }
+ 
+ [lints.clippy]
+ dbg_macro = "warn"
+diff --git a/build_backend.py b/build_backend.py
+new file mode 100644
+index 0000000..beeb34b
+--- /dev/null
++++ b/build_backend.py
+@@ -0,0 +1,30 @@
++import maturin
++import os
++import shutil
++import subprocess
++import tarfile
++
++from pathlib import Path
++from urllib.request import urlopen
++
++build_sdist = maturin.build_sdist
++
++
++def get_crate_and_patch(namespace, name, version, patched_crates):
++    with (
++        urlopen(f'https://github.com/{namespace}/{name}/archive/refs/tags/v{version}.tar.gz') as f,
++        tarfile.open(fileobj=f, mode='r:gz') as tar,
++    ):
++        tar.extractall(patched_crates, filter='data')
++    crate = patched_crates / f'{name}-{version}'
++    crate = crate.rename(patched_crates / name)
++    subprocess.check_call(['patch', '-p1', '-d', str(crate), '-i', str((Path('patches') / f'{name}.patch').absolute())])
++
++
++def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
++    patched_crates = Path('patched_crates')
++    shutil.rmtree(patched_crates, ignore_errors=True)
++    patched_crates.mkdir()
++    get_crate_and_patch('PyO3', 'pyo3', '0.22.2', patched_crates)
++    get_crate_and_patch('pydantic', 'jiter', '0.5.0', patched_crates)
++    return maturin.build_wheel(wheel_directory, config_settings, metadata_directory)
+diff --git a/patches/jiter.patch b/patches/jiter.patch
+new file mode 100644
+index 0000000..15bcb1a
+--- /dev/null
++++ b/patches/jiter.patch
+@@ -0,0 +1,34 @@
++diff --git a/Cargo.toml b/Cargo.toml
++index d2b0781..ca9645a 100644
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -28,5 +28,5 @@ inherits = "release"
++ debug = true
++ 
++ [workspace.dependencies]
++-pyo3 = { version = "0.22.0" }
++-pyo3-build-config = { version = "0.22.0" }
+++pyo3 = { version = "0.22.2", path = "../pyo3" }
+++pyo3-build-config = { version = "0.22.2", path = "../pyo3/pyo3-build-config" }
++diff --git a/crates/jiter/src/py_string_cache.rs b/crates/jiter/src/py_string_cache.rs
++index 96dcf66..21e6979 100644
++--- a/crates/jiter/src/py_string_cache.rs
+++++ b/crates/jiter/src/py_string_cache.rs
++@@ -200,7 +200,7 @@ pub fn pystring_fast_new<'py>(py: Python<'py>, s: &str, ascii_only: bool) -> Bou
++ 
++ /// Faster creation of PyString from an ASCII string, inspired by
++ /// https://github.com/ijl/orjson/blob/3.10.0/src/str/create.rs#L41
++-#[cfg(not(PyPy))]
+++#[cfg(all(not(PyPy), not(GraalPy)))]
++ unsafe fn pystring_ascii_new<'py>(py: Python<'py>, s: &str) -> Bound<'py, PyString> {
++     let ptr = pyo3::ffi::PyUnicode_New(s.len() as isize, 127);
++     // see https://github.com/pydantic/jiter/pull/72#discussion_r1545485907
++@@ -212,7 +212,7 @@ unsafe fn pystring_ascii_new<'py>(py: Python<'py>, s: &str) -> Bound<'py, PyStri
++ }
++ 
++ // ffi::PyUnicode_DATA seems to be broken for pypy, hence this, marked as unsafe to avoid warnings
++-#[cfg(PyPy)]
+++#[cfg(any(PyPy, GraalPy))]
++ unsafe fn pystring_ascii_new<'py>(py: Python<'py>, s: &str) -> Bound<'py, PyString> {
++     PyString::new_bound(py, s)
++ }
+diff --git a/patches/pyo3.patch b/patches/pyo3.patch
+new file mode 100644
+index 0000000..3d52e98
+--- /dev/null
++++ b/patches/pyo3.patch
+@@ -0,0 +1,31 @@
++diff --git a/pyo3-ffi/src/cpython/pyerrors.rs b/pyo3-ffi/src/cpython/pyerrors.rs
++index 6d17ebc..1d206f9 100644
++--- a/pyo3-ffi/src/cpython/pyerrors.rs
+++++ b/pyo3-ffi/src/cpython/pyerrors.rs
++@@ -6,19 +6,19 @@ use crate::Py_ssize_t;
++ #[derive(Debug)]
++ pub struct PyBaseExceptionObject {
++     pub ob_base: PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub dict: *mut PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub args: *mut PyObject,
++-    #[cfg(all(Py_3_11, not(any(PyPy, GraalPy))))]
+++    #[cfg(all(Py_3_11, not(PyPy)))]
++     pub notes: *mut PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub traceback: *mut PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub context: *mut PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub cause: *mut PyObject,
++-    #[cfg(not(any(PyPy, GraalPy)))]
+++    #[cfg(not(PyPy))]
++     pub suppress_context: char,
++ }
++ 
+diff --git a/pyproject.toml b/pyproject.toml
+index 9d8e5f0..b43c6c4 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -3,7 +3,8 @@ requires = [
+     'maturin>=1,<2',
+     'typing-extensions >=4.6.0,!=4.7.0'
+ ]
+-build-backend = 'maturin'
++backend-path = ['.']
++build-backend = 'build_backend'
+ 
+ [project]
+ name = 'pydantic_core'
+diff --git a/src/input/return_enums.rs b/src/input/return_enums.rs
+index 888dff7..17deb98 100644
+--- a/src/input/return_enums.rs
++++ b/src/input/return_enums.rs
+@@ -10,7 +10,7 @@ use pyo3::exceptions::PyTypeError;
+ use pyo3::ffi;
+ use pyo3::intern;
+ use pyo3::prelude::*;
+-#[cfg(not(PyPy))]
++#[cfg(all(not(PyPy),not(GraalPy)))]
+ use pyo3::types::PyFunction;
+ use pyo3::types::{PyBytes, PyComplex, PyFloat, PyFrozenSet, PyIterator, PyMapping, PySet, PyString};
+ 
+@@ -313,14 +313,14 @@ pub(crate) fn iterate_attributes<'a, 'py>(
+                 // the PyFunction::is_type_of(attr) catches `staticmethod`, but also any other function,
+                 // I think that's better than including static methods in the yielded attributes,
+                 // if someone really wants fields, they can use an explicit field, or a function to modify input
+-                #[cfg(not(PyPy))]
++                #[cfg(all(not(PyPy),not(GraalPy)))]
+                 if !is_bound && !attr.is_instance_of::<PyFunction>() {
+                     return Some(Ok((name, attr)));
+                 }
+                 // MASSIVE HACK! PyFunction doesn't exist for PyPy,
+                 // is_instance_of::<PyFunction> crashes with a null pointer, hence this hack, see
+                 // https://github.com/pydantic/pydantic-core/pull/161#discussion_r917257635
+-                #[cfg(PyPy)]
++                #[cfg(any(PyPy,GraalPy))]
+                 if !is_bound && attr.get_type().to_string() != "<class 'function'>" {
+                     return Some(Ok((name, attr)));
+                 }