Skip to content

Commit 3920092

Browse files
daniel-sanchedaniel-sanche
committed
improved typing
1 parent cbe19db commit 3920092

File tree

7 files changed

+279
-199
lines changed

7 files changed

+279
-199
lines changed

‎gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/_mixins.py.j2‎

Lines changed: 69 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@
2828
# The request isn't a proto-plus wrapped type,
2929
# so it must be constructed via keyword expansion.
3030
if request is None:
31-
request = {}
32-
if isinstance(request, dict):
33-
request = operations_pb2.ListOperationsRequest(**request)
31+
request_pb = operations_pb2.ListOperationsRequest()
32+
elif isinstance(request, dict):
33+
request_pb = operations_pb2.ListOperationsRequest(**request)
34+
else:
35+
request_pb = request
3436

3537
# Wrap the RPC method; this adds retry and timeout information,
3638
# and friendly error handling.
@@ -40,12 +42,12 @@
4042
# add these here.
4143
metadata = tuple(metadata) + (
4244
gapic_v1.routing_header.to_grpc_metadata(
43-
(("name", request.name),)),
45+
(("name", request_pb.name),)),
4446
)
4547

4648
# Send the request.
4749
response = rpc(
48-
request, retry=retry, timeout=timeout, metadata=metadata,)
50+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
4951

5052
# Done; return the response.
5153
return response
@@ -80,9 +82,11 @@
8082
# The request isn't a proto-plus wrapped type,
8183
# so it must be constructed via keyword expansion.
8284
if request is None:
83-
request = {}
84-
if isinstance(request, dict):
85-
request = operations_pb2.GetOperationRequest(**request)
85+
request_pb = operations_pb2.GetOperationRequest()
86+
elif isinstance(request, dict):
87+
request_pb = operations_pb2.GetOperationRequest(**request)
88+
else:
89+
request_pb = request
8690

8791
# Wrap the RPC method; this adds retry and timeout information,
8892
# and friendly error handling.
@@ -92,12 +96,12 @@
9296
# add these here.
9397
metadata = tuple(metadata) + (
9498
gapic_v1.routing_header.to_grpc_metadata(
95-
(("name", request.name),)),
99+
(("name", request_pb.name),)),
96100
)
97101

98102
# Send the request.
99103
response = rpc(
100-
request, retry=retry, timeout=timeout, metadata=metadata,)
104+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
101105

102106
# Done; return the response.
103107
return response
@@ -135,9 +139,11 @@
135139
# The request isn't a proto-plus wrapped type,
136140
# so it must be constructed via keyword expansion.
137141
if request is None:
138-
request = {}
139-
if isinstance(request, dict):
140-
request = operations_pb2.DeleteOperationRequest(**request)
142+
request_pb = operations_pb2.DeleteOperationRequest()
143+
elif isinstance(request, dict):
144+
request_pb = operations_pb2.DeleteOperationRequest(**request)
145+
else:
146+
request_pb = request
141147

142148
# Wrap the RPC method; this adds retry and timeout information,
143149
# and friendly error handling.
@@ -147,11 +153,11 @@
147153
# add these here.
148154
metadata = tuple(metadata) + (
149155
gapic_v1.routing_header.to_grpc_metadata(
150-
(("name", request.name),)),
156+
(("name", request_pb.name),)),
151157
)
152158

153159
# Send the request.
154-
rpc(request, retry=retry, timeout=timeout, metadata=metadata,)
160+
rpc(request_pb, retry=retry, timeout=timeout, metadata=metadata,)
155161
{% endif %}
156162

157163
{% if "CancelOperation" in api.mixin_api_methods %}
@@ -185,9 +191,11 @@
185191
# The request isn't a proto-plus wrapped type,
186192
# so it must be constructed via keyword expansion.
187193
if request is None:
188-
request = {}
189-
if isinstance(request, dict):
190-
request = operations_pb2.CancelOperationRequest(**request)
194+
request_pb = operations_pb2.CancelOperationRequest()
195+
elif isinstance(request, dict):
196+
request_pb = operations_pb2.CancelOperationRequest(**request)
197+
else:
198+
request_pb = request
191199

192200
# Wrap the RPC method; this adds retry and timeout information,
193201
# and friendly error handling.
@@ -197,11 +205,11 @@
197205
# add these here.
198206
metadata = tuple(metadata) + (
199207
gapic_v1.routing_header.to_grpc_metadata(
200-
(("name", request.name),)),
208+
(("name", request_pb.name),)),
201209
)
202210

203211
# Send the request.
204-
rpc(request, retry=retry, timeout=timeout, metadata=metadata,)
212+
rpc(request_pb, retry=retry, timeout=timeout, metadata=metadata,)
205213
{% endif %}
206214

