Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .changesets/1792775030-0ae07c4d.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
id: 1792775030-0ae07c4d
features:
- core
targets:
- pythonv2
type: fix
bump: patch
description: leave fields filtered by include, exclude, exclude_unset or exclude_defaults out of model dumps
author: 2ynn
date: "2026-10-23"
10 changes: 10 additions & 0 deletions .changesets/1792778028-be2ce88f.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
id: 1792778028-be2ce88f
features:
- core
targets:
- pythonv2
type: fix
bump: patch
description: keep the value of fields with an empty API name in model dumps
author: 2ynn
date: "2026-10-23"
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ from base64order.types import (
Base64FileInput,
BaseModel,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)
from pydantic import model_serializer
from typing import Optional, Union
Expand All @@ -168,13 +170,19 @@ class Gadget2(BaseModel):
image: Optional[Base64EncodedString] = None

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(["image"])
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))

if val != UNSET_SENTINEL:
Expand Down Expand Up @@ -214,6 +222,8 @@ from base64order.types import (
Base64FileInput,
BaseModel,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)
from pydantic import model_serializer
from typing import Optional, Union
Expand All @@ -231,13 +241,19 @@ class Thumbnail(BaseModel):
image: Optional[Base64EncodedString] = None

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(["label", "image"])
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))

if val != UNSET_SENTINEL:
Expand All @@ -260,6 +276,8 @@ from base64order.types import (
Base64FileInput,
BaseModel,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)
import pydantic
from pydantic import model_serializer
Expand Down Expand Up @@ -312,15 +330,21 @@ class Widget(BaseModel):
] = None

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(
["id", "thumbnail", "images", "imagesByName", "imageOrIndex", "imageOrFlag"]
)
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))

if val != UNSET_SENTINEL:
Expand Down
15 changes: 13 additions & 2 deletions pkg/generate/snapshots/field_alias_model_rebuild_py_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,12 @@ import pydantic
from pydantic import model_serializer
from typing import Optional
from typing_extensions import Annotated, NotRequired, TypedDict
from userapi.types import BaseModel, UNSET_SENTINEL
from userapi.types import (
BaseModel,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)


class UserProfileTypedDict(TypedDict):
Expand All @@ -96,13 +101,19 @@ class UserProfile(BaseModel):
phone_number: Annotated[Optional[str], pydantic.Field(alias="phoneNumber")] = None

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(["phoneNumber"])
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))

if val != UNSET_SENTINEL:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ func TestSnapPyModelNamespaceSanitization(t *testing.T) {

from __future__ import annotations
from pydantic import model_serializer
from test.types import BaseModel, UNSET_SENTINEL
from test.types import (
BaseModel,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)
from typing import Optional
from typing_extensions import NotRequired, TypedDict

Expand All @@ -155,13 +160,19 @@ class Widget(BaseModel):
name: Optional[str] = None

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(["name"])
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))

if val != UNSET_SENTINEL:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,15 @@ from .alphaconfig import AlphaConfig, AlphaConfigTypedDict
from .betaconfig import BetaConfig, BetaConfigTypedDict
import pydantic
from pydantic import Field, SerializeAsAny, model_serializer
from sdk.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
from sdk.types import (
BaseModel,
Nullable,
OptionalNullable,
UNSET,
UNSET_SENTINEL,
current_exclude_none,
serialize_with_info,
)
from typing import Union
from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict

Expand All @@ -132,14 +140,20 @@ class Body(BaseModel):
] = UNSET

@model_serializer(mode="wrap")
def _serialize_model_with_info(self, handler, info):
return serialize_with_info(self.serialize_model, handler, info)

def serialize_model(self, handler):
optional_fields = set(["executionConfig"])
nullable_fields = set(["executionConfig"])
exclude_none = current_exclude_none()
serialized = handler(self)
m = {}

for n, f in type(self).model_fields.items():
k = f.alias or n
k = f.alias if f.alias is not None else n
if k not in serialized and n not in serialized and exclude_none is False:
continue
val = serialized.get(k, serialized.get(n))
is_nullable_and_explicitly_set = (
k in nullable_fields
Expand Down
Loading
Loading