From 44b4a51e72c081dfbe5cd3c1fd402b5620bad065 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 6 Feb 2026 20:17:28 +0000 Subject: [PATCH] chore: regenerate grafeas --- .../unique-grafeas-client.yaml | 3 +- .librarian/state.yaml | 2 +- packages/grafeas/docs/conf.py | 36 +++++++++++++++++-- .../services/grafeas/async_client.py | 4 +-- .../grafeas_v1/services/grafeas/client.py | 4 +-- .../services/grafeas/transports/base.py | 2 +- .../services/grafeas/transports/grpc.py | 2 +- .../grafeas/transports/grpc_asyncio.py | 2 +- .../services/grafeas/transports/rest.py | 6 ++-- .../services/grafeas/transports/rest_base.py | 2 +- .../grafeas/grafeas_v1/types/deployment.py | 2 +- .../grafeas/grafeas_v1/types/discovery.py | 4 +-- .../grafeas/grafeas_v1/types/grafeas.py | 4 +-- .../grafeas_v1/types/intoto_provenance.py | 4 +-- .../grafeas_v1/types/intoto_statement.py | 4 +-- .../grafeas/grafeas_v1/types/provenance.py | 2 +- .../grafeas/grafeas_v1/types/secret.py | 4 +-- .../grafeas_v1/types/slsa_provenance.py | 4 +-- .../types/slsa_provenance_zero_two.py | 4 +-- .../grafeas/grafeas_v1/types/upgrade.py | 2 +- .../grafeas/grafeas_v1/types/vulnerability.py | 2 +- .../unit/gapic/grafeas_v1/test_grafeas.py | 10 +++--- 22 files changed, 70 insertions(+), 39 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml b/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml index cc094c35201e..065363d674ad 100644 --- a/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml +++ b/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml @@ -61,8 +61,7 @@ replacements: \ Returns: \ GrafeasAsyncClient: The constructed client. \ """ - \ sa_file_func = GrafeasClient.from_service_account_file.__func__ # type: ignore - \ return sa_file_func\(GrafeasAsyncClient, filename, \*args, \*\*kwargs\) + \ return GrafeasClient.from_service_account_file.__func__\(GrafeasAsyncClient, filename, \*args, \*\*kwargs\) # type: ignore \ \ from_service_account_json = from_service_account_file \ diff --git a/.librarian/state.yaml b/.librarian/state.yaml index 0012235a9e60..890e4ca6f271 100644 --- a/.librarian/state.yaml +++ b/.librarian/state.yaml @@ -3661,7 +3661,7 @@ libraries: tag_format: '{id}-v{version}' - id: grafeas version: 1.19.1 - last_generated_commit: cfe62b3c5ceb9f81879c61480f26707980534462 + last_generated_commit: 725496d32a359a40dd773995d3fda0342b440e15 apis: - path: grafeas/v1 service_config: grafeas_v1.yaml diff --git a/packages/grafeas/docs/conf.py b/packages/grafeas/docs/conf.py index 7f0f99732785..908fa0750443 100644 --- a/packages/grafeas/docs/conf.py +++ b/packages/grafeas/docs/conf.py @@ -12,8 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# -# +## # grafeas documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/async_client.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/async_client.py index f88c2f9f5c0f..15c7c4e1f125 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/async_client.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/async_client.py @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_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 grafeas.grafeas_v1.services.grafeas import pagers from grafeas.grafeas_v1.types import ( diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/client.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/client.py index 1c2a69c405ee..d1f607d80de0 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/client.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/client.py @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_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 grafeas.grafeas_v1.services.grafeas import pagers from grafeas.grafeas_v1.types import ( diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/base.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/base.py index c8382e289341..952a4fe7a7c4 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/base.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/base.py @@ -24,7 +24,7 @@ from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from grafeas.grafeas_v1 import gapic_version as package_version from grafeas.grafeas_v1.types import grafeas diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc.py index 0424704ce4bf..602bdb74a032 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc.py @@ -23,7 +23,7 @@ import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc_asyncio.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc_asyncio.py index 63844b89b159..9e8374b4bff5 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc_asyncio.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/grpc_asyncio.py @@ -25,7 +25,7 @@ from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest.py index cadb84765d85..971da45a5703 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest.py @@ -25,8 +25,8 @@ from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from requests import __version__ as requests_version from grafeas.grafeas_v1.types import grafeas @@ -1567,7 +1567,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 = { @@ -1679,7 +1679,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 = { diff --git a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest_base.py b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest_base.py index dd852b1d486b..69eb17a667e0 100644 --- a/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest_base.py +++ b/packages/grafeas/grafeas/grafeas_v1/services/grafeas/transports/rest_base.py @@ -18,8 +18,8 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from grafeas.grafeas_v1.types import grafeas diff --git a/packages/grafeas/grafeas/grafeas_v1/types/deployment.py b/packages/grafeas/grafeas/grafeas_v1/types/deployment.py index 9d41a4aa7764..6150ec30427a 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/deployment.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/deployment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/discovery.py b/packages/grafeas/grafeas/grafeas_v1/types/discovery.py index 8e1b665c2523..4057197e5ac7 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/discovery.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/discovery.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from grafeas.grafeas_v1.types import common diff --git a/packages/grafeas/grafeas/grafeas_v1/types/grafeas.py b/packages/grafeas/grafeas/grafeas_v1/types/grafeas.py index 4c0864f0680d..46f2806eaf7c 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/grafeas.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/grafeas.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_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 proto # type: ignore from grafeas.grafeas_v1.types import attestation as g_attestation diff --git a/packages/grafeas/grafeas/grafeas_v1/types/intoto_provenance.py b/packages/grafeas/grafeas/grafeas_v1/types/intoto_provenance.py index 08112fbc7e8e..594d51f40362 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/intoto_provenance.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/intoto_provenance.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/intoto_statement.py b/packages/grafeas/grafeas/grafeas_v1/types/intoto_statement.py index be85f5a36643..6686e874b267 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/intoto_statement.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/intoto_statement.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from grafeas.grafeas_v1.types import ( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/provenance.py b/packages/grafeas/grafeas/grafeas_v1/types/provenance.py index 35ee483a7b6b..c6329902dedd 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/provenance.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/provenance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/secret.py b/packages/grafeas/grafeas/grafeas_v1/types/secret.py index ee46d13aa952..f0d3d464ce7b 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/secret.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/secret.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from grafeas.grafeas_v1.types import common diff --git a/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance.py b/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance.py index 0640bae93566..c4de31958229 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance_zero_two.py b/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance_zero_two.py index 590263762adf..c8bf8a8acf5f 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance_zero_two.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/slsa_provenance_zero_two.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/grafeas/grafeas/grafeas_v1/types/upgrade.py b/packages/grafeas/grafeas/grafeas_v1/types/upgrade.py index 9621aa1f85d7..18ae6a3cc5cb 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/upgrade.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/upgrade.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from grafeas.grafeas_v1.types import package as g_package diff --git a/packages/grafeas/grafeas/grafeas_v1/types/vulnerability.py b/packages/grafeas/grafeas/grafeas_v1/types/vulnerability.py index dce7860cc796..30678bd58611 100644 --- a/packages/grafeas/grafeas/grafeas_v1/types/vulnerability.py +++ b/packages/grafeas/grafeas/grafeas_v1/types/vulnerability.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from grafeas.grafeas_v1.types import common, cvss, package diff --git a/packages/grafeas/tests/unit/gapic/grafeas_v1/test_grafeas.py b/packages/grafeas/tests/unit/gapic/grafeas_v1/test_grafeas.py index d3a879a74e04..917a674b1fd4 100644 --- a/packages/grafeas/tests/unit/gapic/grafeas_v1/test_grafeas.py +++ b/packages/grafeas/tests/unit/gapic/grafeas_v1/test_grafeas.py @@ -51,11 +51,11 @@ from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from grafeas.grafeas_v1.services.grafeas import ( GrafeasAsyncClient,