207215
{% if "WaitOperation" in api.mixin_api_methods %}
@@ -238,9 +246,11 @@
238246
# The request isn't a proto-plus wrapped type,
239247
# so it must be constructed via keyword expansion.
240248
if request is None:
241-
request = {}
242-
if isinstance(request, dict):
243-
request = operations_pb2.WaitOperationRequest(**request)
249+
request_pb = operations_pb2.WaitOperationRequest()
250+
elif isinstance(request, dict):
251+
request_pb = operations_pb2.WaitOperationRequest(**request)
252+
else:
253+
request_pb = request
244254

245255
# Wrap the RPC method; this adds retry and timeout information,
246256
# and friendly error handling.
@@ -250,7 +260,7 @@
250260

251261
# Send the request.
252262
response = rpc(
253-
request, retry=retry, timeout=timeout, metadata=metadata,)
263+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
254264

255265
# Done; return the response.
256266
return response
@@ -355,9 +365,11 @@
355365
# The request isn't a proto-plus wrapped type,
356366
# so it must be constructed via keyword expansion.
357367
if request is None:
358-
request = {}
359-
if isinstance(request, dict):
360-
request = iam_policy_pb2.SetIamPolicyRequest(**request)
368+
request_pb = iam_policy_pb2.SetIamPolicyRequest()
369+
elif isinstance(request, dict):
370+
request_pb = iam_policy_pb2.SetIamPolicyRequest(**request)
371+
else:
372+
request_pb = request
361373

362374
# Wrap the RPC method; this adds retry and timeout information,
363375
# and friendly error handling.
@@ -367,12 +379,12 @@
367379
# add these here.
368380
metadata = tuple(metadata) + (
369381
gapic_v1.routing_header.to_grpc_metadata(
370-
(("resource", request.resource),)),
382+
(("resource", request_pb.resource),)),
371383
)
372384

373385
# Send the request.
374386
response = rpc(
375-
request, retry=retry, timeout=timeout, metadata=metadata,)
387+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
376388

377389
# Done; return the response.
378390
return response
@@ -473,9 +485,11 @@
473485
# The request isn't a proto-plus wrapped type,
474486
# so it must be constructed via keyword expansion.
475487
if request is None:
476-
request = {}
477-
if isinstance(request, dict):
478-
request = iam_policy_pb2.GetIamPolicyRequest(**request)
488+
request_pb = iam_policy_pb2.GetIamPolicyRequest()
489+
elif isinstance(request, dict):
490+
request_pb = iam_policy_pb2.GetIamPolicyRequest(**request)
491+
else:
492+
request_pb = request
479493

480494
# Wrap the RPC method; this adds retry and timeout information,
481495
# and friendly error handling.
@@ -485,12 +499,12 @@
485499
# add these here.
486500
metadata = tuple(metadata) + (
487501
gapic_v1.routing_header.to_grpc_metadata(
488-
(("resource", request.resource),)),
502+
(("resource", request_pb.resource),)),
489503
)
490504

491505
# Send the request.
492506
response = rpc(
493-
request, retry=retry, timeout=timeout, metadata=metadata,)
507+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
494508

495509
# Done; return the response.
496510
return response
@@ -529,9 +543,11 @@
529543
# The request isn't a proto-plus wrapped type,
530544
# so it must be constructed via keyword expansion.
531545
if request is None:
532-
request = {}
533-
if isinstance(request, dict):
534-
request = iam_policy_pb2.TestIamPermissionsRequest(**request)
546+
request_pb = iam_policy_pb2.TestIamPermissionsRequest()
547+
elif isinstance(request, dict):
548+
request_pb = iam_policy_pb2.TestIamPermissionsRequest(**request)
549+
else:
550+
request_pb = request
535551

536552
# Wrap the RPC method; this adds retry and timeout information,
537553
# and friendly error handling.
@@ -541,12 +557,12 @@
541557
# add these here.
542558
metadata = tuple(metadata) + (
543559
gapic_v1.routing_header.to_grpc_metadata(
544-
(("resource", request.resource),)),
560+
(("resource", request_pb.resource),)),
545561
)
546562

547563
# Send the request.
548564
response = rpc(
549-
request, retry=retry, timeout=timeout, metadata=metadata,)
565+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
550566

551567
# Done; return the response.
552568
return response
@@ -584,9 +600,11 @@
584600
# The request isn't a proto-plus wrapped type,
585601
# so it must be constructed via keyword expansion.
586602
if request is None:
587-
request = {}
588-
if isinstance(request, dict):
589-
request = locations_pb2.GetLocationRequest(**request)
603+
request_pb = locations_pb2.GetLocationRequest()
604+
elif isinstance(request, dict):
605+
request_pb = locations_pb2.GetLocationRequest(**request)
606+
else:
607+
request_pb = request
590608

591609
# Wrap the RPC method; this adds retry and timeout information,
592610
# and friendly error handling.
@@ -596,12 +614,12 @@
596614
# add these here.
597615
metadata = tuple(metadata) + (
598616
gapic_v1.routing_header.to_grpc_metadata(
599-
(("name", request.name),)),
617+
(("name", request_pb.name),)),
600618
)
601619

