Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 00ba77c

Browse files
software-dovsoftware-dov
authored
fix: paged code and templates are no longer message centric (#527)
1 parent 901a9ee commit 00ba77c

5 files changed

Lines changed: 42 additions & 42 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ from typing import Any, Callable, Iterable, Sequence, Tuple
1212
{% for method in service.methods.values() | selectattr('paged_result_field') -%}
1313
{{ method.input.ident.python_import }}
1414
{{ method.output.ident.python_import }}
15-
{{ method.paged_result_field.message.ident.python_import }}
15+
{% if not method.paged_result_field.is_primitive %}{{ method.paged_result_field.message.ident.python_import }}{% endif %}
1616
{% endfor %}
1717
{% endfilter -%}
1818
{% endif %}

‎gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,9 @@ def test_{{ method.name|snake_case }}_pager():
422422
call.side_effect = (
423423
{{ method.output.ident }}(
424424
{{ method.paged_result_field.name }}=[
425-
{{ method.paged_result_field.message.ident }}(),
426-
{{ method.paged_result_field.message.ident }}(),
427-
{{ method.paged_result_field.message.ident }}(),
425+
{{ method.paged_result_field.type.ident }}(),
426+
{{ method.paged_result_field.type.ident }}(),
427+
{{ method.paged_result_field.type.ident }}(),
428428
],
429429
next_page_token='abc',
430430
),
@@ -434,14 +434,14 @@ def test_{{ method.name|snake_case }}_pager():
434434
),
435435
{{ method.output.ident }}(
436436
{{ method.paged_result_field.name }}=[
437-
{{ method.paged_result_field.message.ident }}(),
437+
{{ method.paged_result_field.type.ident }}(),
438438
],
439439
next_page_token='ghi',
440440
),
441441
{{ method.output.ident }}(
442442
{{ method.paged_result_field.name }}=[
443-
{{ method.paged_result_field.message.ident }}(),
444-
{{ method.paged_result_field.message.ident }}(),
443+
{{ method.paged_result_field.type.ident }}(),
444+
{{ method.paged_result_field.type.ident }}(),
445445
],
446446
),
447447
RuntimeError,
@@ -465,7 +465,7 @@ def test_{{ method.name|snake_case }}_pager():
465465

466466
results = [i for i in pager]
467467
assert len(results) == 6
468-
assert all(isinstance(i, {{ method.paged_result_field.message.ident }})
468+
assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
469469
for i in results)
470470

471471
def test_{{ method.name|snake_case }}_pages():
@@ -481,9 +481,9 @@ def test_{{ method.name|snake_case }}_pages():
481481
call.side_effect = (
482482
{{ method.output.ident }}(
483483
{{ method.paged_result_field.name }}=[
484-
{{ method.paged_result_field.message.ident }}(),
485-
{{ method.paged_result_field.message.ident }}(),
486-
{{ method.paged_result_field.message.ident }}(),
484+
{{ method.paged_result_field.type.ident }}(),
485+
{{ method.paged_result_field.type.ident }}(),
486+
{{ method.paged_result_field.type.ident }}(),
487487
],
488488
next_page_token='abc',
489489
),
@@ -493,14 +493,14 @@ def test_{{ method.name|snake_case }}_pages():
493493
),
494494
{{ method.output.ident }}(
495495
{{ method.paged_result_field.name }}=[
496-
{{ method.paged_result_field.message.ident }}(),
496+
{{ method.paged_result_field.type.ident }}(),
497497
],
498498
next_page_token='ghi',
499499
),
500500
{{ method.output.ident }}(
501501
{{ method.paged_result_field.name }}=[
502-
{{ method.paged_result_field.message.ident }}(),
503-
{{ method.paged_result_field.message.ident }}(),
502+
{{ method.paged_result_field.type.ident }}(),
503+
{{ method.paged_result_field.type.ident }}(),
504504
],
505505
),
506506
RuntimeError,

‎gapic/schema/wrappers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ def _ref_types(self, recursive: bool) -> Sequence[Union[MessageType, EnumType]]:
801801

802802
# If this message paginates its responses, it is possible
803803
# that the individual result messages reside in a different module.
804-
if self.paged_result_field:
804+
if self.paged_result_field and self.paged_result_field.message:
805805
answer.append(self.paged_result_field.message)
806806

807807
# Done; return the answer.

‎gapic/templates/%namespace/%name_%version/%sub/services/%service/pagers.py.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ from typing import Any, AsyncIterable, Awaitable, Callable, Iterable, Sequence,
1212
{% for method in service.methods.values() | selectattr('paged_result_field') -%}
1313
{{ method.input.ident.python_import }}
1414
{{ method.output.ident.python_import }}
15-
{{ method.paged_result_field.message.ident.python_import }}
15+
{% if not method.paged_result_field.is_primitive %}{{ method.paged_result_field.message.ident.python_import }}{% endif %}
1616
{% endfor %}
1717
{% endfilter -%}
1818
{% endif %}

‎gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -707,9 +707,9 @@ def test_{{ method.name|snake_case }}_pager():
707707
call.side_effect = (
708708
{{ method.output.ident }}(
709709
{{ method.paged_result_field.name }}=[
710-
{{ method.paged_result_field.message.ident }}(),
711-
{{ method.paged_result_field.message.ident }}(),
712-
{{ method.paged_result_field.message.ident }}(),
710+
{{ method.paged_result_field.type.ident }}(),
711+
{{ method.paged_result_field.type.ident }}(),
712+
{{ method.paged_result_field.type.ident }}(),
713713
],
714714
next_page_token='abc',
715715
),
@@ -719,14 +719,14 @@ def test_{{ method.name|snake_case }}_pager():
719719
),
720720
{{ method.output.ident }}(
721721
{{ method.paged_result_field.name }}=[
722-
{{ method.paged_result_field.message.ident }}(),
722+
{{ method.paged_result_field.type.ident }}(),
723723
],
724724
next_page_token='ghi',
725725
),
726726
{{ method.output.ident }}(
727727
{{ method.paged_result_field.name }}=[
728-
{{ method.paged_result_field.message.ident }}(),
729-
{{ method.paged_result_field.message.ident }}(),
728+
{{ method.paged_result_field.type.ident }}(),
729+
{{ method.paged_result_field.type.ident }}(),
730730
],
731731
),
732732
RuntimeError,
@@ -750,7 +750,7 @@ def test_{{ method.name|snake_case }}_pager():
750750

751751
results = [i for i in pager]
752752
assert len(results) == 6
753-
assert all(isinstance(i, {{ method.paged_result_field.message.ident }})
753+
assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
754754
for i in results)
755755

756756
def test_{{ method.name|snake_case }}_pages():
@@ -766,9 +766,9 @@ def test_{{ method.name|snake_case }}_pages():
766766
call.side_effect = (
767767
{{ method.output.ident }}(
768768
{{ method.paged_result_field.name }}=[
769-
{{ method.paged_result_field.message.ident }}(),
770-
{{ method.paged_result_field.message.ident }}(),
771-
{{ method.paged_result_field.message.ident }}(),
769+
{{ method.paged_result_field.type.ident }}(),
770+
{{ method.paged_result_field.type.ident }}(),
771+
{{ method.paged_result_field.type.ident }}(),
772772
],
773773
next_page_token='abc',
774774
),
@@ -778,14 +778,14 @@ def test_{{ method.name|snake_case }}_pages():
778778
),
779779
{{ method.output.ident }}(
780780
{{ method.paged_result_field.name }}=[
781-
{{ method.paged_result_field.message.ident }}(),
781+
{{ method.paged_result_field.type.ident }}(),
782782
],
783783
next_page_token='ghi',
784784
),
785785
{{ method.output.ident }}(
786786
{{ method.paged_result_field.name }}=[
787-
{{ method.paged_result_field.message.ident }}(),
788-
{{ method.paged_result_field.message.ident }}(),
787+
{{ method.paged_result_field.type.ident }}(),
788+
{{ method.paged_result_field.type.ident }}(),
789789
],
790790
),
791791
RuntimeError,
@@ -808,9 +808,9 @@ async def test_{{ method.name|snake_case }}_async_pager():
808808
call.side_effect = (
809809
{{ method.output.ident }}(
810810
{{ method.paged_result_field.name }}=[
811-
{{ method.paged_result_field.message.ident }}(),
812-
{{ method.paged_result_field.message.ident }}(),
813-
{{ method.paged_result_field.message.ident }}(),
811+
{{ method.paged_result_field.type.ident }}(),
812+
{{ method.paged_result_field.type.ident }}(),
813+
{{ method.paged_result_field.type.ident }}(),
814814
],
815815
next_page_token='abc',
816816
),
@@ -820,14 +820,14 @@ async def test_{{ method.name|snake_case }}_async_pager():
820820
),
821821
{{ method.output.ident }}(
822822
{{ method.paged_result_field.name }}=[
823-
{{ method.paged_result_field.message.ident }}(),
823+
{{ method.paged_result_field.type.ident }}(),
824824
],
825825
next_page_token='ghi',
826826
),
827827
{{ method.output.ident }}(
828828
{{ method.paged_result_field.name }}=[
829-
{{ method.paged_result_field.message.ident }}(),
830-
{{ method.paged_result_field.message.ident }}(),
829+
{{ method.paged_result_field.type.ident }}(),
830+
{{ method.paged_result_field.type.ident }}(),
831831
],
832832
),
833833
RuntimeError,
@@ -839,7 +839,7 @@ async def test_{{ method.name|snake_case }}_async_pager():
839839
responses.append(response)
840840

841841
assert len(responses) == 6
842-
assert all(isinstance(i, {{ method.paged_result_field.message.ident }})
842+
assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
843843
for i in responses)
844844

845845
@pytest.mark.asyncio
@@ -856,9 +856,9 @@ async def test_{{ method.name|snake_case }}_async_pages():
856856
call.side_effect = (
857857
{{ method.output.ident }}(
858858
{{ method.paged_result_field.name }}=[
859-
{{ method.paged_result_field.message.ident }}(),
860-
{{ method.paged_result_field.message.ident }}(),
861-
{{ method.paged_result_field.message.ident }}(),
859+
{{ method.paged_result_field.type.ident }}(),
860+
{{ method.paged_result_field.type.ident }}(),
861+
{{ method.paged_result_field.type.ident }}(),
862862
],
863863
next_page_token='abc',
864864
),
@@ -868,14 +868,14 @@ async def test_{{ method.name|snake_case }}_async_pages():
868868
),
869869
{{ method.output.ident }}(
870870
{{ method.paged_result_field.name }}=[
871-
{{ method.paged_result_field.message.ident }}(),
871+
{{ method.paged_result_field.type.ident }}(),
872872
],
873873
next_page_token='ghi',
874874
),
875875
{{ method.output.ident }}(
876876
{{ method.paged_result_field.name }}=[
877-
{{ method.paged_result_field.message.ident }}(),
878-
{{ method.paged_result_field.message.ident }}(),
877+
{{ method.paged_result_field.type.ident }}(),
878+
{{ method.paged_result_field.type.ident }}(),
879879
],
880880
),
881881
RuntimeError,

0 commit comments

Comments
 (0)