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: remove duplicate assignment of certain flattened, repeated fields #760

Merged
merged 2 commits into from
Feb 2, 2021
Merged

fix: remove duplicate assignment of certain flattened, repeated fields #760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55cf4bc
fix: remove duplicate assignment of certain flattened, repeated fields
software-dov Feb 1, 2021
e1ac13f
Merge branch 'master' into benfix
software-dov Feb 2, 2021
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
28 changes: 14 additions & 14 deletions gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,17 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
raise ValueError('If the `request` argument is set, then none of '
'the individual field arguments should be set.')

{% endif -%}
{% endif -%} {# method.flattened_fields #}
{% if method.input.ident.package != method.ident.package -%} {# request lives in a different package, so there is no proto wrapper #}
# The request isn't a proto-plus wrapped type,
# The request isn't a proto-plus wrapped type.
# 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 #}
{%- else %}
{%- else %} {# Request is in _our_ package #}
# Minor optimization to avoid making a copy if the user passes
# in a {{ method.input.ident }}.
# There's no risk of modifying the input as we've already verified
Expand All @@ -364,22 +364,22 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
# If we have keyword arguments corresponding to fields on the
# request, apply these.
{% endif -%}
{%- for key, field in method.flattened_fields.items() if not(field.repeated and method.input.ident.package != method.ident.package) %}
{%- for key, field in method.flattened_fields.items() if not field.repeated or method.input.ident.package == method.ident.package %}
if {{ field.name }} is not None:
request.{{ key }} = {{ field.name }}
{%- endfor %}
{# Map-y fields can be _updated_, however #}
{%- for key, field in method.flattened_fields.items() if field.map and method.input.ident.package == method.ident.package %}

{%- for key, field in method.flattened_fields.items() if field.repeated and method.input.ident.package != method.ident.package %}
{%- if field.map %} {# map implies repeated, but repeated does NOT imply map#}
if {{ field.name }}:
request.{{ key }}.update({{ field.name }})
{%- endfor %}
{%- else %}
{# And list-y fields can be _extended_ -#}
{%- for key, field in method.flattened_fields.items() if field.repeated and not field.map and method.input.ident.package == method.ident.package %}
if {{ field.name }}:
request.{{ key }}.extend({{ field.name }})
{%- endfor %}
{%- endif %}
{%- endif %} {# field.map #}
{%- endfor %} {# key, field in method.flattened_fields.items() #}
{%- endif %} {# method.client_streaming #}

# Wrap the RPC method; this adds retry and timeout information,
# and friendly error handling.
Expand All @@ -397,15 +397,15 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
{%- endfor %}
)),
)
{%- endif %}
{%- endif %} {# method.field_headers #}

# Send the request.
{% if not method.void %}response = {% endif %}rpc(
{%- if not method.client_streaming %}
request,
{%- else %}
requests,
{%- endif %}
{%- endif %} {# method.client_streaming #}
retry=retry,
timeout=timeout,
metadata=metadata,
Expand All @@ -429,12 +429,12 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
response=response,
metadata=metadata,
)
{%- endif %}
{%- endif %} {# method.lro #}
{%- if not method.void %}

# Done; return the response.
return response
{%- endif %}
{%- endif %} {# method.void #}
{{ '\n' }}
{% endfor %}

Expand Down
4 changes: 2 additions & 2 deletions gapic/ads-templates/noxfile.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import os
import nox # type: ignore


@nox.session(python=['3.6', '3.7'])
@nox.session(python=['3.7', '3.8'])
def unit(session):
"""Run the unit test suite."""

Expand All @@ -24,7 +24,7 @@ def unit(session):
)


@nox.session(python=['3.6', '3.7'])
@nox.session(python=['3.7', '3.8'])
def mypy(session):
"""Run the type checker."""
session.install('mypy')
Expand Down
1 change: 0 additions & 1 deletion gapic/ads-templates/setup.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ setuptools.setup(
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Internet',
Expand Down
18 changes: 9 additions & 9 deletions gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
if use_client_cert:
if client_options.client_cert_source:
is_mtls = True
client_cert_source_func = client_options.client_cert_source
client_cert_source_func = client_options.client_cert_source
else:
is_mtls = mtls.has_default_client_cert_source()
client_cert_source_func = mtls.default_client_cert_source() if is_mtls else None
Expand Down Expand Up @@ -381,22 +381,22 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
# If we have keyword arguments corresponding to fields on the
# request, apply these.
{% endif -%}
{%- for key, field in method.flattened_fields.items() if not field.repeated and method.input.ident.package == method.ident.package %}
{%- for key, field in method.flattened_fields.items() if not field.repeated or method.input.ident.package == method.ident.package %}
if {{ field.name }} is not None:
request.{{ key }} = {{ field.name }}
{%- endfor %}
{# Map-y fields can be _updated_, however #}
{%- for key, field in method.flattened_fields.items() if field.map and method.input.ident.package == method.ident.package %}

{# Map-y fields can be _updated_, however #}
{%- for key, field in method.flattened_fields.items() if field.repeated and method.input.ident.package != method.ident.package %}
{%- if field.map %} {# map implies repeated, but repeated does NOT imply map#}
if {{ field.name }}:
request.{{ key }}.update({{ field.name }})
{%- endfor %}
{%- else %}
{# And list-y fields can be _extended_ -#}
{%- for key, field in method.flattened_fields.items() if field.repeated and not field.map and method.input.ident.package == method.ident.package %}
if {{ field.name }}:
request.{{ key }}.extend({{ field.name }})
{%- endfor %}
{%- endif %}
{%- endif %} {# field.map #}
{%- endfor %} {# method.flattened_fields.items() #}
{%- endif %} {# method.client_streaming #}

# Wrap the RPC method; this adds retry and timeout information,
# and friendly error handling.
Expand Down