Skip to content

Commit ae86013

Browse files
tokuhiromtokuhirom
committed
update pydantic from v1 to v2.
Ref line#496
1 parent 9b814a1 commit ae86013

File tree

271 files changed

+472
-472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

271 files changed

+472
-472
lines changed

‎generator/src/main/java/line/bot/generator/PythonNextgenCustomClientGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
10551055
// need pydantic imports
10561056
if (!pydanticImports.isEmpty()) {
10571057
Map<String, String> item = new HashMap<>();
1058-
item.put("import", String.format(Locale.ROOT, "from pydantic import %s\n", StringUtils.join(pydanticImports, ", ")));
1058+
item.put("import", String.format(Locale.ROOT, "from pydantic.v1 import %s\n", StringUtils.join(pydanticImports, ", ")));
10591059
newImports.add(item);
10601060
}
10611061

‎generator/src/main/resources/python-nextgen-custom-client/api.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import re # noqa: F401
66
import io
77

8-
from pydantic import validate_arguments, ValidationError
8+
from pydantic.v1 import validate_arguments, ValidationError
99
from typing_extensions import Annotated{{#asyncio}}
1010
from typing import overload, Optional, Union, Awaitable{{/asyncio}}
1111

‎generator/src/main/resources/python-nextgen-custom-client/api_response.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44
from typing import Any, Dict, Optional
5-
from pydantic import Field, StrictInt, StrictStr
5+
from pydantic.v1 import Field, StrictInt, StrictStr
66

77
class ApiResponse:
88
"""

‎generator/src/main/resources/python-nextgen-custom-client/asyncio/async_api.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import re # noqa: F401
66
import io
77
import warnings
88

9-
from pydantic import validate_arguments, ValidationError
9+
from pydantic.v1 import validate_arguments, ValidationError
1010
from typing_extensions import Annotated
1111
from typing import overload, Optional, Union, Awaitable
1212

‎generator/src/main/resources/python-nextgen-custom-client/model_anyof.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import pprint
55
import re # noqa: F401
66
{{#vendorExtensions.x-py-datetime-imports}}{{#-first}}from datetime import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-datetime-imports}}
77
{{#vendorExtensions.x-py-typing-imports}}{{#-first}}from typing import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-typing-imports}}
8-
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
8+
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic.v1 import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
99
{{#vendorExtensions.x-py-model-imports}}
1010
{{{.}}}
1111
{{/vendorExtensions.x-py-model-imports}}
1212
from typing import Any, List
13-
from pydantic import StrictStr, Field
13+
from pydantic.v1 import StrictStr, Field
1414

1515
{{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}]
1616

‎generator/src/main/resources/python-nextgen-custom-client/model_enum.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import re # noqa: F401
44
from aenum import Enum, no_arg
55
{{#vendorExtensions.x-py-datetime-imports}}{{#-first}}from datetime import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-datetime-imports}}
66
{{#vendorExtensions.x-py-typing-imports}}{{#-first}}from typing import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-typing-imports}}
7-
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
7+
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic.v1 import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
88

99

1010
class {{classname}}({{vendorExtensions.x-py-enum-type}}, Enum):

‎generator/src/main/resources/python-nextgen-custom-client/model_generic.mustache

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {{{modelPackage}}}
1010

1111
{{#vendorExtensions.x-py-datetime-imports}}{{#-first}}from datetime import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-datetime-imports}}
1212
{{#vendorExtensions.x-py-typing-imports}}{{#-first}}from typing import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-typing-imports}}
13-
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
13+
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic.v1 import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
1414
{{#vendorExtensions.x-py-model-imports}}
1515
{{{.}}}
1616
{{/vendorExtensions.x-py-model-imports}}
@@ -147,7 +147,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
147147
{{#isArray}}
148148
{{^items.isPrimitiveType}}
149149
{{^items.isEnumOrRef}}
150-
# override the default output from pydantic by calling `to_dict()` of each item in {{{name}}} (list)
150+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in {{{name}}} (list)
151151
_items = []
152152
if self.{{{name}}}:
153153
for _item in self.{{{name}}}:
@@ -160,7 +160,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
160160
{{#isMap}}
161161
{{^items.isPrimitiveType}}
162162
{{^items.isEnumOrRef}}
163-
# override the default output from pydantic by calling `to_dict()` of each value in {{{name}}} (dict)
163+
# override the default output from pydantic.v1 by calling `to_dict()` of each value in {{{name}}} (dict)
164164
_field_dict = {}
165165
if self.{{{name}}}:
166166
for _key in self.{{{name}}}:
@@ -174,7 +174,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
174174
{{^isContainer}}
175175
{{^isPrimitiveType}}
176176
{{^isEnumOrRef}}
177-
# override the default output from pydantic by calling `to_dict()` of {{{name}}}
177+
# override the default output from pydantic.v1 by calling `to_dict()` of {{{name}}}
178178
if self.{{{name}}}:
179179
_dict['{{{baseName}}}'] = self.{{{name}}}.to_dict()
180180
{{/isEnumOrRef}}

‎generator/src/main/resources/python-nextgen-custom-client/model_oneof.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import pprint
55
import re # noqa: F401
66
{{#vendorExtensions.x-py-datetime-imports}}{{#-first}}from datetime import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-datetime-imports}}
77
{{#vendorExtensions.x-py-typing-imports}}{{#-first}}from typing import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-typing-imports}}
8-
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
8+
{{#vendorExtensions.x-py-pydantic-imports}}{{#-first}}from pydantic.v1 import{{/-first}} {{{.}}}{{^-last}},{{/-last}}{{/vendorExtensions.x-py-pydantic-imports}}
99
{{#vendorExtensions.x-py-model-imports}}
1010
{{{.}}}
1111
{{/vendorExtensions.x-py-model-imports}}
1212
from typing import Any, List
13-
from pydantic import StrictStr, Field
13+
from pydantic.v1 import StrictStr, Field
1414

1515
{{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
1616

‎linebot/v3/audience/api/async_manage_audience.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import io
1717
import warnings
1818

19-
from pydantic import validate_arguments, ValidationError
19+
from pydantic.v1 import validate_arguments, ValidationError
2020
from typing_extensions import Annotated
2121
from typing import overload, Optional, Union, Awaitable
2222

23-
from pydantic import Field, StrictBool, StrictInt, StrictStr, conint
23+
from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr, conint
2424

2525
from linebot.v3.audience.models.add_audience_to_audience_group_request import AddAudienceToAudienceGroupRequest
2626
from linebot.v3.audience.models.audience_group_create_route import AudienceGroupCreateRoute

‎linebot/v3/audience/api/async_manage_audience_blob.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import io
1717
import warnings
1818

19-
from pydantic import validate_arguments, ValidationError
19+
from pydantic.v1 import validate_arguments, ValidationError
2020
from typing_extensions import Annotated
2121
from typing import overload, Optional, Union, Awaitable
2222

23-
from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, constr
23+
from pydantic.v1 import Field, StrictBool, StrictBytes, StrictInt, StrictStr, constr
2424

2525
from typing import Optional, Union
2626

‎linebot/v3/audience/api/manage_audience.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import re # noqa: F401
1616
import io
1717

18-
from pydantic import validate_arguments, ValidationError
18+
from pydantic.v1 import validate_arguments, ValidationError
1919
from typing_extensions import Annotated
2020

21-
from pydantic import Field, StrictBool, StrictInt, StrictStr, conint
21+
from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr, conint
2222

2323
from linebot.v3.audience.models.add_audience_to_audience_group_request import AddAudienceToAudienceGroupRequest
2424
from linebot.v3.audience.models.audience_group_create_route import AudienceGroupCreateRoute

‎linebot/v3/audience/api/manage_audience_blob.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import re # noqa: F401
1616
import io
1717

18-
from pydantic import validate_arguments, ValidationError
18+
from pydantic.v1 import validate_arguments, ValidationError
1919
from typing_extensions import Annotated
2020

21-
from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, constr
21+
from pydantic.v1 import Field, StrictBool, StrictBytes, StrictInt, StrictStr, constr
2222

2323
from typing import Optional, Union
2424

‎linebot/v3/audience/api_response.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44
from typing import Any, Dict, Optional
5-
from pydantic import Field, StrictInt, StrictStr
5+
from pydantic.v1 import Field, StrictInt, StrictStr
66

77
class ApiResponse:
88
"""

‎linebot/v3/audience/models/add_audience_to_audience_group_request.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import List, Optional
22-
from pydantic import BaseModel, Field, StrictInt, StrictStr, conlist
22+
from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr, conlist
2323
from linebot.v3.audience.models.audience import Audience
2424

2525
class AddAudienceToAudienceGroupRequest(BaseModel):
@@ -57,7 +57,7 @@ def to_dict(self):
5757
exclude={
5858
},
5959
exclude_none=True)
60-
# override the default output from pydantic by calling `to_dict()` of each item in audiences (list)
60+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in audiences (list)
6161
_items = []
6262
if self.audiences:
6363
for _item in self.audiences:

‎linebot/v3/audience/models/audience.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictStr
22+
from pydantic.v1 import BaseModel, Field, StrictStr
2323

2424
class Audience(BaseModel):
2525
"""

‎linebot/v3/audience/models/audience_group.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr
22+
from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr
2323
from linebot.v3.audience.models.audience_group_create_route import AudienceGroupCreateRoute
2424
from linebot.v3.audience.models.audience_group_failed_type import AudienceGroupFailedType
2525
from linebot.v3.audience.models.audience_group_permission import AudienceGroupPermission

‎linebot/v3/audience/models/audience_group_job.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictInt, StrictStr
22+
from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr
2323
from linebot.v3.audience.models.audience_group_job_failed_type import AudienceGroupJobFailedType
2424
from linebot.v3.audience.models.audience_group_job_status import AudienceGroupJobStatus
2525
from linebot.v3.audience.models.audience_group_job_type import AudienceGroupJobType

‎linebot/v3/audience/models/create_audience_group_request.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import List, Optional
22-
from pydantic import BaseModel, Field, StrictBool, StrictStr, conlist, constr
22+
from pydantic.v1 import BaseModel, Field, StrictBool, StrictStr, conlist, constr
2323
from linebot.v3.audience.models.audience import Audience
2424

2525
class CreateAudienceGroupRequest(BaseModel):
@@ -58,7 +58,7 @@ def to_dict(self):
5858
exclude={
5959
},
6060
exclude_none=True)
61-
# override the default output from pydantic by calling `to_dict()` of each item in audiences (list)
61+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in audiences (list)
6262
_items = []
6363
if self.audiences:
6464
for _item in self.audiences:

‎linebot/v3/audience/models/create_audience_group_response.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional, Union
22-
from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, validator
22+
from pydantic.v1 import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, validator
2323
from linebot.v3.audience.models.audience_group_type import AudienceGroupType
2424

2525
class CreateAudienceGroupResponse(BaseModel):

‎linebot/v3/audience/models/create_click_based_audience_group_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictStr, constr
22+
from pydantic.v1 import BaseModel, Field, StrictStr, constr
2323

2424
class CreateClickBasedAudienceGroupRequest(BaseModel):
2525
"""

‎linebot/v3/audience/models/create_click_based_audience_group_response.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
22+
from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
2323
from linebot.v3.audience.models.audience_group_type import AudienceGroupType
2424

2525
class CreateClickBasedAudienceGroupResponse(BaseModel):

‎linebot/v3/audience/models/create_imp_based_audience_group_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictStr, constr
22+
from pydantic.v1 import BaseModel, Field, StrictStr, constr
2323

2424
class CreateImpBasedAudienceGroupRequest(BaseModel):
2525
"""

‎linebot/v3/audience/models/create_imp_based_audience_group_response.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictInt, StrictStr
22+
from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr
2323
from linebot.v3.audience.models.audience_group_type import AudienceGroupType
2424

2525
class CreateImpBasedAudienceGroupResponse(BaseModel):

‎linebot/v3/audience/models/error_detail.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, StrictStr
22+
from pydantic.v1 import BaseModel, Field, StrictStr
2323

2424
class ErrorDetail(BaseModel):
2525
"""

‎linebot/v3/audience/models/error_response.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import List, Optional
22-
from pydantic import BaseModel, Field, StrictStr, conlist
22+
from pydantic.v1 import BaseModel, Field, StrictStr, conlist
2323
from linebot.v3.audience.models.error_detail import ErrorDetail
2424

2525
class ErrorResponse(BaseModel):
@@ -56,7 +56,7 @@ def to_dict(self):
5656
exclude={
5757
},
5858
exclude_none=True)
59-
# override the default output from pydantic by calling `to_dict()` of each item in details (list)
59+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in details (list)
6060
_items = []
6161
if self.details:
6262
for _item in self.details:

