Skip to content

Commit 593378f

Browse files
Merge master into dependabot/npm_and_yarn/modelina-cli/braces-3.0.3
2 parents 3a11686 + 3e4227e commit 593378f

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

examples/generate-python-pydantic-models/__snapshots__/index.spec.ts.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
exports[`Should be able to render python models and should log expected output to console: class-model 1`] = `
44
Array [
55
"class Root(BaseModel):
6-
optional_field: Optional[str] = Field(description='''this field is optional''', default=None, default=None)
6+
optional_field: Optional[str] = Field(description='''this field is optional''', default=None)
77
required_field: str = Field(description='''this field is required''')
8-
no_description: Optional[str] = Field(default=None, default=None)
9-
options: Optional[Options.Options] = Field(default=None, default=None)
10-
content_type: Optional[str] = Field(default=None, default=None)
8+
no_description: Optional[str] = Field(default=None)
9+
options: Optional[Options.Options] = Field(default=None)
10+
content_type: Optional[str] = Field(default=None)
1111
",
1212
]
1313
`;

src/generators/python/presets/Pydantic.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ const PYTHON_PYDANTIC_CLASS_PRESET: ClassPresetType<PythonOptions> = {
5959
) {
6060
decoratorArgs.push('exclude=True');
6161
}
62-
if (!property.required) {
63-
decoratorArgs.push('default=None');
64-
}
6562

6663
return `${propertyName}: ${type} = Field(${decoratorArgs.join(', ')})`;
6764
},

test/generators/python/presets/__snapshots__/Pydantic.spec.ts.snap

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`PYTHON_PYDANTIC_PRESET should render nullable union 1`] = `
44
Array [
55
"class NullableUnionTest(BaseModel):
66
nullable_union_test: Optional[Union[Union1.Union1]] = Field(default=None)
7-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
7+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
88
99
@model_serializer(mode='wrap')
1010
def custom_serializer(self, handler):
@@ -40,8 +40,8 @@ Array [
4040
4141
",
4242
"class Union1(BaseModel):
43-
test_prop1: Optional[str] = Field(default=None, default=None)
44-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
43+
test_prop1: Optional[str] = Field(default=None)
44+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
4545
4646
@model_serializer(mode='wrap')
4747
def custom_serializer(self, handler):
@@ -84,8 +84,8 @@ exports[`PYTHON_PYDANTIC_PRESET should render pydantic for class 1`] = `
8484
prop: Optional[str] = Field(description='''test
8585
multi
8686
line
87-
description''', default=None, default=None)
88-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
87+
description''', default=None)
88+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
8989
9090
@model_serializer(mode='wrap')
9191
def custom_serializer(self, handler):
@@ -125,8 +125,8 @@ exports[`PYTHON_PYDANTIC_PRESET should render pydantic for class 1`] = `
125125
exports[`PYTHON_PYDANTIC_PRESET should render union to support Python < 3.10 1`] = `
126126
Array [
127127
"class UnionTest(BaseModel):
128-
union_test: Optional[Union[Union1.Union1, Union2.Union2]] = Field(default=None, default=None)
129-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
128+
union_test: Optional[Union[Union1.Union1, Union2.Union2]] = Field(default=None)
129+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
130130
131131
@model_serializer(mode='wrap')
132132
def custom_serializer(self, handler):
@@ -162,8 +162,8 @@ Array [
162162
163163
",
164164
"class Union1(BaseModel):
165-
test_prop1: Optional[str] = Field(default=None, default=None)
166-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
165+
test_prop1: Optional[str] = Field(default=None)
166+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
167167
168168
@model_serializer(mode='wrap')
169169
def custom_serializer(self, handler):
@@ -199,8 +199,8 @@ Array [
199199
200200
",
201201
"class Union2(BaseModel):
202-
test_prop2: Optional[str] = Field(default=None, default=None)
203-
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True, default=None)
202+
test_prop2: Optional[str] = Field(default=None)
203+
additional_properties: Optional[dict[str, Any]] = Field(default=None, exclude=True)
204204
205205
@model_serializer(mode='wrap')
206206
def custom_serializer(self, handler):

0 commit comments

Comments
 (0)