Skip to content

Commit 533cc8f

Browse files
p1-rap1-ra
committed
task regen && task check
1 parent b17a38a commit 533cc8f

9 files changed

Lines changed: 249 additions & 215 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from .a_form_data import AFormData
44
from .a_model import AModel
5-
from .a_model_with_properties_reference_that_are_not_object import AModelWithPropertiesReferenceThatAreNotObject
65
from .a_model_with_indirect_reference_property import AModelWithIndirectReferenceProperty
76
from .a_model_with_indirect_self_reference_property import AModelWithIndirectSelfReferenceProperty
87
from .a_model_with_properties_reference_that_are_not_object import AModelWithPropertiesReferenceThatAreNotObject

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ def to_dict(self) -> Dict[str, Any]:
3131
@classmethod
3232
def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
3333
d = src_dict.copy()
34-
an_enum_indirect_ref: Union[Unset, AnEnum] = UNSET
3534
_an_enum_indirect_ref = d.pop("an_enum_indirect_ref", UNSET)
36-
if not isinstance(_an_enum_indirect_ref, Unset):
35+
an_enum_indirect_ref: Union[Unset, AnEnum]
36+
if isinstance(_an_enum_indirect_ref, Unset):
37+
an_enum_indirect_ref = UNSET
38+
else:
3739
an_enum_indirect_ref = AnEnum(_an_enum_indirect_ref)
3840

3941
a_model_with_indirect_reference_property = cls(

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
4444
d = src_dict.copy()
4545
required_self_ref = d.pop("required_self_ref")
4646

47-
an_enum: Union[Unset, AnEnum] = UNSET
4847
_an_enum = d.pop("an_enum", UNSET)
49-
if not isinstance(_an_enum, Unset):
48+
an_enum: Union[Unset, AnEnum]
49+
if isinstance(_an_enum, Unset):
50+
an_enum = UNSET
51+
else:
5052
an_enum = AnEnum(_an_enum)
5153

5254
optional_self_ref = d.pop("optional_self_ref", UNSET)

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

Lines changed: 226 additions & 193 deletions
Large diffs are not rendered by default.

‎openapi_python_client/parser/properties/schemas.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,10 @@ def from_string(*, string: str, config: Config) -> "Class":
6161
class Schemas:
6262
"""Structure for containing all defined, shareable, and reusable schemas (attr classes and Enums)"""
6363

64-
classes_by_reference: Dict[
65-
_ReferencePath, _Holder[Union[Property, RecursiveReferenceInterupt]]
66-
] = attr.ib(factory=dict)
67-
classes_by_name: Dict[
68-
_ClassName, _Holder[Union[Property, RecursiveReferenceInterupt]]
69-
] = attr.ib(factory=dict)
64+
classes_by_reference: Dict[_ReferencePath, _Holder[Union[Property, RecursiveReferenceInterupt]]] = attr.ib(
65+
factory=dict
66+
)
67+
classes_by_name: Dict[_ClassName, _Holder[Union[Property, RecursiveReferenceInterupt]]] = attr.ib(factory=dict)
7068
errors: List[ParseError] = attr.ib(factory=list)
7169

7270

‎openapi_python_client/resolver/collision_resolver.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import hashlib
22
import re
3-
43
from typing import Any, Dict, List, Tuple
4+
55
from .reference import Reference
66
from .resolver_types import SchemaData
77

@@ -74,7 +74,7 @@ def _get_from_ref(self, ref: Reference, attr: SchemaData) -> SchemaData:
7474

7575
if list(cursor) == ["$ref"]:
7676
ref2 = cursor["$ref"]
77-
ref2 = re.sub(r'(.*)_\d',r'\1',ref2)
77+
ref2 = re.sub(r"(.*)_\d", r"\1", ref2)
7878
ref2 = Reference(ref2, self._parent)
7979
if ref2.is_remote():
8080
attr = self._refs[ref2.abs_path]

‎openapi_python_client/resolver/pointer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
class Pointer:
6-
""" https://tools.ietf.org/html/rfc6901 """
6+
"""https://tools.ietf.org/html/rfc6901"""
77

88
def __init__(self, pointer: str) -> None:
99
if pointer is None or pointer != "" and not pointer.startswith("/"):

‎openapi_python_client/resolver/reference.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
class Reference:
9-
""" https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03 """
9+
"""https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03"""
1010

1111
def __init__(self, reference: str, parent: str = None):
1212
self._ref = reference
@@ -40,29 +40,29 @@ def pointer(self) -> Pointer:
4040
return Pointer(frag)
4141

4242
def is_relative(self) -> bool:
43-
""" return True if reference path is a relative path """
43+
"""return True if reference path is a relative path"""
4444
return not self.is_absolute()
4545

4646
def is_absolute(self) -> bool:
47-
""" return True is reference path is an absolute path """
47+
"""return True is reference path is an absolute path"""
4848
return self._parsed_ref.netloc != ""
4949

5050
@property
5151
def value(self) -> str:
5252
return self._ref
5353

5454
def is_url(self) -> bool:
55-
""" return True if the reference path is pointing to an external url location """
55+
"""return True if the reference path is pointing to an external url location"""
5656
return self.is_remote() and self._parsed_ref.netloc != ""
5757

5858
def is_remote(self) -> bool:
59-
""" return True if the reference pointer is pointing to a remote document """
59+
"""return True if the reference pointer is pointing to a remote document"""
6060
return not self.is_local()
6161

6262
def is_local(self) -> bool:
63-
""" return True if the reference pointer is pointing to the current document """
63+
"""return True if the reference pointer is pointing to the current document"""
6464
return self._parsed_ref.path == ""
6565

6666
def is_full_document(self) -> bool:
67-
""" return True if the reference pointer is pointing to the whole document content """
67+
"""return True if the reference pointer is pointing to the whole document content"""
6868
return self.pointer.parent is None

‎openapi_python_client/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def to_valid_python_identifier(value: str) -> str:
6767
See:
6868
https://docs.python.org/3/reference/lexical_analysis.html#identifiers
6969
"""
70-
new_value = fix_reserved_words(fix_keywords(sanitize(value))).lstrip('_')
70+
new_value = fix_reserved_words(fix_keywords(sanitize(value))).lstrip("_")
7171

7272
if new_value.isidentifier():
7373
return new_value

0 commit comments

Comments
 (0)