‎linebot/v3/audience/models/get_audience_data_response.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import List, Optional
22-
from pydantic import BaseModel, Field, conlist
22+
from pydantic.v1 import BaseModel, Field, conlist
2323
from linebot.v3.audience.models.audience_group import AudienceGroup
2424
from linebot.v3.audience.models.audience_group_job import AudienceGroupJob
2525

@@ -57,10 +57,10 @@ def to_dict(self):
5757
exclude={
5858
},
5959
exclude_none=True)
60-
# override the default output from pydantic by calling `to_dict()` of audience_group
60+
# override the default output from pydantic.v1 by calling `to_dict()` of audience_group
6161
if self.audience_group:
6262
_dict['audienceGroup'] = self.audience_group.to_dict()
63-
# override the default output from pydantic by calling `to_dict()` of each item in jobs (list)
63+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in jobs (list)
6464
_items = []
6565
if self.jobs:
6666
for _item in self.jobs:

‎linebot/v3/audience/models/get_audience_group_authority_level_response.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field
22+
from pydantic.v1 import BaseModel, Field
2323
from linebot.v3.audience.models.audience_group_authority_level import AudienceGroupAuthorityLevel
2424

2525
class GetAudienceGroupAuthorityLevelResponse(BaseModel):

‎linebot/v3/audience/models/get_audience_groups_response.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import List, Optional
22-
from pydantic import BaseModel, Field, StrictBool, StrictInt, conlist
22+
from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, conlist
2323
from linebot.v3.audience.models.audience_group import AudienceGroup
2424

