chore: librarian update image pull request: 20260226T212629Z

.librarian/state.yaml

@@ -1,4 +1,4 @@
-image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209
+image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:160860d189ff1c2f7515638478823712fa5b243e27ccc33a2728669fa1e2ed0c
 libraries:
   - id: google-cloud-pubsub
     version: 2.35.0

.repo-metadata.json

@@ -11,7 +11,7 @@
     "api_id": "pubsub.googleapis.com",
     "requires_billing": true,
     "default_version": "v1",
-    "codeowner_team": "@googleapis/cloud-sdk-python-team @googleapis/pubsub-team",
+    "codeowner_team": "@googleapis/api-pubsub",
     "api_shortname": "pubsub",
     "library_type": "GAPIC_COMBO",
     "api_description": "is designed to provide reliable, many-to-many, asynchronous messaging between applications. Publisher applications can send messages to a topic and other applications can subscribe to that topic to receive the messages. By decoupling senders and receivers, Google Cloud Pub/Sub allows developers to communicate between independently written applications."

google/pubsub_v1/services/publisher/async_client.py

@@ -47,11 +47,11 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
 from google.pubsub_v1.services.publisher import pagers
 from google.pubsub_v1.types import pubsub
 from google.pubsub_v1.types import TimeoutType
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
 from .transports.base import PublisherTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc_asyncio import PublisherGrpcAsyncIOTransport
 from .client import PublisherClient
@@ -122,7 +122,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
         Returns:
             PublisherAsyncClient: The constructed client.
         """
-        return PublisherClient.from_service_account_info.__func__(PublisherAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = (
+            PublisherClient.from_service_account_info.__func__  # type: ignore
+        )
+        return sa_info_func(PublisherAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -138,7 +141,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
         Returns:
             PublisherAsyncClient: The constructed client.
         """
