wip try a full lookup tree

pydantic · Feb 13, 2025 · 306c934 · 306c934
1 parent 7b83c59
commit 306c934
Show file tree

Hide file tree

Showing 4 changed files with 520 additions and 174 deletions.
diff --git a/src/input/input_abstract.rs b/src/input/input_abstract.rs
@@ -1,6 +1,7 @@
 use std::convert::Infallible;
 use std::fmt;
 
+use jiter::JsonValue;
 use pyo3::exceptions::PyValueError;
 use pyo3::types::{PyDict, PyList, PyString};
 use pyo3::{intern, prelude::*, IntoPyObjectExt};
@@ -73,6 +74,10 @@ pub trait Input<'py>: fmt::Debug {
         None
     }
 
+    fn as_json(&self) -> Option<&JsonValue<'_>> {
+        None
+    }
+
     fn as_kwargs(&self, py: Python<'py>) -> Option<Bound<'py, PyDict>>;
 
     type Arguments<'a>: Arguments<'py>

diff --git a/src/input/input_json.rs b/src/input/input_json.rs
@@ -43,6 +43,10 @@ impl From<JsonValue<'_>> for LocItem {
 }
 
 impl<'py, 'data> Input<'py> for JsonValue<'data> {
+    fn as_json(&self) -> Option<&JsonValue<'_>> {
+        Some(self)
+    }
+
     #[inline]
     fn py_converter(&self) -> impl IntoPyObject<'py> + '_ {
         self

diff --git a/src/lookup_key.rs b/src/lookup_key.rs
@@ -423,6 +423,10 @@ impl LookupPath {
     pub fn first_key(&self) -> &str {
         &self.first_item.key
     }
+
+    pub fn rest(&self) -> &[PathItem] {
+        &self.rest
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -437,8 +441,8 @@ pub(crate) enum PathItem {
 /// we store both the string and pystring to save creating the pystring for python
 #[derive(Debug, Clone)]
 pub(crate) struct PathItemString {
-    key: String,
-    py_key: Py<PyString>,
+    pub key: String,
+    pub py_key: Py<PyString>,
 }
 
 impl fmt::Display for PathItem {