Skip to content

Commit

Permalink
fix: remove double None from Pydantic preset
Browse files Browse the repository at this point in the history
  • Loading branch information
black-snow authored and Ronald Bergmann committed Feb 14, 2025
1 parent 8db1b03 commit 1dca3f0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Array [
"class Root(BaseModel):
optional_field: Optional[str] = Field(description='''this field is optional''', default=None, default=None)
required_field: str = Field(description='''this field is required''')
no_description: Optional[str] = Field(default=None, default=None)
options: Optional[Options.Options] = Field(default=None, default=None)
content_type: Optional[str] = Field(default=None, default=None)
no_description: Optional[str] = Field(default=None)
options: Optional[Options.Options] = Field(default=None)
content_type: Optional[str] = Field(default=None)
",
]
`;
Expand Down
3 changes: 0 additions & 3 deletions src/generators/python/presets/Pydantic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ const PYTHON_PYDANTIC_CLASS_PRESET: ClassPresetType<PythonOptions> = {
) {
decoratorArgs.push('exclude=True');
}
if (!property.required) {
decoratorArgs.push('default=None');
}

return `${propertyName}: ${type} = Field(${decoratorArgs.join(', ')})`;
},
Expand Down
22 changes: 11 additions & 11 deletions test/generators/python/presets/__snapshots__/Pydantic.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`PYTHON_PYDANTIC_PRESET should render nullable union 1`] = `
Array [
"class NullableUnionTest(BaseModel):
nullable_union_test: Optional[Union[Union1.Union1]] = Field(default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down Expand Up @@ -40,8 +40,8 @@ Array [
",
"class Union1(BaseModel):
test_prop1: Optional[str] = Field(default=None, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
test_prop1: Optional[str] = Field(default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down Expand Up @@ -84,8 +84,8 @@ exports[`PYTHON_PYDANTIC_PRESET should render pydantic for class 1`] = `
prop: Optional[str] = Field(description='''test
multi
line
description''', default=None, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
description''', default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down Expand Up @@ -125,8 +125,8 @@ exports[`PYTHON_PYDANTIC_PRESET should render pydantic for class 1`] = `
exports[`PYTHON_PYDANTIC_PRESET should render union to support Python < 3.10 1`] = `
Array [
"class UnionTest(BaseModel):
union_test: Optional[Union[Union1.Union1, Union2.Union2]] = Field(default=None, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
union_test: Optional[Union[Union1.Union1, Union2.Union2]] = Field(default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down Expand Up @@ -162,8 +162,8 @@ Array [
",
"class Union1(BaseModel):
test_prop1: Optional[str] = Field(default=None, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
test_prop1: Optional[str] = Field(default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down Expand Up @@ -199,8 +199,8 @@ Array [
",
"class Union2(BaseModel):
test_prop2: Optional[str] = Field(default=None, default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
test_prop2: Optional[str] = Field(default=None)
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
@model_serializer(mode='wrap')
def custom_serializer(self, handler):
Expand Down

0 comments on commit 1dca3f0

Please sign in to comment.