Skip to content

[Python] Support for per-operation servers #6557

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
spacether merged 23 commits into from
Jun 26, 2020
Merged

[Python] Support for per-operation servers #6557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
81e594d
Dynamic server support
jirikuncar Jun 5, 2020
4985f27
regenerated
jirikuncar Jun 5, 2020
1fd2e65
Apply suggestions from code review
jirikuncar Jun 5, 2020
6caf66f
regenerated
jirikuncar Jun 5, 2020
5eec729
Add ParameterizedServer feature to Python experimental
jirikuncar Jun 5, 2020
df1c324
Fix lookup of server variables
jirikuncar Jun 5, 2020
3920645
Add tests and change default value for servers
jirikuncar Jun 8, 2020
7420edb
Fix server variables
jirikuncar Jun 8, 2020
5422cfd
Return base path when index is None
jirikuncar Jun 8, 2020
280837f
Merge remote-tracking branch 'upstream/master' into python-experiment…
jirikuncar Jun 8, 2020
294d164
Use HOST
jirikuncar Jun 8, 2020
f38fc72
Apply suggestions from code review
jirikuncar Jun 11, 2020
8ec2cb7
Apply suggestions from code review
jirikuncar Jun 11, 2020
655ecd0
Merge remote-tracking branch 'upstream/master' into python-experiment…
jirikuncar Jun 11, 2020
6e97360
regenerated
jirikuncar Jun 11, 2020
0a57b4c
Add specific tests for dynamic servers
jirikuncar Jun 12, 2020
5788068
Merge remote-tracking branch 'upstream/master' into python-experiment…
jirikuncar Jun 12, 2020
1d19097
regenerated
jirikuncar Jun 12, 2020
ff976a4
add docstring
jirikuncar Jun 14, 2020
032533d
Merge remote-tracking branch 'upstream/master' into python-experiment…
jirikuncar Jun 14, 2020
3706f4d
regenerated
jirikuncar Jun 15, 2020
3a1d0ca
Merge remote-tracking branch 'upstream/master' into python-experiment…
jirikuncar Jun 23, 2020
66df647
Fix wrong merge resolution
jirikuncar Jun 23, 2020
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
Fix wrong merge resolution
  • Loading branch information
