FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat: Add UUID string format. Thanks @estyrke! (#1140) · e2b-dev/openapi-python-client@2fcd3cb · GitHub

/ openapi-python-client Public
forked from openapi-generators/openapi-python-client

Commit 2fcd3cb

Browse files
dbanty
and
estyrke
authored
feat: Add UUID string format. Thanks @estyrke! (openapi-generators#1140)
Replaces openapi-generators#1131 with a few fixes --------- Co-authored-by: Emil Styrke <emil.styrke@arboair.com> Co-authored-by: Dylan Anthony <dbanty@users.noreply.github.com>
1 parent 4478b62 commit 2fcd3cb

11 files changed

Lines changed: 325 additions & 2 deletions

File tree

‎end_to_end_tests/__snapshots__/test_end_to_end.ambr‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,25 @@
99
Circular $ref in request body
1010

1111

12+
If you believe this was a mistake or this tool is missing a feature you need, please open an issue at https://github.com/openapi-generators/openapi-python-client/issues/new/choose
13+
14+
'''
15+
# ---
16+
# name: test_documents_with_errors[invalid-uuid-defaults]
17+
'''
18+
Generating /test-documents-with-errors
19+
Warning(s) encountered while generating. Client was generated, but some pieces may be missing
20+
21+
WARNING parsing PUT / within default. Endpoint will not be generated.
22+
23+
cannot parse parameter of endpoint put_: Invalid UUID value: 3
24+
25+
26+
WARNING parsing POST / within default. Endpoint will not be generated.
27+
28+
cannot parse parameter of endpoint post_: Invalid UUID value: notauuid
29+
30+
1231
If you believe this was a mistake or this tool is missing a feature you need, please open an issue at https://github.com/openapi-generators/openapi-python-client/issues/new/choose
1332

1433
'''

‎end_to_end_tests/baseline_openapi_3.0.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,6 +1714,8 @@
17141714
"aCamelDateTime",
17151715
"a_date",
17161716
"a_nullable_date",
1717+
"a_uuid",
1718+
"a_nullable_uuid",
17171719
"required_nullable",
17181720
"required_not_nullable",
17191721
"model",
@@ -1784,6 +1786,23 @@
17841786
"type": "string",
17851787
"format": "date"
17861788
},
1789+
"a_uuid": {
1790+
"title": "A Uuid",
1791+
"type": "string",
1792+
"format": "uuid"
1793+
},
1794+
"a_nullable_uuid": {
1795+
"title": "A Nullable Uuid",
1796+
"type": "string",
1797+
"format": "uuid",
1798+
"nullable": true,
1799+
"default": "07EF8B4D-AA09-4FFA-898D-C710796AFF41"
1800+
},
1801+
"a_not_required_uuid": {
1802+
"title": "A Not Required Uuid",
1803+
"type": "string",
1804+
"format": "uuid"
1805+
},
17871806
"1_leading_digit": {
17881807
"title": "Leading Digit",
17891808
"type": "string"

‎end_to_end_tests/baseline_openapi_3.1.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ info:
16991699
"aCamelDateTime",
17001700
"a_date",
17011701
"a_nullable_date",
1702+
"a_uuid",
1703+
"a_nullable_uuid",
17021704
"required_nullable",
17031705
"required_not_nullable",
17041706
"model",
@@ -1771,6 +1773,29 @@ info:
17711773
"type": "string",
17721774
"format": "date"
17731775
},
1776+
"a_uuid": {
1777+
"title": "A Uuid",
1778+
"type": "string",
1779+
"format": "uuid"
1780+
},
1781+
"a_nullable_uuid": {
1782+
"title": "A Nullable Uuid",
1783+
"anyOf": [
1784+
{
1785+
"type": "string",
1786+
"format": "uuid",
1787+
},
1788+
{
1789+
"type": "null"
1790+
}
1791+
],
1792+
"default": "07EF8B4D-AA09-4FFA-898D-C710796AFF41"
1793+
},
1794+
"a_not_required_uuid": {
1795+
"title": "A Not Required Uuid",
1796+
"type": "string",
1797+
"format": "uuid"
1798+
},
17741799
"1_leading_digit": {
17751800
"title": "Leading Digit",
17761801
"type": "string"

‎end_to_end_tests/documents_with_errors/invalid-uuid-defaults.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
openapi: "3.1.0"
2+
info:
3+
title: "Circular Body Ref"
4+
version: "0.1.0"
5+
paths:
6+
/:
7+
post:
8+
parameters:
9+
- name: id
10+
in: query
11+
required: false
12+
schema:
13+
type: string
14+
format: uuid
15+
default: "notauuid"
16+
responses:
17+
"200":
18+
description: "Successful Response"
19+
put:
20+
parameters:
21+
- name: another_id
22+
in: query
23+
required: false
24+
schema:
25+
type: string
26+
format: uuid
27+
default: 3
28+
responses:
29+
"200":
30+
description: "Successful Response"

‎end_to_end_tests/golden-record/my_test_api_client/models/a_model.py‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import datetime
22
from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union, cast
3+
from uuid import UUID
34

45
from attrs import define as _attrs_define
56
from dateutil.parser import isoparse
@@ -27,6 +28,8 @@ class AModel:
2728
a_camel_date_time (Union[datetime.date, datetime.datetime]):
2829
a_date (datetime.date):
2930
a_nullable_date (Union[None, datetime.date]):
31+
a_uuid (UUID):
32+
a_nullable_uuid (Union[None, UUID]): Default: UUID('07EF8B4D-AA09-4FFA-898D-C710796AFF41').
3033
required_nullable (Union[None, str]):
3134
required_not_nullable (str):
3235
one_of_models (Union['FreeFormModel', 'ModelWithUnionProperty', Any]):
@@ -37,6 +40,7 @@ class AModel:
3740
an_optional_allof_enum (Union[Unset, AnAllOfEnum]):
3841
nested_list_of_enums (Union[Unset, List[List[DifferentEnum]]]):
3942
a_not_required_date (Union[Unset, datetime.date]):
43+
a_not_required_uuid (Union[Unset, UUID]):
4044
attr_1_leading_digit (Union[Unset, str]):
4145
attr_leading_underscore (Union[Unset, str]):
4246
not_required_nullable (Union[None, Unset, str]):
@@ -51,17 +55,20 @@ class AModel:
5155
a_camel_date_time: Union[datetime.date, datetime.datetime]
5256
a_date: datetime.date
5357
a_nullable_date: Union[None, datetime.date]
58+
a_uuid: UUID
5459
required_nullable: Union[None, str]
5560
required_not_nullable: str
5661
one_of_models: Union["FreeFormModel", "ModelWithUnionProperty", Any]
5762
nullable_one_of_models: Union["FreeFormModel", "ModelWithUnionProperty", None]
5863
model: "ModelWithUnionProperty"
5964
nullable_model: Union["ModelWithUnionProperty", None]
6065
an_allof_enum_with_overridden_default: AnAllOfEnum = AnAllOfEnum.OVERRIDDEN_DEFAULT
66+
a_nullable_uuid: Union[None, UUID] = UUID("07EF8B4D-AA09-4FFA-898D-C710796AFF41")
6167
any_value: Union[Unset, Any] = "default"
6268
an_optional_allof_enum: Union[Unset, AnAllOfEnum] = UNSET
6369
nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
6470
a_not_required_date: Union[Unset, datetime.date] = UNSET
71+
a_not_required_uuid: Union[Unset, UUID] = UNSET
6572
attr_1_leading_digit: Union[Unset, str] = UNSET
6673
attr_leading_underscore: Union[Unset, str] = UNSET
6774
not_required_nullable: Union[None, Unset, str] = UNSET
@@ -93,6 +100,14 @@ def to_dict(self) -> Dict[str, Any]:
93100
else:
94101
a_nullable_date = self.a_nullable_date
95102

103+
a_uuid = str(self.a_uuid)
104+
105+
a_nullable_uuid: Union[None, str]
106+
if isinstance(self.a_nullable_uuid, UUID):
107+
a_nullable_uuid = str(self.a_nullable_uuid)
108+
else:
109+
a_nullable_uuid = self.a_nullable_uuid
110+
96111
required_nullable: Union[None, str]
97112
required_nullable = self.required_nullable
98113

@@ -143,6 +158,10 @@ def to_dict(self) -> Dict[str, Any]:
143158
if not isinstance(self.a_not_required_date, Unset):
144159
a_not_required_date = self.a_not_required_date.isoformat()
145160

161+
a_not_required_uuid: Union[Unset, str] = UNSET
162+
if not isinstance(self.a_not_required_uuid, Unset):
163+
a_not_required_uuid = str(self.a_not_required_uuid)
164+
146165
attr_1_leading_digit = self.attr_1_leading_digit
147166

148167
attr_leading_underscore = self.attr_leading_underscore
@@ -193,6 +212,8 @@ def to_dict(self) -> Dict[str, Any]:
193212
"aCamelDateTime": a_camel_date_time,
194213
"a_date": a_date,
195214
"a_nullable_date": a_nullable_date,
215+
"a_uuid": a_uuid,
216+
"a_nullable_uuid": a_nullable_uuid,
196217
"required_nullable": required_nullable,
197218
"required_not_nullable": required_not_nullable,
198219
"one_of_models": one_of_models,
@@ -209,6 +230,8 @@ def to_dict(self) -> Dict[str, Any]:
209230
field_dict["nested_list_of_enums"] = nested_list_of_enums
210231
if a_not_required_date is not UNSET:
211232
field_dict["a_not_required_date"] = a_not_required_date
233+
if a_not_required_uuid is not UNSET:
234+
field_dict["a_not_required_uuid"] = a_not_required_uuid
212235
if attr_1_leading_digit is not UNSET:
213236
field_dict["1_leading_digit"] = attr_1_leading_digit
214237
if attr_leading_underscore is not UNSET:
@@ -272,6 +295,23 @@ def _parse_a_nullable_date(data: object) -> Union[None, datetime.date]:
272295

273296
a_nullable_date = _parse_a_nullable_date(d.pop("a_nullable_date"))
274297

298+
a_uuid = UUID(d.pop("a_uuid"))
299+
300+
def _parse_a_nullable_uuid(data: object) -> Union[None, UUID]:
301+
if data is None:
302+
return data
303+
try:
304+
if not isinstance(data, str):
305+
raise TypeError()
306+
a_nullable_uuid_type_0 = UUID(data)
307+
308+
return a_nullable_uuid_type_0
309+
except: # noqa: E722
310+
pass
311+
return cast(Union[None, UUID], data)
312+
313+
a_nullable_uuid = _parse_a_nullable_uuid(d.pop("a_nullable_uuid"))
314+
275315
def _parse_required_nullable(data: object) -> Union[None, str]:
276316
if data is None:
277317
return data
@@ -370,6 +410,13 @@ def _parse_nullable_model(data: object) -> Union["ModelWithUnionProperty", None]
370410
else:
371411
a_not_required_date = isoparse(_a_not_required_date).date()
372412

413+
_a_not_required_uuid = d.pop("a_not_required_uuid", UNSET)
414+
a_not_required_uuid: Union[Unset, UUID]
415+
if isinstance(_a_not_required_uuid, Unset):
416+
a_not_required_uuid = UNSET
417+
else:
418+
a_not_required_uuid = UUID(_a_not_required_uuid)
419+
373420
attr_1_leading_digit = d.pop("1_leading_digit", UNSET)
374421

375422
attr_leading_underscore = d.pop("_leading_underscore", UNSET)
@@ -463,6 +510,8 @@ def _parse_not_required_nullable_model(data: object) -> Union["ModelWithUnionPro
463510
a_camel_date_time=a_camel_date_time,
464511
a_date=a_date,
465512
a_nullable_date=a_nullable_date,
513+
a_uuid=a_uuid,
514+
a_nullable_uuid=a_nullable_uuid,
466515
required_nullable=required_nullable,
467516
required_not_nullable=required_not_nullable,
468517
one_of_models=one_of_models,
@@ -473,6 +522,7 @@ def _parse_not_required_nullable_model(data: object) -> Union["ModelWithUnionPro
473522
an_optional_allof_enum=an_optional_allof_enum,
474523
nested_list_of_enums=nested_list_of_enums,
475524
a_not_required_date=a_not_required_date,
525+
a_not_required_uuid=a_not_required_uuid,
476526
attr_1_leading_digit=attr_1_leading_digit,
477527
attr_leading_underscore=attr_leading_underscore,
478528
not_required_nullable=not_required_nullable,

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL