Skip to content
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

fix: python support for multiple query and header params #566

Merged
merged 3 commits into from
Mar 22, 2024
Merged

fix: python support for multiple query and header params #566

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5697503
chore: fixed python header and query params mustache
tiwarishubham635 Mar 18, 2024
44832eb
chore: corrected header and body params mustache
tiwarishubham635 Mar 18, 2024
464c436
Merge branch 'main' into python_param_fix
tiwarishubham635 Mar 19, 2024
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
110 changes: 80 additions & 30 deletions src/main/resources/twilio-python/listOperations.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,19 @@
{{^bodyParam}}{{#hasParams}}data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: {{#startsWith baseType text='object'}}serialize.object(e){{else}}e{{/startsWith}}){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
}){{/hasParams}}{{/bodyParam}}
{{#allParams}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}}
{{#allParams}}{{#isBodyParam}}headers = {"Content-Type": "application/json"}{{/isBodyParam}}{{/allParams}}
payload = self._version.create(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#allParams}}{{#if isHeaderParam}} headers=headers{{/if}}{{#if isBodyParam}} headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}})
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
{{#bodyParams.0}}'Content-Type': 'application/json'{{/bodyParams.0}}
})
{{/headerParams.0}}
{{^headerParams}}{{#bodyParams.0}}headers = {'Content-Type': 'application/json'}{{/bodyParams.0}}{{/headerParams}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
})
{{/queryParams.0}}
payload = self._version.create(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#headerParams.0}} headers=headers{{/headerParams.0}}{{^headerParams}}{{#bodyParams.0}} headers=headers{{/bodyParams.0}}{{/headerParams}}{{#queryParams.0}}, params=params{{/queryParams.0}})

return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}})

Expand All @@ -26,16 +36,22 @@
{{/allParams}}
:returns: The created {{instanceName}}
"""
{{#bodyParam}}
data = {{paramName}}.to_dict()
headers = {"Content-Type": "application/json"}
{{/bodyParam}}
{{#bodyParam}}data = {{paramName}}.to_dict(){{/bodyParam}}
{{^bodyParam}}{{#hasParams}}data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: {{#startsWith baseType text='object'}}serialize.object(e){{else}}e{{/startsWith}}){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
}){{/hasParams}}{{/bodyParam}}
{{#allParams}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}}
{{#allParams}}{{#isQueryParam}}params = values.of({'{{{baseName}}}': {{paramName}}, }){{/isQueryParam}}{{/allParams}}
payload = await self._version.create_async(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#allParams}}{{#if isHeaderParam}} headers=headers{{/if}}{{#if isBodyParam}} headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}})
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{^headerParams}}{{#bodyParams.0}}headers = {'Content-Type': 'application/json'}{{/bodyParams.0}}{{/headerParams}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
})
{{/queryParams.0}}
payload = await self._version.create_async(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#headerParams.0}} headers=headers{{/headerParams.0}}{{^headerParams}}{{#bodyParams.0}} headers=headers{{/bodyParams.0}}{{/headerParams}}{{#queryParams.0}}, params=params{{/queryParams.0}})

return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}})
{{/vendorExtensions.x-is-create-operation}}{{^instancePath}}{{#vendorExtensions.x-is-fetch-operation}}
Expand Down Expand Up @@ -68,13 +84,13 @@
:returns: The fetched {{instanceName}}
"""
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
})
{{/queryParams.0}}
payload = await self._version.fetch_async(method='GET', uri=self._uri{{#headerParams.0}}, headers=headers{{/headerParams.0}}{{#queryParams.0}}, params=params{{/queryParams.0}})
Expand All @@ -87,9 +103,16 @@
{{#allParams}}:param {{paramName}}: {{{description}}}{{/allParams}}
:returns: True if delete succeeds, False otherwise
"""
{{#allParams}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}}
{{#allParams}}{{#isQueryParam}}params = values.of({'{{{baseName}}}': {{paramName}}, }){{/isQueryParam}}{{/allParams}}
return self._version.delete(method='DELETE', uri=self._uri{{#allParams}}{{#if isHeaderParam}}, headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}})
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
}){{/queryParams.0}}
return self._version.delete(method='DELETE', uri=self._uri{{#headerParams.0}}, headers=headers{{/headerParams.0}}{{#queryParams.0}}, params=params{{/queryParams.0}})

async def delete_async(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> bool:
"""
Expand All @@ -98,9 +121,16 @@
{{#allParams}}:param {{paramName}}: {{{description}}}{{/allParams}}
:returns: True if delete succeeds, False otherwise
"""
{{#allParams}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}}
{{#allParams}}{{#isQueryParam}}params = values.of({'{{{baseName}}}': {{paramName}}, }){{/isQueryParam}}{{/allParams}}
return await self._version.delete_async(method='DELETE', uri=self._uri{{#allParams}}{{#if isHeaderParam}}, headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}}){{/vendorExtensions.x-is-delete-operation}}{{#vendorExtensions.x-is-update-operation}}
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
}){{/queryParams.0}}
return await self._version.delete_async(method='DELETE', uri=self._uri{{#headerParams.0}}, headers=headers{{/headerParams.0}}{{#queryParams.0}}, params=params{{/queryParams.0}}){{/vendorExtensions.x-is-delete-operation}}{{#vendorExtensions.x-is-update-operation}}
def update(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> {{instanceName}}:
"""
Update the {{instanceName}}
Expand All @@ -109,11 +139,21 @@
{{/allParams}}
:returns: The created {{instanceName}}
"""
data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: e){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
})
{{#allParams}}{{^isFormParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isFormParam}}{{/allParams}}
payload = self._version.update(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}})
{{#bodyParam}}data = {{paramName}}.to_dict(){{/bodyParam}}
{{^bodyParam}}{{#hasParams}}data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: {{#startsWith baseType text='object'}}serialize.object(e){{else}}e{{/startsWith}}){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
}){{/hasParams}}{{/bodyParam}}
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
})
{{/queryParams.0}}
payload = self._version.update(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#headerParams.0}} headers=headers{{/headerParams.0}}{{^headerParams}}{{#bodyParams.0}} headers=headers{{/bodyParams.0}}{{/headerParams}}{{#queryParams.0}}, params=params{{/queryParams.0}})

return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}})

Expand All @@ -125,11 +165,21 @@
{{/allParams}}
:returns: The created {{instanceName}}
"""
data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: e){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
})
{{#allParams}}{{^isFormParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isFormParam}}{{/allParams}}
payload = await self._version.update_async(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}})
{{#bodyParam}}data = {{paramName}}.to_dict(){{/bodyParam}}
{{^bodyParam}}{{#hasParams}}data = values.of({ {{#allParams}}{{#isFormParam}}
'{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: {{#startsWith baseType text='object'}}serialize.object(e){{else}}e{{/startsWith}}){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/isFormParam}}{{/allParams}}
}){{/hasParams}}{{/bodyParam}}
{{#headerParams.0}}headers = values.of({
{{#headerParams}}'{{{baseName}}}': {{paramName}},
{{/headerParams}}
})
{{/headerParams.0}}
{{#queryParams.0}}params = values.of({
{{#queryParams}}'{{{baseName}}}': {{paramName}},
{{/queryParams}}
})
{{/queryParams.0}}
payload = await self._version.update_async(method='POST', uri=self._uri, {{#hasParams}}data=data,{{/hasParams}}{{#headerParams.0}} headers=headers{{/headerParams.0}}{{^headerParams}}{{#bodyParams.0}} headers=headers{{/bodyParams.0}}{{/headerParams}}{{#queryParams.0}}, params=params{{/queryParams.0}})

return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}}){{/vendorExtensions.x-is-update-operation}}{{/instancePath}}{{#vendorExtensions.x-is-read-operation}}
def stream(self, {{#allParams}}
Expand Down
Loading