2525
class GetAudienceGroupsResponse(BaseModel):
@@ -60,7 +60,7 @@ def to_dict(self):
6060
exclude={
6161
},
6262
exclude_none=True)
63-
# override the default output from pydantic by calling `to_dict()` of each item in audience_groups (list)
63+
# override the default output from pydantic.v1 by calling `to_dict()` of each item in audience_groups (list)
6464
_items = []
6565
if self.audience_groups:
6666
for _item in self.audience_groups:

‎linebot/v3/audience/models/update_audience_group_authority_level_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field
22+
from pydantic.v1 import BaseModel, Field
2323
from linebot.v3.audience.models.audience_group_authority_level import AudienceGroupAuthorityLevel
2424

2525
class UpdateAudienceGroupAuthorityLevelRequest(BaseModel):

‎linebot/v3/audience/models/update_audience_group_description_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
from typing import Optional
22-
from pydantic import BaseModel, Field, constr
22+
from pydantic.v1 import BaseModel, Field, constr
2323

2424
class UpdateAudienceGroupDescriptionRequest(BaseModel):
2525
"""

‎linebot/v3/insight/api/async_insight.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import io
1717
import warnings
1818

19-
from pydantic import validate_arguments, ValidationError
19+
from pydantic.v1 import validate_arguments, ValidationError
2020
from typing_extensions import Annotated
2121
from typing import overload, Optional, Union, Awaitable
2222

23-
from pydantic import Field, constr, validator
23+
from pydantic.v1 import Field, constr, validator
2424

2525
from typing import Optional
2626

0 commit comments

Comments
 (0)