@jirikuncar
jirikuncar committed Jun 23, 2020
commit 66df64717c47d2e27ea2d2c6a57957c295496e58
12 changes: 10 additions & 2 deletions modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ class Endpoint(object):
self.openapi_types = root_map['openapi_types']
extra_types = {
'async_req': (bool,),
'_host_index': (int,),
'_host_index': (none_type, int),
'_preload_content': (bool,),
'_request_timeout': (none_type, int, (int,), [int]),
'_return_http_data_only': (bool,),
Expand Down Expand Up @@ -755,7 +755,15 @@ class Endpoint(object):
def call_with_http_info(self, **kwargs):

try:
_host = self.settings['servers'][kwargs['_host_index']]
index = self.api_client.configuration.server_operation_index.get(
self.settings['operation_id'], self.api_client.configuration.server_index
) if kwargs['_host_index'] is None else kwargs['_host_index']
server_variables = self.api_client.configuration.server_operation_variables.get(
self.settings['operation_id'], self.api_client.configuration.server_variables
)
_host = self.api_client.configuration.get_host_from_settings(
index, variables=server_variables, servers=self.settings['servers']
)
except IndexError:
if self.settings['servers']:
raise ApiValueError(
Expand Down
12 changes: 10 additions & 2 deletions samples/client/petstore/python-experimental/petstore_api/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ def __init__(self, settings=None, params_map=None, root_map=None,
self.openapi_types = root_map['openapi_types']
extra_types = {
'async_req': (bool,),
'_host_index': (int,),
'_host_index': (none_type, int),
'_preload_content': (bool,),
'_request_timeout': (none_type, int, (int,), [int]),
'_return_http_data_only': (bool,),
Expand Down Expand Up @@ -734,7 +734,15 @@ def __call__(self, *args, **kwargs):
def call_with_http_info(self, **kwargs):

try:
_host = self.settings['servers'][kwargs['_host_index']]
index = self.api_client.configuration.server_operation_index.get(
self.settings['operation_id'], self.api_client.configuration.server_index
) if kwargs['_host_index'] is None else kwargs['_host_index']
server_variables = self.api_client.configuration.server_operation_variables.get(
self.settings['operation_id'], self.api_client.configuration.server_variables
)
_host = self.api_client.configuration.get_host_from_settings(
index, variables=server_variables, servers=self.settings['servers']
)
except IndexError:
if self.settings['servers']:
raise ApiValueError(
Expand Down
12 changes: 10 additions & 2 deletions ...napi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ def __init__(self, settings=None, params_map=None, root_map=None,
self.openapi_types = root_map['openapi_types']
extra_types = {
'async_req': (bool,),
'_host_index': (int,),
'_host_index': (none_type, int),
'_preload_content': (bool,),
'_request_timeout': (none_type, int, (int,), [int]),
'_return_http_data_only': (bool,),
Expand Down Expand Up @@ -734,7 +734,15 @@ def __call__(self, *args, **kwargs):
def call_with_http_info(self, **kwargs):

try:
_host = self.settings['servers'][kwargs['_host_index']]
index = self.api_client.configuration.server_operation_index.get(
self.settings['operation_id'], self.api_client.configuration.server_index
) if kwargs['_host_index'] is None else kwargs['_host_index']
server_variables = self.api_client.configuration.server_operation_variables.get(
self.settings['operation_id'], self.api_client.configuration.server_variables
)
_host = self.api_client.configuration.get_host_from_settings(
index, variables=server_variables, servers=self.settings['servers']
)
except IndexError:
if self.settings['servers']:
raise ApiValueError(
Expand Down
12 changes: 10 additions & 2 deletions ...penapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ def __init__(self, settings=None, params_map=None, root_map=None,
self.openapi_types = root_map['openapi_types']
extra_types = {
'async_req': (bool,),
'_host_index': (int,),
'_host_index': (none_type, int),
'_preload_content': (bool,),
'_request_timeout': (none_type, int, (int,), [int]),
'_return_http_data_only': (bool,),
Expand Down Expand Up @@ -734,7 +734,15 @@ def __call__(self, *args, **kwargs):
def call_with_http_info(self, **kwargs):

try:
_host = self.settings['servers'][kwargs['_host_index']]
index = self.api_client.configuration.server_operation_index.get(
self.settings['operation_id'], self.api_client.configuration.server_index
) if kwargs['_host_index'] is None else kwargs['_host_index']
server_variables = self.api_client.configuration.server_operation_variables.get(
self.settings['operation_id'], self.api_client.configuration.server_variables
)
_host = self.api_client.configuration.get_host_from_settings(
index, variables=server_variables, servers=self.settings['servers']
)
except IndexError:
if self.settings['servers']:
raise ApiValueError(
Expand Down
12 changes: 10 additions & 2 deletions samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ def __init__(self, settings=None, params_map=None, root_map=None,
self.openapi_types = root_map['openapi_types']
extra_types = {
'async_req': (bool,),
'_host_index': (int,),
'_host_index': (none_type, int),
'_preload_content': (bool,),
'_request_timeout': (none_type, int, (int,), [int]),
'_return_http_data_only': (bool,),
Expand Down Expand Up @@ -741,7 +741,15 @@ def __call__(self, *args, **kwargs):
def call_with_http_info(self, **kwargs):

try:
_host = self.settings['servers'][kwargs['_host_index']]
index = self.api_client.configuration.server_operation_index.get(
self.settings['operation_id'], self.api_client.configuration.server_index
) if kwargs['_host_index'] is None else kwargs['_host_index']
server_variables = self.api_client.configuration.server_operation_variables.get(
self.settings['operation_id'], self.api_client.configuration.server_variables
)
_host = self.api_client.configuration.get_host_from_settings(
index, variables=server_variables, servers=self.settings['servers']
)
except IndexError:
if self.settings['servers']:
raise ApiValueError(
Expand Down