602620
# Send the request.
603621
response = rpc(
604-
request, retry=retry, timeout=timeout, metadata=metadata,)
622+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
605623

606624
# Done; return the response.
607625
return response
@@ -635,9 +653,11 @@
635653
# The request isn't a proto-plus wrapped type,
636654
# so it must be constructed via keyword expansion.
637655
if request is None:
638-
request = {}
639-
if isinstance(request, dict):
640-
request = locations_pb2.ListLocationsRequest(**request)
656+
request_pb = locations_pb2.ListLocationsRequest()
657+
elif isinstance(request, dict):
658+
request_pb = locations_pb2.ListLocationsRequest(**request)
659+
else:
660+
request_pb = request
641661

642662
# Wrap the RPC method; this adds retry and timeout information,
643663
# and friendly error handling.
@@ -647,12 +667,12 @@
647667
# add these here.
648668
metadata = tuple(metadata) + (
649669
gapic_v1.routing_header.to_grpc_metadata(
650-
(("name", request.name),)),
670+
(("name", request_pb.name),)),
651671
)
652672

653673
# Send the request.
654674
response = rpc(
655-
request, retry=retry, timeout=timeout, metadata=metadata,)
675+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
656676

657677
# Done; return the response.
658678
return response

‎gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,11 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
634634
# The request isn't a proto-plus wrapped type,
635635
# so it must be constructed via keyword expansion.
636636
if request is None:
637-
request = {}
638-
if isinstance(request, dict):
639-
request = iam_policy_pb2.SetIamPolicyRequest(**request)
637+
request_pb = iam_policy_pb2.SetIamPolicyRequest()
638+
elif isinstance(request, dict):
639+
request_pb = iam_policy_pb2.SetIamPolicyRequest(**request)
640+
else:
641+
request_pb = request
640642

641643
# Wrap the RPC method; this adds retry and timeout information,
642644
# and friendly error handling.
@@ -650,12 +652,12 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
650652
# add these here.
651653
metadata = tuple(metadata) + (
652654
gapic_v1.routing_header.to_grpc_metadata(
653-
(("resource", request.resource),)),
655+
(("resource", request_pb.resource),)),
654656
)
655657

656658
# Send the request.
657659
response = rpc(
658-
request, retry=retry, timeout=timeout, metadata=metadata,)
660+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
659661

660662
# Done; return the response.
661663
return response
@@ -753,9 +755,11 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
753755
# The request isn't a proto-plus wrapped type,
754756
# so it must be constructed via keyword expansion.
755757
if request is None:
756-
request = {}
757-
if isinstance(request, dict):
758-
request = iam_policy_pb2.GetIamPolicyRequest(**request)
758+
request_pb = iam_policy_pb2.GetIamPolicyRequest()
759+
elif isinstance(request, dict):
760+
request_pb = iam_policy_pb2.GetIamPolicyRequest(**request)
761+
else:
762+
request_pb = request
759763

760764
# Wrap the RPC method; this adds retry and timeout information,
761765
# and friendly error handling.
@@ -769,12 +773,12 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
769773
# add these here.
770774
metadata = tuple(metadata) + (
771775
gapic_v1.routing_header.to_grpc_metadata(
772-
(("resource", request.resource),)),
776+
(("resource", request_pb.resource),)),
773777
)
774778

775779
# Send the request.
776780
response = rpc(
777-
request, retry=retry, timeout=timeout, metadata=metadata,)
781+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
778782

779783
# Done; return the response.
780784
return response
@@ -811,9 +815,11 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
811815
# The request isn't a proto-plus wrapped type,
812816
# so it must be constructed via keyword expansion.
813817
if request is None:
814-
request = {}
815-
if isinstance(request, dict):
816-
request = iam_policy_pb2.TestIamPermissionsRequest(**request)
818+
request_pb = iam_policy_pb2.TestIamPermissionsRequest()
819+
elif isinstance(request, dict):
820+
request_pb = iam_policy_pb2.TestIamPermissionsRequest(**request)
821+
else:
822+
request_pb = request
817823

818824
# Wrap the RPC method; this adds retry and timeout information,
819825
# and friendly error handling.
@@ -827,12 +833,12 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
827833
# add these here.
828834
metadata = tuple(metadata) + (
829835
gapic_v1.routing_header.to_grpc_metadata(
830-
(("resource", request.resource),)),
836+
(("resource", request_pb.resource),)),
831837
)
832838

833839
# Send the request.
834840
response = rpc(
835-
request, retry=retry, timeout=timeout, metadata=metadata,)
841+
request_pb, retry=retry, timeout=timeout, metadata=metadata,)
836842

837843
# Done; return the response.
838844
return response

0 commit comments

Comments
 (0)