Skip to content

[Python-experimental] types now classes, adds additionalProperties handling #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 13 commits into from
Oct 28, 2019
Merged

[Python-experimental] types now classes, adds additionalProperties handling #4154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
89f7c85
Changes python-experimental types to classes, adds additionalalproper…
spacether Sep 23, 2019
3e71c05
Regenerates python-experimental client
spacether Oct 14, 2019
2bdd00a
Updates windows python-experimental bat file
spacether Oct 15, 2019
7864c5a
Fixes addModelImport so client generation will work with the v2 spec
spacether Oct 15, 2019
630499c
Reverts PythonClientCodegen.java
spacether Oct 16, 2019
beff6fe
Acutally revert PythonClientCodegen.java
spacether Oct 16, 2019
2ee49a1
Updates the sample example for file_type in docs
spacether Oct 16, 2019
9ce5a7f
Silences line too long error for python models so CI tests pass
spacether Oct 16, 2019
b901305
Fixes handling of file uploads, adds tests for uploading files
spacether Oct 22, 2019
0c10c0b
Removes comment
spacether Oct 22, 2019
87788c6
Fixes mock installation in python2
spacether Oct 22, 2019
43062b7
Limit mock addition to python-experimental test requirements only
spacether Oct 22, 2019
8e4e58b
Removes SmartBear copyright line
spacether Oct 23, 2019
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
Prev Previous commit
Next Next commit
Silences line too long error for python models so CI tests pass
  • Loading branch information
@spacether
spacether committed Oct 16, 2019
commit 9ce5a7f5bbd96db23db6f2e32cd0dbaefcd3e510
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/python/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class {{classname}}(object):
allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#items.isString}}"{{/items.isString}}{{{this}}}{{#items.isString}}"{{/items.isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501
{{#isListContainer}}
if (self.local_vars_configuration.client_side_validation and
not set({{{name}}}).issubset(set(allowed_values))):
not set({{{name}}}).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set({{{name}}}) - set(allowed_values))), # noqa: E501
Expand All @@ -124,7 +124,7 @@ class {{classname}}(object):
{{/isListContainer}}
{{#isMapContainer}}
if (self.local_vars_configuration.client_side_validation and
not set({{{name}}}.keys()).issubset(set(allowed_values))):
not set({{{name}}}.keys()).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid keys in `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set({{{name}}}.keys()) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def array_enum(self, array_enum):
"""
allowed_values = ["fish", "crab"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(array_enum).issubset(set(allowed_values))):
not set(array_enum).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `array_enum` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(array_enum) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def map_of_enum_string(self, map_of_enum_string):
"""
allowed_values = ["UPPER", "lower"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(map_of_enum_string.keys()).issubset(set(allowed_values))):
not set(map_of_enum_string.keys()).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid keys in `map_of_enum_string` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(map_of_enum_string.keys()) - set(allowed_values))), # noqa: E501
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/python-asyncio/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
certifi >= 14.05.14
future; python_version<="2.7"
six >= 1.10
python_dateutil >= 2.5.3
setuptools >= 21.0.0
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def array_enum(self, array_enum):
"""
allowed_values = ["fish", "crab"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(array_enum).issubset(set(allowed_values))):
not set(array_enum).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `array_enum` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(array_enum) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python-tornado/petstore_api/models/map_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def map_of_enum_string(self, map_of_enum_string):
"""
allowed_values = ["UPPER", "lower"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(map_of_enum_string.keys()).issubset(set(allowed_values))):
not set(map_of_enum_string.keys()).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid keys in `map_of_enum_string` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(map_of_enum_string.keys()) - set(allowed_values))), # noqa: E501
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/python-tornado/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
certifi >= 14.05.14
future; python_version<="2.7"
six >= 1.10
python_dateutil >= 2.5.3
setuptools >= 21.0.0
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python/petstore_api/models/enum_arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def array_enum(self, array_enum):
"""
allowed_values = ["fish", "crab"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(array_enum).issubset(set(allowed_values))):
not set(array_enum).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `array_enum` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(array_enum) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/python/petstore_api/models/map_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def map_of_enum_string(self, map_of_enum_string):
"""
allowed_values = ["UPPER", "lower"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(map_of_enum_string.keys()).issubset(set(allowed_values))):
not set(map_of_enum_string.keys()).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid keys in `map_of_enum_string` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(map_of_enum_string.keys()) - set(allowed_values))), # noqa: E501
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
certifi >= 14.05.14
future; python_version<="2.7"
six >= 1.10
python_dateutil >= 2.5.3
setuptools >= 21.0.0
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def array_enum(self, array_enum):
"""
allowed_values = ["fish", "crab"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(array_enum).issubset(set(allowed_values))):
not set(array_enum).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `array_enum` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(array_enum) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/python/petstore_api/models/inline_object2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def enum_form_string_array(self, enum_form_string_array):
"""
allowed_values = [">", "$"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(enum_form_string_array).issubset(set(allowed_values))):
not set(enum_form_string_array).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid values for `enum_form_string_array` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(enum_form_string_array) - set(allowed_values))), # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/python/petstore_api/models/map_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def map_of_enum_string(self, map_of_enum_string):
"""
allowed_values = ["UPPER", "lower"] # noqa: E501
if (self.local_vars_configuration.client_side_validation and
not set(map_of_enum_string.keys()).issubset(set(allowed_values))):
not set(map_of_enum_string.keys()).issubset(set(allowed_values))): # noqa: E501
raise ValueError(
"Invalid keys in `map_of_enum_string` [{0}], must be a subset of [{1}]" # noqa: E501
.format(", ".join(map(str, set(map_of_enum_string.keys()) - set(allowed_values))), # noqa: E501
Expand Down
1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
certifi >= 14.05.14
future; python_version<="2.7"
six >= 1.10
python_dateutil >= 2.5.3
setuptools >= 21.0.0
Expand Down