From 5697503d406bb9223201cae06f016a8f40461de6 Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Mon, 18 Mar 2024 14:35:30 +0530 Subject: [PATCH 1/2] chore: fixed python header and query params mustache --- .../twilio-python/listOperations.handlebars | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/src/main/resources/twilio-python/listOperations.handlebars b/src/main/resources/twilio-python/listOperations.handlebars index 5152295de..19200ddd9 100644 --- a/src/main/resources/twilio-python/listOperations.handlebars +++ b/src/main/resources/twilio-python/listOperations.handlebars @@ -12,7 +12,11 @@ {{^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}} + {{#headerParams.0}}headers = values.of({ + {{#headerParams}}'{{{baseName}}}': {{paramName}}, + {{/headerParams}} + }) + {{/headerParams.0}} {{#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}}) @@ -33,8 +37,16 @@ {{^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}} + {{#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.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}}) return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}}) @@ -68,13 +80,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}}) @@ -87,8 +99,15 @@ {{#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}} + {{#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{{#allParams}}{{#if isHeaderParam}}, headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}}) async def delete_async(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> bool: @@ -98,8 +117,15 @@ {{#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}} + {{#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{{#allParams}}{{#if isHeaderParam}}, headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}}){{/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}}: """ @@ -112,7 +138,11 @@ 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}} + {{#headerParams.0}}headers = values.of({ + {{#headerParams}}'{{{baseName}}}': {{paramName}}, + {{/headerParams}} + }) + {{/headerParams.0}} payload = self._version.update(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}}) return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}}) @@ -128,7 +158,11 @@ 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}} + {{#headerParams.0}}headers = values.of({ + {{#headerParams}}'{{{baseName}}}': {{paramName}}, + {{/headerParams}} + }) + {{/headerParams.0}} payload = await self._version.update_async(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}}) return {{instanceName}}(self._version, payload{{#listPathParams}}, {{paramName}}=self._solution['{{paramName}}']{{/listPathParams}}){{/vendorExtensions.x-is-update-operation}}{{/instancePath}}{{#vendorExtensions.x-is-read-operation}} From 44832eb72bc9a6b4038514a3359ec6f6242a5090 Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Mon, 18 Mar 2024 16:20:21 +0530 Subject: [PATCH 2/2] chore: corrected header and body params mustache --- .../twilio-python/listOperations.handlebars | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src/main/resources/twilio-python/listOperations.handlebars b/src/main/resources/twilio-python/listOperations.handlebars index 19200ddd9..9a0ae6e85 100644 --- a/src/main/resources/twilio-python/listOperations.handlebars +++ b/src/main/resources/twilio-python/listOperations.handlebars @@ -15,10 +15,16 @@ {{#headerParams.0}}headers = values.of({ {{#headerParams}}'{{{baseName}}}': {{paramName}}, {{/headerParams}} + {{#bodyParams.0}}'Content-Type': 'application/json'{{/bodyParams.0}} }) {{/headerParams.0}} - {{#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}}{{#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}}) @@ -30,10 +36,7 @@ {{/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}} @@ -42,12 +45,13 @@ {{/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}}{{#allParams}}{{#if isHeaderParam}} headers=headers{{/if}}{{#if isBodyParam}} headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}}) + 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}} @@ -108,7 +112,7 @@ {{#queryParams}}'{{{baseName}}}': {{paramName}}, {{/queryParams}} }){{/queryParams.0}} - return self._version.delete(method='DELETE', uri=self._uri{{#allParams}}{{#if isHeaderParam}}, headers=headers{{/if}}{{#if isQueryParam}}, params=params{{/if}}{{/allParams}}) + 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: """ @@ -126,7 +130,7 @@ {{#queryParams}}'{{{baseName}}}': {{paramName}}, {{/queryParams}} }){{/queryParams.0}} - 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}} + 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}} @@ -135,15 +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}} - }) + {{#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}} - payload = self._version.update(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}}) + {{#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}}) @@ -155,15 +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}} - }) + {{#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}} - payload = await self._version.update_async(method='POST', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}} headers=headers{{/if}}{{/allParams}}) + {{#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}}