From c19fe84ff2260f865a7ce0d664b1a17600ebadfd Mon Sep 17 00:00:00 2001 From: AsabuHere Date: Tue, 3 Dec 2024 19:49:00 +0530 Subject: [PATCH 1/3] Adding required models --- src/main/resources/twilio-python/context.handlebars | 2 +- src/main/resources/twilio-python/instance.handlebars | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/twilio-python/context.handlebars b/src/main/resources/twilio-python/context.handlebars index dcb59e7cd..c7447e98f 100644 --- a/src/main/resources/twilio-python/context.handlebars +++ b/src/main/resources/twilio-python/context.handlebars @@ -1,5 +1,5 @@ class {{apiName}}Context(InstanceContext): - +{{#if nestedModels}}{{>modelClasses}}{{/if}} def __init__(self, version: Version{{#instancePathParams}}, {{paramName}}: {{{dataType}}}{{/instancePathParams}}): """ Initialize the {{apiName}}Context diff --git a/src/main/resources/twilio-python/instance.handlebars b/src/main/resources/twilio-python/instance.handlebars index f9e8dc750..9a2060866 100644 --- a/src/main/resources/twilio-python/instance.handlebars +++ b/src/main/resources/twilio-python/instance.handlebars @@ -1,4 +1,5 @@ class {{instanceName}}(InstanceResource): +{{#if nestedModels}}{{>modelClasses}}{{/if}} {{>model}} """{{#vars}} :ivar {{name}}: {{{description}}}{{/vars}} From caec3010c322237b02c6544bcbb9751637df0fdf Mon Sep 17 00:00:00 2001 From: AsabuHere Date: Wed, 4 Dec 2024 10:13:53 +0530 Subject: [PATCH 2/3] orgs api changes for python --- .../twilio-python/listOperations.handlebars | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/resources/twilio-python/listOperations.handlebars b/src/main/resources/twilio-python/listOperations.handlebars index c0dba1eef..41d1b1f0c 100644 --- a/src/main/resources/twilio-python/listOperations.handlebars +++ b/src/main/resources/twilio-python/listOperations.handlebars @@ -354,7 +354,18 @@ 'PageSize': page_size, }) - response = self._version.page(method='{{vendorExtensions.x-http-method}}', uri=self._uri, params=data) + headers = values.of({ + {{#headerParams}}'{{{baseName}}}': {{paramName}}, + {{/headerParams}}'Content-Type': 'application/x-www-form-urlencoded' + }) + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + + response = self._version.page(method='{{vendorExtensions.x-http-method}}', uri=self._uri, params=data, headers=headers) return {{apiName}}Page(self._version, response{{#if listPathParams}}, self._solution{{/if}}) async def page_async(self, {{#allParams}} @@ -381,7 +392,18 @@ 'PageSize': page_size, }) - response = await self._version.page_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, params=data) + headers = values.of({ + {{#headerParams}}'{{{baseName}}}': {{paramName}}, + {{/headerParams}}'Content-Type': 'application/x-www-form-urlencoded' + }) + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + + response = await self._version.page_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, params=data, headers=headers) return {{apiName}}Page(self._version, response{{#if listPathParams}}, self._solution{{/if}}) def get_page(self, target_url: str) -> {{apiName}}Page: From e32f3b6e1679585c50b96c529ffe64229acc6fa9 Mon Sep 17 00:00:00 2001 From: AsabuHere Date: Wed, 4 Dec 2024 11:53:36 +0530 Subject: [PATCH 3/3] orgs api changes for python --- .../twilio-python/context.handlebars | 70 ++++++++++++++++--- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/src/main/resources/twilio-python/context.handlebars b/src/main/resources/twilio-python/context.handlebars index c7447e98f..0d2f34d60 100644 --- a/src/main/resources/twilio-python/context.handlebars +++ b/src/main/resources/twilio-python/context.handlebars @@ -30,9 +30,17 @@ class {{apiName}}Context(InstanceContext): 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}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}} - payload = self._version.update(method='{{vendorExtensions.x-http-method}}', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}}{{#if isHeaderParam}} headers=headers{{/if}}{{/if}}{{/allParams}}) + headers = values.of({}) + {{#allParams}}{{#isHeaderParam}}headers['{{{baseName}}}'] = {{paramName}}{{/isHeaderParam}}{{/allParams}} + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + + payload = self._version.update(method='{{vendorExtensions.x-http-method}}', uri=self._uri, data=data, headers=headers) return {{instanceName}}( self._version, @@ -51,9 +59,16 @@ class {{apiName}}Context(InstanceContext): 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}}{{#isHeaderParam}}headers = values.of({'{{{baseName}}}': {{paramName}}, }){{/isHeaderParam}}{{/allParams}} + headers = values.of({}) + {{#allParams}}{{#isHeaderParam}}headers['{{{baseName}}}'] = {{paramName}}{{/isHeaderParam}}{{/allParams}} + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} - payload = await self._version.update_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, data=data,{{#allParams}}{{#if isFormParam}}{{else}}{{#if isHeaderParam}} headers=headers{{/if}}{{/if}}{{/allParams}}) + payload = await self._version.update_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, data=data, headers=headers) return {{instanceName}}( self._version, @@ -63,7 +78,7 @@ class {{apiName}}Context(InstanceContext): {{/vendorExtensions.x-twilio.ignoreOperation}}{{/vendorExtensions.x-is-update-operation}}{{#vendorExtensions.x-is-fetch-operation}}{{^vendorExtensions.x-twilio.ignoreOperation}} def {{vendorExtensions.x-name-lower}}(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> {{instanceName}}: """ - Fetch the {{instanceName}} + Fetch1 the {{instanceName}} {{#allParams}} :param {{paramName}}: {{{description}}}{{/allParams}} @@ -73,9 +88,18 @@ class {{apiName}}Context(InstanceContext): data = values.of({ {{#allParams}}{{#if vendorExtensions.x-prefixed-collapsible-map}}{{else}} '{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: e){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/if}}{{/allParams}} }) + {{#allParams}}{{#if vendorExtensions.x-prefixed-collapsible-map}}data.update({{vendorExtensions.x-serialize}}({{paramName}}, '{{vendorExtensions.x-prefixed-collapsible-map}}')) {{/if}}{{/allParams}}{{/if}} - payload = self._version.fetch(method='{{vendorExtensions.x-http-method}}', uri=self._uri, {{#if allParams}}params=data{{/if}}) + + headers = values.of({}) + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + payload = self._version.fetch(method='{{vendorExtensions.x-http-method}}', uri=self._uri {{#if allParams}}, params=data{{/if}} , headers=headers) return {{instanceName}}( self._version, @@ -96,9 +120,18 @@ class {{apiName}}Context(InstanceContext): data = values.of({ {{#allParams}}{{#if vendorExtensions.x-prefixed-collapsible-map}}{{else}} '{{{baseName}}}': {{#if vendorExtensions.x-serialize}}{{vendorExtensions.x-serialize}}({{paramName}}{{#if isArray}}, lambda e: e){{else}}){{/if}}{{else}}{{paramName}}{{/if}},{{/if}}{{/allParams}} }) + {{#allParams}}{{#if vendorExtensions.x-prefixed-collapsible-map}}data.update({{vendorExtensions.x-serialize}}({{paramName}}, '{{vendorExtensions.x-prefixed-collapsible-map}}')) {{/if}}{{/allParams}}{{/if}} - payload = await self._version.fetch_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, {{#if allParams}}params=data{{/if}}) + + headers = values.of({}) + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + payload = await self._version.fetch_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri {{#if allParams}}, params=data{{/if}}, headers=headers) return {{instanceName}}( self._version, @@ -117,7 +150,17 @@ class {{apiName}}Context(InstanceContext): """{{#if allParams}} headers = values.of({{#allParams}}{'{{{baseName}}}': {{paramName}}, }{{/allParams}}) {{/if}} - return self._version.delete(method='{{vendorExtensions.x-http-method}}', uri=self._uri,{{#if allParams}} headers=headers{{/if}}) + + {{^if allParams}} + headers = values.of({}) + {{/if}} + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + return self._version.delete(method='{{vendorExtensions.x-http-method}}', uri=self._uri, headers=headers) async def {{vendorExtensions.x-name-lower}}_async(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> bool: """ @@ -129,7 +172,16 @@ class {{apiName}}Context(InstanceContext): """{{#if allParams}} headers = values.of({{#allParams}}{'{{{baseName}}}': {{paramName}}, }{{/allParams}}) {{/if}} - return await self._version.delete_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri,{{#if allParams}} headers=headers{{/if}}) + {{^if allParams}} + headers = values.of({}) + {{/if}} + {{#consumes}} + headers["Content-Type"] = "{{{mediaType}}}" + {{/consumes}} + {{#produces}} + headers["Accept"] = "{{{mediaType}}}" + {{/produces}} + return await self._version.delete_async(method='{{vendorExtensions.x-http-method}}', uri=self._uri, headers=headers) {{/vendorExtensions.x-twilio.ignoreOperation}}{{/vendorExtensions.x-is-delete-operation}}{{#vendorExtensions.x-is-create-operation}}{{^vendorExtensions.x-twilio.ignoreOperation}} def {{vendorExtensions.x-name-lower}}(self{{#allParams}}, {{paramName}}: {{#if required}}{{{dataType}}}{{else}}Union[{{{dataType}}}, object]=values.unset{{/if}}{{/allParams}}) -> {{instanceName}}: """