From b1952439b78fcd7024ac61945ee93861281af674 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 22 Mar 2024 15:07:04 +0000 Subject: [PATCH 1/2] fix: cater for empty async call --- .../%name_%version/%sub/services/%service/async_client.py.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 index de18fb5c2a..6faddf19e1 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 @@ -325,10 +325,8 @@ class {{ service.async_client_name }}: # so it must be constructed via keyword expansion. if isinstance(request, dict): request = {{ method.input.ident }}(**request) - {% if method.flattened_fields %}{# Cross-package req and flattened fields #} elif not request: - request = {{ method.input.ident }}({% if method.input.ident.package != method.ident.package %}{% for f in method.flattened_fields.values() %}{{ f.name }}={{ f.name }}, {% endfor %}{% endif %}) - {% endif %}{# Cross-package req and flattened fields #} + request = {{ method.input.ident }}({% if method.flattened_fields %}{% for f in method.flattened_fields.values() %}{{ f.name }}={{ f.name }}, {% endfor %}{% endif %}) {% else %} request = {{ method.input.ident }}(request) {% endif %} {# different request package #} From 205f610247b47a39bcc5d9025d887880951074a3 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 22 Mar 2024 15:28:12 +0000 Subject: [PATCH 2/2] fix syntax issue --- .../%name_%version/%sub/services/%service/async_client.py.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 index 6faddf19e1..ffcb136fa6 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 @@ -326,7 +326,7 @@ class {{ service.async_client_name }}: if isinstance(request, dict): request = {{ method.input.ident }}(**request) elif not request: - request = {{ method.input.ident }}({% if method.flattened_fields %}{% for f in method.flattened_fields.values() %}{{ f.name }}={{ f.name }}, {% endfor %}{% endif %}) + request = {{ method.input.ident }}({% if method.flattened_fields %}{% for f in method.flattened_fields.values() %}{{ f.name }}={{ f.name }}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}) {% else %} request = {{ method.input.ident }}(request) {% endif %} {# different request package #}