Merge branch 'main' into dependabot/pip/aiohttp-3.13.3

Author: vchudnov-g

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # Code owners file.
 # This file controls who is tagged for review for any given pull request.
 
-*                         @googleapis/python-core-client-libraries
+*                         @googleapis/cloud-sdk-python-team

.github/blunderbuss.yml

@@ -4,14 +4,14 @@
 # Note: This file is autogenerated. To make changes to the assignee
 # team, please update `codeowner_team` in `.repo-metadata.json`.
 assign_issues:
-  - googleapis/actools-python
+  - googleapis/cloud-sdk-python-team
 
 assign_issues_by:
   - labels:
       - "samples"
     to:
       - googleapis/python-samples-reviewers
-      - googleapis/actools-python
+      - googleapis/cloud-sdk-python-team
 
 assign_prs:
-  - googleapis/actools-python
+  - googleapis/cloud-sdk-python-team

.repo-metadata.json

@@ -10,5 +10,5 @@
     "repo": "googleapis/gapic-generator-python",
     "distribution_name": "gapic-generator",
     "default_version": "",
-    "codeowner_team": "@googleapis/actools-python"
+    "codeowner_team": "@googleapis/cloud-sdk-python-team"
 }

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

@@ -98,7 +98,8 @@ class {{ service.async_client_name }}:
         Returns:
             {{ service.async_client_name }}: The constructed client.
         """
-        return {{ service.client_name }}.from_service_account_info.__func__({{ service.async_client_name }}, info, *args, **kwargs)  # type: ignore
+        sa_info_func = {{ service.client_name }}.from_service_account_info.__func__  # type: ignore
+        return sa_info_func({{ service.async_client_name }}, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -114,7 +115,8 @@ class {{ service.async_client_name }}:
         Returns:
             {{ service.async_client_name }}: The constructed client.
         """
-        return {{ service.client_name }}.from_service_account_file.__func__({{ service.async_client_name }}, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = {{ service.client_name }}.from_service_account_file.__func__  # type: ignore
+        return sa_file_func({{ service.async_client_name }}, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

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

@@ -26,6 +26,7 @@ from google.protobuf import json_format
 import json
 import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
 from proto.marshal.rules.dates import DurationRule, TimestampRule
 from proto.marshal.rules import wrappers

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2

@@ -752,8 +752,18 @@ def test_{{ method_name }}_pager(transport_name: str = "grpc"):
 
         results = list(pager)
         assert len(results) == 6
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                   for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                   for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in results)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                    for i in results)
+        {% endif %}
 {% endif %}
 def test_{{ method_name }}_pages(transport_name: str = "grpc"):
     client = {{ service.client_name }}(
@@ -913,9 +923,19 @@ async def test_{{ method_name }}_async_pager():
         assert async_pager.get('a') is None
         assert isinstance(async_pager.get('h'), {{ method.paged_result_field.type.fields.get('value').ident }})
         {% else %}
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                for i in responses)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                for i in responses)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in responses)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                 for i in responses)
         {% endif %}
+        {% endif %}
 
 
 @pytest.mark.asyncio
@@ -1412,9 +1432,19 @@ def test_{{ method_name }}_rest_pager(transport: str = 'rest'):
         assert pager.get('a') is None
         assert isinstance(pager.get('h'), {{ method.paged_result_field.type.fields.get('value').ident }})
         {% else %}
+        {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %}
+        assert all(isinstance(i, Sequence)
+                for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Struct' %}
+        assert all(isinstance(i, Mapping)
+                for i in results)
+        {% elif method.paged_result_field.type.ident|string == 'struct_pb2.Value' %}
+        assert all(True for i in results)
+        {% else %}
         assert all(isinstance(i, {{ method.paged_result_field.type.ident }})
                 for i in results)
         {% endif %}
+        {% endif %}
 
         pages = list(client.{{ method_name }}(request=sample_request).pages)
         for page_, token in zip(pages, ['abc','def','ghi', '']):

noxfile.py

@@ -294,7 +294,7 @@ def showcase_library(
                     }
                 ]
                 update_service_yaml = _add_python_settings(tmp_dir, python_settings)
-                session.run("python", "-c" f"{update_service_yaml}")
+                session.run("python", "-c", f"{update_service_yaml}")
             # END TODO section to remove.
         if retry_config:
             session.run(

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py

@@ -106,7 +106,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
         Returns:
             AssetServiceAsyncClient: The constructed client.
         """
-        return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = AssetServiceClient.from_service_account_info.__func__  # type: ignore
+        return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -122,7 +123,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
         Returns:
             AssetServiceAsyncClient: The constructed client.
         """
-        return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = AssetServiceClient.from_service_account_file.__func__  # type: ignore
+        return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py

@@ -28,6 +28,7 @@
 import json
 import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
 from proto.marshal.rules.dates import DurationRule, TimestampRule
 from proto.marshal.rules import wrappers

tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py

@@ -97,7 +97,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
         Returns:
             IAMCredentialsAsyncClient: The constructed client.
         """
-        return IAMCredentialsClient.from_service_account_info.__func__(IAMCredentialsAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = IAMCredentialsClient.from_service_account_info.__func__  # type: ignore
+        return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -113,7 +114,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
         Returns:
             IAMCredentialsAsyncClient: The constructed client.
         """
-        return IAMCredentialsClient.from_service_account_file.__func__(IAMCredentialsAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = IAMCredentialsClient.from_service_account_file.__func__  # type: ignore
+        return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file