-        return PublisherClient.from_service_account_file.__func__(PublisherAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = (
+            PublisherClient.from_service_account_file.__func__  # type: ignore
+        )
+        return sa_file_func(PublisherAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

google/pubsub_v1/services/publisher/client.py

@@ -65,11 +65,11 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
 from google.pubsub_v1.services.publisher import pagers
 from google.pubsub_v1.types import pubsub
 from google.pubsub_v1.types import TimeoutType
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
 
 import grpc
 from .transports.base import PublisherTransport, DEFAULT_CLIENT_INFO

google/pubsub_v1/services/publisher/transports/base.py

@@ -29,8 +29,8 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     client_library_version=package_version.__version__
@@ -89,8 +89,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -105,11 +103,16 @@ def __init__(
 
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
-                credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
+                credentials_file,
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
         elif credentials is None and not self._ignore_credentials:
             credentials, _ = google.auth.default(
-                **scopes_kwargs, quota_project_id=quota_project_id
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):

google/pubsub_v1/services/publisher/transports/grpc.py

@@ -32,8 +32,8 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from .base import PublisherTransport, DEFAULT_CLIENT_INFO
 
 try:

google/pubsub_v1/services/publisher/transports/grpc_asyncio.py

@@ -35,8 +35,8 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from .base import PublisherTransport, DEFAULT_CLIENT_INFO
 from .grpc import PublisherGrpcTransport
 

google/pubsub_v1/services/publisher/transports/rest.py

@@ -35,8 +35,8 @@
 import warnings
 
 
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 
 from .rest_base import _BasePublisherRestTransport
@@ -918,7 +918,7 @@ def __call__(
                 )
                 method = transcoded_request["method"]
                 try:
-                    request_payload = json_format.MessageToJson(request)
+                    request_payload = type(request).to_json(request)
                 except:
                     request_payload = None
                 http_request = {

google/pubsub_v1/services/publisher/transports/rest_base.py

@@ -26,8 +26,8 @@
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
 
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 
 class _BasePublisherRestTransport(PublisherTransport):

google/pubsub_v1/services/schema_service/async_client.py

@@ -47,10 +47,10 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
 from google.pubsub_v1.services.schema_service import pagers
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport
 from .client import SchemaServiceClient
@@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
         Returns:
             SchemaServiceAsyncClient: The constructed client.
         """
-        return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = (
+            SchemaServiceClient.from_service_account_info.__func__  # type: ignore
+        )
+        return sa_info_func(SchemaServiceAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -133,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
         Returns:
             SchemaServiceAsyncClient: The constructed client.
         """
-        return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = (
+            SchemaServiceClient.from_service_account_file.__func__  # type: ignore
+        )
+        return sa_file_func(SchemaServiceAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

google/pubsub_v1/services/schema_service/client.py

@@ -64,10 +64,10 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
 from google.pubsub_v1.services.schema_service import pagers
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 
 import grpc
 from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO

google/pubsub_v1/services/schema_service/transports/base.py

@@ -29,9 +29,9 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     client_library_version=package_version.__version__
@@ -90,8 +90,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -106,11 +104,16 @@ def __init__(
 
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
-                credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
+                credentials_file,
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
         elif credentials is None and not self._ignore_credentials:
             credentials, _ = google.auth.default(
-                **scopes_kwargs, quota_project_id=quota_project_id
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):

google/pubsub_v1/services/schema_service/transports/grpc.py

@@ -32,9 +32,9 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO
 
 try:

google/pubsub_v1/services/schema_service/transports/grpc_asyncio.py

@@ -35,9 +35,9 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO
 from .grpc import SchemaServiceGrpcTransport
 

google/pubsub_v1/services/schema_service/transports/rest.py

@@ -35,9 +35,9 @@
 import warnings
 
 
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 
 from .rest_base import _BaseSchemaServiceRestTransport
@@ -1116,7 +1116,7 @@ def __call__(
                 )
                 method = transcoded_request["method"]
                 try:
-                    request_payload = json_format.MessageToJson(request)
+                    request_payload = type(request).to_json(request)
                 except:
                     request_payload = None
                 http_request = {

google/pubsub_v1/services/schema_service/transports/rest_base.py

@@ -26,9 +26,9 @@
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
 
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import schema
 from google.pubsub_v1.types import schema as gp_schema
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 
 class _BaseSchemaServiceRestTransport(SchemaServiceTransport):

google/pubsub_v1/services/subscriber/async_client.py

@@ -51,11 +51,11 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
 from google.pubsub_v1.services.subscriber import pagers
 from google.pubsub_v1.types import pubsub
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 from .transports.base import SubscriberTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc_asyncio import SubscriberGrpcAsyncIOTransport
 from .client import SubscriberClient
@@ -126,7 +126,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
         Returns:
             SubscriberAsyncClient: The constructed client.
         """
-        return SubscriberClient.from_service_account_info.__func__(SubscriberAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = (
+            SubscriberClient.from_service_account_info.__func__  # type: ignore
+        )
+        return sa_info_func(SubscriberAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -142,7 +145,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
         Returns:
             SubscriberAsyncClient: The constructed client.
         """
-        return SubscriberClient.from_service_account_file.__func__(SubscriberAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = (
+            SubscriberClient.from_service_account_file.__func__  # type: ignore
+        )
+        return sa_file_func(SubscriberAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 

google/pubsub_v1/services/subscriber/client.py

@@ -67,11 +67,11 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
 from google.pubsub_v1.services.subscriber import pagers
 from google.pubsub_v1.types import pubsub
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 
 import grpc
 from .transports.base import SubscriberTransport, DEFAULT_CLIENT_INFO

google/pubsub_v1/services/subscriber/transports/base.py

@@ -29,8 +29,8 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     client_library_version=package_version.__version__
@@ -89,8 +89,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -105,11 +103,16 @@ def __init__(
 
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
-                credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
+                credentials_file,
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
         elif credentials is None and not self._ignore_credentials:
             credentials, _ = google.auth.default(
-                **scopes_kwargs, quota_project_id=quota_project_id
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):

google/pubsub_v1/services/subscriber/transports/grpc.py

@@ -32,8 +32,8 @@
 
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.pubsub_v1.types import pubsub
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from .base import SubscriberTransport, DEFAULT_CLIENT_INFO
 
 try: