Skip to content

Fix serialize_as_any with recursive ref #1359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix serialize_as_any with recursive ref #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b5c8ce
fix serialize_as_any with recursive ref
nix010 Jul 1, 2024
6093291
Merge branch 'main' into fix-serialize-as-any-with-recursive-ref
nix010 Sep 28, 2024
1976e36
fix ci failed on build up memory stack
nix010 Sep 28, 2024
14b895b
Merge branch 'fix-serialize-as-any-with-recursive-ref' of github.com:…
nix010 Sep 28, 2024
f51a195
add test
nix010 Sep 28, 2024
d6fbaab
Merge branch 'main' into fix-serialize-as-any-with-recursive-ref
nix010 Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/serializers/extra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ impl DuckTypingSerMode {
}
}

pub fn is_need_inference(self) -> bool {
self == DuckTypingSerMode::NeedsInference
}

pub fn to_bool(self) -> bool {
match self {
DuckTypingSerMode::SchemaBased => false,
Expand Down
21 changes: 15 additions & 6 deletions src/serializers/type_serializers/definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use pyo3::types::{PyDict, PyList};

use crate::definitions::DefinitionsBuilder;
use crate::definitions::{DefinitionRef, RecursionSafeCache};
use crate::serializers::DuckTypingSerMode;

use crate::tools::SchemaDict;

Expand Down Expand Up @@ -93,8 +94,12 @@ impl TypeSerializer for DefinitionRefSerializer {
) -> PyResult<PyObject> {
self.definition.read(|comb_serializer| {
let comb_serializer = comb_serializer.unwrap();
let mut guard = extra.recursion_guard(value, self.definition.id())?;
comb_serializer.to_python(value, include, exclude, guard.state())
if extra.duck_typing_ser_mode == DuckTypingSerMode::NeedsInference {
comb_serializer.to_python(value, include, exclude, extra)
} else {
let mut guard = extra.recursion_guard(value, self.definition.id())?;
comb_serializer.to_python(value, include, exclude, guard.state())
}
})
}

Expand All @@ -112,10 +117,14 @@ impl TypeSerializer for DefinitionRefSerializer {
) -> Result<S::Ok, S::Error> {
self.definition.read(|comb_serializer| {
let comb_serializer = comb_serializer.unwrap();
let mut guard = extra
.recursion_guard(value, self.definition.id())
.map_err(py_err_se_err)?;
comb_serializer.serde_serialize(value, serializer, include, exclude, guard.state())
if extra.duck_typing_ser_mode.is_need_inference() {
comb_serializer.serde_serialize(value, serializer, include, exclude, extra)
} else {
let mut guard = extra
.recursion_guard(value, self.definition.id())
.map_err(py_err_se_err)?;
comb_serializer.serde_serialize(value, serializer, include, exclude, guard.state())
}
})
}

Expand Down
40 changes: 40 additions & 0 deletions tests/serializers/test_serialize_as_any.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from dataclasses import dataclass
from typing import Optional

from typing_extensions import TypedDict

Expand Down Expand Up @@ -155,3 +156,42 @@ class Other:
'x': 1,
'y': 'hopefully not a secret',
}


def test_serialize_with_recursive_models() -> None:
class Node:
next: Optional['Node'] = None
value: int = 42

schema = core_schema.definitions_schema(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sydney-runkle I tested the python code and all good but how do I make an equivalent schema for the test here ?

from __future__ import annotations

import traceback

import pydantic


class Model1(pydantic.BaseModel):
    recursive: Model1 | None


class Model2(pydantic.BaseModel):
    recursive: pydantic.SerializeAsAny[Model2] | None

print(Model1(recursive=None).model_dump())
print(Model1(recursive=None).model_dump_json())
print(Model2(recursive=None).model_dump())
print(Model2(recursive=None).model_dump_json())

# All fail:
try:
    print(Model1(recursive=None).model_dump(serialize_as_any=True))
except:
    traceback.print_exc()

try:
    print(Model1(recursive=None).model_dump_json(serialize_as_any=True))
except:
    traceback.print_exc()

try:
    print(Model2(recursive=None).model_dump(serialize_as_any=True))
except:
    traceback.print_exc()

try:
    print(Model2(recursive=None).model_dump_json(serialize_as_any=True))
except:
    traceback.print_exc()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question - I normally just do

from pydantic._internal._core_utils import pretty_print_core_schema
from pydantic import BaseModel

class SomeModel(BaseModel): ...

pretty_print_core_schema(SomeModel.__pydantic_core_schema__)

And then go from that representation in order to build up an equivalent core schema

core_schema.definition_reference_schema('Node'),
[
core_schema.model_schema(
Node,
core_schema.model_fields_schema(
{
'value': core_schema.model_field(
core_schema.with_default_schema(core_schema.int_schema(), default=42)
),
'next': core_schema.model_field(
core_schema.with_default_schema(
core_schema.nullable_schema(core_schema.definition_reference_schema('Node')),
default=None,
)
),
}
),
ref='Node',
)
],
)

Node.__pydantic_core_schema__ = schema
Node.__pydantic_validator__ = SchemaValidator(Node.__pydantic_core_schema__)
Node.__pydantic_serializer__ = SchemaSerializer(Node.__pydantic_core_schema__)
other = Node.__pydantic_validator__.validate_python({'next': {'value': 4}})

assert Node.__pydantic_serializer__.to_python(other, serialize_as_any=True) == {
'next': {'next': None, 'value': 4},
'value': 42,
}