Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Fixes mypy redundant casts issue #251

Merged
spacether merged 4 commits into from
Oct 9, 2023
Merged

Fixes mypy redundant casts issue #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfc994d
Adds uncast returns if property type is the same as the map value type
spacether Oct 6, 2023
44ce4fa
Petstore regen with redundant casts removed
spacether Oct 9, 2023
2693d53
Adds 3 patch tests of typing.cast
spacether Oct 9, 2023
37997d6
Updates samples
spacether Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ...python/src/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,14 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

@property
def bar(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("bar", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...rc/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/allof.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
10 changes: 2 additions & 8 deletions ...ient/3_0_3_unit_test/python/src/unit_test_api/components/schema/allof_with_base_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down Expand Up @@ -125,10 +122,7 @@ def from_dict_(

@property
def baz(self) -> None:
return typing.cast(
None,
self.__getitem__("baz")
)
return self.__getitem__("baz")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../client/3_0_3_unit_test/python/src/unit_test_api/components/schema/anyof_complex_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ..._unit_test/python/src/unit_test_api/components/schema/invalid_string_value_for_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@ def bar(self) -> typing.Union[str, schemas.Unset]:
val = self.get("bar", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...ent/3_0_3_unit_test/python/src/unit_test_api/components/schema/not_more_complex_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def foo(self) -> typing.Union[str, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../client/3_0_3_unit_test/python/src/unit_test_api/components/schema/oneof_complex_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...3_0_3_unit_test/python/src/unit_test_api/components/schema/required_default_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
10 changes: 2 additions & 8 deletions .../client/3_0_3_unit_test/python/src/unit_test_api/components/schema/required_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,14 @@ def from_dict_(

@property
def foo(self) -> schemas.OUTPUT_BASE_TYPES:
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
self.__getitem__("foo")
)
return self.__getitem__("foo")

@property
def bar(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("bar", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...t/3_0_3_unit_test/python/src/unit_test_api/components/schema/required_with_empty_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ def alpha(self) -> typing.Union[int, float, schemas.Unset]:
val = self.get("alpha", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
typing.Union[int, float],
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...son_schema_api/components/schema/any_type_unevaluated_properties_false_with_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def someProp(self) -> typing.Union[str, schemas.Unset]:
val = self.get("someProp", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../json_schema_api/components/schema/object_unevaluated_properties_false_with_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def someProp(self) -> typing.Union[str, schemas.Unset]:
val = self.get("someProp", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
10 changes: 2 additions & 8 deletions ...python/src/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,14 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

@property
def bar(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("bar", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../src/unit_test_api/components/schema/additionalproperties_does_not_look_in_applicators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/allof.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
10 changes: 2 additions & 8 deletions ...ient/3_1_0_unit_test/python/src/unit_test_api/components/schema/allof_with_base_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down Expand Up @@ -125,10 +122,7 @@ def from_dict_(

@property
def baz(self) -> None:
return typing.cast(
None,
self.__getitem__("baz")
)
return self.__getitem__("baz")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../client/3_1_0_unit_test/python/src/unit_test_api/components/schema/anyof_complex_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
10 changes: 2 additions & 8 deletions ...est_api/components/schema/dependent_schemas_dependent_subschema_incompatible_with_root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def bar(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("bar", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val
FooDictInput = typing.TypedDict(
'FooDictInput',
{
Expand Down Expand Up @@ -169,10 +166,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...ent/3_1_0_unit_test/python/src/unit_test_api/components/schema/not_more_complex_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def foo(self) -> typing.Union[str, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions .../client/3_1_0_unit_test/python/src/unit_test_api/components/schema/oneof_complex_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ def from_dict_(

@property
def foo(self) -> str:
return typing.cast(
str,
self.__getitem__("foo")
)
return self.__getitem__("foo")

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
15 changes: 3 additions & 12 deletions ...test_api/components/schema/properties_whose_names_are_javascript_object_property_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ def length(self) -> typing.Union[str, schemas.Unset]:
val = self.get("length", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
str,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down Expand Up @@ -160,10 +157,7 @@ def __proto__(self) -> typing.Union[int, float, schemas.Unset]:
val = self.get("__proto__", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
typing.Union[int, float],
val
)
return val

@property
def toString(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
Expand All @@ -180,10 +174,7 @@ def constructor(self) -> typing.Union[int, float, schemas.Unset]:
val = self.get("constructor", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
typing.Union[int, float],
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...on/src/unit_test_api/components/schema/properties_with_null_valued_instance_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ def foo(self) -> typing.Union[None, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
None,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
5 changes: 1 addition & 4 deletions ...3_1_0_unit_test/python/src/unit_test_api/components/schema/required_default_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ def foo(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
val = self.get("foo", schemas.unset)
if isinstance(val, schemas.Unset):
return val
return typing.cast(
schemas.OUTPUT_BASE_TYPES,
val
)
return val

def get_additional_property_(self, name: str) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
schemas.raise_if_key_known(name, self.__required_keys__, self.__optional_keys__)
Expand Down
Loading